into `\n` instead of ` \n` + 'list_item_style' => '-', // Set the default character for each
- . Can be '-', '*', or '+'
+ ];
+ }
+ $environment = Environment::createDefaultEnvironment($options);
+ $environment->addConverter(new TableConverter());
+ $converter = new HtmlConverter($environment);
+
+ try {
+ $markdown = $converter->convert($html);
+ } catch (InvalidArgumentException $e) {
+ logger("Invalid HTML. HTMLToMarkdown library threw an exception.");
+ }
- /**
- * @brief Convert bbcode to Markdown.
- *
- * @param string $Text The message as bbcode
- * @param array $options default empty
- * @return string The message converted to Markdown
- */
-
- static public function from_bbcode($Text, $options = []) {
-
- /*
- * Transform #tags, strip off the [url] and replace spaces with underscore
- */
-
- $Text = preg_replace_callback('/#\[([zu])rl\=(.*?)\](.*?)\[\/[(zu)]rl\]/i',
- create_function('$match', 'return \'#\'. str_replace(\' \', \'_\', $match[3]);'), $Text);
-
- $Text = preg_replace('/#\^\[([zu])rl\=(.*?)\](.*?)\[\/([zu])rl\]/i', '[$1rl=$2]$3[/$4rl]', $Text);
-
- // Converting images with size parameters to simple images. Markdown doesn't know it.
- $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
-
- $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism", [ '\\Zotlabs\\Lib\\Markdown', 'from_bbcode_share'], $Text);
-
- $x = [ 'bbcode' => $Text, 'options' => $options ];
-
- /**
- * @hooks bb_to_markdown_bb
- * * \e string \b bbcode - The message as bbcode and what will get returned
- * * \e array \b options
- */
- call_hooks('bb_to_markdown_bb', $x);
-
- $Text = $x['bbcode'];
-
- // Convert it to HTML - don't try oembed
- $Text = bbcode($Text, [ 'tryoembed' => false ]);
-
- // Now convert HTML to Markdown
-
- $Text = self::from_html($Text);
-
- //html2markdown adds backslashes infront of hashes after a new line. remove them
- $Text = str_replace("\n\#", "\n#", $Text);
-
-
- // If the text going into bbcode() has a plain URL in it, i.e.
- // with no [url] tags around it, it will come out of parseString()
- // looking like:
- in a
- . Can be '-', '*', or '+'
- ];
- }
-
- $environment = Environment::createDefaultEnvironment($options);
- $environment->addConverter(new TableConverter());
- $converter = new HtmlConverter($environment);
-
- try {
- $markdown = $converter->convert($html);
- } catch (InvalidArgumentException $e) {
- logger("Invalid HTML. HTMLToMarkdown library threw an exception.");
- }
-
- return $markdown;
- }
+ return $markdown;
+ }
}
// Tables are not an official part of the markdown specification.
@@ -330,64 +351,64 @@ class Markdown {
class TableConverter implements ConverterInterface
{
- /**
- * @param ElementInterface $element
- *
- * @return string
- */
- public function convert(ElementInterface $element)
- {
- switch ($element->getTagName()) {
- case 'tr':
- $line = [];
- $i = 1;
- foreach ($element->getChildren() as $td) {
- $i++;
- $v = $td->getValue();
- $v = trim($v);
- if ($i % 2 === 0 || $v !== '') {
- $line[] = $v;
- }
- }
- return '| ' . implode(' | ', $line) . " |\n";
- case 'td':
- case 'th':
- return trim($element->getValue());
- case 'tbody':
- return trim($element->getValue());
- case 'thead':
- $headerLine = reset($element->getChildren())->getValue();
- $headers = explode(' | ', trim(trim($headerLine, "\n"), '|'));
- $hr = [];
- foreach ($headers as $td) {
- $length = strlen(trim($td)) + 2;
- $hr[] = str_repeat('-', $length > 3 ? $length : 3);
- }
- $hr = '|' . implode('|', $hr) . '|';
- return $headerLine . $hr . "\n";
- case 'table':
- $inner = $element->getValue();
- if (strpos($inner, '-----') === false) {
- $inner = explode("\n", $inner);
- $single = explode(' | ', trim($inner[0], '|'));
- $hr = [];
- foreach ($single as $td) {
- $length = strlen(trim($td)) + 2;
- $hr[] = str_repeat('-', $length > 3 ? $length : 3);
- }
- $hr = '|' . implode('|', $hr) . '|';
- array_splice($inner, 1, 0, $hr);
- $inner = implode("\n", $inner);
- }
- return trim($inner) . "\n\n";
- }
- return $element->getValue();
- }
- /**
- * @return string[]
- */
- public function getSupportedTags()
- {
- return array('table', 'tr', 'thead', 'td', 'tbody');
- }
+ /**
+ * @param ElementInterface $element
+ *
+ * @return string
+ */
+ public function convert(ElementInterface $element)
+ {
+ switch ($element->getTagName()) {
+ case 'tr':
+ $line = [];
+ $i = 1;
+ foreach ($element->getChildren() as $td) {
+ $i++;
+ $v = $td->getValue();
+ $v = trim($v);
+ if ($i % 2 === 0 || $v !== '') {
+ $line[] = $v;
+ }
+ }
+ return '| ' . implode(' | ', $line) . " |\n";
+ case 'td':
+ case 'th':
+ return trim($element->getValue());
+ case 'tbody':
+ return trim($element->getValue());
+ case 'thead':
+ $headerLine = reset($element->getChildren())->getValue();
+ $headers = explode(' | ', trim(trim($headerLine, "\n"), '|'));
+ $hr = [];
+ foreach ($headers as $td) {
+ $length = strlen(trim($td)) + 2;
+ $hr[] = str_repeat('-', $length > 3 ? $length : 3);
+ }
+ $hr = '|' . implode('|', $hr) . '|';
+ return $headerLine . $hr . "\n";
+ case 'table':
+ $inner = $element->getValue();
+ if (strpos($inner, '-----') === false) {
+ $inner = explode("\n", $inner);
+ $single = explode(' | ', trim($inner[0], '|'));
+ $hr = [];
+ foreach ($single as $td) {
+ $length = strlen(trim($td)) + 2;
+ $hr[] = str_repeat('-', $length > 3 ? $length : 3);
+ }
+ $hr = '|' . implode('|', $hr) . '|';
+ array_splice($inner, 1, 0, $hr);
+ $inner = implode("\n", $inner);
+ }
+ return trim($inner) . "\n\n";
+ }
+ return $element->getValue();
+ }
+ /**
+ * @return string[]
+ */
+ public function getSupportedTags()
+ {
+ return array('table', 'tr', 'thead', 'td', 'tbody');
+ }
}
diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php
index a58a5753a..304f0cd02 100644
--- a/Zotlabs/Lib/MarkdownSoap.php
+++ b/Zotlabs/Lib/MarkdownSoap.php
@@ -22,111 +22,126 @@ namespace Zotlabs\Lib;
* $html = \Michelf\MarkdownExtra::DefaultTransform($markdown);
* @endcode
*/
-class MarkdownSoap {
+class MarkdownSoap
+{
- /**
- * @var string
- */
- private $str;
- /**
- * @var string
- */
- private $token;
+ /**
+ * @var string
+ */
+ private $str;
+ /**
+ * @var string
+ */
+ private $token;
- function __construct($s) {
- $this->str = $s;
- $this->token = random_string(20);
- }
+ public function __construct($s)
+ {
+ $this->str = $s;
+ $this->token = random_string(20);
+ }
- function clean() {
+ public function clean()
+ {
- $x = $this->extract_code($this->str);
+ $x = $this->extract_code($this->str);
- $x = $this->purify($x);
+ $x = $this->purify($x);
- $x = $this->putback_code($x);
+ $x = $this->putback_code($x);
- $x = $this->escape($x);
+ $x = $this->escape($x);
- return $x;
- }
+ return $x;
+ }
- /**
- * @brief Extracts code blocks and privately escapes them from processing.
- *
- * @see encode_code()
- * @see putback_code()
- *
- * @param string $s
- * @return string
- */
- function extract_code($s) {
+ /**
+ * @brief Extracts code blocks and privately escapes them from processing.
+ *
+ * @param string $s
+ * @return string
+ * @see encode_code()
+ * @see putback_code()
+ *
+ */
+ public function extract_code($s)
+ {
- $text = preg_replace_callback('{
+ $text = preg_replace_callback(
+ '{
(?:\n\n|\A\n?)
( # $1 = the code block -- one or more lines, starting with a space/tab
(?>
- [ ]{'.'4'.'} # Lines must start with a tab or a tab-width of spaces
+ [ ]{' . '4' . '} # Lines must start with a tab or a tab-width of spaces
.*\n+
)+
)
- ((?=^[ ]{0,'.'4'.'}\S)|\Z) # Lookahead for non-space at line-start, or end of doc
+ ((?=^[ ]{0,' . '4' . '}\S)|\Z) # Lookahead for non-space at line-start, or end of doc
}xm',
- [ $this , 'encode_code' ], $s);
+ [$this, 'encode_code'],
+ $s
+ );
- return $text;
- }
+ return $text;
+ }
- function encode_code($matches) {
- return $this->token . ';' . base64_encode($matches[0]) . ';' ;
- }
+ public function encode_code($matches)
+ {
+ return $this->token . ';' . base64_encode($matches[0]) . ';';
+ }
- function decode_code($matches) {
- return base64_decode($matches[1]);
- }
+ public function decode_code($matches)
+ {
+ return base64_decode($matches[1]);
+ }
- /**
- * @brief Put back the code blocks.
- *
- * @see extract_code()
- * @see decode_code()
- *
- * @param string $s
- * @return string
- */
- function putback_code($s) {
- $text = preg_replace_callback('{' . $this->token . '\;(.*?)\;}xm', [ $this, 'decode_code' ], $s);
- return $text;
- }
+ /**
+ * @brief Put back the code blocks.
+ *
+ * @param string $s
+ * @return string
+ * @see extract_code()
+ * @see decode_code()
+ *
+ */
+ public function putback_code($s)
+ {
+ $text = preg_replace_callback('{' . $this->token . '\;(.*?)\;}xm', [$this, 'decode_code'], $s);
+ return $text;
+ }
- function purify($s) {
- $s = $this->protect_autolinks($s);
- $s = purify_html($s);
- $s = $this->unprotect_autolinks($s);
- return $s;
- }
+ public function purify($s)
+ {
+ $s = $this->protect_autolinks($s);
+ $s = purify_html($s);
+ $s = $this->unprotect_autolinks($s);
+ return $s;
+ }
- function protect_autolinks($s) {
- $s = preg_replace('/\<(https?\:\/\/)(.*?)\>/', '[$1$2]($1$2)', $s);
- return $s;
- }
+ public function protect_autolinks($s)
+ {
+ $s = preg_replace('/\<(https?\:\/\/)(.*?)\>/', '[$1$2]($1$2)', $s);
+ return $s;
+ }
- function unprotect_autolinks($s) {
- return $s;
- }
+ public function unprotect_autolinks($s)
+ {
+ return $s;
+ }
- function escape($s) {
- return htmlspecialchars($s, ENT_QUOTES, 'UTF-8', false);
- }
+ public function escape($s)
+ {
+ return htmlspecialchars($s, ENT_QUOTES, 'UTF-8', false);
+ }
- /**
- * @brief Converts special HTML entities back to characters.
- *
- * @param string $s
- * @return string
- */
- static public function unescape($s) {
- return htmlspecialchars_decode($s, ENT_QUOTES);
- }
+ /**
+ * @brief Converts special HTML entities back to characters.
+ *
+ * @param string $s
+ * @return string
+ */
+ public static function unescape($s)
+ {
+ return htmlspecialchars_decode($s, ENT_QUOTES);
+ }
}
diff --git a/Zotlabs/Lib/MastAPI.php b/Zotlabs/Lib/MastAPI.php
index 7bfd7191a..99c5dfddc 100644
--- a/Zotlabs/Lib/MastAPI.php
+++ b/Zotlabs/Lib/MastAPI.php
@@ -5,99 +5,104 @@ namespace Zotlabs\Lib;
use App;
use Zotlabs\Lib\PConfig;
+class MastAPI
+{
-class MastAPI {
+ public static function format_channel($channel)
+ {
+ $p = q(
+ "select * from profile where uid = %d and is_default = 1",
+ intval($channel['channel_id'])
+ );
- static function format_channel($channel) {
- $p = q("select * from profile where uid = %d and is_default = 1",
- intval($channel['channel_id'])
- );
+ $a = q(
+ "select * from account where account_id = %d",
+ intval($channel['channel_account_id'])
+ );
- $a = q("select * from account where account_id = %d",
- intval($channel['channel_account_id'])
- );
-
- $followers = q("select count(xchan_hash) as total from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'their_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0 ",
+ $followers = q(
+ "select count(xchan_hash) as total from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'their_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0 ",
intval($channel['channel_id']),
intval($channel['channel_id']),
dbesc($channel['channel_hash'])
);
- $following = q("select count(xchan_hash) as total from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'my_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0",
- intval($channel['channel_id']),
- intval($channel['channel_id']),
- dbesc($channel['channel_hash'])
- );
+ $following = q(
+ "select count(xchan_hash) as total from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'my_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0",
+ intval($channel['channel_id']),
+ intval($channel['channel_id']),
+ dbesc($channel['channel_hash'])
+ );
- $cover_photo = get_cover_photo($channel['channel_id'],'array');
+ $cover_photo = get_cover_photo($channel['channel_id'], 'array');
$item_normal = item_normal();
// count posts/comments
- $statuses = q("SELECT COUNT(id) as total FROM item
+ $statuses = q(
+ "SELECT COUNT(id) as total FROM item
WHERE uid = %d
AND author_xchan = '%s' $item_normal ",
intval($channel['channel_id']),
- dbesc($channel['channel_hash'])
+ dbesc($channel['channel_hash'])
);
- $ret = [];
- $ret['id'] = (string) $channel['channel_id'];
- $ret['username'] = $channel['channel_address'];
- $ret['acct'] = $channel['channel_address'];
- $ret['display_name'] = $channel['channel_name'];
- $ret['locked'] = ((intval(PConfig::Get($channel['channel_id'],'system','autoperms'))) ? false : true );
- $ret['discoverable'] = ((1 - intval($channel['xchan_hidden'])) ? true : false);
- $ret['created_at'] = datetime_convert('UTC','UTC', $a[0]['account_created'], ATOM_TIME);
- $ret['note'] = bbcode($p[0]['about'], [ 'export' => true ]);
- $ret['url'] = channel_url($channel);
- $ret['avatar'] = $channel['xchan_photo_l'];
- $ret['avatar_static'] = $channel['xchan_photo_l'];
- if ($cover_photo) {
- $ret['header'] = $cover_photo['url'];
- $ret['header_static'] = $cover_photo['url'];
- }
- $ret['followers_count'] = intval($followers[0]['total']);
- $ret['following_count'] = intval($following[0]['total']);
- $ret['statuses_count'] = intval($statuses[0]['total']);
- $ret['last_status_at'] = datetime_convert('UTC','UTC', $channel['lastpost'], ATOM_TIME);
+ $ret = [];
+ $ret['id'] = (string)$channel['channel_id'];
+ $ret['username'] = $channel['channel_address'];
+ $ret['acct'] = $channel['channel_address'];
+ $ret['display_name'] = $channel['channel_name'];
+ $ret['locked'] = ((intval(PConfig::Get($channel['channel_id'], 'system', 'autoperms'))) ? false : true);
+ $ret['discoverable'] = ((1 - intval($channel['xchan_hidden'])) ? true : false);
+ $ret['created_at'] = datetime_convert('UTC', 'UTC', $a[0]['account_created'], ATOM_TIME);
+ $ret['note'] = bbcode($p[0]['about'], ['export' => true]);
+ $ret['url'] = channel_url($channel);
+ $ret['avatar'] = $channel['xchan_photo_l'];
+ $ret['avatar_static'] = $channel['xchan_photo_l'];
+ if ($cover_photo) {
+ $ret['header'] = $cover_photo['url'];
+ $ret['header_static'] = $cover_photo['url'];
+ }
+ $ret['followers_count'] = intval($followers[0]['total']);
+ $ret['following_count'] = intval($following[0]['total']);
+ $ret['statuses_count'] = intval($statuses[0]['total']);
+ $ret['last_status_at'] = datetime_convert('UTC', 'UTC', $channel['lastpost'], ATOM_TIME);
- return $ret;
- }
+ return $ret;
+ }
- static function format_site() {
+ public static function format_site()
+ {
- $register = intval(get_config('system','register_policy'));
+ $register = intval(get_config('system', 'register_policy'));
- $u = q("select count(channel_id) as total from channel where channel_removed = 0");
- $i = q("select count(id) as total from item where item_origin = 1");
- $s = q("select count(site_url) as total from site");
+ $u = q("select count(channel_id) as total from channel where channel_removed = 0");
+ $i = q("select count(id) as total from item where item_origin = 1");
+ $s = q("select count(site_url) as total from site");
- $admins = q("select * from channel left join account on account_id = channel_account_id where ( account_roles & 4096 ) > 0 and account_default_channel = channel_id");
- $adminsx = channelx_by_n($admins[0]['channel_id']);
+ $admins = q("select * from channel left join account on account_id = channel_account_id where ( account_roles & 4096 ) > 0 and account_default_channel = channel_id");
+ $adminsx = channelx_by_n($admins[0]['channel_id']);
- $ret = [];
- $ret['uri'] = z_root();
- $ret['title'] = System::get_site_name();
- $ret['description'] = bbcode(get_config('system','siteinfo',''), [ 'export' => true ] );
- $ret['email'] = get_config('system','admin_email');
- $ret['version'] = System::get_project_version();
- $ret['registrations'] = (($register) ? true : false);
- $ret['approval_required'] = (($register === REGISTER_APPROVE) ? true : false);
- $ret['invites_enabled'] = false;
- $ret['urls'] = [];
- $ret['stats'] = [
- 'user_count' => intval($u[0]['total']),
- 'status_count' => intval($i[0]['total']),
- 'domain_count' => intval($s[0]['total']),
- ];
+ $ret = [];
+ $ret['uri'] = z_root();
+ $ret['title'] = System::get_site_name();
+ $ret['description'] = bbcode(get_config('system', 'siteinfo', ''), ['export' => true]);
+ $ret['email'] = get_config('system', 'admin_email');
+ $ret['version'] = System::get_project_version();
+ $ret['registrations'] = (($register) ? true : false);
+ $ret['approval_required'] = (($register === REGISTER_APPROVE) ? true : false);
+ $ret['invites_enabled'] = false;
+ $ret['urls'] = [];
+ $ret['stats'] = [
+ 'user_count' => intval($u[0]['total']),
+ 'status_count' => intval($i[0]['total']),
+ 'domain_count' => intval($s[0]['total']),
+ ];
- $ret['contact_account'] = self::format_channel($adminsx);
+ $ret['contact_account'] = self::format_channel($adminsx);
- return $ret;
-
- }
-
-}
\ No newline at end of file
+ return $ret;
+ }
+}
diff --git a/Zotlabs/Lib/MessageFilter.php b/Zotlabs/Lib/MessageFilter.php
index 6941c2e45..f61e240aa 100644
--- a/Zotlabs/Lib/MessageFilter.php
+++ b/Zotlabs/Lib/MessageFilter.php
@@ -3,88 +3,94 @@
namespace Zotlabs\Lib;
-
-class MessageFilter {
+class MessageFilter
+{
- static public function evaluate($item,$incl,$excl) {
+ public static function evaluate($item, $incl, $excl)
+ {
- require_once('include/html2plain.php');
+ require_once('include/html2plain.php');
$text = prepare_text($item['body'],((isset($item['mimetype'])) ? $item['mimetype'] : 'text/x-multicode'));
- $text = html2plain(($item['title']) ? $item['title'] . ' ' . $text : $text);
+ $text = html2plain(($item['title']) ? $item['title'] . ' ' . $text : $text);
- $lang = null;
+ $lang = null;
- if((strpos($incl,'lang=') !== false) || (strpos($excl,'lang=') !== false) || (strpos($incl,'lang!=') !== false) || (strpos($excl,'lang!=') !== false)) {
- $lang = detect_language($text);
- }
+ if ((strpos($incl, 'lang=') !== false) || (strpos($excl, 'lang=') !== false) || (strpos($incl, 'lang!=') !== false) || (strpos($excl, 'lang!=') !== false)) {
+ $lang = detect_language($text);
+ }
- $tags = ((isset($item['term']) && is_array($item['term']) && count($item['term'])) ? $item['term'] : false);
+ $tags = ((isset($item['term']) && is_array($item['term']) && count($item['term'])) ? $item['term'] : false);
- // exclude always has priority
+ // exclude always has priority
- $exclude = (($excl) ? explode("\n",$excl) : null);
+ $exclude = (($excl) ? explode("\n", $excl) : null);
- if($exclude) {
- foreach($exclude as $word) {
- $word = trim($word);
- if(! $word)
- continue;
- if(substr($word,0,1) === '#' && $tags) {
- foreach($tags as $t)
- if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*')))
- return false;
- }
- elseif(substr($word,0,1) === '$' && $tags) {
- foreach($tags as $t)
- if(($t['ttype'] == TERM_CATEGORY) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*')))
- return false;
- }
- elseif((strpos($word,'/') === 0) && preg_match($word,$text))
- return false;
- elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0))
- return false;
- elseif((strpos($word,'lang!=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,6))) != 0))
- return false;
- elseif(stristr($text,$word) !== false)
- return false;
- }
- }
+ if ($exclude) {
+ foreach ($exclude as $word) {
+ $word = trim($word);
+ if (! $word) {
+ continue;
+ }
+ if (substr($word, 0, 1) === '#' && $tags) {
+ foreach ($tags as $t) {
+ if ((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($word, 1)) || (substr($word, 1) === '*'))) {
+ return false;
+ }
+ }
+ } elseif (substr($word, 0, 1) === '$' && $tags) {
+ foreach ($tags as $t) {
+ if (($t['ttype'] == TERM_CATEGORY) && (($t['term'] === substr($word, 1)) || (substr($word, 1) === '*'))) {
+ return false;
+ }
+ }
+ } elseif ((strpos($word, '/') === 0) && preg_match($word, $text)) {
+ return false;
+ } elseif ((strpos($word, 'lang=') === 0) && ($lang) && (strcasecmp($lang, trim(substr($word, 5))) == 0)) {
+ return false;
+ } elseif ((strpos($word, 'lang!=') === 0) && ($lang) && (strcasecmp($lang, trim(substr($word, 6))) != 0)) {
+ return false;
+ } elseif (stristr($text, $word) !== false) {
+ return false;
+ }
+ }
+ }
- $include = (($incl) ? explode("\n",$incl) : null);
-
- if($include) {
- foreach($include as $word) {
- $word = trim($word);
- if(! $word)
- continue;
- if(substr($word,0,1) === '#' && $tags) {
- foreach($tags as $t)
- if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*')))
- return true;
- }
- elseif(substr($word,0,1) === '$' && $tags) {
- foreach($tags as $t)
- if(($t['ttype'] == TERM_CATEGORY) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*')))
- return true;
- }
- elseif((strpos($word,'/') === 0) && preg_match($word,$text))
- return true;
- elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0))
- return true;
- elseif((strpos($word,'lang!=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,6))) != 0))
- return true;
- elseif(stristr($text,$word) !== false)
- return true;
- }
- }
- else {
- return true;
- }
-
- return false;
- }
+ $include = (($incl) ? explode("\n", $incl) : null);
+ if ($include) {
+ foreach ($include as $word) {
+ $word = trim($word);
+ if (! $word) {
+ continue;
+ }
+ if (substr($word, 0, 1) === '#' && $tags) {
+ foreach ($tags as $t) {
+ if ((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($word, 1)) || (substr($word, 1) === '*'))) {
+ return true;
+ }
+ }
+ } elseif (substr($word, 0, 1) === '$' && $tags) {
+ foreach ($tags as $t) {
+ if (($t['ttype'] == TERM_CATEGORY) && (($t['term'] === substr($word, 1)) || (substr($word, 1) === '*'))) {
+ return true;
+ }
+ }
+ } elseif ((strpos($word, '/') === 0) && preg_match($word, $text)) {
+ return true;
+ } elseif ((strpos($word, 'lang=') === 0) && ($lang) && (strcasecmp($lang, trim(substr($word, 5))) == 0)) {
+ return true;
+ } elseif ((strpos($word, 'lang!=') === 0) && ($lang) && (strcasecmp($lang, trim(substr($word, 6))) != 0)) {
+ return true;
+ } elseif (stristr($text, $word) !== false) {
+ return true;
+ }
+ }
+ } else {
+ return true;
+ }
+ return false;
+ }
}
diff --git a/Zotlabs/Lib/Nodeinfo.php b/Zotlabs/Lib/Nodeinfo.php
index 62efd7583..65d5c78a5 100644
--- a/Zotlabs/Lib/Nodeinfo.php
+++ b/Zotlabs/Lib/Nodeinfo.php
@@ -2,43 +2,40 @@
namespace Zotlabs\Lib;
+class Nodeinfo
+{
-
-class Nodeinfo {
-
- static public function fetch($url) {
- $href = EMPTY_STR;
- $m = parse_url($url);
- if ($m['scheme'] && $m['host']) {
- $s = $m['scheme'] . '://' . $m['host'] . '/.well-known/nodeinfo';
- $n = z_fetch_url($s);
- if ($n['success']) {
- $j = json_decode($n['body'], true);
- if ($j && $j['links']) {
- // lemmy just sends one result
- if (isset($j['links']['rel'])) {
- if ($j['links']['rel'] === 'http://nodeinfo.diaspora.software/ns/schema/2.0' && isset($j['links']['href'])) {
- $href = $j['links']['href'];
- }
- }
- else {
- foreach ($j['links'] as $l) {
- if (isset($l['rel']) && $l['rel'] === 'http://nodeinfo.diaspora.software/ns/schema/2.0' && isset($l['href'])) {
- $href = $l['href'];
- }
- }
- }
- }
- }
- }
- if ($href) {
- $n = z_fetch_url($href);
- if ($n['success']) {
- return json_decode($n['body'],true);
- }
- }
- return [];
-
- }
-
-}
\ No newline at end of file
+ public static function fetch($url)
+ {
+ $href = EMPTY_STR;
+ $m = parse_url($url);
+ if ($m['scheme'] && $m['host']) {
+ $s = $m['scheme'] . '://' . $m['host'] . '/.well-known/nodeinfo';
+ $n = z_fetch_url($s);
+ if ($n['success']) {
+ $j = json_decode($n['body'], true);
+ if ($j && $j['links']) {
+ // lemmy just sends one result
+ if (isset($j['links']['rel'])) {
+ if ($j['links']['rel'] === 'http://nodeinfo.diaspora.software/ns/schema/2.0' && isset($j['links']['href'])) {
+ $href = $j['links']['href'];
+ }
+ } else {
+ foreach ($j['links'] as $l) {
+ if (isset($l['rel']) && $l['rel'] === 'http://nodeinfo.diaspora.software/ns/schema/2.0' && isset($l['href'])) {
+ $href = $l['href'];
+ }
+ }
+ }
+ }
+ }
+ }
+ if ($href) {
+ $n = z_fetch_url($href);
+ if ($n['success']) {
+ return json_decode($n['body'], true);
+ }
+ }
+ return [];
+ }
+}
diff --git a/Zotlabs/Lib/PConfig.php b/Zotlabs/Lib/PConfig.php
index efc5698c2..b456be5ca 100644
--- a/Zotlabs/Lib/PConfig.php
+++ b/Zotlabs/Lib/PConfig.php
@@ -2,6 +2,8 @@
namespace Zotlabs\Lib;
+use App;
+
/**
* @brief Class for handling channel specific configurations.
*
@@ -16,193 +18,212 @@ namespace Zotlabs\Lib;
* The old (deprecated?) way to access a PConfig value is:
* @code{.php}$var = get_pconfig(local_channel(), 'category', 'key');@endcode
*/
-class PConfig {
+class PConfig
+{
- /**
- * @brief Loads all configuration values of a channel into a cached storage.
- *
- * All configuration values of the given channel are stored in global cache
- * which is available under the global variable App::$config[$uid].
- *
- * @param string $uid
- * The channel_id
- * @return void|false Nothing or false if $uid is null or false
- */
- static public function Load($uid) {
- if(is_null($uid) || $uid === false)
- return false;
+ /**
+ * @brief Loads all configuration values of a channel into a cached storage.
+ *
+ * All configuration values of the given channel are stored in global cache
+ * which is available under the global variable App::$config[$uid].
+ *
+ * @param string $uid
+ * The channel_id
+ * @return void|false Nothing or false if $uid is null or false
+ */
+ public static function Load($uid)
+ {
+ if (is_null($uid) || $uid === false) {
+ return false;
+ }
- if(! is_array(\App::$config)) {
- btlogger('App::$config not an array');
- }
+ if (! is_array(App::$config)) {
+ btlogger('App::$config not an array');
+ }
- if(! array_key_exists($uid, \App::$config)) {
- \App::$config[$uid] = [];
- }
+ if (! array_key_exists($uid, App::$config)) {
+ App::$config[$uid] = [];
+ }
- if(! is_array(\App::$config[$uid])) {
- btlogger('App::$config[$uid] not an array: ' . $uid);
- }
+ if (! is_array(App::$config[$uid])) {
+ btlogger('App::$config[$uid] not an array: ' . $uid);
+ }
- $r = q("SELECT * FROM pconfig WHERE uid = %d",
- intval($uid)
- );
+ $r = q(
+ "SELECT * FROM pconfig WHERE uid = %d",
+ intval($uid)
+ );
- if($r) {
- foreach($r as $rr) {
- $k = $rr['k'];
- $c = $rr['cat'];
- if(! array_key_exists($c, \App::$config[$uid])) {
- \App::$config[$uid][$c] = [];
- \App::$config[$uid][$c]['config_loaded'] = true;
- }
- \App::$config[$uid][$c][$k] = $rr['v'];
- }
- }
- }
+ if ($r) {
+ foreach ($r as $rr) {
+ $k = $rr['k'];
+ $c = $rr['cat'];
+ if (! array_key_exists($c, App::$config[$uid])) {
+ App::$config[$uid][$c] = [];
+ App::$config[$uid][$c]['config_loaded'] = true;
+ }
+ App::$config[$uid][$c][$k] = $rr['v'];
+ }
+ }
+ }
- /**
- * @brief Get a particular channel's config variable given the category name
- * ($family) and a key.
- *
- * Get a particular channel's config value from the given category ($family)
- * and the $key from a cached storage in App::$config[$uid].
- *
- * Returns false if not set.
- *
- * @param string $uid
- * The channel_id
- * @param string $family
- * The category of the configuration value
- * @param string $key
- * The configuration key to query
- * @param mixed $default (optional, default false)
- * Default value to return if key does not exist
- * @return mixed Stored value or false if it does not exist
- */
- static public function Get($uid, $family, $key, $default = false) {
+ /**
+ * @brief Get a particular channel's config variable given the category name
+ * ($family) and a key.
+ *
+ * Get a particular channel's config value from the given category ($family)
+ * and the $key from a cached storage in App::$config[$uid].
+ *
+ * Returns false if not set.
+ *
+ * @param string $uid
+ * The channel_id
+ * @param string $family
+ * The category of the configuration value
+ * @param string $key
+ * The configuration key to query
+ * @param mixed $default (optional, default false)
+ * Default value to return if key does not exist
+ * @return mixed Stored value or false if it does not exist
+ */
+ public static function Get($uid, $family, $key, $default = false)
+ {
- if(is_null($uid) || $uid === false)
- return $default;
+ if (is_null($uid) || $uid === false) {
+ return $default;
+ }
- if(! array_key_exists($uid, \App::$config))
- self::Load($uid);
+ if (! array_key_exists($uid, App::$config)) {
+ self::Load($uid);
+ }
- if((! array_key_exists($family, \App::$config[$uid])) || (! array_key_exists($key, \App::$config[$uid][$family])))
- return $default;
+ if ((! array_key_exists($family, App::$config[$uid])) || (! array_key_exists($key, App::$config[$uid][$family]))) {
+ return $default;
+ }
- return unserialise(\App::$config[$uid][$family][$key]);
- }
+ return unserialise(App::$config[$uid][$family][$key]);
+ }
- /**
- * @brief Sets a configuration value for a channel.
- *
- * Stores a config value ($value) in the category ($family) under the key ($key)
- * for the channel_id $uid.
- *
- * @param string $uid
- * The channel_id
- * @param string $family
- * The category of the configuration value
- * @param string $key
- * The configuration key to set
- * @param string $value
- * The value to store
- * @return mixed Stored $value or false
- */
- static public function Set($uid, $family, $key, $value) {
+ /**
+ * @brief Sets a configuration value for a channel.
+ *
+ * Stores a config value ($value) in the category ($family) under the key ($key)
+ * for the channel_id $uid.
+ *
+ * @param string $uid
+ * The channel_id
+ * @param string $family
+ * The category of the configuration value
+ * @param string $key
+ * The configuration key to set
+ * @param string $value
+ * The value to store
+ * @return mixed Stored $value or false
+ */
+ public static function Set($uid, $family, $key, $value)
+ {
- // this catches subtle errors where this function has been called
- // with local_channel() when not logged in (which returns false)
- // and throws an error in array_key_exists below.
- // we provide a function backtrace in the logs so that we can find
- // and fix the calling function.
+ // this catches subtle errors where this function has been called
+ // with local_channel() when not logged in (which returns false)
+ // and throws an error in array_key_exists below.
+ // we provide a function backtrace in the logs so that we can find
+ // and fix the calling function.
- if(is_null($uid) || $uid === false) {
- btlogger('UID is FALSE!', LOGGER_NORMAL, LOG_ERR);
- return;
- }
+ if (is_null($uid) || $uid === false) {
+ btlogger('UID is FALSE!', LOGGER_NORMAL, LOG_ERR);
+ return;
+ }
- // manage array value
- $dbvalue = ((is_array($value)) ? serialise($value) : $value);
- $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue);
+ // manage array value
+ $dbvalue = ((is_array($value)) ? serialise($value) : $value);
+ $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue);
- if(self::Get($uid, $family, $key) === false) {
- if(! array_key_exists($uid, \App::$config))
- \App::$config[$uid] = [];
- if(! array_key_exists($family, \App::$config[$uid]))
- \App::$config[$uid][$family] = [];
+ if (self::Get($uid, $family, $key) === false) {
+ if (! array_key_exists($uid, App::$config)) {
+ App::$config[$uid] = [];
+ }
+ if (! array_key_exists($family, App::$config[$uid])) {
+ App::$config[$uid][$family] = [];
+ }
- $ret = q("INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ",
- intval($uid),
- dbesc($family),
- dbesc($key),
- dbesc($dbvalue)
- );
- }
- else {
+ $ret = q(
+ "INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ",
+ intval($uid),
+ dbesc($family),
+ dbesc($key),
+ dbesc($dbvalue)
+ );
+ } else {
+ $ret = q(
+ "UPDATE pconfig SET v = '%s' WHERE uid = %d and cat = '%s' AND k = '%s'",
+ dbesc($dbvalue),
+ intval($uid),
+ dbesc($family),
+ dbesc($key)
+ );
+ }
- $ret = q("UPDATE pconfig SET v = '%s' WHERE uid = %d and cat = '%s' AND k = '%s'",
- dbesc($dbvalue),
- intval($uid),
- dbesc($family),
- dbesc($key)
- );
- }
+ // keep a separate copy for all variables which were
+ // set in the life of this page. We need this to
+ // synchronise channel clones.
- // keep a separate copy for all variables which were
- // set in the life of this page. We need this to
- // synchronise channel clones.
+ if (! array_key_exists('transient', App::$config[$uid])) {
+ App::$config[$uid]['transient'] = [];
+ }
+ if (! array_key_exists($family, App::$config[$uid]['transient'])) {
+ App::$config[$uid]['transient'][$family] = [];
+ }
- if(! array_key_exists('transient', \App::$config[$uid]))
- \App::$config[$uid]['transient'] = [];
- if(! array_key_exists($family, \App::$config[$uid]['transient']))
- \App::$config[$uid]['transient'][$family] = [];
+ App::$config[$uid][$family][$key] = $value;
+ App::$config[$uid]['transient'][$family][$key] = $value;
- \App::$config[$uid][$family][$key] = $value;
- \App::$config[$uid]['transient'][$family][$key] = $value;
+ if ($ret) {
+ return $value;
+ }
- if($ret)
- return $value;
-
- return $ret;
- }
+ return $ret;
+ }
- /**
- * @brief Deletes the given key from the channel's configuration.
- *
- * Removes the configured value from the stored cache in App::$config[$uid]
- * and removes it from the database.
- *
- * @param string $uid
- * The channel_id
- * @param string $family
- * The category of the configuration value
- * @param string $key
- * The configuration key to delete
- * @return mixed
- */
- static public function Delete($uid, $family, $key) {
+ /**
+ * @brief Deletes the given key from the channel's configuration.
+ *
+ * Removes the configured value from the stored cache in App::$config[$uid]
+ * and removes it from the database.
+ *
+ * @param string $uid
+ * The channel_id
+ * @param string $family
+ * The category of the configuration value
+ * @param string $key
+ * The configuration key to delete
+ * @return mixed
+ */
+ public static function Delete($uid, $family, $key)
+ {
- if(is_null($uid) || $uid === false)
- return false;
+ if (is_null($uid) || $uid === false) {
+ return false;
+ }
- $ret = false;
+ $ret = false;
- if(array_key_exists($uid,\App::$config)
- && is_array(\App::$config['uid'])
- && array_key_exists($family,\App::$config['uid'])
- && array_key_exists($key, \App::$config[$uid][$family]))
- unset(\App::$config[$uid][$family][$key]);
+ if (
+ array_key_exists($uid, App::$config)
+ && is_array(App::$config['uid'])
+ && array_key_exists($family, App::$config['uid'])
+ && array_key_exists($key, App::$config[$uid][$family])
+ ) {
+ unset(App::$config[$uid][$family][$key]);
+ }
- $ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'",
- intval($uid),
- dbesc($family),
- dbesc($key)
- );
-
- return $ret;
- }
+ $ret = q(
+ "DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'",
+ intval($uid),
+ dbesc($family),
+ dbesc($key)
+ );
+ return $ret;
+ }
}
diff --git a/Zotlabs/Lib/Permcat.php b/Zotlabs/Lib/Permcat.php
index 92f69cdbd..c94061586 100644
--- a/Zotlabs/Lib/Permcat.php
+++ b/Zotlabs/Lib/Permcat.php
@@ -21,157 +21,168 @@ use Zotlabs\Access\Permissions;
* These answer the question "Can Joe view *this* album/photo?".
*/
-class Permcat {
+class Permcat
+{
- /**
- * @var array
- */
- private $permcats = [];
+ /**
+ * @var array
+ */
+ private $permcats = [];
- /**
- * @brief Permcat constructor.
- *
- * @param int $channel_id
- */
- public function __construct($channel_id) {
+ /**
+ * @brief Permcat constructor.
+ *
+ * @param int $channel_id
+ */
+ public function __construct($channel_id)
+ {
- $perms = [];
+ $perms = [];
- // first check role perms for a perms_connect setting
+ // first check role perms for a perms_connect setting
- $role = get_pconfig($channel_id,'system','permissions_role');
- if($role) {
- $x = PermissionRoles::role_perms($role);
- if($x['perms_connect']) {
- $perms = Permissions::FilledPerms($x['perms_connect']);
- }
- }
+ $role = get_pconfig($channel_id, 'system', 'permissions_role');
+ if ($role) {
+ $x = PermissionRoles::role_perms($role);
+ if ($x['perms_connect']) {
+ $perms = Permissions::FilledPerms($x['perms_connect']);
+ }
+ }
- // if no role perms it may be a custom role, see if there any autoperms
+ // if no role perms it may be a custom role, see if there any autoperms
- if(! $perms) {
- $perms = Permissions::FilledAutoPerms($channel_id);
- }
+ if (! $perms) {
+ $perms = Permissions::FilledAutoPerms($channel_id);
+ }
- // if no autoperms it may be a custom role with manual perms
+ // if no autoperms it may be a custom role with manual perms
- if(! $perms) {
- $c = channelx_by_n($channel_id);
- if($c) {
- $perms = Permissions::FilledPerms(get_abconfig($channel_id,$c['channel_hash'],'system','my_perms',EMPTY_STR));
- }
- }
+ if (! $perms) {
+ $c = channelx_by_n($channel_id);
+ if ($c) {
+ $perms = Permissions::FilledPerms(get_abconfig($channel_id, $c['channel_hash'], 'system', 'my_perms', EMPTY_STR));
+ }
+ }
- // nothing was found - create a filled permission array where all permissions are 0
+ // nothing was found - create a filled permission array where all permissions are 0
- if(! $perms) {
- $perms = Permissions::FilledPerms([]);
- }
+ if (! $perms) {
+ $perms = Permissions::FilledPerms([]);
+ }
- $this->permcats[] = [
- 'name' => 'default',
- 'localname' => t('default','permcat'),
- 'perms' => Permissions::Operms($perms),
- 'system' => 1
- ];
+ $this->permcats[] = [
+ 'name' => 'default',
+ 'localname' => t('default', 'permcat'),
+ 'perms' => Permissions::Operms($perms),
+ 'system' => 1
+ ];
- $p = $this->load_permcats($channel_id);
- if($p) {
- for($x = 0; $x < count($p); $x++) {
- $this->permcats[] = [
- 'name' => $p[$x][0],
- 'localname' => $p[$x][1],
- 'perms' => Permissions::Operms(Permissions::FilledPerms($p[$x][2])),
- 'system' => intval($p[$x][3])
- ];
- }
- }
- }
+ $p = $this->load_permcats($channel_id);
+ if ($p) {
+ for ($x = 0; $x < count($p); $x++) {
+ $this->permcats[] = [
+ 'name' => $p[$x][0],
+ 'localname' => $p[$x][1],
+ 'perms' => Permissions::Operms(Permissions::FilledPerms($p[$x][2])),
+ 'system' => intval($p[$x][3])
+ ];
+ }
+ }
+ }
- /**
- * @brief Return array with permcats.
- *
- * @return array
- */
- public function listing() {
- return $this->permcats;
- }
+ /**
+ * @brief Return array with permcats.
+ *
+ * @return array
+ */
+ public function listing()
+ {
+ return $this->permcats;
+ }
- /**
- * @brief
- *
- * @param string $name
- * @return array
- * * \e array with permcats
- * * \e bool \b error if $name not found in permcats true
- */
- public function fetch($name) {
- if($name && $this->permcats) {
- foreach($this->permcats as $permcat) {
- if(strcasecmp($permcat['name'], $name) === 0) {
- return $permcat;
- }
- }
- }
+ /**
+ * @brief
+ *
+ * @param string $name
+ * @return array
+ * * \e array with permcats
+ * * \e bool \b error if $name not found in permcats true
+ */
+ public function fetch($name)
+ {
+ if ($name && $this->permcats) {
+ foreach ($this->permcats as $permcat) {
+ if (strcasecmp($permcat['name'], $name) === 0) {
+ return $permcat;
+ }
+ }
+ }
- return ['error' => true];
- }
+ return ['error' => true];
+ }
- public function load_permcats($uid) {
+ public function load_permcats($uid)
+ {
- $permcats = [
- [ 'follower', t('follower','permcat'),
- [ 'view_stream','view_profile','view_contacts','view_storage','view_pages','view_wiki',
- 'post_like' ], 1
- ],
- [ 'contributor', t('contributor','permcat'),
- [ 'view_stream','view_profile','view_contacts','view_storage','view_pages','view_wiki',
- 'post_wall','post_comments','write_wiki','post_like','tag_deliver','chat' ], 1
- ],
- [ 'publisher', t('publisher','permcat'),
- [ 'view_stream','view_profile','view_contacts','view_storage','view_pages',
- 'write_storage','post_wall','write_pages','write_wiki','post_comments','post_like','tag_deliver',
- 'chat', 'republish' ], 1
- ]
- ];
+ $permcats = [
+ [ 'follower', t('follower', 'permcat'),
+ [ 'view_stream','view_profile','view_contacts','view_storage','view_pages','view_wiki',
+ 'post_like' ], 1
+ ],
+ [ 'contributor', t('contributor', 'permcat'),
+ [ 'view_stream','view_profile','view_contacts','view_storage','view_pages','view_wiki',
+ 'post_wall','post_comments','write_wiki','post_like','tag_deliver','chat' ], 1
+ ],
+ [ 'publisher', t('publisher', 'permcat'),
+ [ 'view_stream','view_profile','view_contacts','view_storage','view_pages',
+ 'write_storage','post_wall','write_pages','write_wiki','post_comments','post_like','tag_deliver',
+ 'chat', 'republish' ], 1
+ ]
+ ];
- if($uid) {
- $x = q("select * from pconfig where uid = %d and cat = 'permcat'",
- intval($uid)
- );
- if($x) {
- foreach($x as $xv) {
- $value = ((preg_match('|^a:[0-9]+:{.*}$|s', $xv['v'])) ? unserialize($xv['v']) : $xv['v']);
- $permcats[] = [ $xv['k'], $xv['k'], $value, 0 ];
- }
- }
- }
+ if ($uid) {
+ $x = q(
+ "select * from pconfig where uid = %d and cat = 'permcat'",
+ intval($uid)
+ );
+ if ($x) {
+ foreach ($x as $xv) {
+ $value = ((preg_match('|^a:[0-9]+:{.*}$|s', $xv['v'])) ? unserialize($xv['v']) : $xv['v']);
+ $permcats[] = [ $xv['k'], $xv['k'], $value, 0 ];
+ }
+ }
+ }
- /**
- * @hooks permcats
- * * \e array
- */
- call_hooks('permcats', $permcats);
+ /**
+ * @hooks permcats
+ * * \e array
+ */
+ call_hooks('permcats', $permcats);
- return $permcats;
- }
+ return $permcats;
+ }
- static public function find_permcat($arr, $name) {
- if((! $arr) || (! $name))
- return false;
+ public static function find_permcat($arr, $name)
+ {
+ if ((! $arr) || (! $name)) {
+ return false;
+ }
- foreach($arr as $p)
- if($p['name'] == $name)
- return $p['value'];
- }
+ foreach ($arr as $p) {
+ if ($p['name'] == $name) {
+ return $p['value'];
+ }
+ }
+ }
- static public function update($channel_id, $name, $permarr) {
- PConfig::Set($channel_id, 'permcat', $name, $permarr);
- }
+ public static function update($channel_id, $name, $permarr)
+ {
+ PConfig::Set($channel_id, 'permcat', $name, $permarr);
+ }
- static public function delete($channel_id, $name) {
- PConfig::Delete($channel_id, 'permcat', $name);
- }
-
-}
\ No newline at end of file
+ public static function delete($channel_id, $name)
+ {
+ PConfig::Delete($channel_id, 'permcat', $name);
+ }
+}
diff --git a/Zotlabs/Lib/PermissionDescription.php b/Zotlabs/Lib/PermissionDescription.php
index 51d5f890d..58d2ee7f3 100644
--- a/Zotlabs/Lib/PermissionDescription.php
+++ b/Zotlabs/Lib/PermissionDescription.php
@@ -2,6 +2,10 @@
namespace Zotlabs\Lib;
+use App;
+use Zotlabs\Access\PermissionLimits;
+use Zotlabs\Access\Permissions;
+
require_once("include/permissions.php");
require_once("include/language.php");
require_once("include/text.php");
@@ -12,148 +16,178 @@ require_once("include/text.php");
* permission settings for an item with an empty ACL.
* i.e the caption, icon, and tooltip for the no-ACL option in the ACL dialog.
*/
-class PermissionDescription {
+class PermissionDescription
+{
- private $global_perm;
- private $channel_perm;
- private $fallback_description;
+ private $global_perm;
+ private $channel_perm;
+ private $fallback_description;
- /**
- * Constructor is private.
- * Use static methods fromGlobalPermission(), fromStandalonePermission(),
- * or fromDescription() to create instances.
- *
- * @internal
- * @param int $global_perm
- * @param int $channel_perm
- * @param string $description (optional) default empty
- */
- private function __construct($global_perm, $channel_perm, $description = '') {
- $this->global_perm = $global_perm;
- $this->channel_perm = $channel_perm;
- $this->fallback_description = ($description == '') ? t('Visible to your default audience') : $description;
- }
+ /**
+ * Constructor is private.
+ * Use static methods fromGlobalPermission(), fromStandalonePermission(),
+ * or fromDescription() to create instances.
+ *
+ * @internal
+ * @param int $global_perm
+ * @param int $channel_perm
+ * @param string $description (optional) default empty
+ */
+ private function __construct($global_perm, $channel_perm, $description = '')
+ {
+ $this->global_perm = $global_perm;
+ $this->channel_perm = $channel_perm;
+ $this->fallback_description = ($description == '') ? t('Visible to your default audience') : $description;
+ }
- /**
- * If the interpretation of an empty ACL can't be summarised with a global default permission
- * or a specific permission setting then use this method and describe what it means instead.
- * Remember to localize the description first.
- *
- * @param string $description - the localized caption for the no-ACL option in the ACL dialog.
- * @return a new instance of PermissionDescription
- */
- public static function fromDescription($description) {
- return new PermissionDescription('', 0x80000, $description);
- }
+ /**
+ * If the interpretation of an empty ACL can't be summarised with a global default permission
+ * or a specific permission setting then use this method and describe what it means instead.
+ * Remember to localize the description first.
+ *
+ * @param string $description - the localized caption for the no-ACL option in the ACL dialog.
+ * @return a new instance of PermissionDescription
+ */
+ public static function fromDescription($description)
+ {
+ return new PermissionDescription('', 0x80000, $description);
+ }
- /**
- * Use this method only if the interpretation of an empty ACL doesn't fall back to a global
- * default permission. You should pass one of the constants from boot.php - PERMS_PUBLIC,
- * PERMS_NETWORK etc.
- *
- * @param integer $perm - a single enumerated constant permission - PERMS_PUBLIC, PERMS_NETWORK etc.
- * @return a new instance of PermissionDescription
- */
- public static function fromStandalonePermission($perm) {
+ /**
+ * Use this method only if the interpretation of an empty ACL doesn't fall back to a global
+ * default permission. You should pass one of the constants from boot.php - PERMS_PUBLIC,
+ * PERMS_NETWORK etc.
+ *
+ * @param int $perm - a single enumerated constant permission - PERMS_PUBLIC, PERMS_NETWORK etc.
+ * @return a new instance of PermissionDescription
+ */
+ public static function fromStandalonePermission($perm)
+ {
- $result = new PermissionDescription('', $perm);
+ $result = new PermissionDescription('', $perm);
- $checkPerm = $result->get_permission_description();
- if($checkPerm == $result->fallback_description) {
- $result = null;
- logger('null PermissionDescription from unknown standalone permission: ' . $perm, LOGGER_DEBUG, LOG_ERR);
- }
+ $checkPerm = $result->get_permission_description();
+ if ($checkPerm == $result->fallback_description) {
+ $result = null;
+ logger('null PermissionDescription from unknown standalone permission: ' . $perm, LOGGER_DEBUG, LOG_ERR);
+ }
- return $result;
- }
+ return $result;
+ }
- /**
- * This is the preferred way to create a PermissionDescription, as it provides the most details.
- * Use this method if you know an empty ACL will result in one of the global default permissions
- * being used, such as channel_r_stream (for which you would pass 'view_stream').
- *
- * @param string $permname - a key for the global perms array from get_perms() in permissions.php,
- * e.g. 'view_stream', 'view_profile', etc.
- * @return a new instance of PermissionDescription
- */
- public static function fromGlobalPermission($permname) {
+ /**
+ * This is the preferred way to create a PermissionDescription, as it provides the most details.
+ * Use this method if you know an empty ACL will result in one of the global default permissions
+ * being used, such as channel_r_stream (for which you would pass 'view_stream').
+ *
+ * @param string $permname - a key for the global perms array from get_perms() in permissions.php,
+ * e.g. 'view_stream', 'view_profile', etc.
+ * @return a new instance of PermissionDescription
+ */
+ public static function fromGlobalPermission($permname)
+ {
- $result = null;
+ $result = null;
- $global_perms = \Zotlabs\Access\Permissions::Perms();
+ $global_perms = Permissions::Perms();
- if(array_key_exists($permname, $global_perms)) {
+ if (array_key_exists($permname, $global_perms)) {
+ $channelPerm = PermissionLimits::Get(App::$channel['channel_id'], $permname);
- $channelPerm = \Zotlabs\Access\PermissionLimits::Get(\App::$channel['channel_id'], $permname);
+ $result = new PermissionDescription('', $channelPerm);
+ } else {
+ // The acl dialog can handle null arguments, but it shouldn't happen
+ logger('null PermissionDescription from unknown global permission: ' . $permname, LOGGER_DEBUG, LOG_ERR);
+ }
- $result = new PermissionDescription('', $channelPerm);
- } else {
- // The acl dialog can handle null arguments, but it shouldn't happen
- logger('null PermissionDescription from unknown global permission: ' . $permname, LOGGER_DEBUG, LOG_ERR);
- }
+ return $result;
+ }
- return $result;
- }
+ /**
+ * Gets a localized description of the permission, or a generic message if the permission
+ * is unknown.
+ *
+ * @return string description
+ */
+ public function get_permission_description()
+ {
- /**
- * Gets a localized description of the permission, or a generic message if the permission
- * is unknown.
- *
- * @return string description
- */
- public function get_permission_description() {
+ switch ($this->channel_perm) {
+ case 0:
+ return t('Only me');
+ case PERMS_PUBLIC:
+ return t('Public');
+ case PERMS_NETWORK:
+ return t('Anybody in the $Projectname network');
+ case PERMS_SITE:
+ return sprintf(t('Any account on %s'), App::get_hostname());
+ case PERMS_CONTACTS:
+ return t('Any of my connections');
+ case PERMS_SPECIFIC:
+ return t('Only connections I specifically allow');
+ case PERMS_AUTHED:
+ return t('Anybody authenticated (could include visitors from other networks)');
+ case PERMS_PENDING:
+ return t('Any connections including those who haven\'t yet been approved');
+ default:
+ return $this->fallback_description;
+ }
+ }
- switch($this->channel_perm) {
- case 0: return t('Only me');
- case PERMS_PUBLIC: return t('Public');
- case PERMS_NETWORK: return t('Anybody in the $Projectname network');
- case PERMS_SITE: return sprintf(t('Any account on %s'), \App::get_hostname());
- case PERMS_CONTACTS: return t('Any of my connections');
- case PERMS_SPECIFIC: return t('Only connections I specifically allow');
- case PERMS_AUTHED: return t('Anybody authenticated (could include visitors from other networks)');
- case PERMS_PENDING: return t('Any connections including those who haven\'t yet been approved');
- default: return $this->fallback_description;
- }
- }
+ /**
+ * Returns an icon css class name if an appropriate one is available, e.g. "fa-globe" for Public,
+ * otherwise returns empty string.
+ *
+ * @return string icon css class name (often FontAwesome)
+ */
+ public function get_permission_icon()
+ {
- /**
- * Returns an icon css class name if an appropriate one is available, e.g. "fa-globe" for Public,
- * otherwise returns empty string.
- *
- * @return string icon css class name (often FontAwesome)
- */
- public function get_permission_icon() {
+ switch ($this->channel_perm) {
+ case 0:
+ return 'fa-eye-slash';
+ case PERMS_PUBLIC:
+ return 'fa-globe';
+ case PERMS_NETWORK:
+ return 'fa-share-alt-square'; // fa-share-alt-square is very similiar to the hubzilla logo, but we should create our own logo class to use
+ case PERMS_SITE:
+ return 'fa-sitemap';
+ case PERMS_CONTACTS:
+ return 'fa-group';
+ case PERMS_SPECIFIC:
+ return 'fa-list';
+ case PERMS_AUTHED:
+ return '';
+ case PERMS_PENDING:
+ return '';
+ default:
+ return '';
+ }
+ }
- switch($this->channel_perm) {
- case 0:/* only me */ return 'fa-eye-slash';
- case PERMS_PUBLIC: return 'fa-globe';
- case PERMS_NETWORK: return 'fa-share-alt-square'; // fa-share-alt-square is very similiar to the hubzilla logo, but we should create our own logo class to use
- case PERMS_SITE: return 'fa-sitemap';
- case PERMS_CONTACTS: return 'fa-group';
- case PERMS_SPECIFIC: return 'fa-list';
- case PERMS_AUTHED: return '';
- case PERMS_PENDING: return '';
- default: return '';
- }
- }
-
- /**
- * Returns a localized description of where the permission came from, if this is known.
- * If it's not know, or if the permission is standalone and didn't come from a default
- * permission setting, then empty string is returned.
- *
- * @return string description or empty string
- */
- public function get_permission_origin_description() {
-
- switch($this->global_perm) {
- case PERMS_R_STREAM: return t('This is your default setting for the audience of your normal stream, and posts.');
- case PERMS_R_PROFILE: return t('This is your default setting for who can view your default channel profile');
- case PERMS_R_ABOOK: return t('This is your default setting for who can view your connections');
- case PERMS_R_STORAGE: return t('This is your default setting for who can view your file storage and photos');
- case PERMS_R_PAGES: return t('This is your default setting for the audience of your webpages');
- default: return '';
- }
- }
+ /**
+ * Returns a localized description of where the permission came from, if this is known.
+ * If it's not know, or if the permission is standalone and didn't come from a default
+ * permission setting, then empty string is returned.
+ *
+ * @return string description or empty string
+ */
+ public function get_permission_origin_description()
+ {
+ switch ($this->global_perm) {
+ case PERMS_R_STREAM:
+ return t('This is your default setting for the audience of your normal stream, and posts.');
+ case PERMS_R_PROFILE:
+ return t('This is your default setting for who can view your default channel profile');
+ case PERMS_R_ABOOK:
+ return t('This is your default setting for who can view your connections');
+ case PERMS_R_STORAGE:
+ return t('This is your default setting for who can view your file storage and photos');
+ case PERMS_R_PAGES:
+ return t('This is your default setting for the audience of your webpages');
+ default:
+ return '';
+ }
+ }
}
diff --git a/Zotlabs/Lib/Queue.php b/Zotlabs/Lib/Queue.php
index 02b4f9038..1ff8d18a8 100644
--- a/Zotlabs/Lib/Queue.php
+++ b/Zotlabs/Lib/Queue.php
@@ -1,4 +1,6 @@
- $base,
+ 'site_update' => datetime_convert(),
+ 'site_dead' => 0,
+ 'site_type' => ((in_array($outq['outq_driver'], ['post', 'activitypub'])) ? SITE_TYPE_NOTZOT : SITE_TYPE_UNKNOWN),
+ 'site_crypto' => ''
+ ]
+ );
+ }
+ }
- site_store_lowlevel(
- [
- 'site_url' => $base,
- 'site_update' => datetime_convert(),
- 'site_dead' => 0,
- 'site_type' => ((in_array($outq['outq_driver'], [ 'post', 'activitypub' ])) ? SITE_TYPE_NOTZOT : SITE_TYPE_UNKNOWN),
- 'site_crypto' => ''
- ]
- );
- }
- }
+ $arr = array('outq' => $outq, 'base' => $base, 'handled' => false, 'immediate' => $immediate);
+ call_hooks('queue_deliver', $arr);
+ if ($arr['handled']) {
+ return;
+ }
- $arr = array('outq' => $outq, 'base' => $base, 'handled' => false, 'immediate' => $immediate);
- call_hooks('queue_deliver',$arr);
- if($arr['handled'])
- return;
+ // "post" queue driver - used for diaspora and friendica-over-diaspora communications.
- // "post" queue driver - used for diaspora and friendica-over-diaspora communications.
+ if ($outq['outq_driver'] === 'post') {
+ $result = z_post_url($outq['outq_posturl'], $outq['outq_msg']);
+ if ($result['success'] && $result['return_code'] < 300) {
+ logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG);
+ if ($base) {
+ q(
+ "update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
+ dbesc(datetime_convert()),
+ dbesc($base)
+ );
+ }
+ q(
+ "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
+ dbesc('accepted for delivery'),
+ dbesc(datetime_convert()),
+ dbesc($outq['outq_hash'])
+ );
+ self::remove($outq['outq_hash']);
- if($outq['outq_driver'] === 'post') {
- $result = z_post_url($outq['outq_posturl'],$outq['outq_msg']);
- if($result['success'] && $result['return_code'] < 300) {
- logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG);
- if($base) {
- q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
- dbesc(datetime_convert()),
- dbesc($base)
- );
- }
- q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
- dbesc('accepted for delivery'),
- dbesc(datetime_convert()),
- dbesc($outq['outq_hash'])
- );
- self::remove($outq['outq_hash']);
+ // server is responding - see if anything else is going to this destination and is piled up
+ // and try to send some more. We're relying on the fact that do_delivery() results in an
+ // immediate delivery otherwise we could get into a queue loop.
- // server is responding - see if anything else is going to this destination and is piled up
- // and try to send some more. We're relying on the fact that do_delivery() results in an
- // immediate delivery otherwise we could get into a queue loop.
+ if (!$immediate) {
+ $x = q(
+ "select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0",
+ dbesc($outq['outq_posturl'])
+ );
- if(! $immediate) {
- $x = q("select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0",
- dbesc($outq['outq_posturl'])
- );
-
- $piled_up = [];
- if($x) {
- foreach($x as $xx) {
- $piled_up[] = $xx['outq_hash'];
- }
- }
- if($piled_up) {
- // call do_delivery() with the force flag
- do_delivery($piled_up, true);
- }
- }
- }
- else {
- logger('deliver: queue post returned ' . $result['return_code']
- . ' from ' . $outq['outq_posturl'],LOGGER_DEBUG);
- self::update($outq['outq_hash'],10);
- }
- return;
- }
+ $piled_up = [];
+ if ($x) {
+ foreach ($x as $xx) {
+ $piled_up[] = $xx['outq_hash'];
+ }
+ }
+ if ($piled_up) {
+ // call do_delivery() with the force flag
+ do_delivery($piled_up, true);
+ }
+ }
+ } else {
+ logger('deliver: queue post returned ' . $result['return_code']
+ . ' from ' . $outq['outq_posturl'], LOGGER_DEBUG);
+ self::update($outq['outq_hash'], 10);
+ }
+ return;
+ }
- if ($outq['outq_driver'] === 'asfetch') {
+ if ($outq['outq_driver'] === 'asfetch') {
+ $channel = channelx_by_n($outq['outq_channel']);
+ if (!$channel) {
+ logger('missing channel: ' . $outq['outq_channel']);
+ return;
+ }
- $channel = channelx_by_n($outq['outq_channel']);
- if (! $channel) {
- logger('missing channel: ' . $outq['outq_channel']);
- return;
- }
+ if (!ActivityStreams::is_url($outq['outq_posturl'])) {
+ logger('fetch item is not url: ' . $outq['outq_posturl']);
+ self::remove($outq['outq_hash']);
+ return;
+ }
- if (! ActivityStreams::is_url($outq['outq_posturl'])) {
- logger('fetch item is not url: ' . $outq['outq_posturl']);
- self::remove($outq['outq_hash']);
- return;
- }
+ $j = Activity::fetch($outq['outq_posturl'], $channel);
+ if ($j) {
+ $AS = new ActivityStreams($j, null, true);
+ if ($AS->is_valid() && isset($AS->data['type'])) {
+ if (ActivityStreams::is_an_actor($AS->data['type'])) {
+ Activity::actor_store($AS->data['id'], $AS->data);
+ }
+ if (strpos($AS->data['type'], 'Collection') !== false) {
+ // we are probably fetching a collection already - and do not support collection recursion at this time
+ self::remove($outq['outq_hash']);
+ return;
+ }
+ $item = Activity::decode_note($AS, true);
+ if ($item) {
+ Activity::store($channel, $channel['channnel_hash'], $AS, $item, true, true);
+ }
+ }
+ logger('deliver: queue fetch success from ' . $outq['outq_posturl'], LOGGER_DEBUG);
+ self::remove($outq['outq_hash']);
- $j = Activity::fetch($outq['outq_posturl'],$channel);
- if ($j) {
- $AS = new ActivityStreams($j, null, true);
- if ($AS->is_valid() && isset($AS->data['type'])) {
- if (ActivityStreams::is_an_actor($AS->data['type'])) {
- Activity::actor_store($AS->data['id'],$AS->data);
- }
- if (strpos($AS->data['type'],'Collection') !== false) {
- // we are probably fetching a collection already - and do not support collection recursion at this time
- self::remove($outq['outq_hash']);
- return;
- }
- $item = Activity::decode_note($AS,true);
- if ($item) {
- Activity::store($channel,$channel['channnel_hash'],$AS,$item,true,true);
- }
- }
- logger('deliver: queue fetch success from ' . $outq['outq_posturl'], LOGGER_DEBUG);
- self::remove($outq['outq_hash']);
+ // server is responding - see if anything else is going to this destination and is piled up
+ // and try to send some more. We're relying on the fact that do_delivery() results in an
+ // immediate delivery otherwise we could get into a queue loop.
- // server is responding - see if anything else is going to this destination and is piled up
- // and try to send some more. We're relying on the fact that do_delivery() results in an
- // immediate delivery otherwise we could get into a queue loop.
+ if (!$immediate) {
+ $x = q(
+ "select outq_hash from outq where outq_driver = 'asfetch' and outq_channel = %d and outq_delivered = 0",
+ dbesc($outq['outq_channel'])
+ );
- if (! $immediate) {
- $x = q("select outq_hash from outq where outq_driver = 'asfetch' and outq_channel = %d and outq_delivered = 0",
- dbesc($outq['outq_channel'])
- );
+ $piled_up = [];
+ if ($x) {
+ foreach ($x as $xx) {
+ $piled_up[] = $xx['outq_hash'];
+ }
+ }
+ if ($piled_up) {
+ do_delivery($piled_up, true);
+ }
+ }
+ } else {
+ logger('deliver: queue fetch failed' . ' from ' . $outq['outq_posturl'], LOGGER_DEBUG);
+ self::update($outq['outq_hash'], 10);
+ }
+ return;
+ }
- $piled_up = [];
- if ($x) {
- foreach ($x as $xx) {
- $piled_up[] = $xx['outq_hash'];
- }
- }
- if ($piled_up) {
- do_delivery($piled_up,true);
- }
- }
- }
- else {
- logger('deliver: queue fetch failed' . ' from ' . $outq['outq_posturl'],LOGGER_DEBUG);
- self::update($outq['outq_hash'],10);
- }
- return;
- }
-
- if($outq['outq_driver'] === 'activitypub') {
-
- $channel = channelx_by_n($outq['outq_channel']);
- if (! $channel) {
- logger('missing channel: ' . $outq['outq_channel']);
- return;
- }
+ if ($outq['outq_driver'] === 'activitypub') {
+ $channel = channelx_by_n($outq['outq_channel']);
+ if (!$channel) {
+ logger('missing channel: ' . $outq['outq_channel']);
+ return;
+ }
- $retries = 0;
- $m = parse_url($outq['outq_posturl']);
-
- $headers = [];
- $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' ;
- $ret = $outq['outq_msg'];
- logger('ActivityPub send: ' . jindent($ret), LOGGER_DATA);
- $headers['Date'] = datetime_convert('UTC','UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T');
- $headers['Digest'] = HTTPSig::generate_digest_header($ret);
- $headers['Host'] = $m['host'];
- $headers['(request-target)'] = 'post ' . get_request_string($outq['outq_posturl']);
+ $retries = 0;
+ $m = parse_url($outq['outq_posturl']);
- $xhead = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel));
- if(strpos($outq['outq_posturl'],'http') !== 0) {
- logger('bad url: ' . $outq['outq_posturl']);
- self::remove($outq['outq_hash']);
- }
+ $headers = [];
+ $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"';
+ $ret = $outq['outq_msg'];
+ logger('ActivityPub send: ' . jindent($ret), LOGGER_DATA);
+ $headers['Date'] = datetime_convert('UTC', 'UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T');
+ $headers['Digest'] = HTTPSig::generate_digest_header($ret);
+ $headers['Host'] = $m['host'];
+ $headers['(request-target)'] = 'post ' . get_request_string($outq['outq_posturl']);
- $result = z_post_url($outq['outq_posturl'],$outq['outq_msg'],$retries,[ 'headers' => $xhead ]);
+ $xhead = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel));
+ if (strpos($outq['outq_posturl'], 'http') !== 0) {
+ logger('bad url: ' . $outq['outq_posturl']);
+ self::remove($outq['outq_hash']);
+ }
- if($result['success'] && $result['return_code'] < 300) {
- logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG);
- if($base) {
- q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
- dbesc(datetime_convert()),
- dbesc($base)
- );
- }
- q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
- dbesc('accepted for delivery'),
- dbesc(datetime_convert()),
- dbesc($outq['outq_hash'])
- );
- self::remove($outq['outq_hash']);
+ $result = z_post_url($outq['outq_posturl'], $outq['outq_msg'], $retries, ['headers' => $xhead]);
- // server is responding - see if anything else is going to this destination and is piled up
- // and try to send some more. We're relying on the fact that do_delivery() results in an
- // immediate delivery otherwise we could get into a queue loop.
+ if ($result['success'] && $result['return_code'] < 300) {
+ logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG);
+ if ($base) {
+ q(
+ "update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
+ dbesc(datetime_convert()),
+ dbesc($base)
+ );
+ }
+ q(
+ "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
+ dbesc('accepted for delivery'),
+ dbesc(datetime_convert()),
+ dbesc($outq['outq_hash'])
+ );
+ self::remove($outq['outq_hash']);
- if(! $immediate) {
- $x = q("select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0",
- dbesc($outq['outq_posturl'])
- );
+ // server is responding - see if anything else is going to this destination and is piled up
+ // and try to send some more. We're relying on the fact that do_delivery() results in an
+ // immediate delivery otherwise we could get into a queue loop.
- $piled_up = [];
- if($x) {
- foreach($x as $xx) {
- $piled_up[] = $xx['outq_hash'];
- }
- }
- if($piled_up) {
- do_delivery($piled_up,true);
- }
- }
- }
- else {
- if ($result['return_code'] >= 300) {
- q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
- dbesc('delivery rejected' . ' ' . $result['return_code']),
- dbesc(datetime_convert()),
- dbesc($outq['outq_hash'])
- );
- }
- else {
- $dr = q("select * from dreport where dreport_queue = '%s'",
- dbesc($outq['outq_hash'])
- );
- if ($dr) {
- // update every queue entry going to this site with the most recent communication error
- q("update dreport set dreport_log = '%s' where dreport_site = '%s'",
- dbesc(z_curl_error($result)),
- dbesc($dr[0]['dreport_site'])
- );
- }
- }
- logger('deliver: queue post returned ' . $result['return_code'] . ' from ' . $outq['outq_posturl'],LOGGER_DEBUG);
- self::update($outq['outq_hash'],10);
- }
- return;
- }
+ if (!$immediate) {
+ $x = q(
+ "select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0",
+ dbesc($outq['outq_posturl'])
+ );
- // normal zot delivery
+ $piled_up = [];
+ if ($x) {
+ foreach ($x as $xx) {
+ $piled_up[] = $xx['outq_hash'];
+ }
+ }
+ if ($piled_up) {
+ do_delivery($piled_up, true);
+ }
+ }
+ } else {
+ if ($result['return_code'] >= 300) {
+ q(
+ "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
+ dbesc('delivery rejected' . ' ' . $result['return_code']),
+ dbesc(datetime_convert()),
+ dbesc($outq['outq_hash'])
+ );
+ } else {
+ $dr = q(
+ "select * from dreport where dreport_queue = '%s'",
+ dbesc($outq['outq_hash'])
+ );
+ if ($dr) {
+ // update every queue entry going to this site with the most recent communication error
+ q(
+ "update dreport set dreport_log = '%s' where dreport_site = '%s'",
+ dbesc(z_curl_error($result)),
+ dbesc($dr[0]['dreport_site'])
+ );
+ }
+ }
+ logger('deliver: queue post returned ' . $result['return_code'] . ' from ' . $outq['outq_posturl'], LOGGER_DEBUG);
+ self::update($outq['outq_hash'], 10);
+ }
+ return;
+ }
- logger('deliver: dest: ' . $outq['outq_posturl'], LOGGER_DEBUG);
+ // normal zot delivery
+
+ logger('deliver: dest: ' . $outq['outq_posturl'], LOGGER_DEBUG);
- if($outq['outq_posturl'] === z_root() . '/zot') {
- // local delivery
- $zot = new \Zotlabs\Zot6\Receiver(new \Zotlabs\Zot6\Zot6Handler(),$outq['outq_notify']);
- $result = $zot->run();
- logger('returned_json: ' . json_encode($result,JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES), LOGGER_DATA);
- logger('deliver: local zot delivery succeeded to ' . $outq['outq_posturl']);
- Libzot::process_response($outq['outq_posturl'],[ 'success' => true, 'body' => json_encode($result) ], $outq);
+ if ($outq['outq_posturl'] === z_root() . '/zot') {
+ // local delivery
+ $zot = new Receiver(new Zot6Handler(), $outq['outq_notify']);
+ $result = $zot->run();
+ logger('returned_json: ' . json_encode($result, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES), LOGGER_DATA);
+ logger('deliver: local zot delivery succeeded to ' . $outq['outq_posturl']);
+ Libzot::process_response($outq['outq_posturl'], ['success' => true, 'body' => json_encode($result)], $outq);
- if(! $immediate) {
- $x = q("select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0",
- dbesc($outq['outq_posturl'])
- );
+ if (!$immediate) {
+ $x = q(
+ "select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0",
+ dbesc($outq['outq_posturl'])
+ );
- $piled_up = [];
- if($x) {
- foreach($x as $xx) {
- $piled_up[] = $xx['outq_hash'];
- }
- }
- if($piled_up) {
- do_delivery($piled_up,true);
- }
- }
- }
- else {
- logger('remote');
- $channel = null;
+ $piled_up = [];
+ if ($x) {
+ foreach ($x as $xx) {
+ $piled_up[] = $xx['outq_hash'];
+ }
+ }
+ if ($piled_up) {
+ do_delivery($piled_up, true);
+ }
+ }
+ } else {
+ logger('remote');
+ $channel = null;
- if($outq['outq_channel']) {
- $channel = channelx_by_n($outq['outq_channel'],true);
- }
+ if ($outq['outq_channel']) {
+ $channel = channelx_by_n($outq['outq_channel'], true);
+ }
- $host_crypto = null;
+ $host_crypto = null;
- if($channel && $base) {
- $h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_network in ('nomad','zot6') order by hubloc_id desc limit 1",
- dbesc($base)
- );
- if($h) {
- $host_crypto = $h[0];
- }
- }
-
- $msg = $outq['outq_notify'];
+ if ($channel && $base) {
+ $h = q(
+ "select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_network in ('zot6','nomad') order by hubloc_id desc limit 1",
+ dbesc($base)
+ );
+ if ($h) {
+ $host_crypto = $h[0];
+ }
+ }
+ $msg = $outq['outq_notify'];
if ($outq['outq_driver'] === 'nomad') {
$result = Libzot::nomad($outq['outq_posturl'],$msg,$channel,$host_crypto);
@@ -471,27 +491,27 @@ class Queue {
$result = Libzot::zot($outq['outq_posturl'],$msg,$channel,$host_crypto);
}
- if($result['success']) {
- logger('deliver: remote nomad/zot delivery succeeded to ' . $outq['outq_posturl']);
- Libzot::process_response($outq['outq_posturl'],$result, $outq);
- }
- else {
- $dr = q("select * from dreport where dreport_queue = '%s'",
- dbesc($outq['outq_hash'])
- );
+ if ($result['success']) {
+ logger('deliver: remote nomad/zot delivery succeeded to ' . $outq['outq_posturl']);
+ Libzot::process_response($outq['outq_posturl'], $result, $outq);
+ } else {
+ $dr = q(
+ "select * from dreport where dreport_queue = '%s'",
+ dbesc($outq['outq_hash'])
+ );
- // update every queue entry going to this site with the most recent communication error
- q("update dreport set dreport_log = '%s' where dreport_site = '%s'",
- dbesc(z_curl_error($result)),
- dbesc($dr[0]['dreport_site'])
- );
-
- logger('deliver: remote zot delivery failed to ' . $outq['outq_posturl']);
- logger('deliver: remote zot delivery fail data: ' . print_r($result,true), LOGGER_DATA);
- self::update($outq['outq_hash'],10);
- }
- }
- return;
- }
+ // update every queue entry going to this site with the most recent communication error
+ q(
+ "update dreport set dreport_log = '%s' where dreport_site = '%s'",
+ dbesc(z_curl_error($result)),
+ dbesc($dr[0]['dreport_site'])
+ );
+
+ logger('deliver: remote nomad/zot delivery failed to ' . $outq['outq_posturl']);
+ logger('deliver: remote nomad/zot delivery fail data: ' . print_r($result, true), LOGGER_DATA);
+ self::update($outq['outq_hash'], 10);
+ }
+ }
+ return;
+ }
}
-
diff --git a/Zotlabs/Lib/SConfig.php b/Zotlabs/Lib/SConfig.php
index 76e5b3af9..1d4e93a3f 100644
--- a/Zotlabs/Lib/SConfig.php
+++ b/Zotlabs/Lib/SConfig.php
@@ -7,23 +7,27 @@ namespace Zotlabs\Lib;
*
* @see XConfig
*/
-
-class SConfig {
- static public function Load($server_id) {
- return XConfig::Load('s_' . $server_id);
- }
+class SConfig
+{
- static public function Get($server_id,$family,$key,$default = false) {
- return XConfig::Get('s_' . $server_id,$family,$key, $default);
- }
+ public static function Load($server_id)
+ {
+ return XConfig::Load('s_' . $server_id);
+ }
- static public function Set($server_id,$family,$key,$value) {
- return XConfig::Set('s_' . $server_id,$family,$key,$value);
- }
+ public static function Get($server_id, $family, $key, $default = false)
+ {
+ return XConfig::Get('s_' . $server_id, $family, $key, $default);
+ }
- static public function Delete($server_id,$family,$key) {
- return XConfig::Delete('s_' . $server_id,$family,$key);
- }
+ public static function Set($server_id, $family, $key, $value)
+ {
+ return XConfig::Set('s_' . $server_id, $family, $key, $value);
+ }
+ public static function Delete($server_id, $family, $key)
+ {
+ return XConfig::Delete('s_' . $server_id, $family, $key);
+ }
}
diff --git a/Zotlabs/Lib/Share.php b/Zotlabs/Lib/Share.php
index 4d7f36d4e..9de030273 100644
--- a/Zotlabs/Lib/Share.php
+++ b/Zotlabs/Lib/Share.php
@@ -6,222 +6,227 @@ use App;
use Zotlabs\Daemon\Run;
use Zotlabs\Lib\Libsync;
-class Share {
+class Share
+{
- private $item = null;
+ private $item = null;
- public function __construct($post_id) {
-
- if (! $post_id) {
- return;
- }
-
- if (is_array($post_id)) {
- $this->item = $post_id;
- return;
- }
-
- if (! (local_channel() || remote_channel())) {
- return;
- }
+ public function __construct($post_id)
+ {
- $r = q("SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d LIMIT 1",
- intval($post_id)
- );
- if (! $r) {
- return;
- }
+ if (! $post_id) {
+ return;
+ }
- if (($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss')) {
- return;
- }
-
- $sql_extra = item_permissions_sql($r[0]['uid']);
-
- $r = q("select * from item where id = %d $sql_extra",
- intval($post_id)
- );
- if (! $r) {
- return;
- }
-
- if (! in_array($r[0]['mimetype'], [ 'text/bbcode', 'text/x-multicode' ])) {
- return;
- }
-
- /** @FIXME eventually we want to post remotely via rpost on your home site */
- // When that works remove this next bit:
-
- if (! local_channel()) {
- return;
- }
+ if (is_array($post_id)) {
+ $this->item = $post_id;
+ return;
+ }
- xchan_query($r);
-
- $this->item = array_shift($r);
+ if (! (local_channel() || remote_channel())) {
+ return;
+ }
- $arr = [];
+ $r = q(
+ "SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d LIMIT 1",
+ intval($post_id)
+ );
+ if (! $r) {
+ return;
+ }
- $owner_uid = $this->item['uid'];
- $owner_aid = $this->item['aid'];
+ if (($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss')) {
+ return;
+ }
- $channel = channelx_by_n($this->item['uid']);
- $observer = App::get_observer();
+ $sql_extra = item_permissions_sql($r[0]['uid']);
- $can_comment = false;
- if ((array_key_exists('owner',$this->item)) && intval($this->item['owner']['abook_self'])) {
- $can_comment = perm_is_allowed($this->item['uid'],$observer['xchan_hash'],'post_comments');
- }
- else {
- $can_comment = can_comment_on_post($observer['xchan_hash'],$this->item);
- }
+ $r = q(
+ "select * from item where id = %d $sql_extra",
+ intval($post_id)
+ );
+ if (! $r) {
+ return;
+ }
- if (! $can_comment) {
- return;
- }
+ if (! in_array($r[0]['mimetype'], [ 'text/bbcode', 'text/x-multicode' ])) {
+ return;
+ }
- $r = q("select * from xchan where xchan_hash = '%s' limit 1",
- dbesc($this->item['owner_xchan'])
- );
+ /** @FIXME eventually we want to post remotely via rpost on your home site */
+ // When that works remove this next bit:
- if ($r) {
- $thread_owner = array_shift($r);
- }
- else {
- return;
- }
-
- $r = q("select * from xchan where xchan_hash = '%s' limit 1",
- dbesc($this->item['author_xchan'])
- );
- if ($r) {
- $item_author = array_shift($r);
- }
- else {
- return;
- }
+ if (! local_channel()) {
+ return;
+ }
- if ($item_author['network'] === 'activitypub') {
+ xchan_query($r);
- // for Mastodon compatibility, send back an ActivityPub Announce activity.
- // We don't need or want these on our own network as there is no mechanism for providing
- // a fair-use defense to copyright claims and frivolous lawsuits.
-
- $arr['aid'] = $owner_aid;
- $arr['uid'] = $owner_uid;
+ $this->item = array_shift($r);
- $arr['item_origin'] = 1;
- $arr['item_wall'] = $this->item['item_wall'];
- $arr['uuid'] = new_uuid();
- $arr['mid'] = z_root() . '/item/' . $arr['uuid'];
- $arr['mid'] = str_replace('/item/','/activity/',$arr['mid']);
- $arr['parent_mid'] = $this->item['mid'];
+ $arr = [];
- $mention = '@[zrl=' . $this->item['author']['xchan_url'] . ']' . $this->item['author']['xchan_name'] . '[/zrl]';
- $arr['body'] = sprintf( t('🔁 Repeated %1$s\'s %2$s'), $mention, $this->item['obj_type']);
+ $owner_uid = $this->item['uid'];
+ $owner_aid = $this->item['aid'];
- $arr['author_xchan'] = $observer['xchan_hash'];
- $arr['owner_xchan'] = $this->item['author_xchan'];
- $arr['obj'] = $this->item['obj'];
- $arr['obj_type'] = $this->item['obj_type'];
- $arr['verb'] = 'Announce';
+ $channel = channelx_by_n($this->item['uid']);
+ $observer = App::get_observer();
- $post = item_store($arr);
+ $can_comment = false;
+ if ((array_key_exists('owner', $this->item)) && intval($this->item['owner']['abook_self'])) {
+ $can_comment = perm_is_allowed($this->item['uid'], $observer['xchan_hash'], 'post_comments');
+ } else {
+ $can_comment = can_comment_on_post($observer['xchan_hash'], $this->item);
+ }
- $post_id = $post['item_id'];
+ if (! $can_comment) {
+ return;
+ }
- $arr['id'] = $post_id;
-
- call_hooks('post_local_end', $arr);
+ $r = q(
+ "select * from xchan where xchan_hash = '%s' limit 1",
+ dbesc($this->item['owner_xchan'])
+ );
- $r = q("select * from item where id = %d",
- intval($post_id)
- );
- if ($r) {
- xchan_query($r);
- $sync_item = fetch_post_tags($r);
- Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0],true) ] ]);
- }
+ if ($r) {
+ $thread_owner = array_shift($r);
+ } else {
+ return;
+ }
- Run::Summon([ 'Notifier','like',$post_id ]);
- }
-
- return;
+ $r = q(
+ "select * from xchan where xchan_hash = '%s' limit 1",
+ dbesc($this->item['author_xchan'])
+ );
+ if ($r) {
+ $item_author = array_shift($r);
+ } else {
+ return;
+ }
- }
+ if ($item_author['network'] === 'activitypub') {
+ // for Mastodon compatibility, send back an ActivityPub Announce activity.
+ // We don't need or want these on our own network as there is no mechanism for providing
+ // a fair-use defense to copyright claims and frivolous lawsuits.
- public function obj() {
- $obj = [];
+ $arr['aid'] = $owner_aid;
+ $arr['uid'] = $owner_uid;
- if(! $this->item)
- return $obj;
+ $arr['item_origin'] = 1;
+ $arr['item_wall'] = $this->item['item_wall'];
+ $arr['uuid'] = new_uuid();
+ $arr['mid'] = z_root() . '/item/' . $arr['uuid'];
+ $arr['mid'] = str_replace('/item/', '/activity/', $arr['mid']);
+ $arr['parent_mid'] = $this->item['mid'];
- $obj['type'] = $this->item['obj_type'];
- $obj['id'] = $this->item['mid'];
- $obj['content'] = bbcode($this->item['body']);
- $obj['source'] = [
- 'mediaType' => $this->item['mimetype'],
- 'content' => $this->item['body']
- ];
+ $mention = '@[zrl=' . $this->item['author']['xchan_url'] . ']' . $this->item['author']['xchan_name'] . '[/zrl]';
+ $arr['body'] = sprintf(t('🔁 Repeated %1$s\'s %2$s'), $mention, $this->item['obj_type']);
- $obj['name'] = $this->item['title'];
- $obj['published'] = $this->item['created'];
- $obj['updated'] = $this->item['edited'];
- $obj['attributedTo'] = ((strpos($this->item['author']['xchan_hash'],'http') === 0)
- ? $this->item['author']['xchan_hash']
- : $this->item['author']['xchan_url']);
+ $arr['author_xchan'] = $observer['xchan_hash'];
+ $arr['owner_xchan'] = $this->item['author_xchan'];
+ $arr['obj'] = $this->item['obj'];
+ $arr['obj_type'] = $this->item['obj_type'];
+ $arr['verb'] = 'Announce';
- return $obj;
- }
+ $post = item_store($arr);
- public function bbcode() {
- $bb = EMPTY_STR;
+ $post_id = $post['item_id'];
- if (! $this->item)
- return $bb;
+ $arr['id'] = $post_id;
- if (! $this->item['author']) {
- $author = q("select * from xchan where xchan_hash = '%s' limit 1",
- dbesc($this->item['author_xchan'])
- );
- if ($author) {
- $this->item['author'] = array_shift($author);
- }
- }
+ call_hooks('post_local_end', $arr);
- $special_object = (in_array($this->item['obj_type'], [ ACTIVITY_OBJ_PHOTO, 'Event', 'Question' ]) ? true : false);
- if($special_object) {
- $object = json_decode($this->item['obj'],true);
- $special = (($object['source']) ? $object['source']['content'] : $object['body']);
- }
-
- if (strpos($this->item['body'], "[/share]") !== false) {
- $pos = strpos($this->item['body'], "[share");
- $bb = substr($this->item['body'], $pos);
- } else {
- $bb = "[share author='" . urlencode($this->item['author']['xchan_name']).
- "' profile='" . $this->item['author']['xchan_url'] .
- "' portable_id='" . $this->item['author']['xchan_hash'] .
- "' avatar='" . $this->item['author']['xchan_photo_s'] .
- "' link='" . $this->item['plink'] .
+ $r = q(
+ "select * from item where id = %d",
+ intval($post_id)
+ );
+ if ($r) {
+ xchan_query($r);
+ $sync_item = fetch_post_tags($r);
+ Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0], true) ] ]);
+ }
+
+ Run::Summon([ 'Notifier','like',$post_id ]);
+ }
+
+ return;
+ }
+
+ public function obj()
+ {
+ $obj = [];
+
+ if (! $this->item) {
+ return $obj;
+ }
+
+ $obj['type'] = $this->item['obj_type'];
+ $obj['id'] = $this->item['mid'];
+ $obj['content'] = bbcode($this->item['body']);
+ $obj['source'] = [
+ 'mediaType' => $this->item['mimetype'],
+ 'content' => $this->item['body']
+ ];
+
+ $obj['name'] = $this->item['title'];
+ $obj['published'] = $this->item['created'];
+ $obj['updated'] = $this->item['edited'];
+ $obj['attributedTo'] = ((strpos($this->item['author']['xchan_hash'], 'http') === 0)
+ ? $this->item['author']['xchan_hash']
+ : $this->item['author']['xchan_url']);
+
+ return $obj;
+ }
+
+ public function bbcode()
+ {
+ $bb = EMPTY_STR;
+
+ if (! $this->item) {
+ return $bb;
+ }
+
+ if (! $this->item['author']) {
+ $author = q(
+ "select * from xchan where xchan_hash = '%s' limit 1",
+ dbesc($this->item['author_xchan'])
+ );
+ if ($author) {
+ $this->item['author'] = array_shift($author);
+ }
+ }
+
+ $special_object = (in_array($this->item['obj_type'], [ ACTIVITY_OBJ_PHOTO, 'Event', 'Question' ]) ? true : false);
+ if ($special_object) {
+ $object = json_decode($this->item['obj'], true);
+ $special = (($object['source']) ? $object['source']['content'] : $object['body']);
+ }
+
+ if (strpos($this->item['body'], "[/share]") !== false) {
+ $pos = strpos($this->item['body'], "[share");
+ $bb = substr($this->item['body'], $pos);
+ } else {
+ $bb = "[share author='" . urlencode($this->item['author']['xchan_name']) .
+ "' profile='" . $this->item['author']['xchan_url'] .
+ "' portable_id='" . $this->item['author']['xchan_hash'] .
+ "' avatar='" . $this->item['author']['xchan_photo_s'] .
+ "' link='" . $this->item['plink'] .
"' auth='" . (in_array($this->item['author']['network'],['nomad','zot6']) ? 'true' : 'false') .
- "' posted='" . $this->item['created'] .
- "' message_id='" . $this->item['mid'] .
- "']";
- if ($this->item['title']) {
- $bb .= '[b]'.$this->item['title'].'[/b]'."\r\n";
- }
- if ($this->item['summary']) {
- $bb .= $this->item['summary'] . "\r\n";
- }
-
- $bb .= (($special_object) ? $special . "\r\n" . $this->item['body'] : $this->item['body']);
- $bb .= "[/share]";
- }
+ "' posted='" . $this->item['created'] .
+ "' message_id='" . $this->item['mid'] .
+ "']";
+ if ($this->item['title']) {
+ $bb .= '[b]' . $this->item['title'] . '[/b]' . "\r\n";
+ }
+ if ($this->item['summary']) {
+ $bb .= $this->item['summary'] . "\r\n";
+ }
- return $bb;
-
- }
+ $bb .= (($special_object) ? $special . "\r\n" . $this->item['body'] : $this->item['body']);
+ $bb .= "[/share]";
+ }
+ return $bb;
+ }
}
diff --git a/Zotlabs/Lib/SvgSanitizer.php b/Zotlabs/Lib/SvgSanitizer.php
index 906b4bb3e..5e21c4f12 100644
--- a/Zotlabs/Lib/SvgSanitizer.php
+++ b/Zotlabs/Lib/SvgSanitizer.php
@@ -7,150 +7,154 @@ use Zotlabs\Lib\Config;
/**
* SVGSantiizer
- *
+ *
* Allowlist-based PHP SVG sanitizer.
- *
+ *
* @link https://github.com/alister-/SVG-Sanitizer}
* @author Alister Norris
* @copyright Copyright (c) 2013 Alister Norris
* @license http://opensource.org/licenses/mit-license.php The MIT License
* @package svgsanitizer
*/
+class SvgSanitizer
+{
-class SvgSanitizer {
-
- private $xmlDoc; // PHP XML DOMDocument
+ private $xmlDoc; // PHP XML DOMDocument
- private $removedattrs = [];
+ private $removedattrs = [];
- private static $allowed_functions = [ 'matrix', 'url', 'translate', 'rgb' ];
+ private static $allowed_functions = ['matrix', 'url', 'translate', 'rgb'];
- // defines the allowlist of elements and attributes allowed.
- private static $allowlist = [
- 'a' => [ 'class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'href', 'xlink:href', 'xlink:title' ],
- 'circle' => [ 'class', 'clip-path', 'clip-rule', 'cx', 'cy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'r', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ],
- 'clipPath' => [ 'class', 'clipPathUnits', 'id' ],
- 'defs' => [ ],
- 'style' => [ 'type' ],
- 'desc' => [ ],
- 'ellipse' => [ 'class', 'clip-path', 'clip-rule', 'cx', 'cy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'requiredFeatures', 'rx', 'ry', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ],
- 'feGaussianBlur' => [ 'class', 'color-interpolation-filters', 'id', 'requiredFeatures', 'stdDeviation' ],
- 'filter' => [ 'class', 'color-interpolation-filters', 'filterRes', 'filterUnits', 'height', 'id', 'primitiveUnits', 'requiredFeatures', 'width', 'x', 'xlink:href', 'y' ],
- 'foreignObject' => [ 'class', 'font-size', 'height', 'id', 'opacity', 'requiredFeatures', 'style', 'transform', 'width', 'x', 'y' ],
- 'g' => [ 'class', 'clip-path', 'clip-rule', 'id', 'display', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'font-family', 'font-size', 'font-style', 'font-weight', 'text-anchor' ],
- 'image' => [ 'class', 'clip-path', 'clip-rule', 'filter', 'height', 'id', 'mask', 'opacity', 'requiredFeatures', 'style', 'systemLanguage', 'transform', 'width', 'x', 'xlink:href', 'xlink:title', 'y' ],
- 'line' => [ 'class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'x1', 'x2', 'y1', 'y2' ],
- 'linearGradient' => [ 'class', 'id', 'gradientTransform', 'gradientUnits', 'requiredFeatures', 'spreadMethod', 'systemLanguage', 'x1', 'x2', 'xlink:href', 'y1', 'y2' ],
- 'marker' => [ 'id', 'class', 'markerHeight', 'markerUnits', 'markerWidth', 'orient', 'preserveAspectRatio', 'refX', 'refY', 'systemLanguage', 'viewBox' ],
- 'mask' => [ 'class', 'height', 'id', 'maskContentUnits', 'maskUnits', 'width', 'x', 'y' ],
- 'metadata' => [ 'class', 'id' ],
- 'path' => [ 'class', 'clip-path', 'clip-rule', 'd', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ],
- 'pattern' => [ 'class', 'height', 'id', 'patternContentUnits', 'patternTransform', 'patternUnits', 'requiredFeatures', 'style', 'systemLanguage', 'viewBox', 'width', 'x', 'xlink:href', 'y' ],
- 'polygon' => [ 'class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'class', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ],
- 'polyline' => [ 'class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ],
- 'radialGradient' => [ 'class', 'cx', 'cy', 'fx', 'fy', 'gradientTransform', 'gradientUnits', 'id', 'r', 'requiredFeatures', 'spreadMethod', 'systemLanguage', 'xlink:href' ],
- 'rect' => [ 'class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'height', 'id', 'mask', 'opacity', 'requiredFeatures', 'rx', 'ry', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'width', 'x', 'y' ],
- 'stop' => [ 'class', 'id', 'offset', 'requiredFeatures', 'stop-color', 'stop-opacity', 'style', 'systemLanguage' ],
- 'svg' => [ 'class', 'clip-path', 'clip-rule', 'filter', 'id', 'height', 'mask', 'preserveAspectRatio', 'requiredFeatures', 'style', 'systemLanguage', 'viewBox', 'width', 'x', 'xmlns', 'xmlns:se', 'xmlns:xlink', 'y' ],
- 'switch' => [ 'class', 'id', 'requiredFeatures', 'systemLanguage' ],
- 'symbol' => [ 'class', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'opacity', 'preserveAspectRatio', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'viewBox' ],
- 'text' => [ 'class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'text-anchor', 'transform', 'x', 'xml:space', 'y' ],
- 'textPath' => [ 'class', 'id', 'method', 'requiredFeatures', 'spacing', 'startOffset', 'style', 'systemLanguage', 'transform', 'xlink:href' ],
- 'title' => [ ],
- 'tspan' => [ 'class', 'clip-path', 'clip-rule', 'dx', 'dy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'mask', 'opacity', 'requiredFeatures', 'rotate', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'text-anchor', 'textLength', 'transform', 'x', 'xml:space', 'y' ],
- 'use' => [ 'class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'height', 'id', 'mask', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'transform', 'width', 'x', 'xlink:href', 'y' ],
- ];
+ // defines the allowlist of elements and attributes allowed.
+ private static $allowlist = [
+ 'a' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'href', 'xlink:href', 'xlink:title'],
+ 'circle' => ['class', 'clip-path', 'clip-rule', 'cx', 'cy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'r', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'],
+ 'clipPath' => ['class', 'clipPathUnits', 'id'],
+ 'defs' => [],
+ 'style' => ['type'],
+ 'desc' => [],
+ 'ellipse' => ['class', 'clip-path', 'clip-rule', 'cx', 'cy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'requiredFeatures', 'rx', 'ry', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'],
+ 'feGaussianBlur' => ['class', 'color-interpolation-filters', 'id', 'requiredFeatures', 'stdDeviation'],
+ 'filter' => ['class', 'color-interpolation-filters', 'filterRes', 'filterUnits', 'height', 'id', 'primitiveUnits', 'requiredFeatures', 'width', 'x', 'xlink:href', 'y'],
+ 'foreignObject' => ['class', 'font-size', 'height', 'id', 'opacity', 'requiredFeatures', 'style', 'transform', 'width', 'x', 'y'],
+ 'g' => ['class', 'clip-path', 'clip-rule', 'id', 'display', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'font-family', 'font-size', 'font-style', 'font-weight', 'text-anchor'],
+ 'image' => ['class', 'clip-path', 'clip-rule', 'filter', 'height', 'id', 'mask', 'opacity', 'requiredFeatures', 'style', 'systemLanguage', 'transform', 'width', 'x', 'xlink:href', 'xlink:title', 'y'],
+ 'line' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'x1', 'x2', 'y1', 'y2'],
+ 'linearGradient' => ['class', 'id', 'gradientTransform', 'gradientUnits', 'requiredFeatures', 'spreadMethod', 'systemLanguage', 'x1', 'x2', 'xlink:href', 'y1', 'y2'],
+ 'marker' => ['id', 'class', 'markerHeight', 'markerUnits', 'markerWidth', 'orient', 'preserveAspectRatio', 'refX', 'refY', 'systemLanguage', 'viewBox'],
+ 'mask' => ['class', 'height', 'id', 'maskContentUnits', 'maskUnits', 'width', 'x', 'y'],
+ 'metadata' => ['class', 'id'],
+ 'path' => ['class', 'clip-path', 'clip-rule', 'd', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'],
+ 'pattern' => ['class', 'height', 'id', 'patternContentUnits', 'patternTransform', 'patternUnits', 'requiredFeatures', 'style', 'systemLanguage', 'viewBox', 'width', 'x', 'xlink:href', 'y'],
+ 'polygon' => ['class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'class', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'],
+ 'polyline' => ['class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'],
+ 'radialGradient' => ['class', 'cx', 'cy', 'fx', 'fy', 'gradientTransform', 'gradientUnits', 'id', 'r', 'requiredFeatures', 'spreadMethod', 'systemLanguage', 'xlink:href'],
+ 'rect' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'height', 'id', 'mask', 'opacity', 'requiredFeatures', 'rx', 'ry', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'width', 'x', 'y'],
+ 'stop' => ['class', 'id', 'offset', 'requiredFeatures', 'stop-color', 'stop-opacity', 'style', 'systemLanguage'],
+ 'svg' => ['class', 'clip-path', 'clip-rule', 'filter', 'id', 'height', 'mask', 'preserveAspectRatio', 'requiredFeatures', 'style', 'systemLanguage', 'viewBox', 'width', 'x', 'xmlns', 'xmlns:se', 'xmlns:xlink', 'y'],
+ 'switch' => ['class', 'id', 'requiredFeatures', 'systemLanguage'],
+ 'symbol' => ['class', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'opacity', 'preserveAspectRatio', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'viewBox'],
+ 'text' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'text-anchor', 'transform', 'x', 'xml:space', 'y'],
+ 'textPath' => ['class', 'id', 'method', 'requiredFeatures', 'spacing', 'startOffset', 'style', 'systemLanguage', 'transform', 'xlink:href'],
+ 'title' => [],
+ 'tspan' => ['class', 'clip-path', 'clip-rule', 'dx', 'dy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'mask', 'opacity', 'requiredFeatures', 'rotate', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'text-anchor', 'textLength', 'transform', 'x', 'xml:space', 'y'],
+ 'use' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'height', 'id', 'mask', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'transform', 'width', 'x', 'xlink:href', 'y'],
+ ];
- function __construct() {
- $this->xmlDoc = new DOMDocument('1.0','UTF-8');
- $this->xmlDoc->preserveWhiteSpace = false;
- libxml_use_internal_errors(true);
- }
+ public function __construct()
+ {
+ $this->xmlDoc = new DOMDocument('1.0', 'UTF-8');
+ $this->xmlDoc->preserveWhiteSpace = false;
+ libxml_use_internal_errors(true);
+ }
- // load XML SVG
- function load($file) {
- $this->xmlDoc->load($file);
- }
+ // load XML SVG
+ public function load($file)
+ {
+ $this->xmlDoc->load($file);
+ }
- function loadXML($str) {
- if (! $str) {
- logger('loadxml: empty input', LOGGER_DEBUG);
- return false;
- }
- if (! $this->xmlDoc->loadXML($str)) {
- logger('loadxml: ' . print_r(array_slice(libxml_get_errors(),0,Config::Get('system','svg_backtrace_limit',3)),true), LOGGER_DEBUG);
- return false;
- }
- return true;
- }
+ public function loadXML($str)
+ {
+ if (!$str) {
+ logger('loadxml: empty input', LOGGER_DEBUG);
+ return false;
+ }
+ if (!$this->xmlDoc->loadXML($str)) {
+ logger('loadxml: ' . print_r(array_slice(libxml_get_errors(), 0, Config::Get('system', 'svg_backtrace_limit', 3)), true), LOGGER_DEBUG);
+ return false;
+ }
+ return true;
+ }
- function sanitize()
- {
- // all elements in xml doc
- $allElements = $this->xmlDoc->getElementsByTagName('*');
+ public function sanitize()
+ {
+ // all elements in xml doc
+ $allElements = $this->xmlDoc->getElementsByTagName('*');
- // loop through all elements
- for($i = 0; $i < $allElements->length; $i++)
- {
- $this->removedattrs = [];
-
- $currentNode = $allElements->item($i);
+ // loop through all elements
+ for ($i = 0; $i < $allElements->length; $i++) {
+ $this->removedattrs = [];
- // logger('current_node: ' . print_r($currentNode,true));
+ $currentNode = $allElements->item($i);
- // array of allowed attributes in specific element
- $allowlist_attr_arr = self::$allowlist[$currentNode->tagName];
+ // logger('current_node: ' . print_r($currentNode,true));
- // does element exist in allowlist?
- if(isset($allowlist_attr_arr)) {
- $total = $currentNode->attributes->length;
-
- for($x = 0; $x < $total; $x++) {
+ // array of allowed attributes in specific element
+ $allowlist_attr_arr = self::$allowlist[$currentNode->tagName];
- // get attributes name
- $attrName = $currentNode->attributes->item($x)->nodeName;
+ // does element exist in allowlist?
+ if (isset($allowlist_attr_arr)) {
+ $total = $currentNode->attributes->length;
- // logger('checking: ' . print_r($currentNode->attributes->item($x),true));
- $matches = false;
-
- // check if attribute isn't in allowlist
- if(! in_array($attrName, $allowlist_attr_arr)) {
- $this->removedattrs[] = $attrName;
- }
- // check for disallowed functions
- elseif (preg_match_all('/([a-zA-Z0-9]+)[\s]*\(/',
- $currentNode->attributes->item($x)->textContent,$matches,PREG_SET_ORDER)) {
- if ($attrName === 'text') {
- continue;
- }
- foreach ($matches as $match) {
- if(! in_array($match[1],self::$allowed_functions)) {
- logger('queue_remove_function: ' . $match[1],LOGGER_DEBUG);
- $this->removedattrs[] = $attrName;
- }
- }
- }
- }
- if ($this->removedattrs) {
- foreach ($this->removedattrs as $attr) {
- $currentNode->removeAttribute($attr);
- logger('removed: ' . $attr, LOGGER_DEBUG);
- }
- }
+ for ($x = 0; $x < $total; $x++) {
+ // get attributes name
+ $attrName = $currentNode->attributes->item($x)->nodeName;
- }
+ // logger('checking: ' . print_r($currentNode->attributes->item($x),true));
+ $matches = false;
- // else remove element
- else {
- logger('remove_node: ' . print_r($currentNode,true));
- $currentNode->parentNode->removeChild($currentNode);
- }
- }
- return true;
- }
+ // check if attribute isn't in allowlist
+ if (!in_array($attrName, $allowlist_attr_arr)) {
+ $this->removedattrs[] = $attrName;
+ } // check for disallowed functions
+ elseif (
+ preg_match_all(
+ '/([a-zA-Z0-9]+)[\s]*\(/',
+ $currentNode->attributes->item($x)->textContent,
+ $matches,
+ PREG_SET_ORDER
+ )
+ ) {
+ if ($attrName === 'text') {
+ continue;
+ }
+ foreach ($matches as $match) {
+ if (!in_array($match[1], self::$allowed_functions)) {
+ logger('queue_remove_function: ' . $match[1], LOGGER_DEBUG);
+ $this->removedattrs[] = $attrName;
+ }
+ }
+ }
+ }
+ if ($this->removedattrs) {
+ foreach ($this->removedattrs as $attr) {
+ $currentNode->removeAttribute($attr);
+ logger('removed: ' . $attr, LOGGER_DEBUG);
+ }
+ }
+ } // else remove element
+ else {
+ logger('remove_node: ' . print_r($currentNode, true));
+ $currentNode->parentNode->removeChild($currentNode);
+ }
+ }
+ return true;
+ }
- function saveSVG() {
- $this->xmlDoc->formatOutput = true;
- return($this->xmlDoc->saveXML());
- }
+ public function saveSVG()
+ {
+ $this->xmlDoc->formatOutput = true;
+ return ($this->xmlDoc->saveXML());
+ }
}
diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php
index d316b13b6..0df1fb449 100644
--- a/Zotlabs/Lib/System.php
+++ b/Zotlabs/Lib/System.php
@@ -4,116 +4,145 @@ namespace Zotlabs\Lib;
use App;
-class System {
+class System
+{
- static public function get_platform_name() {
- if(is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('platform_name',App::$config['system']))
- return App::$config['system']['platform_name'];
- return PLATFORM_NAME;
- }
+ public static function get_platform_name()
+ {
+ if (is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('platform_name', App::$config['system'])) {
+ return App::$config['system']['platform_name'];
+ }
+ return PLATFORM_NAME;
+ }
- static public function get_site_name() {
- if(is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['sitename'])
- return App::$config['system']['sitename'];
- return '';
- }
+ public static function get_site_name()
+ {
+ if (is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['sitename']) {
+ return App::$config['system']['sitename'];
+ }
+ return '';
+ }
- static public function get_banner() {
+ public static function get_banner()
+ {
- if(is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('banner',App::$config['system']) && App::$config['system']['banner']) {
- return App::$config['system']['banner'];
+ if (is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('banner', App::$config['system']) && App::$config['system']['banner']) {
+ return App::$config['system']['banner'];
+ }
+ return self::get_site_name();
+ }
+
+ public static function get_project_icon()
+ {
+ if (is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('icon', App::$config['system'])) {
+ return App::$config['system']['icon'];
+ }
+ return z_root() . '/images/' . PLATFORM_NAME . '-64.png';
+ }
+
+ public static function get_project_favicon()
+ {
+ if (is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('favicon', App::$config['system'])) {
+ return App::$config['system']['favicon'];
+ }
+ return z_root() . '/images/' . PLATFORM_NAME . '.ico';
+ }
+
+
+ public static function get_project_version()
+ {
+ if (array_path_exists('system/hide_version', App::$config) && intval(App::$config['system']['hide_version'])) {
+ return '';
+ }
+ if (is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('std_version', App::$config['system'])) {
+ return App::$config['system']['std_version'];
+ }
+
+ return self::get_std_version();
+ }
+
+ public static function get_update_version()
+ {
+ if (is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['hide_version']) {
+ return EMPTY_STR;
+ }
+ return DB_UPDATE_VERSION;
+ }
+
+
+ public static function get_notify_icon()
+ {
+ if (is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['email_notify_icon_url']) {
+ return App::$config['system']['email_notify_icon_url'];
+ }
+ return self::get_project_icon();
+ }
+
+ public static function get_site_icon()
+ {
+ if (is_array(App::$config) && is_array(App::$config['system']) && isset(App::$config['system']['site_icon_url']) && App::$config['system']['site_icon_url']) {
+ return App::$config['system']['site_icon_url'];
+ }
+ return self::get_project_icon();
+ }
+
+ public static function get_site_favicon()
+ {
+ if (is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['site_favicon_url']) {
+ return App::$config['system']['site_favicon_url'];
+ }
+ return self::get_project_favicon();
+ }
+
+ public static function get_project_link()
+ {
+ if (is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['project_link']) {
+ return App::$config['system']['project_link'];
+ }
+ return 'https://zotlabs.com/' . PLATFORM_NAME;
+ }
+
+ public static function get_project_srclink()
+ {
+ if (is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['project_srclink']) {
+ return App::$config['system']['project_srclink'];
+ }
+ if (PLATFORM_NAME === 'streams') {
+ return 'https://codeberg.org/streams/' . PLATFORM_NAME;
}
- return self::get_site_name();
- }
- static public function get_project_icon() {
- if(is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('icon',App::$config['system'])) {
- return App::$config['system']['icon'];
- }
- return z_root() . '/images/' . PLATFORM_NAME . '-64.png';
- }
+ return 'https://codeberg.org/zot/' . PLATFORM_NAME;
+ }
- static public function get_project_favicon() {
- if(is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('favicon',App::$config['system'])) {
- return App::$config['system']['favicon'];
- }
- return z_root() . '/images/' . PLATFORM_NAME . '.ico';
- }
+ public static function ebs()
+ {
+ if (defined('EBSSTATE')) {
+ return EBSSTATE;
+ }
+ return 'armed';
+ }
+ public static function get_zot_revision()
+ {
+ $x = [ 'revision' => ZOT_REVISION ];
+ call_hooks('zot_revision', $x);
+ return $x['revision'];
+ }
- static public function get_project_version() {
- if(array_path_exists('system/hide_version', App::$config) && intval(App::$config['system']['hide_version']))
- return '';
- if(is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('std_version',App::$config['system']))
- return App::$config['system']['std_version'];
+ public static function get_std_version()
+ {
+ if (defined('STD_VERSION')) {
+ return STD_VERSION;
+ }
+ return '0.0.0';
+ }
- return self::get_std_version();
- }
+ public static function compatible_project($p)
+ {
- static public function get_update_version() {
- if(is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['hide_version'])
- return EMPTY_STR;
- return DB_UPDATE_VERSION;
- }
-
-
- static public function get_notify_icon() {
- if(is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['email_notify_icon_url'])
- return App::$config['system']['email_notify_icon_url'];
- return self::get_project_icon();
- }
-
- static public function get_site_icon() {
- if(is_array(App::$config) && is_array(App::$config['system']) && isset(App::$config['system']['site_icon_url']) && App::$config['system']['site_icon_url'])
- return App::$config['system']['site_icon_url'];
- return self::get_project_icon();
- }
-
- static public function get_site_favicon() {
- if(is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['site_favicon_url'])
- return App::$config['system']['site_favicon_url'];
- return self::get_project_favicon();
- }
-
- static public function get_project_link() {
- if(is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['project_link'])
- return App::$config['system']['project_link'];
- return 'https://zotlabs.com/' . PLATFORM_NAME;
- }
-
- static public function get_project_srclink() {
- if(is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['project_srclink'])
- return App::$config['system']['project_srclink'];
- if (PLATFORM_NAME === 'streams') {
- return 'https://codeberg.org/streams/' . PLATFORM_NAME;
- }
- return 'https://codeberg.org/zot/' . PLATFORM_NAME;
- }
-
- static public function ebs() {
- if(defined('EBSSTATE')) {
- return EBSSTATE;
- }
- return 'armed';
- }
-
- static public function get_zot_revision() {
- $x = [ 'revision' => ZOT_REVISION ];
- call_hooks('zot_revision',$x);
- return $x['revision'];
- }
-
- static public function get_std_version() {
- if(defined('STD_VERSION'))
- return STD_VERSION;
- return '0.0.0';
- }
-
- static public function compatible_project($p) {
-
- if (in_array(strtolower($p),['hubzilla', 'zap', 'red', 'misty', 'mistpark', 'redmatrix', 'osada', 'roadhouse', 'streams'])) {
- return true;
- }
- return false;
- }
+ if (in_array(strtolower($p), ['hubzilla', 'zap', 'red', 'misty', 'mistpark', 'redmatrix', 'osada', 'roadhouse','streams'])) {
+ return true;
+ }
+ return false;
+ }
}
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 23cdf336d..c44ac923c 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -1,4 +1,6 @@
-data = $data;
- $this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
- $this->threaded = get_config('system','thread_allow',true);
+ public function __construct($data)
+ {
- $observer = App::get_observer();
+ $this->data = $data;
+ $this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
+ $this->threaded = get_config('system', 'thread_allow', true);
- // Prepare the children
- if($data['children']) {
- foreach($data['children'] as $item) {
+ $observer = App::get_observer();
- /*
- * Only add those that will be displayed
- */
+ // Prepare the children
+ if ($data['children']) {
+ foreach ($data['children'] as $item) {
+ /*
+ * Only add those that will be displayed
+ */
- if(! visible_activity($item)) {
- continue;
- }
+ if (! visible_activity($item)) {
+ continue;
+ }
- // this is a quick hack to hide ActivityPub DMs that we should not be allowed to see
- // but may have been forwarded as part of a conversation
+ // this is a quick hack to hide ActivityPub DMs that we should not be allowed to see
+ // but may have been forwarded as part of a conversation
- if(intval($item['item_private']) && (intval($item['item_restrict']) & 1 ) && $item['mid'] !== $item['parent_mid']) {
- if(! $observer) {
- continue;
- }
- }
+ if (intval($item['item_private']) && (intval($item['item_restrict']) & 1 ) && $item['mid'] !== $item['parent_mid']) {
+ if (! $observer) {
+ continue;
+ }
+ }
- $child = new ThreadItem($item);
- $this->add_child($child);
- }
+ $child = new ThreadItem($item);
+ $this->add_child($child);
+ }
+ }
+
+ // allow a site to configure the order and content of the reaction emoji list
+ if ($this->toplevel) {
+ $x = get_config('system', 'reactions');
+ if ($x && is_array($x) && count($x)) {
+ $this->reactions = $x;
+ }
+ }
+ }
+
+ /**
+ * Get data in a form usable by a conversation template
+ *
+ * Returns:
+ * _ The data requested on success
+ * _ false on failure
+ */
+
+ public function get_template_data($conv_responses, $thread_level = 1)
+ {
+
+ $result = [];
+
+ $item = $this->get_data();
+
+ $commentww = '';
+ $sparkle = '';
+ $buttons = '';
+ $dropping = false;
+ $star = false;
+ $isstarred = "unstarred fa-star-o";
+ $is_comment = false;
+ $is_item = false;
+ $osparkle = '';
+ $total_children = $this->count_descendants();
+ $unseen_comments = ((isset($item['real_uid']) && $item['real_uid']) ? 0 : $this->count_unseen_descendants());
+ $privacy_warning = false;
+
+ $conv = $this->get_conversation();
+ $observer = $conv->get_observer();
+
+ $lock = t('Public visibility');
+ if (intval($item['item_private']) === 2) {
+ $lock = t('Direct message (private mail)');
+ }
+ if (intval($item['item_private']) === 1) {
+ $lock = t('Restricted visibility');
}
- // allow a site to configure the order and content of the reaction emoji list
- if($this->toplevel) {
- $x = get_config('system','reactions');
- if($x && is_array($x) && count($x)) {
- $this->reactions = $x;
- }
- }
- }
-
- /**
- * Get data in a form usable by a conversation template
- *
- * Returns:
- * _ The data requested on success
- * _ false on failure
- */
-
- public function get_template_data($conv_responses, $thread_level = 1) {
-
- $result = [];
-
- $item = $this->get_data();
-
- $commentww = '';
- $sparkle = '';
- $buttons = '';
- $dropping = false;
- $star = false;
- $isstarred = "unstarred fa-star-o";
- $is_comment = false;
- $is_item = false;
- $osparkle = '';
- $total_children = $this->count_descendants();
- $unseen_comments = ((isset($item['real_uid']) && $item['real_uid']) ? 0 : $this->count_unseen_descendants());
- $privacy_warning = false;
-
- $conv = $this->get_conversation();
- $observer = $conv->get_observer();
-
- $lock = (((intval($item['item_private'])) || (($item['uid'] == local_channel()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
- || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
- ? t('Private Message')
- : false);
-
- $locktype = $item['item_private'];
-
- $shareable = ((($conv->get_profile_owner() == local_channel() && local_channel()) && (! intval($item['item_private']))) ? true : false);
-
- // allow an exemption for sharing stuff from your private feeds
- if($item['author']['xchan_network'] === 'rss')
- $shareable = true;
-
- // @fixme
- // Have recently added code to properly handle polls in group reshares by redirecting all of the poll responses to the group.
- // Sharing a poll using a regular embedded share is harder because the poll will need to fork. This is due to comment permissions.
- // The original poll author may not accept responses from strangers. Forking the poll will receive responses from the sharer's
- // followers, but there's no elegant way to merge these two sets of results together. For now, we'll disable sharing polls.
-
- if ($item['obj_type'] === 'Question') {
- $shareable = false;
- }
-
-
- if ($item['item_restrict'] & 2) {
- $privacy_warning = true;
- $lock = t('This comment is part of a private conversation, yet was shared with the public. Discretion advised.');
- }
-
- $mode = $conv->get_mode();
-
- $edlink = 'editpost';
-
- if(local_channel() && $observer['xchan_hash'] === $item['author_xchan'])
- $edpost = array(z_root() . '/' . $edlink . '/' . $item['id'], t('Edit'));
- else
- $edpost = false;
-
- if(local_channel() && $observer['xchan_hash'] === $item['owner_xchan'])
- $myconv = true;
- else
- $myconv = false;
-
-
- if($item['verb'] === 'Announce') {
- $edpost = false;
- }
-
-
- if ($observer && $observer['xchan_hash']
- && ( $observer['xchan_hash'] == $this->get_data_value('author_xchan')
- || $observer['xchan_hash'] == $this->get_data_value('owner_xchan')
- || $observer['xchan_hash'] == $this->get_data_value('source_xchan')
- || $this->get_data_value('uid') == local_channel()))
- $dropping = true;
-
-
- if(array_key_exists('real_uid',$item)) {
- $edpost = false;
- $dropping = false;
- }
-
-
- if($dropping) {
- $drop = array(
- 'dropping' => $dropping,
- 'delete' => t('Delete'),
- );
- }
- elseif(is_site_admin()) {
- $drop = [ 'dropping' => true, 'delete' => t('Admin Delete') ];
- }
-
- if(isset($observer_is_pageowner) && $observer_is_pageowner) {
- $multidrop = array(
- 'select' => t('Select'),
- );
- }
-
- $filer = ((($conv->get_profile_owner() == local_channel()) && (! array_key_exists('real_uid',$item))) ? t('Save to Folder') : false);
-
- $profile_avatar = $item['author']['xchan_photo_m'];
- $profile_link = chanlink_hash($item['author_xchan']);
- $profile_name = $item['author']['xchan_name'];
-
- $profile_addr = $item['author']['xchan_addr'] ? $item['author']['xchan_addr'] : $item['author']['xchan_url'];
-
- $location = format_location($item);
- $isevent = false;
- $attend = null;
- $canvote = false;
-
- // process action responses - e.g. like/dislike/attend/agree/whatever
- $response_verbs = [ 'like', 'dislike' ];
-
- if($item['obj_type'] === ACTIVITY_OBJ_EVENT) {
- $response_verbs[] = 'attendyes';
- $response_verbs[] = 'attendno';
- $response_verbs[] = 'attendmaybe';
- if($this->is_commentable() && $observer) {
- $isevent = true;
- $attend = array( t('I will attend'), t('I will not attend'), t('I might attend'));
- $undo_attend = t('Undo attendance');
- }
- }
-
- $responses = get_responses($conv_responses,$response_verbs,$this,$item);
-
- $my_responses = [];
- foreach($response_verbs as $v) {
- $my_responses[$v] = ((isset($conv_responses[$v][$item['mid'] . '-m']) && $conv_responses[$v][$item['mid'] . '-m']) ? 1 : 0);
- }
-
- $like_count = ((x($conv_responses['like'],$item['mid'])) ? $conv_responses['like'][$item['mid']] : '');
- $like_list = ((x($conv_responses['like'],$item['mid'])) ? $conv_responses['like'][$item['mid'] . '-l'] : '');
- if (($like_list) && (count($like_list) > MAX_LIKERS)) {
- $like_list_part = array_slice($like_list, 0, MAX_LIKERS);
- array_push($like_list_part, '' . t('View all') . '');
- } else {
- $like_list_part = '';
- }
- if(get_config('system','show_like_counts',true)) {
- $like_button_label = tt('Like','Likes',$like_count,'noun');
- }
- else {
- $like_button_label = t('Likes','noun');
- }
-
- $dislike_count = ((x($conv_responses['dislike'],$item['mid'])) ? $conv_responses['dislike'][$item['mid']] : '');
- $dislike_list = ((x($conv_responses['dislike'],$item['mid'])) ? $conv_responses['dislike'][$item['mid'] . '-l'] : '');
- if(get_config('system','show_like_counts',true)) {
- $dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun');
- }
- else {
- $dislike_button_label = t('Dislikes','noun');
- }
-
- if (($dislike_list) && (count($dislike_list) > MAX_LIKERS)) {
- $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS);
- array_push($dislike_list_part, '' . t('View all') . '');
- } else {
- $dislike_list_part = '';
- }
-
-
- $showlike = ((x($conv_responses['like'],$item['mid'])) ? format_like($conv_responses['like'][$item['mid']],$conv_responses['like'][$item['mid'] . '-l'],'like',$item['mid']) : '');
- $showdislike = ((x($conv_responses['dislike'],$item['mid']))
- ? format_like($conv_responses['dislike'][$item['mid']],$conv_responses['dislike'][$item['mid'] . '-l'],'dislike',$item['mid']) : '');
-
- /*
- * We should avoid doing this all the time, but it depends on the conversation mode
- * And the conv mode may change when we change the conv, or it changes its mode
- * Maybe we should establish a way to be notified about conversation changes
- */
-
- $this->check_wall_to_wall();
-
- if($this->is_toplevel()) {
- if(local_channel() && $conv->get_profile_owner() == local_channel() && (! array_key_exists('real_uid',$item))) {
- $star = [
- 'toggle' => t('Save'),
- 'isstarred' => ((intval($item['item_starred'])) ? true : false),
- ];
- }
- }
- else {
- $is_comment = true;
- }
-
-
- $verified = (intval($item['item_verified']) ? t('Message signature validated') : '');
- $forged = ((($item['sig']) && (! intval($item['item_verified']))) ? t('Message signature incorrect') : '');
- $unverified = '' ; // (($this->is_wall_to_wall() && (! intval($item['item_verified']))) ? t('Message cannot be verified') : '');
-
-
- if($conv->get_profile_owner() == local_channel()) {
- $tagger = array(
- 'tagit' => t("Add Tag"),
- 'classtagger' => "",
- );
- }
-
- $has_bookmarks = false;
- if(isset($item['term']) && is_array($item['term'])) {
- foreach($item['term'] as $t) {
- if($t['ttype'] == TERM_BOOKMARK)
- $has_bookmarks = true;
- }
- }
-
- $has_event = false;
- if(($item['obj_type'] === ACTIVITY_OBJ_EVENT) && $conv->get_profile_owner() == local_channel())
- $has_event = true;
-
- if($this->is_commentable() && $observer) {
- $like = array( t('I like this'), t('Undo like'));
- $dislike = array( t('I don\'t like this'), t('Undo dislike') );
- }
-
- $share = $embed = EMPTY_STR;
-
- if ($shareable) {
- $share = t('Repeat This');
- $embed = t('Share this');
- }
-
- $dreport = '';
-
- $keep_reports = intval(get_config('system','expire_delivery_reports'));
- if($keep_reports === 0)
- $keep_reports = 10;
-
- if((! get_config('system','disable_dreport')) && strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC',"now - $keep_reports days")) > 0) {
- $dreport = t('Delivery Report');
- $dreport_link = gen_link_id($item['mid']);
- }
- $is_new = false;
-
- if (strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) {
- $is_new = true;
- }
-
- localize_item($item);
-
- $opts = [];
- if ($this->is_wall_to_wall()) {
- if ($this->owner_censored) {
- $opts['censored'] = true;
- }
- }
-
- $body = prepare_body($item,true,$opts);
-
- // $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link
- // since we can't depend on llink or plink pointing to the right local location.
-
- $owner_address = substr($item['owner']['xchan_addr'],0,strpos($item['owner']['xchan_addr'],'@'));
- $viewthread = $item['llink'];
- if($conv->get_mode() === 'channel')
- $viewthread = z_root() . '/channel/' . $owner_address . '?f=&mid=' . urlencode(gen_link_id($item['mid']));
-
- $comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
- $list_unseen_txt = (($unseen_comments) ? sprintf( t('%d unseen'),$unseen_comments) : '');
-
- $children = $this->get_children();
-
-
- $has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
-
- $dropdown_extras_arr = [ 'item' => $item , 'dropdown_extras' => '' ];
- call_hooks('dropdown_extras',$dropdown_extras_arr);
- $dropdown_extras = $dropdown_extras_arr['dropdown_extras'];
-
- // Pinned item processing
- $allowed_type = (in_array($item['item_type'], get_config('system', 'pin_types', [ ITEM_TYPE_POST ])) ? true : false);
- $pinned_items = ($allowed_type ? get_pconfig($item['uid'], 'pinned', $item['item_type'], []) : []);
- $pinned = ((! empty($pinned_items) && in_array($item['mid'], $pinned_items)) ? true : false);
-
- $tmp_item = array(
- 'template' => $this->get_template(),
- 'mode' => $mode,
- 'item_type' => intval($item['item_type']),
- 'comment_order' => $item['comment_order'],
- 'parent' => $this->get_data_value('parent'),
- 'collapsed' => ((intval($item['comment_order']) > 3) ? true : false),
- 'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
- 'body' => $body['html'],
- 'tags' => $body['tags'],
- 'categories' => $body['categories'],
- 'mentions' => $body['mentions'],
- 'attachments' => $body['attachments'],
- 'folders' => $body['folders'],
- 'text' => strip_tags($body['html']),
- 'id' => $this->get_id(),
- 'mid' => $item['mid'],
- 'isevent' => $isevent,
- 'attend' => $attend,
- 'undo_attend' => $undo_attend,
- 'consensus' => '',
- 'conlabels' => '',
- 'canvote' => $canvote,
- 'linktitle' => sprintf( t('View %s\'s profile - %s'), $profile_name, (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url'])),
- 'olinktitle' => sprintf( t('View %s\'s profile - %s'), $this->get_owner_name(), (($item['owner']['xchan_addr']) ? $item['owner']['xchan_addr'] : $item['owner']['xchan_url'])),
- 'llink' => $item['llink'],
- 'viewthread' => $viewthread,
- 'to' => t('to'),
- 'via' => t('via'),
- 'wall' => t('Wall-to-Wall'),
- 'vwall' => t('via Wall-To-Wall:'),
- 'profile_url' => $profile_link,
- 'thread_action_menu' => thread_action_menu($item,$conv->get_mode()),
- 'thread_author_menu' => thread_author_menu($item,$conv->get_mode()),
- 'dreport' => $dreport,
- 'dreport_link' => ((isset($dreport_link) && $dreport_link) ? $dreport_link : EMPTY_STR),
- 'myconv' => $myconv,
- 'name' => $profile_name,
- 'thumb' => $profile_avatar,
- 'osparkle' => $osparkle,
- 'sparkle' => $sparkle,
- 'title' => $item['title'],
- 'title_tosource' => get_pconfig($conv->get_profile_owner(),'system','title_tosource'),
- 'ago' => relative_date($item['created']),
- 'app' => $item['app'],
- 'str_app' => sprintf( t('from %s'), $item['app']),
- 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'),
- 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
- 'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''),
- 'expiretime' => (($item['expires'] > NULL_DATE) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''),
- 'lock' => $lock,
- 'locktype' => $locktype,
- 'delayed' => $item['item_delayed'],
- 'privacy_warning' => $privacy_warning,
- 'verified' => $verified,
- 'unverified' => $unverified,
- 'forged' => $forged,
- 'location' => $location,
- 'divider' => get_pconfig($conv->get_profile_owner(),'system','item_divider'),
- 'attend_label' => t('Attend'),
- 'attend_title' => t('Attendance Options'),
- 'vote_label' => t('Vote'),
- 'vote_title' => t('Voting Options'),
- 'comment_lbl' => (($this->is_commentable() && $observer) ? t('Reply') : ''),
- 'is_comment' => $is_comment,
- 'is_new' => $is_new,
- 'mod_display' => ((argv(0) === 'display') ? true : false), // comments are not collapsed when using mod_display
- 'owner_url' => $this->get_owner_url(),
- 'owner_photo' => $this->get_owner_photo(),
- 'owner_name' => $this->get_owner_name(),
- 'photo' => $body['photo'],
- 'event' => $body['event'],
- 'has_tags' => $has_tags,
- 'reactions' => $this->reactions,
-
- // Item toolbar buttons
-
- 'emojis' => '', // deprecated - use your operating system or a browser plugin
- 'like' => $like,
- 'dislike' => $dislike,
- 'share' => $share,
- 'embed' => $embed,
- 'rawmid' => $item['mid'],
- 'plink' => get_plink($item),
- 'edpost' => $edpost, // ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
- 'star' => $star,
- 'tagger' => ((feature_enabled($conv->get_profile_owner(),'commtag')) ? $tagger : ''),
- 'filer' => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''),
- 'pinned' => ($pinned ? t('Pinned post') : ''),
- 'pinnable' => (($this->is_toplevel() && local_channel() && $item['owner_xchan'] == $observer['xchan_hash'] && $allowed_type && $item['item_private'] == 0 && $item['item_delayed'] == 0) ? '1' : ''),
- 'pinme' => ($pinned ? t('Unpin this post') : t('Pin this post')),
- 'isdraft' => boolval($item['item_unpublished']),
- 'draft_txt' => t('Saved draft'),
- 'bookmark' => (($conv->get_profile_owner() == local_channel() && local_channel() && $has_bookmarks) ? t('Save Bookmarks') : ''),
- 'addtocal' => (($has_event && ! $item['resource_id']) ? t('Add to Calendar') : ''),
- 'drop' => $drop,
- 'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''),
- 'dropdown_extras' => $dropdown_extras,
-
- // end toolbar buttons
-
- 'unseen_comments' => $unseen_comments,
- 'comment_count' => $total_children,
- 'comment_count_txt' => $comment_count_txt,
- 'list_unseen_txt' => $list_unseen_txt,
- 'markseen' => t('Mark all seen'),
- 'responses' => $responses,
- 'my_responses' => $my_responses,
- 'like_count' => $like_count,
- 'like_list' => $like_list,
- 'like_list_part' => $like_list_part,
- 'like_button_label' => $like_button_label,
- 'like_modal_title' => t('Likes','noun'),
- 'dislike_modal_title' => t('Dislikes','noun'),
- 'dislike_count' => $dislike_count,
- 'dislike_list' => $dislike_list,
- 'dislike_list_part' => $dislike_list_part,
- 'dislike_button_label' => $dislike_button_label,
- 'modal_dismiss' => t('Close'),
- 'showlike' => $showlike,
- 'showdislike' => $showdislike,
- 'comment' => ($item['item_delayed'] ? '' : $this->get_comment_box()),
- 'previewing' => ($conv->is_preview() ? true : false ),
- 'preview_lbl' => t('This is an unsaved preview'),
- 'wait' => t('Please wait'),
- 'submid' => str_replace(['+','='], ['',''], base64_encode($item['mid'])),
- 'thread_level' => $thread_level,
- 'indentpx' => intval(get_pconfig(local_channel(),'system','thread_indent_px',get_config('system','thread_indent_px',0))),
- 'thread_max' => intval(get_config('system','thread_maxlevel',20)) + 1
- );
-
- $arr = array('item' => $item, 'output' => $tmp_item);
- call_hooks('display_item', $arr);
-
- $result = $arr['output'];
-
- $result['children'] = [];
-
- if (local_channel() && get_pconfig(local_channel(),'system','activitypub',get_config('system','activitypub', ACTIVITYPUB_ENABLED))) {
- // place to store all the author addresses (links if not available) in the thread so we can auto-mention them in JS.
- $result['authors'] = [];
- // fix to add in sub-replies if replying to a comment on your own post from the top level.
- if ($observer && ($profile_addr === $observer['xchan_hash'] || $profile_addr === $observer['xchan_addr'])) {
- // ignore it
- }
- else {
- $result['authors'][] = $profile_addr;
- }
-
- // Add any mentions from the immediate parent, unless they are mentions of the current viewer or duplicates
- if (isset($item['term']) && is_array($item['term'])) {
- $additional_mentions = [];
- foreach ($item['term'] as $t) {
- if ($t['ttype'] == TERM_MENTION) {
- $additional_mentions[] = ((($position = strpos($t['url'],'url=')) !== false) ? urldecode(substr($t['url'],$position + 4)) : $t['url']);;
- }
- }
- if ($additional_mentions) {
- $r = q("select hubloc_addr, hubloc_id_url, hubloc_hash from hubloc where hubloc_id_url in (" . protect_sprintf(stringify_array($additional_mentions, true)) . ") ");
- if ($r) {
- foreach ($r as $rv) {
- $ment = (($r[0]['hubloc_addr']) ? $r[0]['hubloc_addr'] : $r[0]['hubloc_id_url']);
- if ($ment) {
- if ($observer && $observer['xchan_hash'] !== $rv['hubloc_hash'] && ! in_array($ment,$result['authors'])) {
- $result['authors'][] = $ment;
- }
- }
- }
- }
- }
- }
- }
-
- $nb_children = count($children);
-
- $total_children = $this->count_visible_descendants();
-
- $visible_comments = get_config('system', 'expanded_comments', 3);
-
- if(($this->get_display_mode() === 'normal') && ($nb_children > 0)) {
- if ($children) {
- foreach($children as $child) {
- $xz = $child->get_template_data($conv_responses, $thread_level + 1);
- $result['children'][] = $xz;
- }
- }
- // Collapse
- if($total_children > $visible_comments && $thread_level == 1) {
- $result['children'][0]['comment_firstcollapsed'] = true;
- $result['children'][0]['num_comments'] = $comment_count_txt;
- $result['children'][0]['hide_text'] = sprintf( t('%s show all'), '');
- }
- }
-
- $result['private'] = $item['item_private'];
- $result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
-
- if($this->is_threaded()) {
- $result['flatten'] = false;
- $result['threaded'] = true;
- }
- else {
- $result['flatten'] = true;
- $result['threaded'] = false;
- }
-
- return $result;
- }
-
- public function get_id() {
- return $this->get_data_value('id');
- }
-
- public function get_display_mode() {
- return $this->display_mode;
- }
-
- public function set_display_mode($mode) {
- $this->display_mode = $mode;
- }
-
- public function is_threaded() {
- return $this->threaded;
- }
-
- public function get_author() {
- $xchan = $this->get_data_value('author');
- if($xchan['xchan_addr']) {
- return $xchan['xchan_addr'];
- }
- return $xchan['xchan_url'];
- }
-
- public function set_reload($val) {
- $this->reload = $val;
- }
-
- public function get_reload() {
- return $this->reload;
- }
-
- public function set_commentable($val) {
- $this->commentable = $val;
- foreach($this->get_children() as $child)
- $child->set_commentable($val);
- }
-
- public function is_commentable() {
- return $this->commentable;
- }
-
- /**
- * Add a child item
- */
- public function add_child($item) {
- $item_id = $item->get_id();
- if(!$item_id) {
- logger('[ERROR] Item::add_child : Item has no ID!!', LOGGER_DEBUG);
- return false;
- }
- if($this->get_child($item->get_id())) {
- logger('[WARN] Item::add_child : Item already exists ('. $item->get_id() .').', LOGGER_DEBUG);
- return false;
- }
-
- /*
- * Only add what will be displayed
- */
-
- if(activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE)) {
- return false;
- }
-
- $item->set_parent($this);
- $this->children[] = $item;
- return end($this->children);
- }
-
- /**
- * Get a child by its ID
- */
-
- public function get_child($id) {
- foreach($this->get_children() as $child) {
- if($child->get_id() == $id)
- return $child;
- }
- return null;
- }
-
- /**
- * Get all our children
- */
-
- public function get_children() {
- return $this->children;
- }
-
- /**
- * Set our parent
- */
- protected function set_parent($item) {
- $parent = $this->get_parent();
- if($parent) {
- $parent->remove_child($this);
- }
- $this->parent = $item;
- $this->set_conversation($item->get_conversation());
- }
-
- /**
- * Remove our parent
- */
-
- protected function remove_parent() {
- $this->parent = null;
- $this->conversation = null;
- }
-
- /**
- * Remove a child
- */
-
- public function remove_child($item) {
- $id = $item->get_id();
- foreach($this->get_children() as $key => $child) {
- if($child->get_id() == $id) {
- $child->remove_parent();
- unset($this->children[$key]);
- // Reindex the array, in order to make sure there won't be any trouble on loops using count()
- $this->children = array_values($this->children);
- return true;
- }
- }
- logger('[WARN] Item::remove_child : Item is not a child ('. $id .').', LOGGER_DEBUG);
- return false;
- }
-
- /**
- * Get parent item
- */
- protected function get_parent() {
- return $this->parent;
- }
-
- /**
- * set conversation
- */
- public function set_conversation($conv) {
- $previous_mode = ($this->conversation ? $this->conversation->get_mode() : '');
-
- $this->conversation = $conv;
-
- // Set it on our children too
- foreach($this->get_children() as $child)
- $child->set_conversation($conv);
- }
-
- /**
- * get conversation
- */
- public function get_conversation() {
- return $this->conversation;
- }
-
- /**
- * Get raw data
- *
- * We shouldn't need this
- */
- public function get_data() {
- return $this->data;
- }
-
- /**
- * Get a data value
- *
- * Returns:
- * _ value on success
- * _ false on failure
- */
- public function get_data_value($name) {
- if(!isset($this->data[$name])) {
-// logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
- return false;
- }
-
- return $this->data[$name];
- }
-
- /**
- * Get template
- */
- public function get_template() {
- return $this->template;
- }
-
-
- public function set_template($t) {
- $this->template = $t;
- }
-
- /**
- * Check if this is a toplevel post
- */
- private function is_toplevel() {
- return $this->toplevel;
- }
-
- /**
- * Count the total of our descendants
- */
- private function count_descendants() {
- $children = $this->get_children();
- $total = count($children);
- if($total > 0) {
- foreach($children as $child) {
- $total += $child->count_descendants();
- }
- }
- return $total;
- }
-
- public function count_visible_descendants() {
- $total = 0;
- $children = $this->get_children();
- if ($children) {
- foreach ($children as $child) {
- if (! visible_activity($child->data)) {
- continue;
- }
- $total ++;
- $total += $child->count_visible_descendants();
- }
- }
- return $total;
- }
-
-
- private function label_descendants($count = 0) {
- if(! array_key_exists('sequence',$this->data)) {
- if($count) {
- $count ++;
- }
- $this->data['sequence'] = $count;
- }
- logger('labelled: ' . print_r($this->data,true), LOGGER_DATA);
- $children = $this->get_children();
- $total = count($children);
- if($total > 0) {
- foreach($children as $child) {
- if(! visible_activity($child->data)) {
- continue;
- }
- if(! array_key_exists('sequence',$this->data)) {
- $count ++;
- $child->data['sequence'] = $count;
- logger('labelled_child: ' . print_r($child->data,true), LOGGER_DATA);
- }
- $child->label_descendants($count);
- }
- }
- }
-
- private function count_unseen_descendants() {
- $children = $this->get_children();
- $total = count($children);
- if($total > 0) {
- $total = 0;
- foreach($children as $child) {
- if(! visible_activity($child->data)) {
- continue;
- }
- if(intval($child->data['item_unseen']))
- $total ++;
- }
- }
- return $total;
- }
-
-
- /**
- * Get the template for the comment box
- */
- private function get_comment_box_template() {
- return $this->comment_box_template;
- }
-
- /**
- * Get the comment box
- *
- * Returns:
- * _ The comment box string (empty if no comment box)
- * _ false on failure
- */
- private function get_comment_box($indent = 0) {
-
- if(!$this->is_toplevel() && !get_config('system','thread_allow',true)) {
- return '';
- }
-
- $comment_box = '';
- $conv = $this->get_conversation();
-
-// logger('Commentable conv: ' . $conv->is_commentable());
-
- if(! $this->is_commentable())
- return;
-
- $template = get_markup_template($this->get_comment_box_template());
-
- $observer = $conv->get_observer();
-
- $arr = array('comment_buttons' => '','id' => $this->get_id());
- call_hooks('comment_buttons',$arr);
- $comment_buttons = $arr['comment_buttons'];
-
- $feature_auto_save_draft = ((feature_enabled($conv->get_profile_owner(), 'auto_save_draft')) ? "true" : "false");
- $permanent_draft = ((intval($conv->get_profile_owner()) === intval(local_channel()) && Apps::system_app_installed($conv->get_profile_owner(),'Drafts')) ? ('Save draft') : EMPTY_STR);
-
-
-
- $comment_box = replace_macros($template,array(
- '$return_path' => '',
- '$threaded' => $this->is_threaded(),
- '$jsreload' => $conv->reload,
- '$type' => (($conv->get_mode() === 'channel') ? 'wall-comment' : 'net-comment'),
- '$id' => $this->get_id(),
- '$parent' => $this->get_id(),
- '$comment_buttons' => $comment_buttons,
- '$profile_uid' => $conv->get_profile_owner(),
- '$mylink' => $observer['xchan_url'],
- '$mytitle' => t('This is you'),
- '$myphoto' => $observer['xchan_photo_s'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$edat' => EMPTY_STR,
- '$edbold' => t('Bold'),
- '$editalic' => t('Italic'),
- '$eduline' => t('Underline'),
- '$edquote' => t('Quote'),
- '$edcode' => t('Code'),
- '$edimg' => t('Image'),
- '$edatt' => t('Attach/Upload file'),
- '$edurl' => t('Insert Link'),
- '$edvideo' => t('Video'),
- '$preview' => t('Preview'),
- '$reset' => t('Reset'),
- '$indent' => $indent,
- '$can_upload' => (perm_is_allowed($conv->get_profile_owner(),get_observer_hash(),'write_storage') && $conv->is_uploadable()),
- '$feature_encrypt' => ((Apps::system_app_installed($conv->get_profile_owner(),'Secrets')) ? true : false),
- '$feature_markup' => ((Apps::system_app_installed($conv->get_profile_owner(),'Markup')) ? true : false),
- '$encrypt' => t('Encrypt text'),
- '$cipher' => $conv->get_cipher(),
- '$sourceapp' => App::$sourcename,
- '$observer' => get_observer_hash(),
- '$anoncomments' => ((($conv->get_mode() === 'channel' || $conv->get_mode() === 'display') && perm_is_allowed($conv->get_profile_owner(),'','post_comments')) ? true : false),
- '$anonname' => [ 'anonname', t('Your full name (required)') ],
- '$anonmail' => [ 'anonmail', t('Your email address (required)') ],
- '$anonurl' => [ 'anonurl', t('Your website URL (optional)') ],
- '$auto_save_draft' => $feature_auto_save_draft,
- '$save' => $permanent_draft,
- '$top' => $this->is_toplevel()
- ));
-
- return $comment_box;
- }
-
- private function get_redirect_url() {
- return $this->redirect_url;
- }
-
- /**
- * Check if we are a wall to wall item and set the relevant properties
- */
- protected function check_wall_to_wall() {
- $conv = $this->get_conversation();
- $this->wall_to_wall = false;
- $this->owner_url = '';
- $this->owner_photo = '';
- $this->owner_name = '';
- $this->owner_censored = false;
-
- if($conv->get_mode() === 'channel')
- return;
-
- if($this->is_toplevel() && ($this->get_data_value('author_xchan') != $this->get_data_value('owner_xchan'))) {
- $this->owner_url = chanlink_hash($this->data['owner']['xchan_hash']);
- $this->owner_photo = $this->data['owner']['xchan_photo_m'];
- $this->owner_name = $this->data['owner']['xchan_name'];
- $this->wall_to_wall = true;
- }
-
- // present friend-of-friend conversations from hyperdrive as relayed posts from the first friend
- // we find among the respondents.
-
- if ($this->is_toplevel() && (! $this->data['owner']['abook_id'])) {
- if ($this->data['children']) {
- $friend = $this->find_a_friend($this->data['children']);
- if ($friend) {
- $this->owner_url = $friend['url'];
- $this->owner_photo = $friend['photo'];
- $this->owner_name = $friend['name'];
- $this->owner_censored = $friend['censored'];
- $this->wall_to_wall = true;
- }
- }
- }
- }
-
- private function find_a_friend($items) {
- $ret = null;
- if ($items) {
- foreach ($items as $child) {
- if ($child['author']['abook_id'] && (! intval($child['author']['abook_self']))) {
- return [
- 'url' => chanlink_hash($child['author']['xchan_hash']),
- 'photo' => $child['author']['xchan_photo_m'],
- 'name' => $child['author']['xchan_name'],
- 'censored' => (($child['author']['xchan_censored'] || $child['author']['abook_censor']) ? true : false)
- ];
- if ($child['children']) {
- $ret = $this->find_a_friend($child['children']);
- if ($ret) {
- break;
- }
- }
- }
- }
- }
- return $ret;
- }
-
-
- private function is_wall_to_wall() {
- return $this->wall_to_wall;
- }
-
- private function get_owner_url() {
- return $this->owner_url;
- }
-
- private function get_owner_photo() {
- return $this->owner_photo;
- }
-
- private function get_owner_name() {
- return $this->owner_name;
- }
-
- private function is_visiting() {
- return $this->visiting;
- }
-
+ $locktype = intval($item['item_private']);
+ $shareable = ((($conv->get_profile_owner() == local_channel() && local_channel()) && (! intval($item['item_private']))) ? true : false);
+
+ // allow an exemption for sharing stuff from your private feeds
+ if ($item['author']['xchan_network'] === 'rss') {
+ $shareable = true;
+ }
+ // @fixme
+ // Have recently added code to properly handle polls in group reshares by redirecting all of the poll responses to the group.
+ // Sharing a poll using a regular embedded share is harder because the poll will need to fork. This is due to comment permissions.
+ // The original poll author may not accept responses from strangers. Forking the poll will receive responses from the sharer's
+ // followers, but there's no elegant way to merge these two sets of results together. For now, we'll disable sharing polls.
+ if ($item['obj_type'] === 'Question') {
+ $shareable = false;
+ }
+
+
+ if ($item['item_restrict'] & 2) {
+ $privacy_warning = true;
+ $lock = t('This comment is part of a private conversation, yet was shared with the public. Discretion advised.');
+ }
+
+ $mode = $conv->get_mode();
+
+ $edlink = 'editpost';
+
+ if (local_channel() && $observer['xchan_hash'] === $item['author_xchan']) {
+ $edpost = array(z_root() . '/' . $edlink . '/' . $item['id'], t('Edit'));
+ } else {
+ $edpost = false;
+ }
+
+ if (local_channel() && $observer['xchan_hash'] === $item['owner_xchan']) {
+ $myconv = true;
+ } else {
+ $myconv = false;
+ }
+
+
+ if ($item['verb'] === 'Announce') {
+ $edpost = false;
+ }
+
+
+ if (
+ $observer && $observer['xchan_hash']
+ && ( $observer['xchan_hash'] == $this->get_data_value('author_xchan')
+ || $observer['xchan_hash'] == $this->get_data_value('owner_xchan')
+ || $observer['xchan_hash'] == $this->get_data_value('source_xchan')
+ || $this->get_data_value('uid') == local_channel())
+ ) {
+ $dropping = true;
+ }
+
+
+ if (array_key_exists('real_uid', $item)) {
+ $edpost = false;
+ $dropping = false;
+ }
+
+
+ if ($dropping) {
+ $drop = array(
+ 'dropping' => $dropping,
+ 'delete' => t('Delete'),
+ );
+ } elseif (is_site_admin()) {
+ $drop = [ 'dropping' => true, 'delete' => t('Admin Delete') ];
+ }
+
+ if (isset($observer_is_pageowner) && $observer_is_pageowner) {
+ $multidrop = array(
+ 'select' => t('Select'),
+ );
+ }
+
+ $filer = ((($conv->get_profile_owner() == local_channel()) && (! array_key_exists('real_uid', $item))) ? t('Save to Folder') : false);
+
+ $profile_avatar = $item['author']['xchan_photo_m'];
+ $profile_link = chanlink_hash($item['author_xchan']);
+ $profile_name = $item['author']['xchan_name'];
+
+ $profile_addr = $item['author']['xchan_addr'] ? $item['author']['xchan_addr'] : $item['author']['xchan_url'];
+
+ $location = format_location($item);
+ $isevent = false;
+ $attend = null;
+ $canvote = false;
+
+ // process action responses - e.g. like/dislike/attend/agree/whatever
+ $response_verbs = [ 'like', 'dislike' ];
+
+ if ($item['obj_type'] === ACTIVITY_OBJ_EVENT) {
+ $response_verbs[] = 'attendyes';
+ $response_verbs[] = 'attendno';
+ $response_verbs[] = 'attendmaybe';
+ if ($this->is_commentable() && $observer) {
+ $isevent = true;
+ $attend = array( t('I will attend'), t('I will not attend'), t('I might attend'));
+ $undo_attend = t('Undo attendance');
+ }
+ }
+
+ $responses = get_responses($conv_responses, $response_verbs, $this, $item);
+
+ $my_responses = [];
+ foreach ($response_verbs as $v) {
+ $my_responses[$v] = ((isset($conv_responses[$v][$item['mid'] . '-m']) && $conv_responses[$v][$item['mid'] . '-m']) ? 1 : 0);
+ }
+
+ $like_count = ((x($conv_responses['like'], $item['mid'])) ? $conv_responses['like'][$item['mid']] : '');
+ $like_list = ((x($conv_responses['like'], $item['mid'])) ? $conv_responses['like'][$item['mid'] . '-l'] : '');
+ if (($like_list) && (count($like_list) > MAX_LIKERS)) {
+ $like_list_part = array_slice($like_list, 0, MAX_LIKERS);
+ array_push($like_list_part, '' . t('View all') . '');
+ } else {
+ $like_list_part = '';
+ }
+ if (get_config('system', 'show_like_counts', true)) {
+ $like_button_label = tt('Like', 'Likes', $like_count, 'noun');
+ } else {
+ $like_button_label = t('Likes', 'noun');
+ }
+
+ $dislike_count = ((x($conv_responses['dislike'], $item['mid'])) ? $conv_responses['dislike'][$item['mid']] : '');
+ $dislike_list = ((x($conv_responses['dislike'], $item['mid'])) ? $conv_responses['dislike'][$item['mid'] . '-l'] : '');
+ if (get_config('system', 'show_like_counts', true)) {
+ $dislike_button_label = tt('Dislike', 'Dislikes', $dislike_count, 'noun');
+ } else {
+ $dislike_button_label = t('Dislikes', 'noun');
+ }
+
+ if (($dislike_list) && (count($dislike_list) > MAX_LIKERS)) {
+ $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS);
+ array_push($dislike_list_part, '' . t('View all') . '');
+ } else {
+ $dislike_list_part = '';
+ }
+
+
+ $showlike = ((x($conv_responses['like'], $item['mid'])) ? format_like($conv_responses['like'][$item['mid']], $conv_responses['like'][$item['mid'] . '-l'], 'like', $item['mid']) : '');
+ $showdislike = ((x($conv_responses['dislike'], $item['mid']))
+ ? format_like($conv_responses['dislike'][$item['mid']], $conv_responses['dislike'][$item['mid'] . '-l'], 'dislike', $item['mid']) : '');
+
+ /*
+ * We should avoid doing this all the time, but it depends on the conversation mode
+ * And the conv mode may change when we change the conv, or it changes its mode
+ * Maybe we should establish a way to be notified about conversation changes
+ */
+
+ $this->check_wall_to_wall();
+
+ if ($this->is_toplevel()) {
+ if (local_channel() && ($conv->get_profile_owner() == local_channel() || intval($item['item_private']) === 0)) {
+ $star = [
+ 'toggle' => t('Save'),
+ 'isstarred' => ((intval($item['item_starred'])) ? true : false),
+ ];
+ }
+ } else {
+ $is_comment = true;
+ }
+
+
+ $verified = (intval($item['item_verified']) ? t('Message signature validated') : '');
+ $forged = ((($item['sig']) && (! intval($item['item_verified']))) ? t('Message signature incorrect') : '');
+ $unverified = '' ; // (($this->is_wall_to_wall() && (! intval($item['item_verified']))) ? t('Message cannot be verified') : '');
+
+
+ if ($conv->get_profile_owner() == local_channel()) {
+ $tagger = array(
+ 'tagit' => t("Add Tag"),
+ 'classtagger' => "",
+ );
+ }
+
+ $has_bookmarks = false;
+ if (isset($item['term']) && is_array($item['term'])) {
+ foreach ($item['term'] as $t) {
+ if ($t['ttype'] == TERM_BOOKMARK) {
+ $has_bookmarks = true;
+ }
+ }
+ }
+
+ $has_event = false;
+ if (($item['obj_type'] === ACTIVITY_OBJ_EVENT) && $conv->get_profile_owner() == local_channel()) {
+ $has_event = true;
+ }
+
+ if ($this->is_commentable() && $observer) {
+ $like = array( t('I like this'), t('Undo like'));
+ $dislike = array( t('I don\'t like this'), t('Undo dislike') );
+ }
+
+ $share = $embed = EMPTY_STR;
+
+ if ($shareable) {
+ $share = t('Repeat This');
+ $embed = t('Share this');
+ }
+
+ $dreport = '';
+
+ $keep_reports = intval(get_config('system', 'expire_delivery_reports'));
+ if ($keep_reports === 0) {
+ $keep_reports = 10;
+ }
+
+ if ((! get_config('system', 'disable_dreport')) && strcmp(datetime_convert('UTC', 'UTC', $item['created']), datetime_convert('UTC', 'UTC', "now - $keep_reports days")) > 0) {
+ $dreport = t('Delivery Report');
+ $dreport_link = gen_link_id($item['mid']);
+ }
+ $is_new = false;
+
+ if (strcmp(datetime_convert('UTC', 'UTC', $item['created']), datetime_convert('UTC', 'UTC', 'now - 12 hours')) > 0) {
+ $is_new = true;
+ }
+
+ localize_item($item);
+
+ $opts = [];
+ if ($this->is_wall_to_wall()) {
+ if ($this->owner_censored) {
+ $opts['censored'] = true;
+ }
+ }
+
+ $body = prepare_body($item, true, $opts);
+
+ // $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link
+ // since we can't depend on llink or plink pointing to the right local location.
+
+ $owner_address = substr($item['owner']['xchan_addr'], 0, strpos($item['owner']['xchan_addr'], '@'));
+ $viewthread = $item['llink'];
+ if ($conv->get_mode() === 'channel') {
+ $viewthread = z_root() . '/channel/' . $owner_address . '?f=&mid=' . urlencode(gen_link_id($item['mid']));
+ }
+
+ $comment_count_txt = sprintf(tt('%d comment', '%d comments', $total_children), $total_children);
+ $list_unseen_txt = (($unseen_comments) ? sprintf(t('%d unseen'), $unseen_comments) : '');
+
+ $children = $this->get_children();
+
+
+ $has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
+
+ $dropdown_extras_arr = [ 'item' => $item , 'dropdown_extras' => '' ];
+ call_hooks('dropdown_extras', $dropdown_extras_arr);
+ $dropdown_extras = $dropdown_extras_arr['dropdown_extras'];
+
+ // Pinned item processing
+ $allowed_type = (in_array($item['item_type'], get_config('system', 'pin_types', [ ITEM_TYPE_POST ])) ? true : false);
+ $pinned_items = ($allowed_type ? get_pconfig($item['uid'], 'pinned', $item['item_type'], []) : []);
+ $pinned = ((! empty($pinned_items) && in_array($item['mid'], $pinned_items)) ? true : false);
+
+ $tmp_item = array(
+ 'template' => $this->get_template(),
+ 'mode' => $mode,
+ 'item_type' => intval($item['item_type']),
+ 'comment_order' => $item['comment_order'],
+ 'parent' => $this->get_data_value('parent'),
+ 'collapsed' => ((intval($item['comment_order']) > 3) ? true : false),
+ 'type' => implode("", array_slice(explode("/", $item['verb']), -1)),
+ 'body' => $body['html'],
+ 'tags' => $body['tags'],
+ 'categories' => $body['categories'],
+ 'mentions' => $body['mentions'],
+ 'attachments' => $body['attachments'],
+ 'folders' => $body['folders'],
+ 'text' => strip_tags($body['html']),
+ 'id' => $this->get_id(),
+ 'mid' => $item['mid'],
+ 'isevent' => $isevent,
+ 'attend' => $attend,
+ 'undo_attend' => $undo_attend,
+ 'consensus' => '',
+ 'conlabels' => '',
+ 'canvote' => $canvote,
+ 'linktitle' => sprintf(t('View %s\'s profile - %s'), $profile_name, (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url'])),
+ 'olinktitle' => sprintf(t('View %s\'s profile - %s'), $this->get_owner_name(), (($item['owner']['xchan_addr']) ? $item['owner']['xchan_addr'] : $item['owner']['xchan_url'])),
+ 'llink' => $item['llink'],
+ 'viewthread' => $viewthread,
+ 'to' => t('to'),
+ 'via' => t('via'),
+ 'wall' => t('Wall-to-Wall'),
+ 'vwall' => t('via Wall-To-Wall:'),
+ 'profile_url' => $profile_link,
+ 'thread_action_menu' => thread_action_menu($item, $conv->get_mode()),
+ 'thread_author_menu' => thread_author_menu($item, $conv->get_mode()),
+ 'dreport' => $dreport,
+ 'dreport_link' => ((isset($dreport_link) && $dreport_link) ? $dreport_link : EMPTY_STR),
+ 'myconv' => $myconv,
+ 'name' => $profile_name,
+ 'thumb' => $profile_avatar,
+ 'osparkle' => $osparkle,
+ 'sparkle' => $sparkle,
+ 'title' => $item['title'],
+ 'title_tosource' => get_pconfig($conv->get_profile_owner(), 'system', 'title_tosource'),
+ 'ago' => relative_date($item['created']),
+ 'app' => $item['app'],
+ 'str_app' => sprintf(t('from %s'), $item['app']),
+ 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'),
+ 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
+ 'editedtime' => (($item['edited'] != $item['created']) ? sprintf(t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''),
+ 'expiretime' => (($item['expires'] > NULL_DATE) ? sprintf(t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')) : ''),
+ 'lock' => $lock,
+ 'locktype' => $locktype,
+ 'delayed' => $item['item_delayed'],
+ 'privacy_warning' => $privacy_warning,
+ 'verified' => $verified,
+ 'unverified' => $unverified,
+ 'forged' => $forged,
+ 'location' => $location,
+ 'divider' => get_pconfig($conv->get_profile_owner(), 'system', 'item_divider'),
+ 'attend_label' => t('Attend'),
+ 'attend_title' => t('Attendance Options'),
+ 'vote_label' => t('Vote'),
+ 'vote_title' => t('Voting Options'),
+ 'comment_lbl' => (($this->is_commentable() && $observer) ? t('Reply') : ''),
+ 'is_comment' => $is_comment,
+ 'is_new' => $is_new,
+ 'mod_display' => ((argv(0) === 'display') ? true : false), // comments are not collapsed when using mod_display
+ 'owner_url' => $this->get_owner_url(),
+ 'owner_photo' => $this->get_owner_photo(),
+ 'owner_name' => $this->get_owner_name(),
+ 'photo' => $body['photo'],
+ 'event' => $body['event'],
+ 'has_tags' => $has_tags,
+ 'reactions' => $this->reactions,
+
+ // Item toolbar buttons
+
+ 'emojis' => '', // deprecated - use your operating system or a browser plugin
+ 'like' => $like,
+ 'dislike' => $dislike,
+ 'share' => $share,
+ 'embed' => $embed,
+ 'rawmid' => $item['mid'],
+ 'plink' => get_plink($item),
+ 'edpost' => $edpost, // ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
+ 'star' => $star,
+ 'tagger' => ((feature_enabled($conv->get_profile_owner(), 'commtag')) ? $tagger : ''),
+ 'filer' => ((feature_enabled($conv->get_profile_owner(), 'filing')) ? $filer : ''),
+ 'pinned' => ($pinned ? t('Pinned post') : ''),
+ 'pinnable' => (($this->is_toplevel() && local_channel() && $item['owner_xchan'] == $observer['xchan_hash'] && $allowed_type && $item['item_private'] == 0 && $item['item_delayed'] == 0) ? '1' : ''),
+ 'pinme' => ($pinned ? t('Unpin this post') : t('Pin this post')),
+ 'isdraft' => boolval($item['item_unpublished']),
+ 'draft_txt' => t('Saved draft'),
+ 'bookmark' => (($conv->get_profile_owner() == local_channel() && local_channel() && $has_bookmarks) ? t('Save Bookmarks') : ''),
+ 'addtocal' => (($has_event && ! $item['resource_id']) ? t('Add to Calendar') : ''),
+ 'drop' => $drop,
+ 'multidrop' => ((feature_enabled($conv->get_profile_owner(), 'multi_delete')) ? $multidrop : ''),
+ 'dropdown_extras' => $dropdown_extras,
+
+ // end toolbar buttons
+
+ 'unseen_comments' => $unseen_comments,
+ 'comment_count' => $total_children,
+ 'comment_count_txt' => $comment_count_txt,
+ 'list_unseen_txt' => $list_unseen_txt,
+ 'markseen' => t('Mark all seen'),
+ 'responses' => $responses,
+ 'my_responses' => $my_responses,
+ 'like_count' => $like_count,
+ 'like_list' => $like_list,
+ 'like_list_part' => $like_list_part,
+ 'like_button_label' => $like_button_label,
+ 'like_modal_title' => t('Likes', 'noun'),
+ 'dislike_modal_title' => t('Dislikes', 'noun'),
+ 'dislike_count' => $dislike_count,
+ 'dislike_list' => $dislike_list,
+ 'dislike_list_part' => $dislike_list_part,
+ 'dislike_button_label' => $dislike_button_label,
+ 'modal_dismiss' => t('Close'),
+ 'showlike' => $showlike,
+ 'showdislike' => $showdislike,
+ 'comment' => ($item['item_delayed'] ? '' : $this->get_comment_box()),
+ 'previewing' => ($conv->is_preview() ? true : false ),
+ 'preview_lbl' => t('This is an unsaved preview'),
+ 'wait' => t('Please wait'),
+ 'submid' => str_replace(['+','='], ['',''], base64_encode($item['mid'])),
+ 'thread_level' => $thread_level,
+ 'indentpx' => intval(get_pconfig(local_channel(), 'system', 'thread_indent_px', get_config('system', 'thread_indent_px', 0))),
+ 'thread_max' => intval(get_config('system', 'thread_maxlevel', 20)) + 1
+ );
+
+ $arr = array('item' => $item, 'output' => $tmp_item);
+ call_hooks('display_item', $arr);
+
+ $result = $arr['output'];
+
+ $result['children'] = [];
+
+ if (local_channel() && get_pconfig(local_channel(), 'system', 'activitypub', get_config('system', 'activitypub', ACTIVITYPUB_ENABLED))) {
+ // place to store all the author addresses (links if not available) in the thread so we can auto-mention them in JS.
+ $result['authors'] = [];
+ // fix to add in sub-replies if replying to a comment on your own post from the top level.
+ if ($observer && ($profile_addr === $observer['xchan_hash'] || $profile_addr === $observer['xchan_addr'])) {
+ // ignore it
+ } else {
+ $result['authors'][] = $profile_addr;
+ }
+
+ // Add any mentions from the immediate parent, unless they are mentions of the current viewer or duplicates
+ if (isset($item['term']) && is_array($item['term'])) {
+ $additional_mentions = [];
+ foreach ($item['term'] as $t) {
+ if ($t['ttype'] == TERM_MENTION) {
+ $additional_mentions[] = ((($position = strpos($t['url'], 'url=')) !== false) ? urldecode(substr($t['url'], $position + 4)) : $t['url']);
+ }
+ }
+ if ($additional_mentions) {
+ $r = q("select hubloc_addr, hubloc_id_url, hubloc_hash from hubloc where hubloc_id_url in (" . protect_sprintf(stringify_array($additional_mentions, true)) . ") ");
+ if ($r) {
+ foreach ($r as $rv) {
+ $ment = (($r[0]['hubloc_addr']) ? $r[0]['hubloc_addr'] : $r[0]['hubloc_id_url']);
+ if ($ment) {
+ if ($observer && $observer['xchan_hash'] !== $rv['hubloc_hash'] && ! in_array($ment, $result['authors'])) {
+ $result['authors'][] = $ment;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ $nb_children = count($children);
+
+ $total_children = $this->count_visible_descendants();
+
+ $visible_comments = get_config('system', 'expanded_comments', 3);
+
+ if (($this->get_display_mode() === 'normal') && ($nb_children > 0)) {
+ if ($children) {
+ foreach ($children as $child) {
+ $xz = $child->get_template_data($conv_responses, $thread_level + 1);
+ $result['children'][] = $xz;
+ }
+ }
+ // Collapse
+ if ($total_children > $visible_comments && $thread_level == 1) {
+ $result['children'][0]['comment_firstcollapsed'] = true;
+ $result['children'][0]['num_comments'] = $comment_count_txt;
+ $result['children'][0]['hide_text'] = sprintf(t('%s show all'), '');
+ }
+ }
+
+ $result['private'] = $item['item_private'];
+ $result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
+
+ if ($this->is_threaded()) {
+ $result['flatten'] = false;
+ $result['threaded'] = true;
+ } else {
+ $result['flatten'] = true;
+ $result['threaded'] = false;
+ }
+
+ return $result;
+ }
+
+ public function get_id()
+ {
+ return $this->get_data_value('id');
+ }
+
+ public function get_display_mode()
+ {
+ return $this->display_mode;
+ }
+
+ public function set_display_mode($mode)
+ {
+ $this->display_mode = $mode;
+ }
+
+ public function is_threaded()
+ {
+ return $this->threaded;
+ }
+
+ public function get_author()
+ {
+ $xchan = $this->get_data_value('author');
+ if ($xchan['xchan_addr']) {
+ return $xchan['xchan_addr'];
+ }
+ return $xchan['xchan_url'];
+ }
+
+ public function set_reload($val)
+ {
+ $this->reload = $val;
+ }
+
+ public function get_reload()
+ {
+ return $this->reload;
+ }
+
+ public function set_commentable($val)
+ {
+ $this->commentable = $val;
+ foreach ($this->get_children() as $child) {
+ $child->set_commentable($val);
+ }
+ }
+
+ public function is_commentable()
+ {
+ return $this->commentable;
+ }
+
+ /**
+ * Add a child item
+ */
+ public function add_child($item)
+ {
+ $item_id = $item->get_id();
+ if (!$item_id) {
+ logger('[ERROR] Item::add_child : Item has no ID!!', LOGGER_DEBUG);
+ return false;
+ }
+ if ($this->get_child($item->get_id())) {
+ logger('[WARN] Item::add_child : Item already exists (' . $item->get_id() . ').', LOGGER_DEBUG);
+ return false;
+ }
+
+ /*
+ * Only add what will be displayed
+ */
+
+ if (activity_match($item->get_data_value('verb'), ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'), ACTIVITY_DISLIKE)) {
+ return false;
+ }
+
+ $item->set_parent($this);
+ $this->children[] = $item;
+ return end($this->children);
+ }
+
+ /**
+ * Get a child by its ID
+ */
+
+ public function get_child($id)
+ {
+ foreach ($this->get_children() as $child) {
+ if ($child->get_id() == $id) {
+ return $child;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Get all our children
+ */
+
+ public function get_children()
+ {
+ return $this->children;
+ }
+
+ /**
+ * Set our parent
+ */
+ protected function set_parent($item)
+ {
+ $parent = $this->get_parent();
+ if ($parent) {
+ $parent->remove_child($this);
+ }
+ $this->parent = $item;
+ $this->set_conversation($item->get_conversation());
+ }
+
+ /**
+ * Remove our parent
+ */
+
+ protected function remove_parent()
+ {
+ $this->parent = null;
+ $this->conversation = null;
+ }
+
+ /**
+ * Remove a child
+ */
+
+ public function remove_child($item)
+ {
+ $id = $item->get_id();
+ foreach ($this->get_children() as $key => $child) {
+ if ($child->get_id() == $id) {
+ $child->remove_parent();
+ unset($this->children[$key]);
+ // Reindex the array, in order to make sure there won't be any trouble on loops using count()
+ $this->children = array_values($this->children);
+ return true;
+ }
+ }
+ logger('[WARN] Item::remove_child : Item is not a child (' . $id . ').', LOGGER_DEBUG);
+ return false;
+ }
+
+ /**
+ * Get parent item
+ */
+ protected function get_parent()
+ {
+ return $this->parent;
+ }
+
+ /**
+ * set conversation
+ */
+ public function set_conversation($conv)
+ {
+ $previous_mode = ($this->conversation ? $this->conversation->get_mode() : '');
+
+ $this->conversation = $conv;
+
+ // Set it on our children too
+ foreach ($this->get_children() as $child) {
+ $child->set_conversation($conv);
+ }
+ }
+
+ /**
+ * get conversation
+ */
+ public function get_conversation()
+ {
+ return $this->conversation;
+ }
+
+ /**
+ * Get raw data
+ *
+ * We shouldn't need this
+ */
+ public function get_data()
+ {
+ return $this->data;
+ }
+
+ /**
+ * Get a data value
+ *
+ * Returns:
+ * _ value on success
+ * _ false on failure
+ */
+ public function get_data_value($name)
+ {
+ if (!isset($this->data[$name])) {
+// logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
+ return false;
+ }
+
+ return $this->data[$name];
+ }
+
+ /**
+ * Get template
+ */
+ public function get_template()
+ {
+ return $this->template;
+ }
+
+
+ public function set_template($t)
+ {
+ $this->template = $t;
+ }
+
+ /**
+ * Check if this is a toplevel post
+ */
+ private function is_toplevel()
+ {
+ return $this->toplevel;
+ }
+
+ /**
+ * Count the total of our descendants
+ */
+ private function count_descendants()
+ {
+ $children = $this->get_children();
+ $total = count($children);
+ if ($total > 0) {
+ foreach ($children as $child) {
+ $total += $child->count_descendants();
+ }
+ }
+ return $total;
+ }
+
+ public function count_visible_descendants()
+ {
+ $total = 0;
+ $children = $this->get_children();
+ if ($children) {
+ foreach ($children as $child) {
+ if (! visible_activity($child->data)) {
+ continue;
+ }
+ $total++;
+ $total += $child->count_visible_descendants();
+ }
+ }
+ return $total;
+ }
+
+
+ private function label_descendants($count = 0)
+ {
+ if (! array_key_exists('sequence', $this->data)) {
+ if ($count) {
+ $count++;
+ }
+ $this->data['sequence'] = $count;
+ }
+ logger('labelled: ' . print_r($this->data, true), LOGGER_DATA);
+ $children = $this->get_children();
+ $total = count($children);
+ if ($total > 0) {
+ foreach ($children as $child) {
+ if (! visible_activity($child->data)) {
+ continue;
+ }
+ if (! array_key_exists('sequence', $this->data)) {
+ $count++;
+ $child->data['sequence'] = $count;
+ logger('labelled_child: ' . print_r($child->data, true), LOGGER_DATA);
+ }
+ $child->label_descendants($count);
+ }
+ }
+ }
+
+ private function count_unseen_descendants()
+ {
+ $children = $this->get_children();
+ $total = count($children);
+ if ($total > 0) {
+ $total = 0;
+ foreach ($children as $child) {
+ if (! visible_activity($child->data)) {
+ continue;
+ }
+ if (intval($child->data['item_unseen'])) {
+ $total++;
+ }
+ }
+ }
+ return $total;
+ }
+
+
+ /**
+ * Get the template for the comment box
+ */
+ private function get_comment_box_template()
+ {
+ return $this->comment_box_template;
+ }
+
+ /**
+ * Get the comment box
+ *
+ * Returns:
+ * _ The comment box string (empty if no comment box)
+ * _ false on failure
+ */
+ private function get_comment_box($indent = 0)
+ {
+
+ if (!$this->is_toplevel() && !get_config('system', 'thread_allow', true)) {
+ return '';
+ }
+
+ $comment_box = '';
+ $conv = $this->get_conversation();
+
+// logger('Commentable conv: ' . $conv->is_commentable());
+
+ if (! $this->is_commentable()) {
+ return;
+ }
+
+ $template = get_markup_template($this->get_comment_box_template());
+
+ $observer = $conv->get_observer();
+
+ $arr = array('comment_buttons' => '','id' => $this->get_id());
+ call_hooks('comment_buttons', $arr);
+ $comment_buttons = $arr['comment_buttons'];
+
+ $feature_auto_save_draft = ((feature_enabled($conv->get_profile_owner(), 'auto_save_draft')) ? "true" : "false");
+ $permanent_draft = ((intval($conv->get_profile_owner()) === intval(local_channel()) && Apps::system_app_installed($conv->get_profile_owner(), 'Drafts')) ? ('Save draft') : EMPTY_STR);
+
+
+
+ $comment_box = replace_macros($template, array(
+ '$return_path' => '',
+ '$threaded' => $this->is_threaded(),
+ '$jsreload' => $conv->reload,
+ '$type' => (($conv->get_mode() === 'channel') ? 'wall-comment' : 'net-comment'),
+ '$id' => $this->get_id(),
+ '$parent' => $this->get_id(),
+ '$comment_buttons' => $comment_buttons,
+ '$profile_uid' => $conv->get_profile_owner(),
+ '$mylink' => $observer['xchan_url'],
+ '$mytitle' => t('This is you'),
+ '$myphoto' => $observer['xchan_photo_s'],
+ '$comment' => t('Comment'),
+ '$submit' => t('Submit'),
+ '$edat' => EMPTY_STR,
+ '$edbold' => t('Bold'),
+ '$editalic' => t('Italic'),
+ '$eduline' => t('Underline'),
+ '$edquote' => t('Quote'),
+ '$edcode' => t('Code'),
+ '$edimg' => t('Image'),
+ '$edatt' => t('Attach/Upload file'),
+ '$edurl' => t('Insert Link'),
+ '$edvideo' => t('Video'),
+ '$preview' => t('Preview'),
+ '$reset' => t('Reset'),
+ '$indent' => $indent,
+ '$can_upload' => (perm_is_allowed($conv->get_profile_owner(), get_observer_hash(), 'write_storage') && $conv->is_uploadable()),
+ '$feature_encrypt' => ((Apps::system_app_installed($conv->get_profile_owner(), 'Secrets')) ? true : false),
+ '$feature_markup' => ((Apps::system_app_installed($conv->get_profile_owner(), 'Markup')) ? true : false),
+ '$encrypt' => t('Encrypt text'),
+ '$cipher' => $conv->get_cipher(),
+ '$sourceapp' => App::$sourcename,
+ '$observer' => get_observer_hash(),
+ '$anoncomments' => ((($conv->get_mode() === 'channel' || $conv->get_mode() === 'display') && perm_is_allowed($conv->get_profile_owner(), '', 'post_comments')) ? true : false),
+ '$anonname' => [ 'anonname', t('Your full name (required)') ],
+ '$anonmail' => [ 'anonmail', t('Your email address (required)') ],
+ '$anonurl' => [ 'anonurl', t('Your website URL (optional)') ],
+ '$auto_save_draft' => $feature_auto_save_draft,
+ '$save' => $permanent_draft,
+ '$top' => $this->is_toplevel()
+ ));
+
+ return $comment_box;
+ }
+
+ private function get_redirect_url()
+ {
+ return $this->redirect_url;
+ }
+
+ /**
+ * Check if we are a wall to wall item and set the relevant properties
+ */
+ protected function check_wall_to_wall()
+ {
+ $conv = $this->get_conversation();
+ $this->wall_to_wall = false;
+ $this->owner_url = '';
+ $this->owner_photo = '';
+ $this->owner_name = '';
+ $this->owner_censored = false;
+
+ if ($conv->get_mode() === 'channel') {
+ return;
+ }
+
+ if ($this->is_toplevel() && ($this->get_data_value('author_xchan') != $this->get_data_value('owner_xchan'))) {
+ $this->owner_url = chanlink_hash($this->data['owner']['xchan_hash']);
+ $this->owner_photo = $this->data['owner']['xchan_photo_m'];
+ $this->owner_name = $this->data['owner']['xchan_name'];
+ $this->wall_to_wall = true;
+ }
+
+ // present friend-of-friend conversations from hyperdrive as relayed posts from the first friend
+ // we find among the respondents.
+
+ if ($this->is_toplevel() && (! $this->data['owner']['abook_id'])) {
+ if ($this->data['children']) {
+ $friend = $this->find_a_friend($this->data['children']);
+ if ($friend) {
+ $this->owner_url = $friend['url'];
+ $this->owner_photo = $friend['photo'];
+ $this->owner_name = $friend['name'];
+ $this->owner_censored = $friend['censored'];
+ $this->wall_to_wall = true;
+ }
+ }
+ }
+ }
+
+ private function find_a_friend($items)
+ {
+ $ret = null;
+ if ($items) {
+ foreach ($items as $child) {
+ if ($child['author']['abook_id'] && (! intval($child['author']['abook_self']))) {
+ return [
+ 'url' => chanlink_hash($child['author']['xchan_hash']),
+ 'photo' => $child['author']['xchan_photo_m'],
+ 'name' => $child['author']['xchan_name'],
+ 'censored' => (($child['author']['xchan_censored'] || $child['author']['abook_censor']) ? true : false)
+ ];
+ if ($child['children']) {
+ $ret = $this->find_a_friend($child['children']);
+ if ($ret) {
+ break;
+ }
+ }
+ }
+ }
+ }
+ return $ret;
+ }
+
+
+ private function is_wall_to_wall()
+ {
+ return $this->wall_to_wall;
+ }
+
+ private function get_owner_url()
+ {
+ return $this->owner_url;
+ }
+
+ private function get_owner_photo()
+ {
+ return $this->owner_photo;
+ }
+
+ private function get_owner_name()
+ {
+ return $this->owner_name;
+ }
+
+ private function is_visiting()
+ {
+ return $this->visiting;
+ }
}
-
diff --git a/Zotlabs/Lib/ThreadListener.php b/Zotlabs/Lib/ThreadListener.php
index 308e02255..1bf4cbe98 100644
--- a/Zotlabs/Lib/ThreadListener.php
+++ b/Zotlabs/Lib/ThreadListener.php
@@ -2,52 +2,62 @@
namespace Zotlabs\Lib;
-class ThreadListener {
+class ThreadListener
+{
- static public function store($target_id,$portable_id,$ltype = 0) {
- $x = self::fetch($target_id,$portable_id,$ltype = 0);
- if(! $x) {
- $r = q("insert into listeners ( target_id, portable_id, ltype ) values ( '%s', '%s' , %d ) ",
- dbesc($target_id),
- dbesc($portable_id),
- intval($ltype)
- );
- }
- }
+ public static function store($target_id, $portable_id, $ltype = 0)
+ {
+ $x = self::fetch($target_id, $portable_id, $ltype = 0);
+ if (! $x) {
+ $r = q(
+ "insert into listeners ( target_id, portable_id, ltype ) values ( '%s', '%s' , %d ) ",
+ dbesc($target_id),
+ dbesc($portable_id),
+ intval($ltype)
+ );
+ }
+ }
- static public function fetch($target_id,$portable_id,$ltype = 0) {
- $x = q("select * from listeners where target_id = '%s' and portable_id = '%s' and ltype = %d limit 1",
- dbesc($target_id),
- dbesc($portable_id),
- intval($ltype)
- );
- if($x) {
- return $x[0];
- }
- return false;
- }
+ public static function fetch($target_id, $portable_id, $ltype = 0)
+ {
+ $x = q(
+ "select * from listeners where target_id = '%s' and portable_id = '%s' and ltype = %d limit 1",
+ dbesc($target_id),
+ dbesc($portable_id),
+ intval($ltype)
+ );
+ if ($x) {
+ return $x[0];
+ }
+ return false;
+ }
- static public function fetch_by_target($target_id,$ltype = 0) {
- $x = q("select * from listeners where target_id = '%s' and ltype = %d",
- dbesc($target_id),
- intval($ltype)
- );
+ public static function fetch_by_target($target_id, $ltype = 0)
+ {
+ $x = q(
+ "select * from listeners where target_id = '%s' and ltype = %d",
+ dbesc($target_id),
+ intval($ltype)
+ );
- return $x;
- }
+ return $x;
+ }
- static public function delete_by_target($target_id, $ltype = 0) {
- return q("delete from listeners where target_id = '%s' and ltype = %d",
- dbesc($target_id),
- intval($ltype)
- );
- }
-
- static public function delete_by_pid($portable_id, $ltype = 0) {
- return q("delete from listeners where portable_id = '%s' and ltype = %d",
- dbesc($portable_id),
- intval($ltype)
- );
- }
+ public static function delete_by_target($target_id, $ltype = 0)
+ {
+ return q(
+ "delete from listeners where target_id = '%s' and ltype = %d",
+ dbesc($target_id),
+ intval($ltype)
+ );
+ }
+ public static function delete_by_pid($portable_id, $ltype = 0)
+ {
+ return q(
+ "delete from listeners where portable_id = '%s' and ltype = %d",
+ dbesc($portable_id),
+ intval($ltype)
+ );
+ }
}
diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php
index 79eaa503b..bbbb882e6 100644
--- a/Zotlabs/Lib/ThreadStream.php
+++ b/Zotlabs/Lib/ThreadStream.php
@@ -1,7 +1,11 @@
-set_mode($mode);
- $this->preview = $preview;
- $this->uploadable = $uploadable;
- $this->prepared_item = $prepared_item;
- $c = ((local_channel()) ? get_pconfig(local_channel(),'system','default_cipher') : '');
- if($c)
- $this->cipher = $c;
- }
+ public function __construct($mode, $preview, $uploadable, $prepared_item = '')
+ {
+ $this->set_mode($mode);
+ $this->preview = $preview;
+ $this->uploadable = $uploadable;
+ $this->prepared_item = $prepared_item;
+ $c = ((local_channel()) ? get_pconfig(local_channel(), 'system', 'default_cipher') : '');
+ if ($c) {
+ $this->cipher = $c;
+ }
+ }
- /**
- * Set the mode we'll be displayed on
- */
- private function set_mode($mode) {
- if($this->get_mode() == $mode)
- return;
+ /**
+ * Set the mode we'll be displayed on
+ */
+ private function set_mode($mode)
+ {
+ if ($this->get_mode() == $mode) {
+ return;
+ }
- $this->observer = \App::get_observer();
- $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : '');
+ $this->observer = App::get_observer();
+ $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : '');
- switch($mode) {
- case 'stream':
- $this->profile_owner = local_channel();
- $this->writable = true;
- break;
- case 'pubstream':
- $this->profile_owner = local_channel();
- $this->writable = ((local_channel()) ? true : false);
- break;
- case 'hq':
- $this->profile_owner = local_channel();
- $this->writable = true;
- break;
- case 'channel':
- $this->profile_owner = \App::$profile['profile_uid'];
- $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
- break;
- case 'cards':
- $this->profile_owner = \App::$profile['profile_uid'];
- $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
- $this->reload = $_SESSION['return_url'];
- break;
- case 'articles':
- $this->profile_owner = \App::$profile['profile_uid'];
- $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
- $this->reload = $_SESSION['return_url'];
- break;
- case 'display':
- // in this mode we set profile_owner after initialisation (from conversation()) and then
- // pull some trickery which allows us to re-invoke this function afterward
- // it's an ugly hack so @FIXME
- $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
- $this->uploadable = perm_is_allowed($this->profile_owner,$ob_hash,'write_storage');
- break;
- case 'page':
- $this->profile_owner = \App::$profile['uid'];
- $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
- break;
- default:
- logger('[ERROR] Conversation::set_mode : Unhandled mode ('. $mode .').', LOGGER_DEBUG);
- return false;
- break;
- }
- $this->mode = $mode;
- }
+ switch ($mode) {
+ case 'stream':
+ $this->profile_owner = local_channel();
+ $this->writable = true;
+ break;
+ case 'pubstream':
+ $this->profile_owner = local_channel();
+ $this->writable = ((local_channel()) ? true : false);
+ break;
+ case 'hq':
+ $this->profile_owner = local_channel();
+ $this->writable = true;
+ break;
+ case 'channel':
+ $this->profile_owner = App::$profile['profile_uid'];
+ $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments');
+ break;
+ case 'cards':
+ $this->profile_owner = App::$profile['profile_uid'];
+ $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments');
+ $this->reload = $_SESSION['return_url'];
+ break;
+ case 'articles':
+ $this->profile_owner = App::$profile['profile_uid'];
+ $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments');
+ $this->reload = $_SESSION['return_url'];
+ break;
+ case 'display':
+ // in this mode we set profile_owner after initialisation (from conversation()) and then
+ // pull some trickery which allows us to re-invoke this function afterward
+ // it's an ugly hack so @FIXME
+ $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments');
+ $this->uploadable = perm_is_allowed($this->profile_owner, $ob_hash, 'write_storage');
+ break;
+ case 'page':
+ $this->profile_owner = App::$profile['uid'];
+ $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments');
+ break;
+ default:
+ logger('[ERROR] Conversation::set_mode : Unhandled mode (' . $mode . ').', LOGGER_DEBUG);
+ return false;
+ break;
+ }
+ $this->mode = $mode;
+ }
- /**
- * Get mode
- */
- public function get_mode() {
- return $this->mode;
- }
+ /**
+ * Get mode
+ */
+ public function get_mode()
+ {
+ return $this->mode;
+ }
- /**
- * Check if page is writable
- */
- public function is_writable() {
- return $this->writable;
- }
+ /**
+ * Check if page is writable
+ */
+ public function is_writable()
+ {
+ return $this->writable;
+ }
- public function is_commentable() {
- return $this->commentable;
- }
+ public function is_commentable()
+ {
+ return $this->commentable;
+ }
- public function is_uploadable() {
- return $this->uploadable;
- }
+ public function is_uploadable()
+ {
+ return $this->uploadable;
+ }
- /**
- * Check if page is a preview
- */
- public function is_preview() {
- return $this->preview;
- }
+ /**
+ * Check if page is a preview
+ */
+ public function is_preview()
+ {
+ return $this->preview;
+ }
- /**
- * Get profile owner
- */
- public function get_profile_owner() {
- return $this->profile_owner;
- }
+ /**
+ * Get profile owner
+ */
+ public function get_profile_owner()
+ {
+ return $this->profile_owner;
+ }
- public function set_profile_owner($uid) {
- $this->profile_owner = $uid;
- $mode = $this->get_mode();
- $this->mode = null;
- $this->set_mode($mode);
- }
+ public function set_profile_owner($uid)
+ {
+ $this->profile_owner = $uid;
+ $mode = $this->get_mode();
+ $this->mode = null;
+ $this->set_mode($mode);
+ }
- public function get_observer() {
- return $this->observer;
- }
+ public function get_observer()
+ {
+ return $this->observer;
+ }
- public function get_cipher() {
- return $this->cipher;
- }
+ public function get_cipher()
+ {
+ return $this->cipher;
+ }
- /**
- * Add a thread to the conversation
- *
- * Returns:
- * _ The inserted item on success
- * _ false on failure
- */
- public function add_thread($item) {
- $item_id = $item->get_id();
- if(!$item_id) {
- logger('Item has no ID!!', LOGGER_DEBUG, LOG_ERR);
- return false;
- }
- if($this->get_thread($item->get_id())) {
- logger('Thread already exists ('. $item->get_id() .').', LOGGER_DEBUG, LOG_WARNING);
- return false;
- }
+ /**
+ * Add a thread to the conversation
+ *
+ * Returns:
+ * _ The inserted item on success
+ * _ false on failure
+ */
+ public function add_thread($item)
+ {
+ $item_id = $item->get_id();
+ if (!$item_id) {
+ logger('Item has no ID!!', LOGGER_DEBUG, LOG_ERR);
+ return false;
+ }
+ if ($this->get_thread($item->get_id())) {
+ logger('Thread already exists (' . $item->get_id() . ').', LOGGER_DEBUG, LOG_WARNING);
+ return false;
+ }
- /*
- * Only add things that will be displayed
- */
-
-
- if(($item->get_data_value('id') != $item->get_data_value('parent')) && (activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE))) {
- return false;
- }
-
- $item->set_commentable(false);
- $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : '');
-
- if(! comments_are_now_closed($item->get_data())) {
- if(($item->get_data_value('author_xchan') === $ob_hash) || ($item->get_data_value('owner_xchan') === $ob_hash))
- $item->set_commentable(true);
-
- if(intval($item->get_data_value('item_nocomment'))) {
- $item->set_commentable(false);
- }
- elseif(! $item->is_commentable()) {
- if((array_key_exists('owner',$item->data)) && intval($item->data['owner']['abook_self']))
- $item->set_commentable(perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'));
- else
- $item->set_commentable(can_comment_on_post($ob_hash,$item->data));
- }
- }
- if($this->mode === 'pubstream' && (! local_channel())) {
- $item->set_commentable(false);
- }
+ /*
+ * Only add things that will be displayed
+ */
- $item->set_conversation($this);
- $this->threads[] = $item;
- return end($this->threads);
- }
+ if (($item->get_data_value('id') != $item->get_data_value('parent')) && (activity_match($item->get_data_value('verb'), ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'), ACTIVITY_DISLIKE))) {
+ return false;
+ }
- /**
- * Get data in a form usable by a conversation template
- *
- * We should find a way to avoid using those arguments (at least most of them)
- *
- * Returns:
- * _ The data requested on success
- * _ false on failure
- */
- public function get_template_data($conv_responses) {
- $result = [];
+ $item->set_commentable(false);
+ $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : '');
- foreach($this->threads as $item) {
+ if (! comments_are_now_closed($item->get_data())) {
+ if (($item->get_data_value('author_xchan') === $ob_hash) || ($item->get_data_value('owner_xchan') === $ob_hash)) {
+ $item->set_commentable(true);
+ }
- if(($item->get_data_value('id') == $item->get_data_value('parent')) && $this->prepared_item) {
- $item_data = $this->prepared_item;
- }
- else {
- $item_data = $item->get_template_data($conv_responses);
- }
- if(!$item_data) {
- logger('Failed to get item template data ('. $item->get_id() .').', LOGGER_DEBUG, LOG_ERR);
- return false;
- }
- $result[] = $item_data;
- }
+ if (intval($item->get_data_value('item_nocomment'))) {
+ $item->set_commentable(false);
+ } elseif (! $item->is_commentable()) {
+ if ((array_key_exists('owner', $item->data)) && intval($item->data['owner']['abook_self'])) {
+ $item->set_commentable(perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments'));
+ } else {
+ $item->set_commentable(can_comment_on_post($ob_hash, $item->data));
+ }
+ }
+ }
+ if ($this->mode === 'pubstream' && (! local_channel())) {
+ $item->set_commentable(false);
+ }
- return $result;
- }
- /**
- * Get a thread based on its item id
- *
- * Returns:
- * _ The found item on success
- * _ false on failure
- */
- private function get_thread($id) {
- foreach($this->threads as $item) {
- if($item->get_id() == $id)
- return $item;
- }
+ $item->set_conversation($this);
+ $this->threads[] = $item;
+ return end($this->threads);
+ }
- return false;
- }
+ /**
+ * Get data in a form usable by a conversation template
+ *
+ * We should find a way to avoid using those arguments (at least most of them)
+ *
+ * Returns:
+ * _ The data requested on success
+ * _ false on failure
+ */
+ public function get_template_data($conv_responses)
+ {
+ $result = [];
+
+ foreach ($this->threads as $item) {
+ if (($item->get_data_value('id') == $item->get_data_value('parent')) && $this->prepared_item) {
+ $item_data = $this->prepared_item;
+ } else {
+ $item_data = $item->get_template_data($conv_responses);
+ }
+ if (!$item_data) {
+ logger('Failed to get item template data (' . $item->get_id() . ').', LOGGER_DEBUG, LOG_ERR);
+ return false;
+ }
+ $result[] = $item_data;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Get a thread based on its item id
+ *
+ * Returns:
+ * _ The found item on success
+ * _ false on failure
+ */
+ private function get_thread($id)
+ {
+ foreach ($this->threads as $item) {
+ if ($item->get_id() == $id) {
+ return $item;
+ }
+ }
+
+ return false;
+ }
}
diff --git a/Zotlabs/Lib/Verify.php b/Zotlabs/Lib/Verify.php
index d1f39d513..04b4114eb 100644
--- a/Zotlabs/Lib/Verify.php
+++ b/Zotlabs/Lib/Verify.php
@@ -2,62 +2,71 @@
namespace Zotlabs\Lib;
+class Verify
+{
-class Verify {
+ public static function create($type, $channel_id, $token, $meta)
+ {
+ return q(
+ "insert into verify ( vtype, channel, token, meta, created ) values ( '%s', %d, '%s', '%s', '%s' )",
+ dbesc($type),
+ intval($channel_id),
+ dbesc($token),
+ dbesc($meta),
+ dbesc(datetime_convert())
+ );
+ }
- static function create($type,$channel_id,$token,$meta) {
- return q("insert into verify ( vtype, channel, token, meta, created ) values ( '%s', %d, '%s', '%s', '%s' )",
- dbesc($type),
- intval($channel_id),
- dbesc($token),
- dbesc($meta),
- dbesc(datetime_convert())
- );
- }
+ public static function match($type, $channel_id, $token, $meta)
+ {
+ $r = q(
+ "select id from verify where vtype = '%s' and channel = %d and token = '%s' and meta = '%s' limit 1",
+ dbesc($type),
+ intval($channel_id),
+ dbesc($token),
+ dbesc($meta)
+ );
+ if ($r) {
+ q(
+ "delete from verify where id = %d",
+ intval($r[0]['id'])
+ );
+ return true;
+ }
+ return false;
+ }
- static function match($type,$channel_id,$token,$meta) {
- $r = q("select id from verify where vtype = '%s' and channel = %d and token = '%s' and meta = '%s' limit 1",
- dbesc($type),
- intval($channel_id),
- dbesc($token),
- dbesc($meta)
- );
- if($r) {
- q("delete from verify where id = %d",
- intval($r[0]['id'])
- );
- return true;
- }
- return false;
- }
+ public static function get_meta($type, $channel_id, $token)
+ {
+ $r = q(
+ "select id, meta from verify where vtype = '%s' and channel = %d and token = '%s' limit 1",
+ dbesc($type),
+ intval($channel_id),
+ dbesc($token)
+ );
+ if ($r) {
+ q(
+ "delete from verify where id = %d",
+ intval($r[0]['id'])
+ );
+ return $r[0]['meta'];
+ }
+ return false;
+ }
- static function get_meta($type,$channel_id,$token) {
- $r = q("select id, meta from verify where vtype = '%s' and channel = %d and token = '%s' limit 1",
- dbesc($type),
- intval($channel_id),
- dbesc($token)
- );
- if($r) {
- q("delete from verify where id = %d",
- intval($r[0]['id'])
- );
- return $r[0]['meta'];
- }
- return false;
- }
-
- /**
- * @brief Purge entries of a verify-type older than interval.
- *
- * @param string $type Verify type
- * @param string $interval SQL compatible time interval
- */
- static function purge($type, $interval) {
- q("delete from verify where vtype = '%s' and created < ( %s - INTERVAL %s )",
- dbesc($type),
- db_utcnow(),
- db_quoteinterval($interval)
- );
- }
-
-}
\ No newline at end of file
+ /**
+ * @brief Purge entries of a verify-type older than interval.
+ *
+ * @param string $type Verify type
+ * @param string $interval SQL compatible time interval
+ */
+ public static function purge($type, $interval)
+ {
+ q(
+ "delete from verify where vtype = '%s' and created < ( %s - INTERVAL %s )",
+ dbesc($type),
+ db_utcnow(),
+ db_quoteinterval($interval)
+ );
+ }
+}
diff --git a/Zotlabs/Lib/Webfinger.php b/Zotlabs/Lib/Webfinger.php
index 4f3fb34d6..e7aad7971 100644
--- a/Zotlabs/Lib/Webfinger.php
+++ b/Zotlabs/Lib/Webfinger.php
@@ -6,104 +6,104 @@ namespace Zotlabs\Lib;
* @brief Fetch and return a webfinger for a resource
*
* @param string $resource - The resource
- * @return boolean|string false or associative array from result JSON
+ * @return bool|string false or associative array from result JSON
*/
+class Webfinger
+{
-class Webfinger {
+ private static $server = EMPTY_STR;
+ private static $resource = EMPTY_STR;
- static private $server = EMPTY_STR;
- static private $resource = EMPTY_STR;
+ public static function exec($resource)
+ {
- static function exec($resource) {
+ if (!$resource) {
+ return false;
+ }
- if (! $resource) {
- return false;
- }
+ self::parse_resource($resource);
- self::parse_resource($resource);
+ if (!(self::$server && self::$resource)) {
+ return false;
+ }
- if (! ( self::$server && self::$resource)) {
- return false;
- }
+ if (!check_siteallowed(self::$server)) {
+ logger('denied: ' . self::$server);
+ return false;
+ }
- if (! check_siteallowed(self::$server)) {
- logger('denied: ' . self::$server);
- return false;
- }
+ logger('fetching resource: ' . self::$resource . ' from ' . self::$server, LOGGER_DEBUG, LOG_INFO);
- logger('fetching resource: ' . self::$resource . ' from ' . self::$server, LOGGER_DEBUG, LOG_INFO);
+ $url = 'https://' . self::$server . '/.well-known/webfinger?f=&resource=' . self::$resource;
- $url = 'https://' . self::$server . '/.well-known/webfinger?f=&resource=' . self::$resource ;
+ $counter = 0;
+ $s = z_fetch_url($url, false, $counter, ['headers' => ['Accept: application/jrd+json, */*']]);
- $counter = 0;
- $s = z_fetch_url($url, false, $counter, [ 'headers' => [ 'Accept: application/jrd+json, */*' ] ]);
+ if ($s['success']) {
+ $j = json_decode($s['body'], true);
+ return ($j);
+ }
- if ($s['success']) {
- $j = json_decode($s['body'], true);
- return($j);
- }
+ return false;
+ }
- return false;
- }
+ public static function parse_resource($resource)
+ {
- static function parse_resource($resource) {
+ self::$resource = urlencode($resource);
- self::$resource = urlencode($resource);
+ if (strpos($resource, 'http') === 0) {
+ $m = parse_url($resource);
+ if ($m) {
+ if ($m['scheme'] !== 'https') {
+ return false;
+ }
+ self::$server = $m['host'] . (($m['port']) ? ':' . $m['port'] : '');
+ } else {
+ return false;
+ }
+ } elseif (strpos($resource, 'tag:') === 0) {
+ $arr = explode(':', $resource); // split the tag
+ $h = explode(',', $arr[1]); // split the host,date
+ self::$server = $h[0];
+ } else {
+ $x = explode('@', $resource);
+ if (!strlen($x[0])) {
+ // e.g. @dan@pixelfed.org
+ array_shift($x);
+ }
+ $username = $x[0];
+ if (count($x) > 1) {
+ self::$server = $x[1];
+ } else {
+ return false;
+ }
+ if (strpos($resource, 'acct:') !== 0) {
+ self::$resource = urlencode('acct:' . $resource);
+ }
+ }
+ }
- if (strpos($resource,'http') === 0) {
- $m = parse_url($resource);
- if ($m) {
- if ($m['scheme'] !== 'https') {
- return false;
- }
- self::$server = $m['host'] . (($m['port']) ? ':' . $m['port'] : '');
- }
- else {
- return false;
- }
- }
- elseif (strpos($resource,'tag:') === 0) {
- $arr = explode(':',$resource); // split the tag
- $h = explode(',',$arr[1]); // split the host,date
- self::$server = $h[0];
- }
- else {
- $x = explode('@',$resource);
- if (! strlen($x[0])) {
- // e.g. @dan@pixelfed.org
- array_shift($x);
- }
- $username = $x[0];
- if (count($x) > 1) {
- self::$server = $x[1];
- }
- else {
- return false;
- }
- if (strpos($resource,'acct:') !== 0) {
- self::$resource = urlencode('acct:' . $resource);
- }
- }
- }
+ /**
+ * @brief fetch a webfinger resource and return a zot6 discovery url if present
+ *
+ */
- /**
- * @brief fetch a webfinger resource and return a zot6 discovery url if present
- *
- */
+ public static function zot_url($resource)
+ {
- static function zot_url($resource) {
+ $arr = self::exec($resource);
- $arr = self::exec($resource);
-
- if (is_array($arr) && array_key_exists('links',$arr)) {
- foreach ($arr['links'] as $link) {
+ if (is_array($arr) && array_key_exists('links', $arr)) {
+ foreach ($arr['links'] as $link) {
if (array_key_exists('rel',$link) && in_array($link['rel'], [ PROTOCOL_NOMAD, PROTOCOL_ZOT6 ])) {
- if (array_key_exists('href',$link) && $link['href'] !== EMPTY_STR) {
- return $link['href'];
- }
- }
- }
- }
- return false;
- }
-}
\ No newline at end of file
+ if (array_key_exists('href', $link) && $link['href'] !== EMPTY_STR) {
+ return $link['href'];
+ }
+ }
+ }
+ }
+ return false;
+ }
+}
+
diff --git a/Zotlabs/Lib/XConfig.php b/Zotlabs/Lib/XConfig.php
index 79e442d5a..a9d86fc88 100644
--- a/Zotlabs/Lib/XConfig.php
+++ b/Zotlabs/Lib/XConfig.php
@@ -24,153 +24,169 @@ use App;
* $var = get_xconfig($observer, 'category', 'key');
* }@endcode
*/
-class XConfig {
+class XConfig
+{
- /**
- * @brief Loads a full xchan's configuration into a cached storage.
- *
- * All configuration values of the given observer hash are stored in global
- * cache which is available under the global variable App::$config[$xchan].
- *
- * @param string $xchan
- * The observer's hash
- * @return void|false Returns false if xchan is not set
- */
- static public function Load($xchan) {
+ /**
+ * @brief Loads a full xchan's configuration into a cached storage.
+ *
+ * All configuration values of the given observer hash are stored in global
+ * cache which is available under the global variable App::$config[$xchan].
+ *
+ * @param string $xchan
+ * The observer's hash
+ * @return void|false Returns false if xchan is not set
+ */
+ public static function Load($xchan)
+ {
- if(! $xchan)
- return false;
+ if (! $xchan) {
+ return false;
+ }
- if(! array_key_exists($xchan, App::$config))
- App::$config[$xchan] = [];
+ if (! array_key_exists($xchan, App::$config)) {
+ App::$config[$xchan] = [];
+ }
- $r = q("SELECT * FROM xconfig WHERE xchan = '%s'",
- dbesc($xchan)
- );
+ $r = q(
+ "SELECT * FROM xconfig WHERE xchan = '%s'",
+ dbesc($xchan)
+ );
- if($r) {
- foreach($r as $rr) {
- $k = $rr['k'];
- $c = $rr['cat'];
- if(! array_key_exists($c, App::$config[$xchan])) {
- App::$config[$xchan][$c] = [];
- App::$config[$xchan][$c]['config_loaded'] = true;
- }
- App::$config[$xchan][$c][$k] = $rr['v'];
- }
- }
- }
+ if ($r) {
+ foreach ($r as $rr) {
+ $k = $rr['k'];
+ $c = $rr['cat'];
+ if (! array_key_exists($c, App::$config[$xchan])) {
+ App::$config[$xchan][$c] = [];
+ App::$config[$xchan][$c]['config_loaded'] = true;
+ }
+ App::$config[$xchan][$c][$k] = $rr['v'];
+ }
+ }
+ }
- /**
- * @brief Get a particular observer's config variable given the category
- * name ($family) and a key.
- *
- * Get a particular observer's config value from the given category ($family)
- * and the $key from a cached storage in App::$config[$xchan].
- *
- * Returns false if not set.
- *
- * @param string $xchan
- * The observer's hash
- * @param string $family
- * The category of the configuration value
- * @param string $key
- * The configuration key to query
- * @param boolean $default (optional) default false
- * @return mixed Stored $value or false if it does not exist
- */
- static public function Get($xchan, $family, $key, $default = false) {
+ /**
+ * @brief Get a particular observer's config variable given the category
+ * name ($family) and a key.
+ *
+ * Get a particular observer's config value from the given category ($family)
+ * and the $key from a cached storage in App::$config[$xchan].
+ *
+ * Returns false if not set.
+ *
+ * @param string $xchan
+ * The observer's hash
+ * @param string $family
+ * The category of the configuration value
+ * @param string $key
+ * The configuration key to query
+ * @param bool $default (optional) default false
+ * @return mixed Stored $value or false if it does not exist
+ */
+ public static function Get($xchan, $family, $key, $default = false)
+ {
- if(! $xchan)
- return $default;
+ if (! $xchan) {
+ return $default;
+ }
- if(! array_key_exists($xchan, App::$config))
- load_xconfig($xchan);
+ if (! array_key_exists($xchan, App::$config)) {
+ load_xconfig($xchan);
+ }
- if((! array_key_exists($family, App::$config[$xchan])) || (! array_key_exists($key, App::$config[$xchan][$family])))
- return $default;
+ if ((! array_key_exists($family, App::$config[$xchan])) || (! array_key_exists($key, App::$config[$xchan][$family]))) {
+ return $default;
+ }
- return unserialise(App::$config[$xchan][$family][$key]);
- }
+ return unserialise(App::$config[$xchan][$family][$key]);
+ }
- /**
- * @brief Sets a configuration value for an observer.
- *
- * Stores a config value ($value) in the category ($family) under the key ($key)
- * for the observer's $xchan hash.
- *
- * @param string $xchan
- * The observer's hash
- * @param string $family
- * The category of the configuration value
- * @param string $key
- * The configuration key to set
- * @param string $value
- * The value to store
- * @return mixed Stored $value or false
- */
- static public function Set($xchan, $family, $key, $value) {
+ /**
+ * @brief Sets a configuration value for an observer.
+ *
+ * Stores a config value ($value) in the category ($family) under the key ($key)
+ * for the observer's $xchan hash.
+ *
+ * @param string $xchan
+ * The observer's hash
+ * @param string $family
+ * The category of the configuration value
+ * @param string $key
+ * The configuration key to set
+ * @param string $value
+ * The value to store
+ * @return mixed Stored $value or false
+ */
+ public static function Set($xchan, $family, $key, $value)
+ {
- // manage array value
- $dbvalue = ((is_array($value)) ? serialise($value) : $value);
- $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue);
+ // manage array value
+ $dbvalue = ((is_array($value)) ? serialise($value) : $value);
+ $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue);
- if(self::Get($xchan, $family, $key) === false) {
- if(! array_key_exists($xchan, App::$config))
- App::$config[$xchan] = [];
- if(! array_key_exists($family, App::$config[$xchan]))
- App::$config[$xchan][$family] = [];
+ if (self::Get($xchan, $family, $key) === false) {
+ if (! array_key_exists($xchan, App::$config)) {
+ App::$config[$xchan] = [];
+ }
+ if (! array_key_exists($family, App::$config[$xchan])) {
+ App::$config[$xchan][$family] = [];
+ }
- $ret = q("INSERT INTO xconfig ( xchan, cat, k, v ) VALUES ( '%s', '%s', '%s', '%s' )",
- dbesc($xchan),
- dbesc($family),
- dbesc($key),
- dbesc($dbvalue)
- );
- }
- else {
- $ret = q("UPDATE xconfig SET v = '%s' WHERE xchan = '%s' and cat = '%s' AND k = '%s'",
- dbesc($dbvalue),
- dbesc($xchan),
- dbesc($family),
- dbesc($key)
- );
- }
+ $ret = q(
+ "INSERT INTO xconfig ( xchan, cat, k, v ) VALUES ( '%s', '%s', '%s', '%s' )",
+ dbesc($xchan),
+ dbesc($family),
+ dbesc($key),
+ dbesc($dbvalue)
+ );
+ } else {
+ $ret = q(
+ "UPDATE xconfig SET v = '%s' WHERE xchan = '%s' and cat = '%s' AND k = '%s'",
+ dbesc($dbvalue),
+ dbesc($xchan),
+ dbesc($family),
+ dbesc($key)
+ );
+ }
- App::$config[$xchan][$family][$key] = $value;
+ App::$config[$xchan][$family][$key] = $value;
- if($ret)
- return $value;
+ if ($ret) {
+ return $value;
+ }
- return $ret;
- }
+ return $ret;
+ }
- /**
- * @brief Deletes the given key from the observer's config.
- *
- * Removes the configured value from the stored cache in App::$config[$xchan]
- * and removes it from the database.
- *
- * @param string $xchan
- * The observer's hash
- * @param string $family
- * The category of the configuration value
- * @param string $key
- * The configuration key to delete
- * @return mixed
- */
- static public function Delete($xchan, $family, $key) {
+ /**
+ * @brief Deletes the given key from the observer's config.
+ *
+ * Removes the configured value from the stored cache in App::$config[$xchan]
+ * and removes it from the database.
+ *
+ * @param string $xchan
+ * The observer's hash
+ * @param string $family
+ * The category of the configuration value
+ * @param string $key
+ * The configuration key to delete
+ * @return mixed
+ */
+ public static function Delete($xchan, $family, $key)
+ {
- if(isset(App::$config[$xchan]) && isset(App::$config[$xchan][$family]) && isset(App::$config[$xchan][$family][$key]))
- unset(App::$config[$xchan][$family][$key]);
+ if (isset(App::$config[$xchan]) && isset(App::$config[$xchan][$family]) && isset(App::$config[$xchan][$family][$key])) {
+ unset(App::$config[$xchan][$family][$key]);
+ }
- $ret = q("DELETE FROM xconfig WHERE xchan = '%s' AND cat = '%s' AND k = '%s'",
- dbesc($xchan),
- dbesc($family),
- dbesc($key)
- );
-
- return $ret;
- }
+ $ret = q(
+ "DELETE FROM xconfig WHERE xchan = '%s' AND cat = '%s' AND k = '%s'",
+ dbesc($xchan),
+ dbesc($family),
+ dbesc($key)
+ );
+ return $ret;
+ }
}
diff --git a/Zotlabs/Lib/ZotURL.php b/Zotlabs/Lib/ZotURL.php
index da0dc61e2..23441d715 100644
--- a/Zotlabs/Lib/ZotURL.php
+++ b/Zotlabs/Lib/ZotURL.php
@@ -4,123 +4,124 @@ namespace Zotlabs\Lib;
use Zotlabs\Web\HTTPSig;
+class ZotURL
+{
-class ZotURL {
+ public static function fetch($url, $channel, $hub = null)
+ {
- static public function fetch($url,$channel,$hub = null) {
+ $ret = [ 'success' => false ];
- $ret = [ 'success' => false ];
-
- if(strpos($url,'x-zot:') !== 0) {
- return $ret;
- }
+ if (strpos($url, 'x-zot:') !== 0) {
+ return $ret;
+ }
- if(! $url) {
- return $ret;
- }
+ if (! $url) {
+ return $ret;
+ }
- $portable_url = substr($url,6);
- $u = explode('/',$portable_url);
- $portable_id = $u[0];
+ $portable_url = substr($url, 6);
+ $u = explode('/', $portable_url);
+ $portable_id = $u[0];
- $hosts = self::lookup($portable_id,$hub);
+ $hosts = self::lookup($portable_id, $hub);
- if(! $hosts) {
- return $ret;
- }
+ if (! $hosts) {
+ return $ret;
+ }
- foreach($hosts as $h) {
- $newurl = $h . '/id/' . $portable_url;
+ foreach ($hosts as $h) {
+ $newurl = $h . '/id/' . $portable_url;
- $m = parse_url($newurl);
+ $m = parse_url($newurl);
- $data = json_encode([ 'zot_token' => random_string() ]);
+ $data = json_encode([ 'zot_token' => random_string() ]);
- if($channel && $m) {
-
- $headers = [
+ if ($channel && $m) {
+ $headers = [
'Accept' => 'application/x-nomad+json, application/x-zot+json',
'Content-Type' => 'application/x-nomad+json',
- 'X-Zot-Token' => random_string(),
- 'Digest' => HTTPSig::generate_digest_header($data),
- 'Host' => $m['host'],
- '(request-target)' => 'post ' . get_request_string($newurl)
- ];
- $h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel),false);
- }
- else {
- $h = [ 'Accept: application/x-nomad+json' ];
- }
-
- $result = [];
+ 'X-Zot-Token' => random_string(),
+ 'Digest' => HTTPSig::generate_digest_header($data),
+ 'Host' => $m['host'],
+ '(request-target)' => 'post ' . get_request_string($newurl)
+ ];
+ $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel), false);
+ } else {
+ $h = [ 'Accept: application/x-nomad+json, application/x-zot+json' ];
+ }
- $redirects = 0;
- $x = z_post_url($newurl,$data,$redirects, [ 'headers' => $h ] );
- if($x['success']) {
- return $x;
- }
- }
+ $result = [];
- return $ret;
+ $redirects = 0;
+ $x = z_post_url($newurl, $data, $redirects, [ 'headers' => $h ]);
+ if ($x['success']) {
+ return $x;
+ }
+ }
- }
+ return $ret;
+ }
- static public function is_zoturl($s) {
+ public static function is_zoturl($s)
+ {
- if(strpos($url,'x-zot:') === 0) {
- return true;
- }
- return false;
- }
+ if (strpos($url, 'x-zot:') === 0) {
+ return true;
+ }
+ return false;
+ }
- static public function lookup($portable_id,$hub) {
+ public static function lookup($portable_id, $hub)
+ {
- $r = q("select * from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and site_dead = 0 order by hubloc_primary desc",
- dbesc($portable_id)
- );
+ $r = q(
+ "select * from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and site_dead = 0 order by hubloc_primary desc",
+ dbesc($portable_id)
+ );
- if(! $r) {
+ if (! $r) {
+ // extend to network lookup
- // extend to network lookup
+ $path = '/q/' . $portable_id;
- $path = '/q/' . $portable_id;
+ // first check sending hub since they have recently communicated with this object
- // first check sending hub since they have recently communicated with this object
+ $redirects = 0;
- $redirects = 0;
+ if ($hub) {
+ $x = z_fetch_url($hub['hubloc_url'] . $path, false, $redirects);
+ $u = self::parse_response($x);
+ if ($u) {
+ return $u;
+ }
+ }
- if($hub) {
- $x = z_fetch_url($hub['hubloc_url'] . $path, false, $redirects);
- $u = self::parse_response($x);
- if($u) {
- return $u;
- }
- }
+ // If this fails, fallback on directory servers
- // If this fails, fallback on directory servers
-
- return false;
- }
- return ids_to_array($r,'hubloc_url');
- }
+ return false;
+ }
+ return ids_to_array($r, 'hubloc_url');
+ }
- static public function parse_response($arr) {
- if(! $arr['success']) {
- return false;
- }
- $a = json_decode($arr['body'],true);
- if($a['success'] && array_key_exists('results', $a) && is_array($a['results']) && count($a['results'])) {
- foreach($a['results'] as $b) {
- $m = discover_by_webbie($b);
- if($m) {
- return([ $b ]);
- }
- }
- }
- return false;
- }
+ public static function parse_response($arr)
+ {
+ if (! $arr['success']) {
+ return false;
+ }
+ $a = json_decode($arr['body'], true);
+ if ($a['success'] && array_key_exists('results', $a) && is_array($a['results']) && count($a['results'])) {
+ foreach ($a['results'] as $b) {
+ $m = discover_by_webbie($b);
+ if ($m) {
+ return([ $b ]);
+ }
+ }
+ }
+ return false;
+ }
+}
-}
\ No newline at end of file
diff --git a/Zotlabs/Lib/Zotfinger.php b/Zotlabs/Lib/Zotfinger.php
index 90a5aa20c..60a545315 100644
--- a/Zotlabs/Lib/Zotfinger.php
+++ b/Zotlabs/Lib/Zotfinger.php
@@ -4,60 +4,59 @@ namespace Zotlabs\Lib;
use Zotlabs\Web\HTTPSig;
-class Zotfinger {
+class Zotfinger
+{
- static function exec($resource,$channel = null,$verify = true) {
+ public static function exec($resource, $channel = null, $verify = true)
+ {
- if (! $resource) {
- return false;
- }
+ if (!$resource) {
+ return false;
+ }
- $m = parse_url($resource);
-
- if ($m['host'] !== punify($m['host'])) {
- $url = str_replace($m['host'],punify($m['host']),$url);
- $m['host'] = punify($m['host']);
- }
+ $m = parse_url($resource);
- $data = json_encode([ 'zot_token' => random_string() ]);
+ if ($m['host'] !== punify($m['host'])) {
+ $url = str_replace($m['host'], punify($m['host']), $url);
+ $m['host'] = punify($m['host']);
+ }
- if ($channel && $m) {
+ $data = json_encode(['zot_token' => random_string()]);
- $headers = [
- 'Accept' => 'application/x-nomad+json, application/x-zot+json',
- 'Content-Type' => 'application/x-nomad+json',
- 'X-Zot-Token' => random_string(),
- 'Digest' => HTTPSig::generate_digest_header($data),
- 'Host' => $m['host'],
- '(request-target)' => 'post ' . get_request_string($resource)
- ];
- $h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel),false);
- }
- else {
- $h = [ 'Accept: application/x-nomad+json, application/x-zot+json' ];
- }
-
- $result = [];
+ if ($channel && $m) {
+ $headers = [
+ 'Accept' => 'application/x-nomad+json, application/x-zot+json',
+ 'Content-Type' => 'application/x-nomad+json',
+ 'X-Zot-Token' => random_string(),
+ 'Digest' => HTTPSig::generate_digest_header($data),
+ 'Host' => $m['host'],
+ '(request-target)' => 'post ' . get_request_string($resource)
+ ];
+ $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel), false);
+ } else {
+ $h = ['Accept: application/x-nomad+json, application/x-zot+json'];
+ }
- $redirects = 0;
- $x = z_post_url($resource,$data,$redirects, [ 'headers' => $h ] );
+ $result = [];
- if ($x['success']) {
+ $redirects = 0;
+ $x = z_post_url($resource, $data, $redirects, ['headers' => $h]);
- if ($verify) {
- $result['signature'] = HTTPSig::verify($x, EMPTY_STR, 'zot6');
- }
-
- $result['data'] = json_decode($x['body'],true);
+ if ($x['success']) {
+ if ($verify) {
+ $result['signature'] = HTTPSig::verify($x, EMPTY_STR, 'zot6');
+ }
- if ($result['data'] && is_array($result['data']) && array_key_exists('encrypted',$result['data']) && $result['data']['encrypted']) {
- $result['data'] = json_decode(Crypto::unencapsulate($result['data'],get_config('system','prvkey')),true);
- }
+ $result['data'] = json_decode($x['body'], true);
- return $result;
- }
+ if ($result['data'] && is_array($result['data']) && array_key_exists('encrypted', $result['data']) && $result['data']['encrypted']) {
+ $result['data'] = json_decode(Crypto::unencapsulate($result['data'], get_config('system', 'prvkey')), true);
+ }
- return false;
- }
+ return $result;
+ }
+
+ return false;
+ }
+}
-}
\ No newline at end of file
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index da6c50e75..e0f764ae9 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -23,101 +23,98 @@ require_once('include/acl_selectors.php');
* keys however this functionality has grown in an ad-hoc manner and has gotten
* quite messy over time.
*/
-
-class Acl extends Controller {
+class Acl extends Controller
+{
- function init() {
+ public function init()
+ {
- // logger('mod_acl: ' . print_r($_REQUEST,true),LOGGER_DATA);
+ // logger('mod_acl: ' . print_r($_REQUEST,true),LOGGER_DATA);
- $start = (x($_REQUEST,'start') ? $_REQUEST['start'] : 0);
- $count = (x($_REQUEST,'count') ? $_REQUEST['count'] : 500);
- $search = (x($_REQUEST,'search') ? $_REQUEST['search'] : '');
- $type = (x($_REQUEST,'type') ? $_REQUEST['type'] : '');
- $noforums = (x($_REQUEST,'n') ? $_REQUEST['n'] : false);
+ $start = (x($_REQUEST, 'start') ? $_REQUEST['start'] : 0);
+ $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 500);
+ $search = (x($_REQUEST, 'search') ? $_REQUEST['search'] : '');
+ $type = (x($_REQUEST, 'type') ? $_REQUEST['type'] : '');
+ $noforums = (x($_REQUEST, 'n') ? $_REQUEST['n'] : false);
- // $type =
- // '' => standard ACL request
- // 'g' => Groups only ACL request
- // 'f' => forums only ACL request
- // 'c' => Connections only ACL request or editor (textarea) mention request
- // $_REQUEST['search'] contains ACL search text.
+ // $type =
+ // '' => standard ACL request
+ // 'g' => Groups only ACL request
+ // 'f' => forums only ACL request
+ // 'c' => Connections only ACL request or editor (textarea) mention request
+ // $_REQUEST['search'] contains ACL search text.
- // $type =
- // 'm' => autocomplete private mail recipient (checks post_mail permission)
- // 'a' => autocomplete connections (mod_connections, mod_poke, mod_sources, mod_photos)
- // 'x' => nav search bar autocomplete (match any xchan)
- // 'z' => autocomplete any xchan, but also include abook_alias, requires non-zero local_channel()
- // and also contains xid without urlencode, used specifically by activity_filter widget
- // $_REQUEST['query'] contains autocomplete search text.
-
-
- // The different autocomplete libraries use different names for the search text
- // parameter. Internally we'll use $search to represent the search text no matter
- // what request variable it was attached to.
-
- if (array_key_exists('query',$_REQUEST)) {
- $search = $_REQUEST['query'];
- }
-
- if ( (! local_channel()) && (! in_array($type, [ 'x', 'c', 'f' ]))) {
- killme();
- }
-
- $permitted = [];
-
- if (in_array($type, [ 'm', 'a', 'f' ])) {
-
- // These queries require permission checking. We'll create a simple array of xchan_hash for those with
- // the requisite permissions which we can check against.
-
- $x = q("select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and v like '%s'",
- intval(local_channel()),
- dbesc(($type === 'm') ? '%post_mail%' : '%tag_deliver%')
- );
-
- $permitted = ids_to_array($x,'xchan');
- }
+ // $type =
+ // 'm' => autocomplete private mail recipient (checks post_mail permission)
+ // 'a' => autocomplete connections (mod_connections, mod_poke, mod_sources, mod_photos)
+ // 'x' => nav search bar autocomplete (match any xchan)
+ // 'z' => autocomplete any xchan, but also include abook_alias, requires non-zero local_channel()
+ // and also contains xid without urlencode, used specifically by activity_filter widget
+ // $_REQUEST['query'] contains autocomplete search text.
- if ($search) {
- $sql_extra = " AND pgrp.gname LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ";
- // sql_extra2 is typically used when we don't have a local_channel - so we are not search abook_alias
- $sql_extra2 = " AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc(punify($search)) . ((strpos($search,'@') === false) ? "%@%'" : "%'")) . ") ";
+ // The different autocomplete libraries use different names for the search text
+ // parameter. Internally we'll use $search to represent the search text no matter
+ // what request variable it was attached to.
+
+ if (array_key_exists('query', $_REQUEST)) {
+ $search = $_REQUEST['query'];
+ }
+
+ if ((!local_channel()) && (!in_array($type, ['x', 'c', 'f']))) {
+ killme();
+ }
+
+ $permitted = [];
+
+ if (in_array($type, ['m', 'a', 'f'])) {
+ // These queries require permission checking. We'll create a simple array of xchan_hash for those with
+ // the requisite permissions which we can check against.
+
+ $x = q(
+ "select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and v like '%s'",
+ intval(local_channel()),
+ dbesc(($type === 'm') ? '%post_mail%' : '%tag_deliver%')
+ );
+
+ $permitted = ids_to_array($x, 'xchan');
+ }
-
- // This horrible mess is needed because position also returns 0 if nothing is found.
- // Would be MUCH easier if it instead returned a very large value
- // Otherwise we could just
- // order by LEAST(POSITION($search IN xchan_name),POSITION($search IN xchan_addr)).
-
- $order_extra2 = "CASE WHEN xchan_name LIKE "
- . protect_sprintf( "'%" . dbesc($search) . "%'" )
- . " then POSITION('" . protect_sprintf(dbesc($search))
- . "' IN xchan_name) else position('" . protect_sprintf(dbesc(punify($search))) . "' IN xchan_addr) end, ";
-
- $sql_extra3 = "AND ( xchan_addr like " . protect_sprintf( "'%" . dbesc(punify($search)) . "%'" ) . " OR xchan_name like " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR abook_alias like " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ) ";
-
- $sql_extra4 = "AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc(punify($search)) . ((strpos($search,'@') === false) ? "%@%'" : "%'")) . " OR abook_alias LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'") . ") ";
+ if ($search) {
+ $sql_extra = " AND pgrp.gname LIKE " . protect_sprintf("'%" . dbesc($search) . "%'") . " ";
+ // sql_extra2 is typically used when we don't have a local_channel - so we are not search abook_alias
+ $sql_extra2 = " AND ( xchan_name LIKE " . protect_sprintf("'%" . dbesc($search) . "%'") . " OR xchan_addr LIKE " . protect_sprintf("'%" . dbesc(punify($search)) . ((strpos($search, '@') === false) ? "%@%'" : "%'")) . ") ";
- }
- else {
- $sql_extra = $sql_extra2 = $sql_extra3 = $sql_extra4 = "";
- }
-
-
- $groups = [];
- $contacts = [];
-
- if ($type == '' || $type == 'g') {
+ // This horrible mess is needed because position also returns 0 if nothing is found.
+ // Would be MUCH easier if it instead returned a very large value
+ // Otherwise we could just
+ // order by LEAST(POSITION($search IN xchan_name),POSITION($search IN xchan_addr)).
- // Normal privacy groups
+ $order_extra2 = "CASE WHEN xchan_name LIKE "
+ . protect_sprintf("'%" . dbesc($search) . "%'")
+ . " then POSITION('" . protect_sprintf(dbesc($search))
+ . "' IN xchan_name) else position('" . protect_sprintf(dbesc(punify($search))) . "' IN xchan_addr) end, ";
- $r = q("SELECT pgrp.id, pgrp.hash, pgrp.gname
+ $sql_extra3 = "AND ( xchan_addr like " . protect_sprintf("'%" . dbesc(punify($search)) . "%'") . " OR xchan_name like " . protect_sprintf("'%" . dbesc($search) . "%'") . " OR abook_alias like " . protect_sprintf("'%" . dbesc($search) . "%'") . " ) ";
+
+ $sql_extra4 = "AND ( xchan_name LIKE " . protect_sprintf("'%" . dbesc($search) . "%'") . " OR xchan_addr LIKE " . protect_sprintf("'%" . dbesc(punify($search)) . ((strpos($search, '@') === false) ? "%@%'" : "%'")) . " OR abook_alias LIKE " . protect_sprintf("'%" . dbesc($search) . "%'") . ") ";
+ } else {
+ $sql_extra = $sql_extra2 = $sql_extra3 = $sql_extra4 = "";
+ }
+
+
+ $groups = [];
+ $contacts = [];
+
+ if ($type == '' || $type == 'g') {
+ // Normal privacy groups
+
+ $r = q(
+ "SELECT pgrp.id, pgrp.hash, pgrp.gname
FROM pgrp, pgrp_member
WHERE pgrp.deleted = 0 AND pgrp.uid = %d
AND pgrp_member.gid = pgrp.id
@@ -125,238 +122,226 @@ class Acl extends Controller {
GROUP BY pgrp.id
ORDER BY pgrp.gname
LIMIT %d OFFSET %d",
- intval(local_channel()),
- intval($count),
- intval($start)
- );
+ intval(local_channel()),
+ intval($count),
+ intval($start)
+ );
- if ($r) {
- foreach ($r as $g) {
- // logger('acl: group: ' . $g['gname'] . ' members: ' . AccessList::members_xchan(local_channel(),$g['id']));
- $groups[] = [
- "type" => "g",
- "photo" => "images/twopeople.png",
- "name" => $g['gname'],
- "id" => $g['id'],
- "xid" => $g['hash'],
- "uids" => AccessList::members_xchan(local_channel(),$g['id']),
- "link" => ''
- ];
- }
- }
- }
-
- if ($type == '' || $type == 'c' || $type === 'f') {
+ if ($r) {
+ foreach ($r as $g) {
+ // logger('acl: group: ' . $g['gname'] . ' members: ' . AccessList::members_xchan(local_channel(),$g['id']));
+ $groups[] = [
+ "type" => "g",
+ "photo" => "images/twopeople.png",
+ "name" => $g['gname'],
+ "id" => $g['id'],
+ "xid" => $g['hash'],
+ "uids" => AccessList::members_xchan(local_channel(), $g['id']),
+ "link" => ''
+ ];
+ }
+ }
+ }
- // Getting info from the abook is better for local users because it contains info about permissions
- if (local_channel()) {
+ if ($type == '' || $type == 'c' || $type === 'f') {
+ // Getting info from the abook is better for local users because it contains info about permissions
+ if (local_channel()) {
+ // add connections
- // add connections
-
- $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, xchan_type, abook_flags, abook_self
+ $r = q(
+ "SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, xchan_type, abook_flags, abook_self
FROM abook left join xchan on abook_xchan = xchan_hash
- WHERE abook_channel = %d AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra4 order by xchan_name asc limit $count" ,
- intval(local_channel())
- );
-
- }
- else { // Visitors
- $r = q("SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_flags, 0 as abook_self
+ WHERE abook_channel = %d AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra4 order by xchan_name asc limit $count",
+ intval(local_channel())
+ );
+ } else { // Visitors
+ $r = q(
+ "SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_flags, 0 as abook_self
FROM xchan left join xlink on xlink_link = xchan_hash
- WHERE xlink_xchan = '%s' AND xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc limit $count" ,
- dbesc(get_observer_hash())
- );
-
- }
- if ((count($r) < 100) && $type == 'c') {
- $r2 = q("SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_flags, 0 as abook_self
- FROM xchan WHERE xchan_deleted = 0 and xchan_network != 'unknown' $sql_extra2 order by $order_extra2 xchan_name asc limit $count"
- );
- if ($r2) {
- $r = array_merge($r,$r2);
- $r = unique_multidim_array($r,'hash');
- }
- }
-
- }
- elseif ($type == 'm') {
-
- $r = [];
- $z = q("SELECT xchan_hash as hash, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url
+ WHERE xlink_xchan = '%s' AND xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc limit $count",
+ dbesc(get_observer_hash())
+ );
+ }
+ if ((count($r) < 100) && $type == 'c') {
+ $r2 = q("SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_flags, 0 as abook_self
+ FROM xchan WHERE xchan_deleted = 0 and xchan_network != 'unknown' $sql_extra2 order by $order_extra2 xchan_name asc limit $count");
+ if ($r2) {
+ $r = array_merge($r, $r2);
+ $r = unique_multidim_array($r, 'hash');
+ }
+ }
+ } elseif ($type == 'm') {
+ $r = [];
+ $z = q(
+ "SELECT xchan_hash as hash, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url
FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_channel = %d
and xchan_deleted = 0
$sql_extra3
ORDER BY xchan_name ASC ",
- intval(local_channel())
- );
- if ($z) {
- foreach ($z as $zz) {
- if (in_array($zz['hash'],$permitted)) {
- $r[] = $zz;
- }
- }
- }
-
- }
- elseif ($type == 'a') {
-
- $r = q("SELECT abook_id as id, xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag FROM abook left join xchan on abook_xchan = xchan_hash
+ intval(local_channel())
+ );
+ if ($z) {
+ foreach ($z as $zz) {
+ if (in_array($zz['hash'], $permitted)) {
+ $r[] = $zz;
+ }
+ }
+ }
+ } elseif ($type == 'a') {
+ $r = q(
+ "SELECT abook_id as id, xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_channel = %d
and xchan_deleted = 0
$sql_extra3
ORDER BY xchan_name ASC ",
- intval(local_channel())
- );
-
- }
- elseif ($type == 'z') {
- $r = q("SELECT xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag FROM xchan left join abook on xchan_hash = abook_xchan
+ intval(local_channel())
+ );
+ } elseif ($type == 'z') {
+ $r = q(
+ "SELECT xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag FROM xchan left join abook on xchan_hash = abook_xchan
WHERE ( abook_channel = %d OR abook_channel IS NULL )
and xchan_deleted = 0
$sql_extra3
ORDER BY xchan_name ASC ",
- intval(local_channel())
- );
- }
+ intval(local_channel())
+ );
+ } elseif ($type == 'x') {
+ $contacts = [];
+ $r = $this->navbar_complete();
+ if ($r) {
+ foreach ($r as $g) {
+ $contacts[] = [
+ "photo" => $g['photo'],
+ "name" => $g['name'],
+ "nick" => $g['address'],
+ 'link' => (($g['address']) ? $g['address'] : $g['url']),
+ 'xchan' => $g['hash']
+ ];
+ }
+ }
- elseif ($type == 'x') {
- $contacts = [];
- $r = $this->navbar_complete();
- if ($r) {
- foreach ($r as $g) {
- $contacts[] = [
- "photo" => $g['photo'],
- "name" => $g['name'],
- "nick" => $g['address'],
- 'link' => (($g['address']) ? $g['address'] : $g['url']),
- 'xchan' => $g['hash']
- ];
- }
- }
-
- $o = [
- 'start' => $start,
- 'count' => $count,
- 'items' => $contacts,
- ];
- json_return_and_die($o);
- }
- else {
- $r = [];
- }
-
- if ($r) {
- foreach ($r as $g) {
-
- if (isset($g['network']) && in_array($g['network'],['rss','anon','unknown']) && ($type != 'a')) {
- continue;
- }
+ $o = [
+ 'start' => $start,
+ 'count' => $count,
+ 'items' => $contacts,
+ ];
+ json_return_and_die($o);
+ } else {
+ $r = [];
+ }
- // 'z' (activity_filter autocomplete) requires an un-encoded hash to prevent double encoding
-
- if ($type !== 'z') {
- $g['hash'] = urlencode($g['hash']);
- }
-
- if (! $g['nick']) {
- $g['nick'] = $g['url'];
- }
+ if ($r) {
+ foreach ($r as $g) {
+ if (isset($g['network']) && in_array($g['network'], ['rss', 'anon', 'unknown']) && ($type != 'a')) {
+ continue;
+ }
- if (in_array($g['hash'],$permitted) && $type === 'f' && (! $noforums)) {
- $contacts[] = [
- "type" => "c",
- "photo" => "images/twopeople.png",
- "name" => $g['name'],
- "id" => urlencode($g['id']),
- "xid" => $g['hash'],
- "link" => (($g['nick']) ? $g['nick'] : $g['url']),
- "nick" => substr($g['nick'],0,strpos($g['nick'],'@')),
- "self" => (intval($g['abook_self']) ? 'abook-self' : ''),
- "taggable" => 'taggable',
- "label" => t('network')
- ];
- }
- if ($type !== 'f') {
- $contacts[] = [
- "type" => "c",
- "photo" => $g['micro'],
- "name" => $g['name'],
- "id" => urlencode($g['id']),
- "xid" => $g['hash'],
- "link" => (($g['nick']) ? $g['nick'] : $g['url']),
- "nick" => ((strpos($g['nick'],'@')) ? substr($g['nick'],0,strpos($g['nick'],'@')) : $g['nick']),
- "self" => (intval($g['abook_self']) ? 'abook-self' : ''),
- "taggable" => '',
- "label" => '',
- ];
- }
- }
- }
-
- $items = array_merge($groups, $contacts);
-
- $o = [
- 'start' => $start,
- 'count' => $count,
- 'items' => $items,
- ];
+ // 'z' (activity_filter autocomplete) requires an un-encoded hash to prevent double encoding
- json_return_and_die($o);
- }
+ if ($type !== 'z') {
+ $g['hash'] = urlencode($g['hash']);
+ }
+
+ if (!$g['nick']) {
+ $g['nick'] = $g['url'];
+ }
+
+ if (in_array($g['hash'], $permitted) && $type === 'f' && (!$noforums)) {
+ $contacts[] = [
+ "type" => "c",
+ "photo" => "images/twopeople.png",
+ "name" => $g['name'],
+ "id" => urlencode($g['id']),
+ "xid" => $g['hash'],
+ "link" => (($g['nick']) ? $g['nick'] : $g['url']),
+ "nick" => substr($g['nick'], 0, strpos($g['nick'], '@')),
+ "self" => (intval($g['abook_self']) ? 'abook-self' : ''),
+ "taggable" => 'taggable',
+ "label" => t('network')
+ ];
+ }
+ if ($type !== 'f') {
+ $contacts[] = [
+ "type" => "c",
+ "photo" => $g['micro'],
+ "name" => $g['name'],
+ "id" => urlencode($g['id']),
+ "xid" => $g['hash'],
+ "link" => (($g['nick']) ? $g['nick'] : $g['url']),
+ "nick" => ((strpos($g['nick'], '@')) ? substr($g['nick'], 0, strpos($g['nick'], '@')) : $g['nick']),
+ "self" => (intval($g['abook_self']) ? 'abook-self' : ''),
+ "taggable" => '',
+ "label" => '',
+ ];
+ }
+ }
+ }
+
+ $items = array_merge($groups, $contacts);
+
+ $o = [
+ 'start' => $start,
+ 'count' => $count,
+ 'items' => $items,
+ ];
+
+ json_return_and_die($o);
+ }
- function navbar_complete() {
-
- // logger('navbar_complete');
-
- if (observer_prohibited()) {
- return;
- }
-
- $dirmode = intval(get_config('system','directory_mode'));
- $search = ((x($_REQUEST,'search')) ? htmlentities($_REQUEST['search'],ENT_COMPAT,'UTF-8',false) : '');
- if (! $search || mb_strlen($search) < 2) {
- return [];
- }
-
- $star = false;
- $address = false;
-
- if (substr($search,0,1) === '@') {
- $search = substr($search,1);
- }
-
- if (substr($search,0,1) === '*') {
- $star = true;
- $search = substr($search,1);
- }
+ public function navbar_complete()
+ {
- if (strpos($search,'@') !== false) {
- $address = true;
- }
+ // logger('navbar_complete');
-
- $url = z_root() . '/dirsearch';
+ if (observer_prohibited()) {
+ return;
+ }
-
- $results = [];
+ $dirmode = intval(get_config('system', 'directory_mode'));
+ $search = ((x($_REQUEST, 'search')) ? htmlentities($_REQUEST['search'], ENT_COMPAT, 'UTF-8', false) : '');
+ if (!$search || mb_strlen($search) < 2) {
+ return [];
+ }
- $count = (x($_REQUEST,'count') ? $_REQUEST['count'] : 100);
+ $star = false;
+ $address = false;
- if ($url) {
- $query = $url . '?f=';
- $query .= '&name=' . urlencode($search) . "&limit=$count" . (($address) ? '&address=' . urlencode(punify($search)) : '');
-
- $x = z_fetch_url($query);
- if ($x['success']) {
- $t = 0;
- $j = json_decode($x['body'],true);
- if ($j && $j['results']) {
- $results = $j['results'];
- }
- }
- }
- return $results;
- }
+ if (substr($search, 0, 1) === '@') {
+ $search = substr($search, 1);
+ }
+
+ if (substr($search, 0, 1) === '*') {
+ $star = true;
+ $search = substr($search, 1);
+ }
+
+ if (strpos($search, '@') !== false) {
+ $address = true;
+ }
+
+
+ $url = z_root() . '/dirsearch';
+
+
+ $results = [];
+
+ $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 100);
+
+ if ($url) {
+ $query = $url . '?f=';
+ $query .= '&name=' . urlencode($search) . "&limit=$count" . (($address) ? '&address=' . urlencode(punify($search)) : '');
+
+ $x = z_fetch_url($query);
+ if ($x['success']) {
+ $t = 0;
+ $j = json_decode($x['body'], true);
+ if ($j && $j['results']) {
+ $results = $j['results'];
+ }
+ }
+ }
+ return $results;
+ }
}
diff --git a/Zotlabs/Module/Activity.php b/Zotlabs/Module/Activity.php
index 5849ae45d..5d9c154f0 100644
--- a/Zotlabs/Module/Activity.php
+++ b/Zotlabs/Module/Activity.php
@@ -1,4 +1,5 @@
[
+ ACTIVITYSTREAMS_JSONLD_REV,
+ 'https://w3id.org/security/v1',
+ ZlibActivity::ap_schema()
+ ]], $i);
- if(! $i)
- http_status_exit(404, 'Not found');
-
- $x = array_merge(['@context' => [
- ACTIVITYSTREAMS_JSONLD_REV,
- 'https://w3id.org/security/v1',
- ZlibActivity::ap_schema()
- ]], $i);
-
- $headers = [];
- $headers['Content-Type'] = 'application/x-nomad+json' ;
- $x['signature'] = LDSignatures::sign($x,$chan);
- $ret = json_encode($x, JSON_UNESCAPED_SLASHES);
- $headers['Digest'] = HTTPSig::generate_digest_header($ret);
- $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
- $h = HTTPSig::create_sig($headers,$chan['channel_prvkey'],channel_url($chan));
- HTTPSig::set_headers($h);
- echo $ret;
- killme();
-
- }
+ $headers = [];
+ $headers['Content-Type'] = 'application/x-nomad+json';
+ $x['signature'] = LDSignatures::sign($x, $chan);
+ $ret = json_encode($x, JSON_UNESCAPED_SLASHES);
+ $headers['Digest'] = HTTPSig::generate_digest_header($ret);
+ $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
+ $h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], channel_url($chan));
+ HTTPSig::set_headers($h);
+ echo $ret;
+ killme();
+ }
+ goaway(z_root() . '/item/' . argv(1));
+ }
+}
- goaway(z_root() . '/item/' . argv(1));
- }
-
-}
\ No newline at end of file
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index 8c9a40a1f..dcba31e2d 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -1,4 +1,5 @@
sm = new SubModule();
- }
+ public function __construct()
+ {
+ $this->sm = new SubModule();
+ }
- function init() {
+ public function init()
+ {
- logger('admin_init', LOGGER_DEBUG);
+ logger('admin_init', LOGGER_DEBUG);
- if (! is_site_admin()) {
- logger('admin denied.');
- return;
- }
-
- if (argc() > 1) {
- $this->sm->call('init');
- }
- }
+ if (!is_site_admin()) {
+ logger('admin denied.');
+ return;
+ }
+
+ if (argc() > 1) {
+ $this->sm->call('init');
+ }
+ }
- function post() {
+ public function post()
+ {
- logger('admin_post', LOGGER_DEBUG);
+ logger('admin_post', LOGGER_DEBUG);
- if (! is_site_admin()) {
- logger('admin denied.');
- return;
- }
-
- if (argc() > 1) {
- $this->sm->call('post');
- }
+ if (!is_site_admin()) {
+ logger('admin denied.');
+ return;
+ }
- // goaway(z_root() . '/admin' );
- }
+ if (argc() > 1) {
+ $this->sm->call('post');
+ }
- /**
- * @return string
- */
+ // goaway(z_root() . '/admin' );
+ }
- function get() {
+ /**
+ * @return string
+ */
- logger('admin_content', LOGGER_DEBUG);
+ public function get()
+ {
- if (! is_site_admin()) {
- logger('admin denied.');
- return login(false);
- }
+ logger('admin_content', LOGGER_DEBUG);
- /*
- * Page content
- */
+ if (!is_site_admin()) {
+ logger('admin denied.');
+ return login(false);
+ }
- nav_set_selected('Admin');
+ /*
+ * Page content
+ */
- $o = '';
+ nav_set_selected('Admin');
- if (argc() > 1) {
- $o = $this->sm->call('get');
- if ($o === false) {
- notice( t('Item not found.') );
- }
- }
- else {
- $o = $this->admin_page_summary();
- }
+ $o = '';
- if (is_ajax()) {
- echo $o;
- killme();
- }
- else {
- return $o;
- }
- }
+ if (argc() > 1) {
+ $o = $this->sm->call('get');
+ if ($o === false) {
+ notice(t('Item not found.'));
+ }
+ } else {
+ $o = $this->admin_page_summary();
+ }
+
+ if (is_ajax()) {
+ echo $o;
+ killme();
+ } else {
+ return $o;
+ }
+ }
- /**
- * @brief Returns content for Admin Summary Page.
- *
- * @return string HTML from parsed admin_summary.tpl
- */
+ /**
+ * @brief Returns content for Admin Summary Page.
+ *
+ * @return string HTML from parsed admin_summary.tpl
+ */
- function admin_page_summary() {
+ public function admin_page_summary()
+ {
- // list total user accounts, expirations etc.
- $accounts = [];
- $r = q("SELECT COUNT(CASE WHEN account_id > 0 THEN 1 ELSE NULL END) AS total, COUNT(CASE WHEN account_expires > %s THEN 1 ELSE NULL END) AS expiring, COUNT(CASE WHEN account_expires < %s AND account_expires > '%s' THEN 1 ELSE NULL END) AS expired, COUNT(CASE WHEN (account_flags & %d)>0 THEN 1 ELSE NULL END) AS blocked FROM account",
- db_utcnow(),
- db_utcnow(),
- dbesc(NULL_DATE),
- intval(ACCOUNT_BLOCKED)
- );
- if ($r) {
- $accounts['total'] = [ 'label' => t('Accounts'), 'val' => $r[0]['total'] ];
- $accounts['blocked'] = [ 'label' => t('Blocked accounts'), 'val' => $r[0]['blocked'] ];
- $accounts['expired'] = [ 'label' => t('Expired accounts'), 'val' => $r[0]['expired'] ];
- $accounts['expiring'] = [ 'label' => t('Expiring accounts'), 'val' => $r[0]['expiring'] ];
- }
+ // list total user accounts, expirations etc.
+ $accounts = [];
+ $r = q(
+ "SELECT COUNT(CASE WHEN account_id > 0 THEN 1 ELSE NULL END) AS total, COUNT(CASE WHEN account_expires > %s THEN 1 ELSE NULL END) AS expiring, COUNT(CASE WHEN account_expires < %s AND account_expires > '%s' THEN 1 ELSE NULL END) AS expired, COUNT(CASE WHEN (account_flags & %d)>0 THEN 1 ELSE NULL END) AS blocked FROM account",
+ db_utcnow(),
+ db_utcnow(),
+ dbesc(NULL_DATE),
+ intval(ACCOUNT_BLOCKED)
+ );
+ if ($r) {
+ $accounts['total'] = ['label' => t('Accounts'), 'val' => $r[0]['total']];
+ $accounts['blocked'] = ['label' => t('Blocked accounts'), 'val' => $r[0]['blocked']];
+ $accounts['expired'] = ['label' => t('Expired accounts'), 'val' => $r[0]['expired']];
+ $accounts['expiring'] = ['label' => t('Expiring accounts'), 'val' => $r[0]['expiring']];
+ }
- // pending registrations
+ // pending registrations
- $pdg = q("SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) > 0 ",
- intval(ACCOUNT_PENDING)
- );
+ $pdg = q(
+ "SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) > 0 ",
+ intval(ACCOUNT_PENDING)
+ );
- $pending = (($pdg) ? count($pdg) : 0);
+ $pending = (($pdg) ? count($pdg) : 0);
- // available channels, primary and clones
- $channels = [];
- $r = q("SELECT COUNT(*) AS total, COUNT(CASE WHEN channel_primary = 1 THEN 1 ELSE NULL END) AS main, COUNT(CASE WHEN channel_primary = 0 THEN 1 ELSE NULL END) AS clones FROM channel WHERE channel_removed = 0 and channel_system = 0");
- if ($r) {
- $channels['total'] = [ 'label' => t('Channels'), 'val' => $r[0]['total'] ];
- $channels['main'] = [ 'label' => t('Primary'), 'val' => $r[0]['main'] ];
- $channels['clones'] = [ 'label' => t('Clones'), 'val' => $r[0]['clones'] ];
- }
+ // available channels, primary and clones
+ $channels = [];
+ $r = q("SELECT COUNT(*) AS total, COUNT(CASE WHEN channel_primary = 1 THEN 1 ELSE NULL END) AS main, COUNT(CASE WHEN channel_primary = 0 THEN 1 ELSE NULL END) AS clones FROM channel WHERE channel_removed = 0 and channel_system = 0");
+ if ($r) {
+ $channels['total'] = ['label' => t('Channels'), 'val' => $r[0]['total']];
+ $channels['main'] = ['label' => t('Primary'), 'val' => $r[0]['main']];
+ $channels['clones'] = ['label' => t('Clones'), 'val' => $r[0]['clones']];
+ }
- // We can do better, but this is a quick queue status
- $r = q("SELECT COUNT(outq_delivered) AS total FROM outq WHERE outq_delivered = 0");
- $queue = (($r) ? $r[0]['total'] : 0);
- $queues = [ 'label' => t('Message queues'), 'queue' => $queue ];
+ // We can do better, but this is a quick queue status
+ $r = q("SELECT COUNT(outq_delivered) AS total FROM outq WHERE outq_delivered = 0");
+ $queue = (($r) ? $r[0]['total'] : 0);
+ $queues = ['label' => t('Message queues'), 'queue' => $queue];
- $plugins = [];
+ $plugins = [];
- if (is_array(App::$plugins) && App::$plugins) {
- foreach (App::$plugins as $p) {
- if ($p) {
- $plugins[] = $p;
- }
- }
- sort($plugins);
- }
- else {
- $plugins = 0;
- }
+ if (is_array(App::$plugins) && App::$plugins) {
+ foreach (App::$plugins as $p) {
+ if ($p) {
+ $plugins[] = $p;
+ }
+ }
+ sort($plugins);
+ } else {
+ $plugins = 0;
+ }
- // Could be extended to provide also other alerts to the admin
+ // Could be extended to provide also other alerts to the admin
- $alertmsg = '';
+ $alertmsg = '';
- $upgrade = EMPTY_STR;
+ $upgrade = EMPTY_STR;
- if((! defined('PLATFORM_ARCHITECTURE')) || (PLATFORM_ARCHITECTURE === 'zap')) {
- $vrelease = get_repository_version('release');
- $vdev = get_repository_version('dev');
- $upgrade = ((version_compare(STD_VERSION,$vrelease) < 0) ? t('Your software should be updated') : '');
- }
-
- $t = get_markup_template('admin_summary.tpl');
- return replace_macros($t, [
- '$title' => t('Administration'),
- '$page' => t('Summary'),
- '$adminalertmsg' => $alertmsg,
- '$queues' => $queues,
- '$accounts' => [ t('Registered accounts'), $accounts ],
- '$pending' => [ t('Pending registrations'), $pending ],
- '$channels' => [ t('Registered channels'), $channels ],
- '$plugins' => (($plugins) ? [ t('Active addons'), $plugins ] : EMPTY_STR),
- '$version' => [ t('Version'), STD_VERSION ],
- '$vmaster' => [ t('Repository version (release)'), $vrelease ],
- '$vdev' => [ t('Repository version (dev)'), $vdev ],
- '$upgrade' => $upgrade,
- '$build' => Config::Get('system', 'db_version')
- ]);
- }
+ if ((!defined('PLATFORM_ARCHITECTURE')) || (PLATFORM_ARCHITECTURE === 'zap')) {
+ $vrelease = get_repository_version('release');
+ $vdev = get_repository_version('dev');
+ $upgrade = ((version_compare(STD_VERSION, $vrelease) < 0) ? t('Your software should be updated') : '');
+ }
+ $t = get_markup_template('admin_summary.tpl');
+ return replace_macros($t, [
+ '$title' => t('Administration'),
+ '$page' => t('Summary'),
+ '$adminalertmsg' => $alertmsg,
+ '$queues' => $queues,
+ '$accounts' => [t('Registered accounts'), $accounts],
+ '$pending' => [t('Pending registrations'), $pending],
+ '$channels' => [t('Registered channels'), $channels],
+ '$plugins' => (($plugins) ? [t('Active addons'), $plugins] : EMPTY_STR),
+ '$version' => [t('Version'), STD_VERSION],
+ '$vmaster' => [t('Repository version (release)'), $vrelease],
+ '$vdev' => [t('Repository version (dev)'), $vdev],
+ '$upgrade' => $upgrade,
+ '$build' => Config::Get('system', 'db_version')
+ ]);
+ }
}
diff --git a/Zotlabs/Module/Admin/Account_edit.php b/Zotlabs/Module/Admin/Account_edit.php
index d9156c744..00262f8fa 100644
--- a/Zotlabs/Module/Admin/Account_edit.php
+++ b/Zotlabs/Module/Admin/Account_edit.php
@@ -2,80 +2,82 @@
namespace Zotlabs\Module\Admin;
+class Account_edit
+{
+ public function post()
+ {
-class Account_edit {
+ $account_id = $_REQUEST['aid'];
- function post() {
+ if (!$account_id) {
+ return;
+ }
- $account_id = $_REQUEST['aid'];
-
- if(! $account_id)
- return;
-
- $pass1 = trim($_REQUEST['pass1']);
- $pass2 = trim($_REQUEST['pass2']);
- if($pass1 && $pass2 && ($pass1 === $pass2)) {
- $salt = random_string(32);
- $password_encoded = hash('whirlpool', $salt . $pass1);
- $r = q("update account set account_salt = '%s', account_password = '%s',
+ $pass1 = trim($_REQUEST['pass1']);
+ $pass2 = trim($_REQUEST['pass2']);
+ if ($pass1 && $pass2 && ($pass1 === $pass2)) {
+ $salt = random_string(32);
+ $password_encoded = hash('whirlpool', $salt . $pass1);
+ $r = q(
+ "update account set account_salt = '%s', account_password = '%s',
account_password_changed = '%s' where account_id = %d",
- dbesc($salt),
- dbesc($password_encoded),
- dbesc(datetime_convert()),
- intval($account_id)
- );
- if($r)
- info( sprintf( t('Password changed for account %d.'), $account_id). EOL);
+ dbesc($salt),
+ dbesc($password_encoded),
+ dbesc(datetime_convert()),
+ intval($account_id)
+ );
+ if ($r) {
+ info(sprintf(t('Password changed for account %d.'), $account_id) . EOL);
+ }
+ }
- }
+ $service_class = trim($_REQUEST['service_class']);
+ $account_language = trim($_REQUEST['account_language']);
- $service_class = trim($_REQUEST['service_class']);
- $account_language = trim($_REQUEST['account_language']);
-
- $r = q("update account set account_service_class = '%s', account_language = '%s'
+ $r = q(
+ "update account set account_service_class = '%s', account_language = '%s'
where account_id = %d",
- dbesc($service_class),
- dbesc($account_language),
- intval($account_id)
- );
+ dbesc($service_class),
+ dbesc($account_language),
+ intval($account_id)
+ );
- if($r)
- info( t('Account settings updated.') . EOL);
+ if ($r) {
+ info(t('Account settings updated.') . EOL);
+ }
- goaway(z_root() . '/admin/accounts');
- }
+ goaway(z_root() . '/admin/accounts');
+ }
- function get() {
- if(argc() > 2)
- $account_id = argv(2);
+ public function get()
+ {
+ if (argc() > 2) {
+ $account_id = argv(2);
+ }
- $x = q("select * from account where account_id = %d limit 1",
- intval($account_id)
- );
+ $x = q(
+ "select * from account where account_id = %d limit 1",
+ intval($account_id)
+ );
- if(! $x) {
- notice ( t('Account not found.') . EOL);
- return '';
- }
+ if (!$x) {
+ notice(t('Account not found.') . EOL);
+ return '';
+ }
- $a = replace_macros(get_markup_template('admin_account_edit.tpl'), [
- '$account' => $x[0],
- '$title' => t('Account Edit'),
- '$pass1' => [ 'pass1', t('New Password'), ' ','' ],
- '$pass2' => [ 'pass2', t('New Password again'), ' ','' ],
- '$account_language' => [ 'account_language' , t('Account language (for emails)'), $x[0]['account_language'], '', language_list() ],
- '$service_class' => [ 'service_class', t('Service class'), $x[0]['account_service_class'], '' ],
- '$submit' => t('Submit'),
- ]
- );
+ $a = replace_macros(get_markup_template('admin_account_edit.tpl'), [
+ '$account' => $x[0],
+ '$title' => t('Account Edit'),
+ '$pass1' => ['pass1', t('New Password'), ' ', ''],
+ '$pass2' => ['pass2', t('New Password again'), ' ', ''],
+ '$account_language' => ['account_language', t('Account language (for emails)'), $x[0]['account_language'], '', language_list()],
+ '$service_class' => ['service_class', t('Service class'), $x[0]['account_service_class'], ''],
+ '$submit' => t('Submit'),
+ ]);
- return $a;
-
-
- }
-
-
-}
\ No newline at end of file
+ return $a;
+ }
+}
diff --git a/Zotlabs/Module/Admin/Accounts.php b/Zotlabs/Module/Admin/Accounts.php
index 1b9b0d768..b59e33bee 100644
--- a/Zotlabs/Module/Admin/Accounts.php
+++ b/Zotlabs/Module/Admin/Accounts.php
@@ -4,199 +4,208 @@ namespace Zotlabs\Module\Admin;
use App;
-class Accounts {
-
- /**
- * @brief Handle POST actions on accounts admin page.
- *
- * This function is called when on the admin user/account page the form was
- * submitted to handle multiple operations at once. If one of the icons next
- * to an entry are pressed the function admin_page_accounts() will handle this.
- *
- */
+class Accounts
+{
- function post() {
+ /**
+ * @brief Handle POST actions on accounts admin page.
+ *
+ * This function is called when on the admin user/account page the form was
+ * submitted to handle multiple operations at once. If one of the icons next
+ * to an entry are pressed the function admin_page_accounts() will handle this.
+ *
+ */
- $pending = ( x($_POST, 'pending') ? $_POST['pending'] : [] );
- $users = ( x($_POST, 'user') ? $_POST['user'] : [] );
- $blocked = ( x($_POST, 'blocked') ? $_POST['blocked'] : [] );
-
- check_form_security_token_redirectOnErr('/admin/accounts', 'admin_accounts');
-
+ public function post()
+ {
- // account block/unblock button was submitted
- if (x($_POST, 'page_accounts_block')) {
- for ($i = 0; $i < count($users); $i++) {
- // if account is blocked remove blocked bit-flag, otherwise add blocked bit-flag
- $op = ($blocked[$i]) ? '& ~' : '| ';
- q("UPDATE account SET account_flags = (account_flags $op %d) WHERE account_id = %d",
- intval(ACCOUNT_BLOCKED),
- intval($users[$i])
- );
- }
- notice( sprintf( tt("%s account blocked/unblocked", "%s accounts blocked/unblocked", count($users)), count($users)) );
- }
+ $pending = (x($_POST, 'pending') ? $_POST['pending'] : []);
+ $users = (x($_POST, 'user') ? $_POST['user'] : []);
+ $blocked = (x($_POST, 'blocked') ? $_POST['blocked'] : []);
- // account delete button was submitted
- if (x($_POST, 'page_accounts_delete')) {
- foreach ($users as $uid){
- account_remove($uid, true, false);
- }
- notice( sprintf( tt("%s account deleted", "%s accounts deleted", count($users)), count($users)) );
- }
-
- // registration approved button was submitted
- if (x($_POST, 'page_accounts_approve')) {
- foreach ($pending as $hash) {
- account_allow($hash);
- }
- }
-
- // registration deny button was submitted
- if (x($_POST, 'page_accounts_deny')) {
- foreach ($pending as $hash) {
- account_deny($hash);
- }
- }
-
- goaway(z_root() . '/admin/accounts' );
- }
+ check_form_security_token_redirectOnErr('/admin/accounts', 'admin_accounts');
- /**
- * @brief Generate accounts admin page and handle single item operations.
- *
- * This function generates the accounts/account admin page and handles the actions
- * if an icon next to an entry was clicked. If several items were selected and
- * the form was submitted it is handled by the function admin_page_accounts_post().
- *
- * @return string
- */
- function get(){
- if (argc() > 2) {
- $uid = argv(3);
- $account = q("SELECT * FROM account WHERE account_id = %d",
- intval($uid)
- );
-
- if (! $account) {
- notice( t('Account not found') . EOL);
- goaway(z_root() . '/admin/accounts' );
- }
-
- check_form_security_token_redirectOnErr('/admin/accounts', 'admin_accounts', 't');
-
- switch (argv(2)) {
- case 'delete':
- // delete user
- account_remove($uid,true,false);
-
- notice( sprintf(t("Account '%s' deleted"), $account[0]['account_email']) . EOL);
- break;
- case 'block':
- q("UPDATE account SET account_flags = ( account_flags | %d ) WHERE account_id = %d",
- intval(ACCOUNT_BLOCKED),
- intval($uid)
- );
-
- notice( sprintf( t("Account '%s' blocked") , $account[0]['account_email']) . EOL);
- break;
- case 'unblock':
- q("UPDATE account SET account_flags = ( account_flags & ~ %d ) WHERE account_id = %d",
- intval(ACCOUNT_BLOCKED),
- intval($uid)
- );
-
- notice( sprintf( t("Account '%s' unblocked"), $account[0]['account_email']) . EOL);
- break;
- }
-
- goaway(z_root() . '/admin/accounts' );
- }
-
- /* get pending */
- $pending = q("SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) != 0 ",
- intval(ACCOUNT_PENDING)
- );
-
- /* get accounts */
-
- $total = q("SELECT count(*) as total FROM account");
- if (count($total)) {
- App::set_pager_total($total[0]['total']);
- App::set_pager_itemspage(100);
- }
-
- $serviceclass = (($_REQUEST['class']) ? " and account_service_class = '" . dbesc($_REQUEST['class']) . "' " : '');
+ // account block/unblock button was submitted
+ if (x($_POST, 'page_accounts_block')) {
+ for ($i = 0; $i < count($users); $i++) {
+ // if account is blocked remove blocked bit-flag, otherwise add blocked bit-flag
+ $op = ($blocked[$i]) ? '& ~' : '| ';
+ q(
+ "UPDATE account SET account_flags = (account_flags $op %d) WHERE account_id = %d",
+ intval(ACCOUNT_BLOCKED),
+ intval($users[$i])
+ );
+ }
+ notice(sprintf(tt("%s account blocked/unblocked", "%s accounts blocked/unblocked", count($users)), count($users)));
+ }
- $key = (($_REQUEST['key']) ? dbesc($_REQUEST['key']) : 'account_id');
- $dir = 'asc';
- if (array_key_exists('dir',$_REQUEST)) {
- $dir = ((intval($_REQUEST['dir'])) ? 'asc' : 'desc');
- }
-
- $base = z_root() . '/admin/accounts?f=';
- $odir = (($dir === 'asc') ? '0' : '1');
+ // account delete button was submitted
+ if (x($_POST, 'page_accounts_delete')) {
+ foreach ($users as $uid) {
+ account_remove($uid, true, false);
+ }
+ notice(sprintf(tt("%s account deleted", "%s accounts deleted", count($users)), count($users)));
+ }
- $users = q("SELECT account_id , account_email, account_lastlog, account_created, account_expires, account_service_class, ( account_flags & %d ) > 0 as blocked,
+ // registration approved button was submitted
+ if (x($_POST, 'page_accounts_approve')) {
+ foreach ($pending as $hash) {
+ account_allow($hash);
+ }
+ }
+
+ // registration deny button was submitted
+ if (x($_POST, 'page_accounts_deny')) {
+ foreach ($pending as $hash) {
+ account_deny($hash);
+ }
+ }
+
+ goaway(z_root() . '/admin/accounts');
+ }
+
+ /**
+ * @brief Generate accounts admin page and handle single item operations.
+ *
+ * This function generates the accounts/account admin page and handles the actions
+ * if an icon next to an entry was clicked. If several items were selected and
+ * the form was submitted it is handled by the function admin_page_accounts_post().
+ *
+ * @return string
+ */
+
+ public function get()
+ {
+ if (argc() > 2) {
+ $uid = argv(3);
+ $account = q(
+ "SELECT * FROM account WHERE account_id = %d",
+ intval($uid)
+ );
+
+ if (!$account) {
+ notice(t('Account not found') . EOL);
+ goaway(z_root() . '/admin/accounts');
+ }
+
+ check_form_security_token_redirectOnErr('/admin/accounts', 'admin_accounts', 't');
+
+ switch (argv(2)) {
+ case 'delete':
+ // delete user
+ account_remove($uid, true, false);
+
+ notice(sprintf(t("Account '%s' deleted"), $account[0]['account_email']) . EOL);
+ break;
+ case 'block':
+ q(
+ "UPDATE account SET account_flags = ( account_flags | %d ) WHERE account_id = %d",
+ intval(ACCOUNT_BLOCKED),
+ intval($uid)
+ );
+
+ notice(sprintf(t("Account '%s' blocked"), $account[0]['account_email']) . EOL);
+ break;
+ case 'unblock':
+ q(
+ "UPDATE account SET account_flags = ( account_flags & ~ %d ) WHERE account_id = %d",
+ intval(ACCOUNT_BLOCKED),
+ intval($uid)
+ );
+
+ notice(sprintf(t("Account '%s' unblocked"), $account[0]['account_email']) . EOL);
+ break;
+ }
+
+ goaway(z_root() . '/admin/accounts');
+ }
+
+ /* get pending */
+ $pending = q(
+ "SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) != 0 ",
+ intval(ACCOUNT_PENDING)
+ );
+
+ /* get accounts */
+
+ $total = q("SELECT count(*) as total FROM account");
+ if (count($total)) {
+ App::set_pager_total($total[0]['total']);
+ App::set_pager_itemspage(100);
+ }
+
+ $serviceclass = (($_REQUEST['class']) ? " and account_service_class = '" . dbesc($_REQUEST['class']) . "' " : '');
+
+ $key = (($_REQUEST['key']) ? dbesc($_REQUEST['key']) : 'account_id');
+ $dir = 'asc';
+ if (array_key_exists('dir', $_REQUEST)) {
+ $dir = ((intval($_REQUEST['dir'])) ? 'asc' : 'desc');
+ }
+
+ $base = z_root() . '/admin/accounts?f=';
+ $odir = (($dir === 'asc') ? '0' : '1');
+
+ $users = q(
+ "SELECT account_id , account_email, account_lastlog, account_created, account_expires, account_service_class, ( account_flags & %d ) > 0 as blocked,
(SELECT %s FROM channel as ch WHERE ch.channel_account_id = ac.account_id and ch.channel_removed = 0 ) as channels FROM account as ac
where true $serviceclass and account_flags != %d order by $key $dir limit %d offset %d ",
- intval(ACCOUNT_BLOCKED),
- db_concat('ch.channel_address', ' '),
- intval(ACCOUNT_BLOCKED | ACCOUNT_PENDING),
- intval(App::$pager['itemspage']),
- intval(App::$pager['start'])
- );
+ intval(ACCOUNT_BLOCKED),
+ db_concat('ch.channel_address', ' '),
+ intval(ACCOUNT_BLOCKED | ACCOUNT_PENDING),
+ intval(App::$pager['itemspage']),
+ intval(App::$pager['start'])
+ );
- if ($users) {
- for($x = 0; $x < count($users); $x ++) {
- $channel_arr = explode(' ',$users[$x]['channels']);
- if ($channel_arr) {
- $linked = [];
- foreach ( $channel_arr as $c) {
- $linked[] = '' . $c . '';
- }
- $users[$x]['channels'] = implode(' ',$linked);
- }
- }
- }
+ if ($users) {
+ for ($x = 0; $x < count($users); $x++) {
+ $channel_arr = explode(' ', $users[$x]['channels']);
+ if ($channel_arr) {
+ $linked = [];
+ foreach ($channel_arr as $c) {
+ $linked[] = '' . $c . '';
+ }
+ $users[$x]['channels'] = implode(' ', $linked);
+ }
+ }
+ }
- $t =
- $o = replace_macros(get_markup_template('admin_accounts.tpl'), [
- '$title' => t('Administration'),
- '$page' => t('Accounts'),
- '$submit' => t('Submit'),
- '$select_all' => t('select all'),
- '$h_pending' => t('Registrations waiting for confirm'),
- '$th_pending' => array( t('Request date'), t('Email') ),
- '$no_pending' => t('No registrations.'),
- '$approve' => t('Approve'),
- '$deny' => t('Deny'),
- '$delete' => t('Delete'),
- '$block' => t('Block'),
- '$unblock' => t('Unblock'),
- '$odir' => $odir,
- '$base' => $base,
- '$h_users' => t('Accounts'),
- '$th_users' => [
- [ t('ID'), 'account_id' ],
- [ t('Email'), 'account_email' ],
- [ t('All Channels'), 'channels' ],
- [ t('Register date'), 'account_created' ],
- [ t('Last login'), 'account_lastlog' ],
- [ t('Expires'), 'account_expires' ],
- [ t('Service Class'), 'account_service_class']
- ],
- '$confirm_delete_multi' => t('Selected accounts will be deleted!\n\nEverything these accounts had posted on this site will be permanently deleted!\n\nAre you sure?'),
- '$confirm_delete' => t('The account {0} will be deleted!\n\nEverything this account has posted on this site will be permanently deleted!\n\nAre you sure?'),
- '$form_security_token' => get_form_security_token("admin_accounts"),
- '$baseurl' => z_root(),
- '$pending' => $pending,
- '$users' => $users,
- ]);
-
- $o .= paginate($a);
-
- return $o;
- }
+ $t =
+ $o = replace_macros(get_markup_template('admin_accounts.tpl'), [
+ '$title' => t('Administration'),
+ '$page' => t('Accounts'),
+ '$submit' => t('Submit'),
+ '$select_all' => t('select all'),
+ '$h_pending' => t('Registrations waiting for confirm'),
+ '$th_pending' => array(t('Request date'), t('Email')),
+ '$no_pending' => t('No registrations.'),
+ '$approve' => t('Approve'),
+ '$deny' => t('Deny'),
+ '$delete' => t('Delete'),
+ '$block' => t('Block'),
+ '$unblock' => t('Unblock'),
+ '$odir' => $odir,
+ '$base' => $base,
+ '$h_users' => t('Accounts'),
+ '$th_users' => [
+ [t('ID'), 'account_id'],
+ [t('Email'), 'account_email'],
+ [t('All Channels'), 'channels'],
+ [t('Register date'), 'account_created'],
+ [t('Last login'), 'account_lastlog'],
+ [t('Expires'), 'account_expires'],
+ [t('Service Class'), 'account_service_class']
+ ],
+ '$confirm_delete_multi' => t('Selected accounts will be deleted!\n\nEverything these accounts had posted on this site will be permanently deleted!\n\nAre you sure?'),
+ '$confirm_delete' => t('The account {0} will be deleted!\n\nEverything this account has posted on this site will be permanently deleted!\n\nAre you sure?'),
+ '$form_security_token' => get_form_security_token("admin_accounts"),
+ '$baseurl' => z_root(),
+ '$pending' => $pending,
+ '$users' => $users,
+ ]);
+
+ $o .= paginate($a);
+
+ return $o;
+ }
}
diff --git a/Zotlabs/Module/Admin/Addons.php b/Zotlabs/Module/Admin/Addons.php
index 8f49d9633..62f57c364 100644
--- a/Zotlabs/Module/Admin/Addons.php
+++ b/Zotlabs/Module/Admin/Addons.php
@@ -2,479 +2,486 @@
namespace Zotlabs\Module\Admin;
-use \Zotlabs\Storage\GitRepo;
-use \Michelf\MarkdownExtra;
+use App;
+use PHPGit\Exception\GitException;
+use Zotlabs\Storage\GitRepo;
+use Michelf\MarkdownExtra;
-class Addons {
+class Addons
+{
- /**
- * @brief
- *
- */
- function post() {
+ /**
+ * @brief
+ *
+ */
+ public function post()
+ {
- if(argc() > 2 && is_file("addon/" . argv(2) . "/" . argv(2) . ".php")) {
- @include_once("addon/" . argv(2) . "/" . argv(2) . ".php");
- if(function_exists(argv(2).'_plugin_admin_post')) {
- $func = argv(2) . '_plugin_admin_post';
- $func($a);
- }
+ if (argc() > 2 && is_file("addon/" . argv(2) . "/" . argv(2) . ".php")) {
+ @include_once("addon/" . argv(2) . "/" . argv(2) . ".php");
+ if (function_exists(argv(2) . '_plugin_admin_post')) {
+ $func = argv(2) . '_plugin_admin_post';
+ $func($a);
+ }
- goaway(z_root() . '/admin/addons/' . argv(2) );
- }
- elseif(argc() > 2) {
- switch(argv(2)) {
- case 'updaterepo':
- if (array_key_exists('repoName', $_REQUEST)) {
- $repoName = $_REQUEST['repoName'];
- }
- else {
- json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
- }
- $extendDir = 'cache/git/sys/extend';
- $addonDir = $extendDir . '/addon';
- if (!file_exists($extendDir)) {
- if (!mkdir($extendDir, 0770, true)) {
- logger('Error creating extend folder: ' . $extendDir);
- json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
- }
- else {
- if (!symlink(realpath('extend/addon'), $addonDir)) {
- logger('Error creating symlink to addon folder: ' . $addonDir);
- json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
- }
- }
- }
- $repoDir = 'cache/git/sys/extend/addon/' . $repoName;
- if (!is_dir($repoDir)) {
- logger('Repo directory does not exist: ' . $repoDir);
- json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
- }
- if (!is_writable($repoDir)) {
- logger('Repo directory not writable to web server: ' . $repoDir);
- json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false));
- }
- $git = new GitRepo('sys', null, false, $repoName, $repoDir);
- try {
- if ($git->pull()) {
- $files = array_diff(scandir($repoDir), array('.', '..'));
- foreach ($files as $file) {
- if (is_dir($repoDir . '/' . $file) && $file !== '.git') {
- $source = '../extend/addon/' . $repoName . '/' . $file;
- $target = realpath('addon/') . '/' . $file;
- unlink($target);
- if (!symlink($source, $target)) {
- logger('Error linking addons to /addon');
- json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false));
- }
- }
- }
- json_return_and_die(array('message' => 'Repo updated.', 'success' => true));
- } else {
- json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false));
- }
- } catch (\PHPGit\Exception\GitException $e) {
- json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false));
- }
- case 'removerepo':
- if (array_key_exists('repoName', $_REQUEST)) {
- $repoName = $_REQUEST['repoName'];
- } else {
- json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
- }
- $extendDir = 'cache/git/sys/extend';
- $addonDir = $extendDir . '/addon';
- if (!file_exists($extendDir)) {
- if (!mkdir($extendDir, 0770, true)) {
- logger('Error creating extend folder: ' . $extendDir);
- json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
- } else {
- if (!symlink(realpath('extend/addon'), $addonDir)) {
- logger('Error creating symlink to addon folder: ' . $addonDir);
- json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
- }
- }
- }
- $repoDir = 'cache/git/sys/extend/addon/' . $repoName;
- if (!is_dir($repoDir)) {
- logger('Repo directory does not exist: ' . $repoDir);
- json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
- }
- if (!is_writable($repoDir)) {
- logger('Repo directory not writable to web server: ' . $repoDir);
- json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false));
- }
- /// @TODO remove directory and unlink /addon/files
- if (rrmdir($repoDir)) {
- json_return_and_die(array('message' => 'Repo deleted.', 'success' => true));
- } else {
- json_return_and_die(array('message' => 'Error deleting addon repo.', 'success' => false));
- }
- case 'installrepo':
- if (array_key_exists('repoURL', $_REQUEST)) {
- $repoURL = $_REQUEST['repoURL'];
- $extendDir = 'cache/git/sys/extend';
- $addonDir = $extendDir . '/addon';
- if (!file_exists($extendDir)) {
- if (!mkdir($extendDir, 0770, true)) {
- logger('Error creating extend folder: ' . $extendDir);
- json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
- } else {
- if (!symlink(realpath('extend/addon'), $addonDir)) {
- logger('Error creating symlink to addon folder: ' . $addonDir);
- json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
- }
- }
- }
- if (!is_writable($extendDir)) {
- logger('Directory not writable to web server: ' . $extendDir);
- json_return_and_die(array('message' => 'Directory not writable to web server.', 'success' => false));
- }
- $repoName = null;
- if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') {
- $repoName = $_REQUEST['repoName'];
- } else {
- $repoName = GitRepo::getRepoNameFromURL($repoURL);
- }
- if (!$repoName) {
- logger('Invalid git repo');
- json_return_and_die(array('message' => 'Invalid git repo', 'success' => false));
- }
- $repoDir = $addonDir . '/' . $repoName;
- $tempRepoBaseDir = 'cache/git/sys/temp/';
- $tempAddonDir = $tempRepoBaseDir . $repoName;
+ goaway(z_root() . '/admin/addons/' . argv(2));
+ } elseif (argc() > 2) {
+ switch (argv(2)) {
+ case 'updaterepo':
+ if (array_key_exists('repoName', $_REQUEST)) {
+ $repoName = $_REQUEST['repoName'];
+ } else {
+ json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
+ }
+ $extendDir = 'cache/git/sys/extend';
+ $addonDir = $extendDir . '/addon';
+ if (!file_exists($extendDir)) {
+ if (!mkdir($extendDir, 0770, true)) {
+ logger('Error creating extend folder: ' . $extendDir);
+ json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
+ } else {
+ if (!symlink(realpath('extend/addon'), $addonDir)) {
+ logger('Error creating symlink to addon folder: ' . $addonDir);
+ json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
+ }
+ }
+ }
+ $repoDir = 'cache/git/sys/extend/addon/' . $repoName;
+ if (!is_dir($repoDir)) {
+ logger('Repo directory does not exist: ' . $repoDir);
+ json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
+ }
+ if (!is_writable($repoDir)) {
+ logger('Repo directory not writable to web server: ' . $repoDir);
+ json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false));
+ }
+ $git = new GitRepo('sys', null, false, $repoName, $repoDir);
+ try {
+ if ($git->pull()) {
+ $files = array_diff(scandir($repoDir), array('.', '..'));
+ foreach ($files as $file) {
+ if (is_dir($repoDir . '/' . $file) && $file !== '.git') {
+ $source = '../extend/addon/' . $repoName . '/' . $file;
+ $target = realpath('addon/') . '/' . $file;
+ unlink($target);
+ if (!symlink($source, $target)) {
+ logger('Error linking addons to /addon');
+ json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false));
+ }
+ }
+ }
+ json_return_and_die(array('message' => 'Repo updated.', 'success' => true));
+ } else {
+ json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false));
+ }
+ } catch (GitException $e) {
+ json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false));
+ }
+ case 'removerepo':
+ if (array_key_exists('repoName', $_REQUEST)) {
+ $repoName = $_REQUEST['repoName'];
+ } else {
+ json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
+ }
+ $extendDir = 'cache/git/sys/extend';
+ $addonDir = $extendDir . '/addon';
+ if (!file_exists($extendDir)) {
+ if (!mkdir($extendDir, 0770, true)) {
+ logger('Error creating extend folder: ' . $extendDir);
+ json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
+ } else {
+ if (!symlink(realpath('extend/addon'), $addonDir)) {
+ logger('Error creating symlink to addon folder: ' . $addonDir);
+ json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
+ }
+ }
+ }
+ $repoDir = 'cache/git/sys/extend/addon/' . $repoName;
+ if (!is_dir($repoDir)) {
+ logger('Repo directory does not exist: ' . $repoDir);
+ json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
+ }
+ if (!is_writable($repoDir)) {
+ logger('Repo directory not writable to web server: ' . $repoDir);
+ json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false));
+ }
+ /// @TODO remove directory and unlink /addon/files
+ if (rrmdir($repoDir)) {
+ json_return_and_die(array('message' => 'Repo deleted.', 'success' => true));
+ } else {
+ json_return_and_die(array('message' => 'Error deleting addon repo.', 'success' => false));
+ }
+ case 'installrepo':
+ if (array_key_exists('repoURL', $_REQUEST)) {
+ $repoURL = $_REQUEST['repoURL'];
+ $extendDir = 'cache/git/sys/extend';
+ $addonDir = $extendDir . '/addon';
+ if (!file_exists($extendDir)) {
+ if (!mkdir($extendDir, 0770, true)) {
+ logger('Error creating extend folder: ' . $extendDir);
+ json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
+ } else {
+ if (!symlink(realpath('extend/addon'), $addonDir)) {
+ logger('Error creating symlink to addon folder: ' . $addonDir);
+ json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
+ }
+ }
+ }
+ if (!is_writable($extendDir)) {
+ logger('Directory not writable to web server: ' . $extendDir);
+ json_return_and_die(array('message' => 'Directory not writable to web server.', 'success' => false));
+ }
+ $repoName = null;
+ if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') {
+ $repoName = $_REQUEST['repoName'];
+ } else {
+ $repoName = GitRepo::getRepoNameFromURL($repoURL);
+ }
+ if (!$repoName) {
+ logger('Invalid git repo');
+ json_return_and_die(array('message' => 'Invalid git repo', 'success' => false));
+ }
+ $repoDir = $addonDir . '/' . $repoName;
+ $tempRepoBaseDir = 'cache/git/sys/temp/';
+ $tempAddonDir = $tempRepoBaseDir . $repoName;
- if (!is_writable($addonDir) || !is_writable($tempAddonDir)) {
- logger('Temp repo directory or /extend/addon not writable to web server: ' . $tempAddonDir);
- json_return_and_die(array('message' => 'Temp repo directory not writable to web server.', 'success' => false));
- }
- rename($tempAddonDir, $repoDir);
+ if (!is_writable($addonDir) || !is_writable($tempAddonDir)) {
+ logger('Temp repo directory or /extend/addon not writable to web server: ' . $tempAddonDir);
+ json_return_and_die(array('message' => 'Temp repo directory not writable to web server.', 'success' => false));
+ }
+ rename($tempAddonDir, $repoDir);
- if (!is_writable(realpath('addon/'))) {
- logger('/addon directory not writable to web server: ' . $tempAddonDir);
- json_return_and_die(array('message' => '/addon directory not writable to web server.', 'success' => false));
- }
- $files = array_diff(scandir($repoDir), array('.', '..'));
- foreach ($files as $file) {
- if (is_dir($repoDir . '/' . $file) && $file !== '.git') {
- $source = '../extend/addon/' . $repoName . '/' . $file;
- $target = realpath('addon/') . '/' . $file;
- unlink($target);
- if (!symlink($source, $target)) {
- logger('Error linking addons to /addon');
- json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false));
- }
- }
- }
- $git = new GitRepo('sys', $repoURL, false, $repoName, $repoDir);
- $repo = $git->probeRepo();
- json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true));
- }
- case 'addrepo':
- if (array_key_exists('repoURL', $_REQUEST)) {
- $repoURL = $_REQUEST['repoURL'];
- $extendDir = 'cache/git/sys/extend';
- $addonDir = $extendDir . '/addon';
- $tempAddonDir = realpath('cache') . '/git/sys/temp';
- if (!file_exists($extendDir)) {
- if (!mkdir($extendDir, 0770, true)) {
- logger('Error creating extend folder: ' . $extendDir);
- json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
- } else {
- if (!symlink(realpath('extend/addon'), $addonDir)) {
- logger('Error creating symlink to addon folder: ' . $addonDir);
- json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
- }
- }
- }
- if (!is_dir($tempAddonDir)) {
- if (!mkdir($tempAddonDir, 0770, true)) {
- logger('Error creating temp plugin repo folder: ' . $tempAddonDir);
- json_return_and_die(array('message' => 'Error creating temp plugin repo folder: ' . $tempAddonDir, 'success' => false));
- }
- }
- $repoName = null;
- if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') {
- $repoName = $_REQUEST['repoName'];
- } else {
- $repoName = GitRepo::getRepoNameFromURL($repoURL);
- }
- if (!$repoName) {
- logger('Invalid git repo');
- json_return_and_die(array('message' => 'Invalid git repo: ' . $repoName, 'success' => false));
- }
- $repoDir = $tempAddonDir . '/' . $repoName;
- if (!is_writable($tempAddonDir)) {
- logger('Temporary directory for new addon repo is not writable to web server: ' . $tempAddonDir);
- json_return_and_die(array('message' => 'Temporary directory for new addon repo is not writable to web server.', 'success' => false));
- }
- // clone the repo if new automatically
- $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir);
+ if (!is_writable(realpath('addon/'))) {
+ logger('/addon directory not writable to web server: ' . $tempAddonDir);
+ json_return_and_die(array('message' => '/addon directory not writable to web server.', 'success' => false));
+ }
+ $files = array_diff(scandir($repoDir), array('.', '..'));
+ foreach ($files as $file) {
+ if (is_dir($repoDir . '/' . $file) && $file !== '.git') {
+ $source = '../extend/addon/' . $repoName . '/' . $file;
+ $target = realpath('addon/') . '/' . $file;
+ unlink($target);
+ if (!symlink($source, $target)) {
+ logger('Error linking addons to /addon');
+ json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false));
+ }
+ }
+ }
+ $git = new GitRepo('sys', $repoURL, false, $repoName, $repoDir);
+ $repo = $git->probeRepo();
+ json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true));
+ }
+ case 'addrepo':
+ if (array_key_exists('repoURL', $_REQUEST)) {
+ $repoURL = $_REQUEST['repoURL'];
+ $extendDir = 'cache/git/sys/extend';
+ $addonDir = $extendDir . '/addon';
+ $tempAddonDir = realpath('cache') . '/git/sys/temp';
+ if (!file_exists($extendDir)) {
+ if (!mkdir($extendDir, 0770, true)) {
+ logger('Error creating extend folder: ' . $extendDir);
+ json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
+ } else {
+ if (!symlink(realpath('extend/addon'), $addonDir)) {
+ logger('Error creating symlink to addon folder: ' . $addonDir);
+ json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
+ }
+ }
+ }
+ if (!is_dir($tempAddonDir)) {
+ if (!mkdir($tempAddonDir, 0770, true)) {
+ logger('Error creating temp plugin repo folder: ' . $tempAddonDir);
+ json_return_and_die(array('message' => 'Error creating temp plugin repo folder: ' . $tempAddonDir, 'success' => false));
+ }
+ }
+ $repoName = null;
+ if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') {
+ $repoName = $_REQUEST['repoName'];
+ } else {
+ $repoName = GitRepo::getRepoNameFromURL($repoURL);
+ }
+ if (!$repoName) {
+ logger('Invalid git repo');
+ json_return_and_die(array('message' => 'Invalid git repo: ' . $repoName, 'success' => false));
+ }
+ $repoDir = $tempAddonDir . '/' . $repoName;
+ if (!is_writable($tempAddonDir)) {
+ logger('Temporary directory for new addon repo is not writable to web server: ' . $tempAddonDir);
+ json_return_and_die(array('message' => 'Temporary directory for new addon repo is not writable to web server.', 'success' => false));
+ }
+ // clone the repo if new automatically
+ $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir);
- $remotes = $git->git->remote();
- $fetchURL = $remotes['origin']['fetch'];
- if ($fetchURL !== $git->url) {
- if (rrmdir($repoDir)) {
- $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir);
- } else {
- json_return_and_die(array('message' => 'Error deleting existing addon repo.', 'success' => false));
- }
- }
- $repo = $git->probeRepo();
- $repo['readme'] = $repo['manifest'] = null;
- foreach ($git->git->tree('master') as $object) {
- if ($object['type'] == 'blob' && (strtolower($object['file']) === 'readme.md' || strtolower($object['file']) === 'readme')) {
- $repo['readme'] = MarkdownExtra::defaultTransform($git->git->cat->blob($object['hash']));
- } else if ($object['type'] == 'blob' && strtolower($object['file']) === 'manifest.json') {
- $repo['manifest'] = $git->git->cat->blob($object['hash']);
- }
- }
- json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true));
- } else {
- json_return_and_die(array('message' => 'No repo URL provided', 'success' => false));
- }
- break;
- default:
- break;
- }
- }
- }
+ $remotes = $git->git->remote();
+ $fetchURL = $remotes['origin']['fetch'];
+ if ($fetchURL !== $git->url) {
+ if (rrmdir($repoDir)) {
+ $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir);
+ } else {
+ json_return_and_die(array('message' => 'Error deleting existing addon repo.', 'success' => false));
+ }
+ }
+ $repo = $git->probeRepo();
+ $repo['readme'] = $repo['manifest'] = null;
+ foreach ($git->git->tree('master') as $object) {
+ if ($object['type'] == 'blob' && (strtolower($object['file']) === 'readme.md' || strtolower($object['file']) === 'readme')) {
+ $repo['readme'] = MarkdownExtra::defaultTransform($git->git->cat->blob($object['hash']));
+ } elseif ($object['type'] == 'blob' && strtolower($object['file']) === 'manifest.json') {
+ $repo['manifest'] = $git->git->cat->blob($object['hash']);
+ }
+ }
+ json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true));
+ } else {
+ json_return_and_die(array('message' => 'No repo URL provided', 'success' => false));
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ }
- /**
- * @brief Addons admin page.
- *
- * @return string with parsed HTML
- */
- function get() {
+ /**
+ * @brief Addons admin page.
+ *
+ * @return string with parsed HTML
+ */
+ public function get()
+ {
- /*
- * Single plugin
- */
+ /*
+ * Single plugin
+ */
- if (\App::$argc == 3){
- $plugin = \App::$argv[2];
- if (!is_file("addon/$plugin/$plugin.php")){
- notice( t("Item not found.") );
- return '';
- }
+ if (App::$argc == 3) {
+ $plugin = App::$argv[2];
+ if (!is_file("addon/$plugin/$plugin.php")) {
+ notice(t("Item not found."));
+ return '';
+ }
- $enabled = in_array($plugin,\App::$plugins);
- $info = get_plugin_info($plugin);
- $x = check_plugin_versions($info);
+ $enabled = in_array($plugin, App::$plugins);
+ $info = get_plugin_info($plugin);
+ $x = check_plugin_versions($info);
- // disable plugins which are installed but incompatible versions
+ // disable plugins which are installed but incompatible versions
- if($enabled && ! $x) {
- $enabled = false;
- $idz = array_search($plugin, \App::$plugins);
- if ($idz !== false) {
- unset(\App::$plugins[$idz]);
- uninstall_plugin($plugin);
- set_config("system","addon", implode(", ",\App::$plugins));
- }
- }
- $info['disabled'] = 1-intval($x);
+ if ($enabled && !$x) {
+ $enabled = false;
+ $idz = array_search($plugin, App::$plugins);
+ if ($idz !== false) {
+ unset(App::$plugins[$idz]);
+ uninstall_plugin($plugin);
+ set_config("system", "addon", implode(", ", App::$plugins));
+ }
+ }
+ $info['disabled'] = 1 - intval($x);
- if (x($_GET,"a") && $_GET['a']=="t"){
- check_form_security_token_redirectOnErr('/admin/addons', 'admin_addons', 't');
- $pinstalled = false;
- // Toggle plugin status
- $idx = array_search($plugin, \App::$plugins);
- if ($idx !== false){
- unset(\App::$plugins[$idx]);
- uninstall_plugin($plugin);
- $pinstalled = false;
- info( sprintf( t("Plugin %s disabled."), $plugin ) );
- } else {
- \App::$plugins[] = $plugin;
- install_plugin($plugin);
- $pinstalled = true;
- info( sprintf( t("Plugin %s enabled."), $plugin ) );
- }
- set_config("system","addon", implode(", ",\App::$plugins));
+ if (x($_GET, "a") && $_GET['a'] == "t") {
+ check_form_security_token_redirectOnErr('/admin/addons', 'admin_addons', 't');
+ $pinstalled = false;
+ // Toggle plugin status
+ $idx = array_search($plugin, App::$plugins);
+ if ($idx !== false) {
+ unset(App::$plugins[$idx]);
+ uninstall_plugin($plugin);
+ $pinstalled = false;
+ info(sprintf(t("Plugin %s disabled."), $plugin));
+ } else {
+ App::$plugins[] = $plugin;
+ install_plugin($plugin);
+ $pinstalled = true;
+ info(sprintf(t("Plugin %s enabled."), $plugin));
+ }
+ set_config("system", "addon", implode(", ", App::$plugins));
- if($pinstalled) {
- @require_once("addon/$plugin/$plugin.php");
- if(function_exists($plugin.'_plugin_admin'))
- goaway(z_root() . '/admin/addons/' . $plugin);
- }
- goaway(z_root() . '/admin/addons' );
- }
+ if ($pinstalled) {
+ @require_once("addon/$plugin/$plugin.php");
+ if (function_exists($plugin . '_plugin_admin')) {
+ goaway(z_root() . '/admin/addons/' . $plugin);
+ }
+ }
+ goaway(z_root() . '/admin/addons');
+ }
- // display plugin details
+ // display plugin details
- if (in_array($plugin, \App::$plugins)){
- $status = 'on';
- $action = t('Disable');
- } else {
- $status = 'off';
- $action = t('Enable');
- }
+ if (in_array($plugin, App::$plugins)) {
+ $status = 'on';
+ $action = t('Disable');
+ } else {
+ $status = 'off';
+ $action = t('Enable');
+ }
- $readme = null;
- if (is_file("addon/$plugin/README.md")){
- $readme = file_get_contents("addon/$plugin/README.md");
- $readme = MarkdownExtra::defaultTransform($readme);
- } else if (is_file("addon/$plugin/README")){
- $readme = "
". file_get_contents("addon/$plugin/README") .""; - } + $readme = null; + if (is_file("addon/$plugin/README.md")) { + $readme = file_get_contents("addon/$plugin/README.md"); + $readme = MarkdownExtra::defaultTransform($readme); + } elseif (is_file("addon/$plugin/README")) { + $readme = "" . file_get_contents("addon/$plugin/README") . ""; + } - $admin_form = ''; + $admin_form = ''; - $r = q("select * from addon where plugin_admin = 1 and aname = '%s' limit 1", - dbesc($plugin) - ); + $r = q( + "select * from addon where plugin_admin = 1 and aname = '%s' limit 1", + dbesc($plugin) + ); - if($r) { - @require_once("addon/$plugin/$plugin.php"); - if(function_exists($plugin.'_plugin_admin')) { - $func = $plugin.'_plugin_admin'; - $func($a, $admin_form); - } - } + if ($r) { + @require_once("addon/$plugin/$plugin.php"); + if (function_exists($plugin . '_plugin_admin')) { + $func = $plugin . '_plugin_admin'; + $func($a, $admin_form); + } + } - $t = get_markup_template('admin_plugins_details.tpl'); - return replace_macros($t, array( - '$title' => t('Administration'), - '$page' => t('Addons'), - '$toggle' => t('Toggle'), - '$settings' => t('Settings'), - '$baseurl' => z_root(), + $t = get_markup_template('admin_plugins_details.tpl'); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Addons'), + '$toggle' => t('Toggle'), + '$settings' => t('Settings'), + '$baseurl' => z_root(), - '$plugin' => $plugin, - '$status' => $status, - '$action' => $action, - '$info' => $info, - '$str_author' => t('Author: '), - '$str_maintainer' => t('Maintainer: '), - '$str_minversion' => t('Minimum project version: '), - '$str_maxversion' => t('Maximum project version: '), - '$str_minphpversion' => t('Minimum PHP version: '), - '$str_serverroles' => t('Compatible Server Roles: '), - '$str_requires' => t('Requires: '), - '$disabled' => t('Disabled - version incompatibility'), + '$plugin' => $plugin, + '$status' => $status, + '$action' => $action, + '$info' => $info, + '$str_author' => t('Author: '), + '$str_maintainer' => t('Maintainer: '), + '$str_minversion' => t('Minimum project version: '), + '$str_maxversion' => t('Maximum project version: '), + '$str_minphpversion' => t('Minimum PHP version: '), + '$str_serverroles' => t('Compatible Server Roles: '), + '$str_requires' => t('Requires: '), + '$disabled' => t('Disabled - version incompatibility'), - '$admin_form' => $admin_form, - '$function' => 'addons', - '$screenshot' => '', - '$readme' => $readme, + '$admin_form' => $admin_form, + '$function' => 'addons', + '$screenshot' => '', + '$readme' => $readme, - '$form_security_token' => get_form_security_token('admin_addons'), - )); - } + '$form_security_token' => get_form_security_token('admin_addons'), + )); + } - /* - * List plugins - */ - $plugins = []; - $files = glob('addon/*/'); - if($files) { - foreach($files as $file) { - if ($file === 'addon/vendor/') { - continue; - } - if (is_dir($file)){ - list($tmp, $id) = array_map('trim', explode('/', $file)); - $info = get_plugin_info($id); - $enabled = in_array($id,\App::$plugins); - $x = check_plugin_versions($info); + /* + * List plugins + */ + $plugins = []; + $files = glob('addon/*/'); + if ($files) { + foreach ($files as $file) { + if ($file === 'addon/vendor/') { + continue; + } + if (is_dir($file)) { + list($tmp, $id) = array_map('trim', explode('/', $file)); + $info = get_plugin_info($id); + $enabled = in_array($id, App::$plugins); + $x = check_plugin_versions($info); - // disable plugins which are installed but incompatible versions + // disable plugins which are installed but incompatible versions - if($enabled && ! $x) { - $enabled = false; - $idz = array_search($id, \App::$plugins); - if ($idz !== false) { - unset(\App::$plugins[$idz]); - uninstall_plugin($id); - set_config("system","addon", implode(", ",\App::$plugins)); - } - } - $info['disabled'] = 1-intval($x); + if ($enabled && !$x) { + $enabled = false; + $idz = array_search($id, App::$plugins); + if ($idz !== false) { + unset(App::$plugins[$idz]); + uninstall_plugin($id); + set_config("system", "addon", implode(", ", App::$plugins)); + } + } + $info['disabled'] = 1 - intval($x); - $plugins[] = array( $id, (($enabled)?"on":"off") , $info); - } - } - } + $plugins[] = array($id, (($enabled) ? "on" : "off"), $info); + } + } + } - usort($plugins,'self::plugin_sort'); + usort($plugins, 'self::plugin_sort'); - $allowManageRepos = false; - if(is_writable('extend/addon') && is_writable('cache')) { - $allowManageRepos = true; - } + $allowManageRepos = false; + if (is_writable('extend/addon') && is_writable('cache')) { + $allowManageRepos = true; + } - $admin_plugins_add_repo_form= replace_macros( - get_markup_template('admin_plugins_addrepo.tpl'), array( - '$post' => 'admin/addons/addrepo', - '$desc' => t('Enter the public git repository URL of the addon repo.'), - '$repoURL' => array('repoURL', t('Addon repo git URL'), '', ''), - '$repoName' => array('repoName', t('Custom repo name'), '', '', t('(optional)')), - '$submit' => t('Download Addon Repo') - ) - ); - $newRepoModalID = random_string(3); - $newRepoModal = replace_macros( - get_markup_template('generic_modal.tpl'), array( - '$id' => $newRepoModalID, - '$title' => t('Install new repo'), - '$ok' => t('Install'), - '$cancel' => t('Cancel') - ) - ); + $admin_plugins_add_repo_form = replace_macros( + get_markup_template('admin_plugins_addrepo.tpl'), + array( + '$post' => 'admin/addons/addrepo', + '$desc' => t('Enter the public git repository URL of the addon repo.'), + '$repoURL' => array('repoURL', t('Addon repo git URL'), '', ''), + '$repoName' => array('repoName', t('Custom repo name'), '', '', t('(optional)')), + '$submit' => t('Download Addon Repo') + ) + ); + $newRepoModalID = random_string(3); + $newRepoModal = replace_macros( + get_markup_template('generic_modal.tpl'), + array( + '$id' => $newRepoModalID, + '$title' => t('Install new repo'), + '$ok' => t('Install'), + '$cancel' => t('Cancel') + ) + ); - $reponames = $this->listAddonRepos(); - $addonrepos = []; - foreach($reponames as $repo) { - $addonrepos[] = array('name' => $repo, 'description' => ''); - /// @TODO Parse repo info to provide more information about repos - } + $reponames = $this->listAddonRepos(); + $addonrepos = []; + foreach ($reponames as $repo) { + $addonrepos[] = array('name' => $repo, 'description' => ''); + /// @TODO Parse repo info to provide more information about repos + } - $t = get_markup_template('admin_plugins.tpl'); - return replace_macros($t, array( - '$title' => t('Administration'), - '$page' => t('Addons'), - '$submit' => t('Submit'), - '$baseurl' => z_root(), - '$function' => 'addons', - '$plugins' => $plugins, - '$disabled' => t('Disabled - version incompatibility'), - '$form_security_token' => get_form_security_token('admin_addons'), - '$allowManageRepos' => $allowManageRepos, - '$managerepos' => t('Manage Repos'), - '$installedtitle' => t('Installed Addon Repositories'), - '$addnewrepotitle' => t('Install a New Addon Repository'), - '$expandform' => false, - '$form' => $admin_plugins_add_repo_form, - '$newRepoModal' => $newRepoModal, - '$newRepoModalID' => $newRepoModalID, - '$addonrepos' => $addonrepos, - '$repoUpdateButton' => t('Update'), - '$repoBranchButton' => t('Switch branch'), - '$repoRemoveButton' => t('Remove') - )); - } + $t = get_markup_template('admin_plugins.tpl'); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Addons'), + '$submit' => t('Submit'), + '$baseurl' => z_root(), + '$function' => 'addons', + '$plugins' => $plugins, + '$disabled' => t('Disabled - version incompatibility'), + '$form_security_token' => get_form_security_token('admin_addons'), + '$allowManageRepos' => $allowManageRepos, + '$managerepos' => t('Manage Repos'), + '$installedtitle' => t('Installed Addon Repositories'), + '$addnewrepotitle' => t('Install a New Addon Repository'), + '$expandform' => false, + '$form' => $admin_plugins_add_repo_form, + '$newRepoModal' => $newRepoModal, + '$newRepoModalID' => $newRepoModalID, + '$addonrepos' => $addonrepos, + '$repoUpdateButton' => t('Update'), + '$repoBranchButton' => t('Switch branch'), + '$repoRemoveButton' => t('Remove') + )); + } - function listAddonRepos() { - $addonrepos = []; - $addonDir = 'extend/addon/'; - if(is_dir($addonDir)) { - if ($handle = opendir($addonDir)) { - while (false !== ($entry = readdir($handle))) { - if ($entry != "." && $entry != "..") { - $addonrepos[] = $entry; - } - } - closedir($handle); - } - } - return $addonrepos; - } + public function listAddonRepos() + { + $addonrepos = []; + $addonDir = 'extend/addon/'; + if (is_dir($addonDir)) { + if ($handle = opendir($addonDir)) { + while (false !== ($entry = readdir($handle))) { + if ($entry != "." && $entry != "..") { + $addonrepos[] = $entry; + } + } + closedir($handle); + } + } + return $addonrepos; + } - static public function plugin_sort($a,$b) { - return(strcmp(strtolower($a[2]['name']),strtolower($b[2]['name']))); - } - -} \ No newline at end of file + public static function plugin_sort($a, $b) + { + return (strcmp(strtolower($a[2]['name']), strtolower($b[2]['name']))); + } +} diff --git a/Zotlabs/Module/Admin/Channels.php b/Zotlabs/Module/Admin/Channels.php index 1456a45af..b34bcd182 100644 --- a/Zotlabs/Module/Admin/Channels.php +++ b/Zotlabs/Module/Admin/Channels.php @@ -9,175 +9,191 @@ use Zotlabs\Daemon\Run; * @brief Admin Module for Channels. * */ - -class Channels { +class Channels +{ - /** - * @brief Handle POST actions on channels admin page. - * - */ - function post() { + /** + * @brief Handle POST actions on channels admin page. + * + */ + public function post() + { - $channels = ( x($_POST, 'channel') ? $_POST['channel'] : Array() ); + $channels = (x($_POST, 'channel') ? $_POST['channel'] : array()); - check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels'); + check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels'); - $xor = db_getfunc('^'); + $xor = db_getfunc('^'); - if(x($_POST, 'page_channels_block')) { - foreach($channels as $uid) { - q("UPDATE channel SET channel_pageflags = ( channel_pageflags $xor %d ) where channel_id = %d", - intval(PAGE_CENSORED), - intval( $uid ) - ); - Run::Summon( [ 'Directory', $uid, 'nopush' ] ); - } - notice( sprintf( tt("%s channel censored/uncensored", "%s channels censored/uncensored", count($channels)), count($channels)) ); - } - if(x($_POST, 'page_channels_code')) { - foreach($channels as $uid) { - q("UPDATE channel SET channel_pageflags = ( channel_pageflags $xor %d ) where channel_id = %d", - intval(PAGE_ALLOWCODE), - intval( $uid ) - ); - } - notice( sprintf( tt("%s channel code allowed/disallowed", "%s channels code allowed/disallowed", count($channels)), count($channels)) ); - } - if(x($_POST, 'page_channels_delete')) { - foreach($channels as $uid) { - channel_remove($uid, true); - } - notice( sprintf( tt("%s channel deleted", "%s channels deleted", count($channels)), count($channels)) ); - } + if (x($_POST, 'page_channels_block')) { + foreach ($channels as $uid) { + q( + "UPDATE channel SET channel_pageflags = ( channel_pageflags $xor %d ) where channel_id = %d", + intval(PAGE_CENSORED), + intval($uid) + ); + Run::Summon(['Directory', $uid, 'nopush']); + } + notice(sprintf(tt("%s channel censored/uncensored", "%s channels censored/uncensored", count($channels)), count($channels))); + } + if (x($_POST, 'page_channels_code')) { + foreach ($channels as $uid) { + q( + "UPDATE channel SET channel_pageflags = ( channel_pageflags $xor %d ) where channel_id = %d", + intval(PAGE_ALLOWCODE), + intval($uid) + ); + } + notice(sprintf(tt("%s channel code allowed/disallowed", "%s channels code allowed/disallowed", count($channels)), count($channels))); + } + if (x($_POST, 'page_channels_delete')) { + foreach ($channels as $uid) { + channel_remove($uid, true); + } + notice(sprintf(tt("%s channel deleted", "%s channels deleted", count($channels)), count($channels))); + } - goaway(z_root() . '/admin/channels' ); - } + goaway(z_root() . '/admin/channels'); + } - /** - * @brief Generate channels admin page and handle single item operations. - * - * @return string with parsed HTML - */ - function get() { - if(argc() > 2) { - $uid = argv(3); - $channel = q("SELECT * FROM channel WHERE channel_id = %d", - intval($uid) - ); + /** + * @brief Generate channels admin page and handle single item operations. + * + * @return string with parsed HTML + */ + public function get() + { + if (argc() > 2) { + $uid = argv(3); + $channel = q( + "SELECT * FROM channel WHERE channel_id = %d", + intval($uid) + ); - if(! $channel) { - notice( t('Channel not found') . EOL); - goaway(z_root() . '/admin/channels' ); - } + if (!$channel) { + notice(t('Channel not found') . EOL); + goaway(z_root() . '/admin/channels'); + } - switch(argv(2)) { - case "delete":{ - check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); - // delete channel - channel_remove($uid,true); + switch (argv(2)) { + case "delete": + { + check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); + // delete channel + channel_remove($uid, true); - notice( sprintf(t("Channel '%s' deleted"), $channel[0]['channel_name']) . EOL); - }; break; + notice(sprintf(t("Channel '%s' deleted"), $channel[0]['channel_name']) . EOL); + } + break; - case "block":{ - check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); - $pflags = $channel[0]['channel_pageflags'] ^ PAGE_CENSORED; - q("UPDATE channel SET channel_pageflags = %d where channel_id = %d", - intval($pflags), - intval( $uid ) - ); - Run::Summon( [ 'Directory', $uid, 'nopush' ]); + case "block": + { + check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); + $pflags = $channel[0]['channel_pageflags'] ^ PAGE_CENSORED; + q( + "UPDATE channel SET channel_pageflags = %d where channel_id = %d", + intval($pflags), + intval($uid) + ); + Run::Summon(['Directory', $uid, 'nopush']); - notice( sprintf( (($pflags & PAGE_CENSORED) ? t("Channel '%s' censored"): t("Channel '%s' uncensored")) , $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')' ) . EOL); - }; break; + notice(sprintf((($pflags & PAGE_CENSORED) ? t("Channel '%s' censored") : t("Channel '%s' uncensored")), $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')') . EOL); + } + break; - case "code":{ - check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); - $pflags = $channel[0]['channel_pageflags'] ^ PAGE_ALLOWCODE; - q("UPDATE channel SET channel_pageflags = %d where channel_id = %d", - intval($pflags), - intval( $uid ) - ); + case "code": + { + check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); + $pflags = $channel[0]['channel_pageflags'] ^ PAGE_ALLOWCODE; + q( + "UPDATE channel SET channel_pageflags = %d where channel_id = %d", + intval($pflags), + intval($uid) + ); - notice( sprintf( (($pflags & PAGE_ALLOWCODE) ? t("Channel '%s' code allowed"): t("Channel '%s' code disallowed")) , $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')' ) . EOL); - }; break; + notice(sprintf((($pflags & PAGE_ALLOWCODE) ? t("Channel '%s' code allowed") : t("Channel '%s' code disallowed")), $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')') . EOL); + } + break; - default: - break; - } - goaway(z_root() . '/admin/channels' ); - } + default: + break; + } + goaway(z_root() . '/admin/channels'); + } - $key = (($_REQUEST['key']) ? dbesc($_REQUEST['key']) : 'channel_id'); - $dir = 'asc'; - if(array_key_exists('dir',$_REQUEST)) - $dir = ((intval($_REQUEST['dir'])) ? 'asc' : 'desc'); + $key = (($_REQUEST['key']) ? dbesc($_REQUEST['key']) : 'channel_id'); + $dir = 'asc'; + if (array_key_exists('dir', $_REQUEST)) { + $dir = ((intval($_REQUEST['dir'])) ? 'asc' : 'desc'); + } - $base = z_root() . '/admin/channels?f='; - $odir = (($dir === 'asc') ? '0' : '1'); + $base = z_root() . '/admin/channels?f='; + $odir = (($dir === 'asc') ? '0' : '1'); - /* get channels */ + /* get channels */ - $total = q("SELECT count(*) as total FROM channel where channel_removed = 0 and channel_system = 0"); - if($total) { - App::set_pager_total($total[0]['total']); - App::set_pager_itemspage(100); - } + $total = q("SELECT count(*) as total FROM channel where channel_removed = 0 and channel_system = 0"); + if ($total) { + App::set_pager_total($total[0]['total']); + App::set_pager_itemspage(100); + } - $channels = q("SELECT * from channel where channel_removed = 0 and channel_system = 0 order by $key $dir limit %d offset %d ", - intval(App::$pager['itemspage']), - intval(App::$pager['start']) - ); + $channels = q( + "SELECT * from channel where channel_removed = 0 and channel_system = 0 order by $key $dir limit %d offset %d ", + intval(App::$pager['itemspage']), + intval(App::$pager['start']) + ); - if($channels) { - for($x = 0; $x < count($channels); $x ++) { - if($channels[$x]['channel_pageflags'] & PAGE_CENSORED) - $channels[$x]['blocked'] = true; - else - $channels[$x]['blocked'] = false; + if ($channels) { + for ($x = 0; $x < count($channels); $x++) { + if ($channels[$x]['channel_pageflags'] & PAGE_CENSORED) { + $channels[$x]['blocked'] = true; + } else { + $channels[$x]['blocked'] = false; + } - if($channels[$x]['channel_pageflags'] & PAGE_ALLOWCODE) - $channels[$x]['allowcode'] = true; - else - $channels[$x]['allowcode'] = false; - - $channels[$x]['channel_link'] = z_root() . '/channel/' . $channels[$x]['channel_address']; - } - } + if ($channels[$x]['channel_pageflags'] & PAGE_ALLOWCODE) { + $channels[$x]['allowcode'] = true; + } else { + $channels[$x]['allowcode'] = false; + } - call_hooks('admin_channels',$channels); + $channels[$x]['channel_link'] = z_root() . '/channel/' . $channels[$x]['channel_address']; + } + } - $o = replace_macros(get_markup_template('admin_channels.tpl'), [ - // strings // - '$title' => t('Administration'), - '$page' => t('Channels'), - '$submit' => t('Submit'), - '$select_all' => t('select all'), - '$delete' => t('Delete'), - '$block' => t('Censor'), - '$unblock' => t('Uncensor'), - '$code' => t('Allow Code'), - '$uncode' => t('Disallow Code'), - '$h_channels' => t('Channel'), - '$base' => $base, - '$odir' => $odir, - '$th_channels' => array( - [ t('UID'), 'channel_id' ], - [ t('Name'), 'channel_name' ], - [ t('Address'), 'channel_address' ]), + call_hooks('admin_channels', $channels); - '$confirm_delete_multi' => t('Selected channels will be deleted!\n\nEverything that was posted in these channels on this site will be permanently deleted!\n\nAre you sure?'), - '$confirm_delete' => t('The channel {0} will be deleted!\n\nEverything that was posted in this channel on this site will be permanently deleted!\n\nAre you sure?'), + $o = replace_macros(get_markup_template('admin_channels.tpl'), [ + // strings // + '$title' => t('Administration'), + '$page' => t('Channels'), + '$submit' => t('Submit'), + '$select_all' => t('select all'), + '$delete' => t('Delete'), + '$block' => t('Censor'), + '$unblock' => t('Uncensor'), + '$code' => t('Allow Code'), + '$uncode' => t('Disallow Code'), + '$h_channels' => t('Channel'), + '$base' => $base, + '$odir' => $odir, + '$th_channels' => array( + [t('UID'), 'channel_id'], + [t('Name'), 'channel_name'], + [t('Address'), 'channel_address']), - '$form_security_token' => get_form_security_token('admin_channels'), + '$confirm_delete_multi' => t('Selected channels will be deleted!\n\nEverything that was posted in these channels on this site will be permanently deleted!\n\nAre you sure?'), + '$confirm_delete' => t('The channel {0} will be deleted!\n\nEverything that was posted in this channel on this site will be permanently deleted!\n\nAre you sure?'), - // values // - '$baseurl' => z_root(), - '$channels' => $channels, - ]); - $o .= paginate($a); + '$form_security_token' => get_form_security_token('admin_channels'), - return $o; - } + // values // + '$baseurl' => z_root(), + '$channels' => $channels, + ]); + $o .= paginate($a); -} \ No newline at end of file + return $o; + } +} diff --git a/Zotlabs/Module/Admin/Cover_photo.php b/Zotlabs/Module/Admin/Cover_photo.php index 3c50a2b42..d411e92bf 100644 --- a/Zotlabs/Module/Admin/Cover_photo.php +++ b/Zotlabs/Module/Admin/Cover_photo.php @@ -1,4 +1,5 @@ 0 order by imgscale asc LIMIT 1", + dbesc($image_id), + intval($channel['channel_id']) + ); + + if ($r) { + $max_thumb = intval(get_config('system', 'max_thumbnail', 1600)); + $iscaled = false; + if (intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) { + $imagick_path = get_config('system', 'imagick_convert_path'); + if ($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) { + $fname = dbunescbin($r[0]['content']); + $tmp_name = $fname . '-001'; + $newsize = photo_calculate_scale(array_merge(getimagesize($fname), ['max' => $max_thumb])); + $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); + // logger('imagick thumbnail command: ' . $cmd); + for ($x = 0; $x < 4; $x++) { + exec($cmd); + if (file_exists($tmp_name)) { + break; + } + } + if (file_exists($tmp_name)) { + $base_image = $r[0]; + $gis = getimagesize($tmp_name); + logger('gis: ' . print_r($gis, true)); + $base_image['width'] = $gis[0]; + $base_image['height'] = $gis[1]; + $base_image['content'] = @file_get_contents($tmp_name); + $iscaled = true; + @unlink($tmp_name); + } + } + } + if (!$iscaled) { + $base_image = $r[0]; + $base_image['content'] = (($base_image['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); + } + + $im = photo_factory($base_image['content'], $base_image['mimetype']); + if ($im->is_valid()) { + // We are scaling and cropping the relative pixel locations to the original photo instead of the + // scaled photo we operated on. + + // First load the scaled photo to check its size. (Should probably pass this in the post form and save + // a query.) + + $g = q( + "select width, height from photo where resource_id = '%s' and uid = %d and imgscale = 3", + dbesc($image_id), + intval($channel['channel_id']) + ); - $srcX = intval($_POST['xstart']); - $srcY = intval($_POST['ystart']); - $srcW = intval($_POST['xfinal']) - $srcX; - $srcH = intval($_POST['yfinal']) - $srcY; - - $r = q("select gender from profile where uid = %d and is_default = 1 limit 1", - intval($channel['channel_id']) - ); - if ($r) { - $profile = array_shift($r); - } - - $r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND imgscale > 0 order by imgscale asc LIMIT 1", - dbesc($image_id), - intval($channel['channel_id']) - ); - - if ($r) { + $scaled_width = $g[0]['width']; + $scaled_height = $g[0]['height']; - $max_thumb = intval(get_config('system','max_thumbnail',1600)); - $iscaled = false; - if (intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) { - $imagick_path = get_config('system','imagick_convert_path'); - if ($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) { + if ((!$scaled_width) || (!$scaled_height)) { + logger('potential divide by zero scaling cover photo'); + return; + } - $fname = dbunescbin($r[0]['content']); - $tmp_name = $fname . '-001'; - $newsize = photo_calculate_scale(array_merge(getimagesize($fname),['max' => $max_thumb])); - $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); - // logger('imagick thumbnail command: ' . $cmd); - for ($x = 0; $x < 4; $x ++) { - exec($cmd); - if (file_exists($tmp_name)) { - break; - } - } - if (file_exists($tmp_name)) { - $base_image = $r[0]; - $gis = getimagesize($tmp_name); -logger('gis: ' . print_r($gis,true)); - $base_image['width'] = $gis[0]; - $base_image['height'] = $gis[1]; - $base_image['content'] = @file_get_contents($tmp_name); - $iscaled = true; - @unlink($tmp_name); - } - } - } - if (! $iscaled) { - $base_image = $r[0]; - $base_image['content'] = (($base_image['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); - } + // unset all other cover photos - $im = photo_factory($base_image['content'], $base_image['mimetype']); - if ($im->is_valid()) { - - // We are scaling and cropping the relative pixel locations to the original photo instead of the - // scaled photo we operated on. - - // First load the scaled photo to check its size. (Should probably pass this in the post form and save - // a query.) - - $g = q("select width, height from photo where resource_id = '%s' and uid = %d and imgscale = 3", - dbesc($image_id), - intval($channel['channel_id']) - ); - - - $scaled_width = $g[0]['width']; - $scaled_height = $g[0]['height']; - - if ((! $scaled_width) || (! $scaled_height)) { - logger('potential divide by zero scaling cover photo'); - return; - } - - // unset all other cover photos - - q("update photo set photo_usage = %d where photo_usage = %d and uid = %d", - intval(PHOTO_NORMAL), - intval(PHOTO_COVER), - intval($channel['channel_id']) - ); - - $orig_srcx = ( $base_image['width'] / $scaled_width ) * $srcX; - $orig_srcy = ( $base_image['height'] / $scaled_height ) * $srcY; - $orig_srcw = ( $srcW / $scaled_width ) * $base_image['width']; - $orig_srch = ( $srcH / $scaled_height ) * $base_image['height']; - - $im->cropImageRect(1200,435,$orig_srcx, $orig_srcy, $orig_srcw, $orig_srch); - - $aid = get_account_id(); - - $p = [ - 'aid' => 0, - 'uid' => $channel['channel_id'], - 'resource_id' => $base_image['resource_id'], - 'filename' => $base_image['filename'], - 'album' => t('Cover Photos'), - 'os_path' => $base_image['os_path'], - 'display_path' => $base_image['display_path'], - 'created' => $base_image['created'], - 'edited' => $base_image['edited'] - ]; - - $p['imgscale'] = 7; - $p['photo_usage'] = PHOTO_COVER; - - $r1 = $im->storeThumbnail($p, PHOTO_RES_COVER_1200); + q( + "update photo set photo_usage = %d where photo_usage = %d and uid = %d", + intval(PHOTO_NORMAL), + intval(PHOTO_COVER), + intval($channel['channel_id']) + ); - $im->doScaleImage(850,310); - $p['imgscale'] = 8; + $orig_srcx = ($base_image['width'] / $scaled_width) * $srcX; + $orig_srcy = ($base_image['height'] / $scaled_height) * $srcY; + $orig_srcw = ($srcW / $scaled_width) * $base_image['width']; + $orig_srch = ($srcH / $scaled_height) * $base_image['height']; - $r2 = $im->storeThumbnail($p, PHOTO_RES_COVER_850); - - $im->doScaleImage(425,160); - $p['imgscale'] = 9; - - $r3 = $im->storeThumbnail($p, PHOTO_RES_COVER_425); - - if ($r1 === false || $r2 === false || $r3 === false) { - // if one failed, delete them all so we can start over. - notice( t('Image resize failed.') . EOL ); - $x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale >= 7 ", - dbesc($base_image['resource_id']), - intval($channel['channel_id']) - ); - return; - } - - } - else - notice( t('Unable to process image') . EOL); - } - - goaway(z_root() . '/admin'); - - } - - - $hash = photo_new_resource(); - $smallest = 0; - - $matches = []; - $partial = false; + $im->cropImageRect(1200, 435, $orig_srcx, $orig_srcy, $orig_srcw, $orig_srch); - if (array_key_exists('HTTP_CONTENT_RANGE',$_SERVER)) { - $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/',$_SERVER['HTTP_CONTENT_RANGE'],$matches); - if ($pm) { - logger('Content-Range: ' . print_r($matches,true)); - $partial = true; - } - } + $aid = get_account_id(); - if ($partial) { - $x = save_chunk($channel,$matches[1],$matches[2],$matches[3]); + $p = [ + 'aid' => 0, + 'uid' => $channel['channel_id'], + 'resource_id' => $base_image['resource_id'], + 'filename' => $base_image['filename'], + 'album' => t('Cover Photos'), + 'os_path' => $base_image['os_path'], + 'display_path' => $base_image['display_path'], + 'created' => $base_image['created'], + 'edited' => $base_image['edited'] + ]; - if ($x['partial']) { - header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); - json_return_and_die($x); - } - else { - header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); + $p['imgscale'] = 7; + $p['photo_usage'] = PHOTO_COVER; - $_FILES['userfile'] = [ - 'name' => $x['name'], - 'type' => $x['type'], - 'tmp_name' => $x['tmp_name'], - 'error' => $x['error'], - 'size' => $x['size'] - ]; - } - } - else { - if (! array_key_exists('userfile',$_FILES)) { - $_FILES['userfile'] = [ - 'name' => $_FILES['files']['name'], - 'type' => $_FILES['files']['type'], - 'tmp_name' => $_FILES['files']['tmp_name'], - 'error' => $_FILES['files']['error'], - 'size' => $_FILES['files']['size'] - ]; - } - } + $r1 = $im->storeThumbnail($p, PHOTO_RES_COVER_1200); - $res = attach_store($channel, $channel['channel_hash'], '', array('album' => t('Cover Photos'), 'hash' => $hash)); - - logger('attach_store: ' . print_r($res,true),LOGGER_DEBUG); + $im->doScaleImage(850, 310); + $p['imgscale'] = 8; - json_return_and_die([ 'message' => $hash ]); - - } - - - /** - * @brief Generate content of profile-photo view - * - * @return string - * - */ - - - function get() { - - if (! is_site_admin()) { - notice( t('Permission denied.') . EOL ); - return; - } - - $channel = get_sys_channel(); - - $newuser = false; - - if (argc() == 3 && argv(1) === 'new') - $newuser = true; + $r2 = $im->storeThumbnail($p, PHOTO_RES_COVER_850); + + $im->doScaleImage(425, 160); + $p['imgscale'] = 9; + + $r3 = $im->storeThumbnail($p, PHOTO_RES_COVER_425); + + if ($r1 === false || $r2 === false || $r3 === false) { + // if one failed, delete them all so we can start over. + notice(t('Image resize failed.') . EOL); + $x = q( + "delete from photo where resource_id = '%s' and uid = %d and imgscale >= 7 ", + dbesc($base_image['resource_id']), + intval($channel['channel_id']) + ); + return; + } + } else { + notice(t('Unable to process image') . EOL); + } + } + + goaway(z_root() . '/admin'); + } - if (argv(2) === 'reset') { - q("update photo set photo_usage = %d where photo_usage = %d and uid = %d", - intval(PHOTO_NORMAL), - intval(PHOTO_COVER), - intval($channel['channel_id']) - ); - } + $hash = photo_new_resource(); + $smallest = 0; - if (argv(2) === 'use') { - if (argc() < 4) { - notice( t('Permission denied.') . EOL ); - return; - }; - - // check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo'); - - $resource_id = argv(3); - - $r = q("SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' and imgscale > 0 ORDER BY imgscale ASC", - intval($channel['channel_id']), - dbesc($resource_id) - ); - if (! $r) { - notice( t('Photo not available.') . EOL ); - return; - } - $havescale = false; - foreach ($r as $rr) { - if ($rr['imgscale'] == 7) { - $havescale = true; - } - } - - $r = q("SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", - intval($r[0]['id']), - intval($channel['channel_id']) - - ); - if (! $r) { - notice( t('Photo not available.') . EOL ); - return; - } - - if (intval($r[0]['os_storage'])) { - $data = @file_get_contents(dbunescbin($r[0]['content'])); - } - else { - $data = dbunescbin($r[0]['content']); - } - - $ph = photo_factory($data, $r[0]['mimetype']); - $smallest = 0; - if ($ph->is_valid()) { - // go ahead as if we have just uploaded a new photo to crop - $i = q("select resource_id, imgscale from photo where resource_id = '%s' and uid = %d and imgscale = 0", - dbesc($r[0]['resource_id']), - intval($channel['channel_id']) - ); - - if ($i) { - $hash = $i[0]['resource_id']; - foreach ($i as $ii) { - $smallest = intval($ii['imgscale']); - } - } - } - - $this->cover_photo_crop_ui_head($ph, $hash, $smallest); - } - - - if(! array_key_exists('imagecrop',App::$data)) { - - $o .= replace_macros(get_markup_template('admin_cover_photo.tpl'), [ - '$user' => $channel['channel_address'], - '$channel_id' => $channel['channel_id'], - '$info' => t('Your cover photo may be visible to anybody on the internet'), - '$existing' => get_cover_photo($channel['channel_id'],'array',PHOTO_RES_COVER_850), - '$lbl_upfile' => t('Upload File:'), - '$lbl_profiles' => t('Select a profile:'), - '$title' => t('Change Cover Photo'), - '$submit' => t('Upload'), - '$profiles' => $profiles, - '$embedPhotos' => t('Use a photo from your albums'), - '$embedPhotosModalTitle' => t('Use a photo from your albums'), - '$embedPhotosModalCancel' => t('Cancel'), - '$embedPhotosModalOK' => t('OK'), - '$modalchooseimages' => t('Choose images to embed'), - '$modalchoosealbum' => t('Choose an album'), - '$modaldiffalbum' => t('Choose a different album'), - '$modalerrorlist' => t('Error getting album list'), - '$modalerrorlink' => t('Error getting photo link'), - '$modalerroralbum' => t('Error getting album'), - '$form_security_token' => get_form_security_token("cover_photo"), - '$select' => t('Select previously uploaded photo'), + $matches = []; + $partial = false; - ]); - - call_hooks('cover_photo_content_end', $o); - - return $o; - } - else { - $filename = App::$data['imagecrop'] . '-3'; - $resolution = 3; + if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) { + $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches); + if ($pm) { + logger('Content-Range: ' . print_r($matches, true)); + $partial = true; + } + } - $o .= replace_macros(get_markup_template('admin_cropcover.tpl'), [ - '$filename' => $filename, - '$profile' => intval($_REQUEST['profile']), - '$resource' => \App::$data['imagecrop'] . '-3', - '$image_url' => z_root() . '/photo/' . $filename, - '$title' => t('Crop Image'), - '$desc' => t('Please adjust the image cropping for optimum viewing.'), - '$form_security_token' => get_form_security_token("cover_photo"), - '$done' => t('Done Editing') - ]); - return $o; - } - } - - /* @brief Generate the UI for photo-cropping - * - * @param $a Current application - * @param $ph Photo-Factory - * @return void - * - */ - - function cover_photo_crop_ui_head($ph, $hash, $smallest){ - - $max_length = get_config('system','max_image_length', MAX_IMAGE_LENGTH); + if ($partial) { + $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]); - if ($max_length > 0) { - $ph->scaleImage($max_length); - } - - $width = $ph->getWidth(); - $height = $ph->getHeight(); - - if ($width < 300 || $height < 300) { - $ph->scaleImageUp(240); - $width = $ph->getWidth(); - $height = $ph->getHeight(); - } - - - App::$data['imagecrop'] = $hash; - App::$data['imagecrop_resolution'] = $smallest; - App::$page['htmlhead'] .= replace_macros(get_markup_template('crophead.tpl'), []); - return; - } - - + if ($x['partial']) { + header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); + json_return_and_die($x); + } else { + header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); + + $_FILES['userfile'] = [ + 'name' => $x['name'], + 'type' => $x['type'], + 'tmp_name' => $x['tmp_name'], + 'error' => $x['error'], + 'size' => $x['size'] + ]; + } + } else { + if (!array_key_exists('userfile', $_FILES)) { + $_FILES['userfile'] = [ + 'name' => $_FILES['files']['name'], + 'type' => $_FILES['files']['type'], + 'tmp_name' => $_FILES['files']['tmp_name'], + 'error' => $_FILES['files']['error'], + 'size' => $_FILES['files']['size'] + ]; + } + } + + $res = attach_store($channel, $channel['channel_hash'], '', array('album' => t('Cover Photos'), 'hash' => $hash)); + + logger('attach_store: ' . print_r($res, true), LOGGER_DEBUG); + + json_return_and_die(['message' => $hash]); + } + + + /** + * @brief Generate content of profile-photo view + * + * @return string + * + */ + + + public function get() + { + + if (!is_site_admin()) { + notice(t('Permission denied.') . EOL); + return; + } + + $channel = get_sys_channel(); + + $newuser = false; + + if (argc() == 3 && argv(1) === 'new') { + $newuser = true; + } + + + if (argv(2) === 'reset') { + q( + "update photo set photo_usage = %d where photo_usage = %d and uid = %d", + intval(PHOTO_NORMAL), + intval(PHOTO_COVER), + intval($channel['channel_id']) + ); + } + + if (argv(2) === 'use') { + if (argc() < 4) { + notice(t('Permission denied.') . EOL); + return; + } + + // check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo'); + + $resource_id = argv(3); + + $r = q( + "SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' and imgscale > 0 ORDER BY imgscale ASC", + intval($channel['channel_id']), + dbesc($resource_id) + ); + if (!$r) { + notice(t('Photo not available.') . EOL); + return; + } + $havescale = false; + foreach ($r as $rr) { + if ($rr['imgscale'] == 7) { + $havescale = true; + } + } + + $r = q( + "SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", + intval($r[0]['id']), + intval($channel['channel_id']) + ); + if (!$r) { + notice(t('Photo not available.') . EOL); + return; + } + + if (intval($r[0]['os_storage'])) { + $data = @file_get_contents(dbunescbin($r[0]['content'])); + } else { + $data = dbunescbin($r[0]['content']); + } + + $ph = photo_factory($data, $r[0]['mimetype']); + $smallest = 0; + if ($ph->is_valid()) { + // go ahead as if we have just uploaded a new photo to crop + $i = q( + "select resource_id, imgscale from photo where resource_id = '%s' and uid = %d and imgscale = 0", + dbesc($r[0]['resource_id']), + intval($channel['channel_id']) + ); + + if ($i) { + $hash = $i[0]['resource_id']; + foreach ($i as $ii) { + $smallest = intval($ii['imgscale']); + } + } + } + + $this->cover_photo_crop_ui_head($ph, $hash, $smallest); + } + + + if (!array_key_exists('imagecrop', App::$data)) { + $o .= replace_macros(get_markup_template('admin_cover_photo.tpl'), [ + '$user' => $channel['channel_address'], + '$channel_id' => $channel['channel_id'], + '$info' => t('Your cover photo may be visible to anybody on the internet'), + '$existing' => get_cover_photo($channel['channel_id'], 'array', PHOTO_RES_COVER_850), + '$lbl_upfile' => t('Upload File:'), + '$lbl_profiles' => t('Select a profile:'), + '$title' => t('Change Cover Photo'), + '$submit' => t('Upload'), + '$profiles' => $profiles, + '$embedPhotos' => t('Use a photo from your albums'), + '$embedPhotosModalTitle' => t('Use a photo from your albums'), + '$embedPhotosModalCancel' => t('Cancel'), + '$embedPhotosModalOK' => t('OK'), + '$modalchooseimages' => t('Choose images to embed'), + '$modalchoosealbum' => t('Choose an album'), + '$modaldiffalbum' => t('Choose a different album'), + '$modalerrorlist' => t('Error getting album list'), + '$modalerrorlink' => t('Error getting photo link'), + '$modalerroralbum' => t('Error getting album'), + '$form_security_token' => get_form_security_token("cover_photo"), + '$select' => t('Select previously uploaded photo'), + + ]); + + call_hooks('cover_photo_content_end', $o); + + return $o; + } else { + $filename = App::$data['imagecrop'] . '-3'; + $resolution = 3; + + $o .= replace_macros(get_markup_template('admin_cropcover.tpl'), [ + '$filename' => $filename, + '$profile' => intval($_REQUEST['profile']), + '$resource' => App::$data['imagecrop'] . '-3', + '$image_url' => z_root() . '/photo/' . $filename, + '$title' => t('Crop Image'), + '$desc' => t('Please adjust the image cropping for optimum viewing.'), + '$form_security_token' => get_form_security_token("cover_photo"), + '$done' => t('Done Editing') + ]); + return $o; + } + } + + /* @brief Generate the UI for photo-cropping + * + * @param $a Current application + * @param $ph Photo-Factory + * @return void + * + */ + + public function cover_photo_crop_ui_head($ph, $hash, $smallest) + { + + $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH); + + if ($max_length > 0) { + $ph->scaleImage($max_length); + } + + $width = $ph->getWidth(); + $height = $ph->getHeight(); + + if ($width < 300 || $height < 300) { + $ph->scaleImageUp(240); + $width = $ph->getWidth(); + $height = $ph->getHeight(); + } + + + App::$data['imagecrop'] = $hash; + App::$data['imagecrop_resolution'] = $smallest; + App::$page['htmlhead'] .= replace_macros(get_markup_template('crophead.tpl'), []); + return; + } } diff --git a/Zotlabs/Module/Admin/Dbsync.php b/Zotlabs/Module/Admin/Dbsync.php index 75be1b90f..fae8c09cb 100644 --- a/Zotlabs/Module/Admin/Dbsync.php +++ b/Zotlabs/Module/Admin/Dbsync.php @@ -2,112 +2,107 @@ namespace Zotlabs\Module\Admin; +class Dbsync +{ -class Dbsync { - + public function get() + { + $o = ''; - function get() { - $o = ''; - - if(argc() > 3 && intval(argv(3)) && argv(2) === 'mark') { - // remove the old style config if it exists - del_config('database', 'update_r' . intval(argv(3))); - set_config('database', '_' . intval(argv(3)), 'success'); - if(intval(get_config('system','db_version')) < intval(argv(3))) - set_config('system','db_version',intval(argv(3))); - info( t('Update has been marked successful') . EOL); - goaway(z_root() . '/admin/dbsync'); - } + if (argc() > 3 && intval(argv(3)) && argv(2) === 'mark') { + // remove the old style config if it exists + del_config('database', 'update_r' . intval(argv(3))); + set_config('database', '_' . intval(argv(3)), 'success'); + if (intval(get_config('system', 'db_version')) < intval(argv(3))) { + set_config('system', 'db_version', intval(argv(3))); + } + info(t('Update has been marked successful') . EOL); + goaway(z_root() . '/admin/dbsync'); + } - if(argc() > 3 && intval(argv(3)) && argv(2) === 'verify') { + if (argc() > 3 && intval(argv(3)) && argv(2) === 'verify') { + $s = '_' . intval(argv(3)); + $cls = '\\Zotlabs\Update\\' . $s; + if (class_exists($cls)) { + $c = new $cls(); + if (method_exists($c, 'verify')) { + $retval = $c->verify(); + if ($retval === UPDATE_FAILED) { + $o .= sprintf(t('Verification of update %s failed. Check system logs.'), $s); + } elseif ($retval === UPDATE_SUCCESS) { + $o .= sprintf(t('Update %s was successfully applied.'), $s); + set_config('database', $s, 'success'); + } else { + $o .= sprintf(t('Verifying update %s did not return a status. Unknown if it succeeded.'), $s); + } + } else { + $o .= sprintf(t('Update %s does not contain a verification function.'), $s); + } + } else { + $o .= sprintf(t('Update function %s could not be found.'), $s); + } - $s = '_' . intval(argv(3)); - $cls = '\\Zotlabs\Update\\' . $s ; - if(class_exists($cls)) { - $c = new $cls(); - if(method_exists($c,'verify')) { - $retval = $c->verify(); - if($retval === UPDATE_FAILED) { - $o .= sprintf( t('Verification of update %s failed. Check system logs.'), $s); - } - elseif($retval === UPDATE_SUCCESS) { - $o .= sprintf( t('Update %s was successfully applied.'), $s); - set_config('database',$s, 'success'); - } - else - $o .= sprintf( t('Verifying update %s did not return a status. Unknown if it succeeded.'), $s); - } - else { - $o .= sprintf( t('Update %s does not contain a verification function.'), $s ); - } - } - else - $o .= sprintf( t('Update function %s could not be found.'), $s); - - return $o; + return $o; + // remove the old style config if it exists + del_config('database', 'update_r' . intval(argv(3))); + set_config('database', '_' . intval(argv(3)), 'success'); + if (intval(get_config('system', 'db_version')) < intval(argv(3))) { + set_config('system', 'db_version', intval(argv(3))); + } + info(t('Update has been marked successful') . EOL); + goaway(z_root() . '/admin/dbsync'); + } + if (argc() > 2 && intval(argv(2))) { + $x = intval(argv(2)); + $s = '_' . $x; + $cls = '\\Zotlabs\Update\\' . $s; + if (class_exists($cls)) { + $c = new $cls(); + $retval = $c->run(); + if ($retval === UPDATE_FAILED) { + $o .= sprintf(t('Executing update procedure %s failed. Check system logs.'), $s); + } elseif ($retval === UPDATE_SUCCESS) { + $o .= sprintf(t('Update %s was successfully applied.'), $s); + set_config('database', $s, 'success'); + } else { + $o .= sprintf(t('Update %s did not return a status. It cannot be determined if it was successful.'), $s); + } + } else { + $o .= sprintf(t('Update function %s could not be found.'), $s); + } + return $o; + } - // remove the old style config if it exists - del_config('database', 'update_r' . intval(argv(3))); - set_config('database', '_' . intval(argv(3)), 'success'); - if(intval(get_config('system','db_version')) < intval(argv(3))) - set_config('system','db_version',intval(argv(3))); - info( t('Update has been marked successful') . EOL); - goaway(z_root() . '/admin/dbsync'); - } + $failed = []; + $r = q("select * from config where cat = 'database' "); + if (count($r)) { + foreach ($r as $rr) { + $upd = intval(substr($rr['k'], -4)); + if ($rr['v'] === 'success') { + continue; + } + $failed[] = $upd; + } + } + if (count($failed)) { + $o = replace_macros(get_markup_template('failed_updates.tpl'), array( + '$base' => z_root(), + '$banner' => t('Failed Updates'), + '$desc' => '', + '$mark' => t('Mark success (if update was manually applied)'), + '$verify' => t('Attempt to verify this update if a verification procedure exists'), + '$apply' => t('Attempt to execute this update step automatically'), + '$failed' => $failed + )); + } else { + return ''; + } + return $o; + } +} - if(argc() > 2 && intval(argv(2))) { - $x = intval(argv(2)); - $s = '_' . $x; - $cls = '\\Zotlabs\Update\\' . $s ; - if(class_exists($cls)) { - $c = new $cls(); - $retval = $c->run(); - if($retval === UPDATE_FAILED) { - $o .= sprintf( t('Executing update procedure %s failed. Check system logs.'), $s); - } - elseif($retval === UPDATE_SUCCESS) { - $o .= sprintf( t('Update %s was successfully applied.'), $s); - set_config('database',$s, 'success'); - } - else - $o .= sprintf( t('Update %s did not return a status. It cannot be determined if it was successful.'), $s); - } - else - $o .= sprintf( t('Update function %s could not be found.'), $s); - - return $o; - } - - $failed = []; - $r = q("select * from config where cat = 'database' "); - if(count($r)) { - foreach($r as $rr) { - $upd = intval(substr($rr['k'],-4)); - if($rr['v'] === 'success') - continue; - $failed[] = $upd; - } - } - if(count($failed)) { - $o = replace_macros(get_markup_template('failed_updates.tpl'),array( - '$base' => z_root(), - '$banner' => t('Failed Updates'), - '$desc' => '', - '$mark' => t('Mark success (if update was manually applied)'), - '$verify' => t('Attempt to verify this update if a verification procedure exists'), - '$apply' => t('Attempt to execute this update step automatically'), - '$failed' => $failed - )); - } - else { - return '' . t('No failed updates.') . '
'; - } - - return $o; - } -} \ No newline at end of file diff --git a/Zotlabs/Module/Admin/Logs.php b/Zotlabs/Module/Admin/Logs.php index c83fc6a9a..e41b80675 100644 --- a/Zotlabs/Module/Admin/Logs.php +++ b/Zotlabs/Module/Admin/Logs.php @@ -2,100 +2,97 @@ namespace Zotlabs\Module\Admin; - -class Logs { +class Logs +{ - - /** - * @brief POST handler for logs admin page. - * - */ + /** + * @brief POST handler for logs admin page. + * + */ - function post() { - if (x($_POST, 'page_logs')) { - check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs'); - - $logfile = ((x($_POST,'logfile')) ? notags(trim($_POST['logfile'])) : ''); - $debugging = ((x($_POST,'debugging')) ? true : false); - $loglevel = ((x($_POST,'loglevel')) ? intval(trim($_POST['loglevel'])) : 0); - - set_config('system','logfile', $logfile); - set_config('system','debugging', $debugging); - set_config('system','loglevel', $loglevel); - } - - info( t('Log settings updated.') ); - goaway(z_root() . '/admin/logs' ); - } - - /** - * @brief Logs admin page. - * - * @return string - */ + public function post() + { + if (x($_POST, 'page_logs')) { + check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs'); - function get() { - - $log_choices = Array( - LOGGER_NORMAL => 'Normal', - LOGGER_TRACE => 'Trace', - LOGGER_DEBUG => 'Debug', - LOGGER_DATA => 'Data', - LOGGER_ALL => 'All' - ); - - $t = get_markup_template('admin_logs.tpl'); - - $f = get_config('system', 'logfile'); - - $data = ''; - - if(!file_exists($f)) { - $data = t("Error trying to open $f log file.\r\n' . t('No failed updates.') . '
Check to see if file $f exist and is + $logfile = ((x($_POST, 'logfile')) ? notags(trim($_POST['logfile'])) : ''); + $debugging = ((x($_POST, 'debugging')) ? true : false); + $loglevel = ((x($_POST, 'loglevel')) ? intval(trim($_POST['loglevel'])) : 0); + + set_config('system', 'logfile', $logfile); + set_config('system', 'debugging', $debugging); + set_config('system', 'loglevel', $loglevel); + } + + info(t('Log settings updated.')); + goaway(z_root() . '/admin/logs'); + } + + /** + * @brief Logs admin page. + * + * @return string + */ + + public function get() + { + + $log_choices = array( + LOGGER_NORMAL => 'Normal', + LOGGER_TRACE => 'Trace', + LOGGER_DEBUG => 'Debug', + LOGGER_DATA => 'Data', + LOGGER_ALL => 'All' + ); + + $t = get_markup_template('admin_logs.tpl'); + + $f = get_config('system', 'logfile'); + + $data = ''; + + if (!file_exists($f)) { + $data = t("Error trying to open $f log file.\r\n
Check to see if file $f exist and is readable."); - } - else { - $fp = fopen($f, 'r'); - if(!$fp) { - $data = t("Couldn't open $f log file.\r\n
Check to see if file $f is readable."); - } - else { - $fstat = fstat($fp); - $size = $fstat['size']; - if($size != 0) - { - if($size > 5000000 || $size < 0) - $size = 5000000; - $seek = fseek($fp,0-$size,SEEK_END); - if($seek === 0) { - $data = escape_tags(fread($fp,$size)); - while(! feof($fp)) - $data .= escape_tags(fread($fp,4096)); - } - } - fclose($fp); - } - } - - return replace_macros($t, array( - '$title' => t('Administration'), - '$page' => t('Logs'), - '$submit' => t('Submit'), - '$clear' => t('Clear'), - '$data' => $data, - '$baseurl' => z_root(), - '$logname' => get_config('system','logfile'), - - // name, label, value, help string, extra data... - '$debugging' => array('debugging', t("Debugging"),get_config('system','debugging'), ""), - '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your top-level webserver directory.")), - '$loglevel' => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices), - - '$form_security_token' => get_form_security_token('admin_logs'), - )); - } - + } else { + $fp = fopen($f, 'r'); + if (!$fp) { + $data = t("Couldn't open $f log file.\r\n
Check to see if file $f is readable."); + } else { + $fstat = fstat($fp); + $size = $fstat['size']; + if ($size != 0) { + if ($size > 5000000 || $size < 0) { + $size = 5000000; + } + $seek = fseek($fp, 0 - $size, SEEK_END); + if ($seek === 0) { + $data = escape_tags(fread($fp, $size)); + while (!feof($fp)) { + $data .= escape_tags(fread($fp, 4096)); + } + } + } + fclose($fp); + } + } + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Logs'), + '$submit' => t('Submit'), + '$clear' => t('Clear'), + '$data' => $data, + '$baseurl' => z_root(), + '$logname' => get_config('system', 'logfile'), -} \ No newline at end of file + // name, label, value, help string, extra data... + '$debugging' => array('debugging', t("Debugging"), get_config('system', 'debugging'), ""), + '$logfile' => array('logfile', t("Log file"), get_config('system', 'logfile'), t("Must be writable by web server. Relative to your top-level webserver directory.")), + '$loglevel' => array('loglevel', t("Log level"), get_config('system', 'loglevel'), "", $log_choices), + + '$form_security_token' => get_form_security_token('admin_logs'), + )); + } +} diff --git a/Zotlabs/Module/Admin/Profile_photo.php b/Zotlabs/Module/Admin/Profile_photo.php index c2e3d28a6..bfe966ddb 100644 --- a/Zotlabs/Module/Admin/Profile_photo.php +++ b/Zotlabs/Module/Admin/Profile_photo.php @@ -1,4 +1,5 @@ is_valid()) { - - $im->cropImage(300,$srcX,$srcY,$srcW,$srcH); - - $aid = 0; - - $p = [ - 'aid' => $aid, - 'uid' => $channel['channel_id'], - 'resource_id' => $base_image['resource_id'], - 'filename' => $base_image['filename'], - 'album' => t('Profile Photos'), - 'os_path' => $base_image['os_path'], - 'display_path' => $base_image['display_path'], - 'created' => $base_image['created'], - 'edited' => $base_image['edited'] - ]; - - $p['imgscale'] = PHOTO_RES_PROFILE_300; - $p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL); - - $r1 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_300); - - $im->scaleImage(80); - $p['imgscale'] = PHOTO_RES_PROFILE_80; - - $r2 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_80); - - $im->scaleImage(48); - $p['imgscale'] = PHOTO_RES_PROFILE_48; - - $r3 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_48); - - if ($r1 === false || $r2 === false || $r3 === false) { - // if one failed, delete them all so we can start over. - notice( t('Image resize failed.') . EOL ); - $x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d ) ", - dbesc($base_image['resource_id']), - $channel['channel_id'], - intval(PHOTO_RES_PROFILE_300), - intval(PHOTO_RES_PROFILE_80), - intval(PHOTO_RES_PROFILE_48) - ); - return; - } +class Profile_photo +{ - $r = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d + /* @brief Initalize the profile-photo edit view + * + * @return void + * + */ + + public function init() + { + + if (!is_site_admin()) { + return; + } + + $channel = get_sys_channel(); + Libprofile::load($channel['channel_address']); + } + + /* @brief Evaluate posted values + * + * @param $a Current application + * @return void + * + */ + + public function post() + { + + if (!is_site_admin()) { + return; + } + + $channel = get_sys_channel(); + + check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo'); + + if ((array_key_exists('cropfinal', $_POST)) && (intval($_POST['cropfinal']) == 1)) { + // logger('crop: ' . print_r($_POST,true)); + + // phase 2 - we have finished cropping + + if (argc() != 3) { + notice(t('Image uploaded but image cropping failed.') . EOL); + return; + } + + $image_id = argv(2); + + if (substr($image_id, -2, 1) == '-') { + $scale = substr($image_id, -1, 1); + $image_id = substr($image_id, 0, -2); + } + + // unless proven otherwise + $is_default_profile = 1; + + if ($_REQUEST['profile']) { + $r = q( + "select id, profile_guid, is_default, gender from profile where id = %d and uid = %d limit 1", + intval($_REQUEST['profile']), + intval($channel['channel_id']) + ); + if ($r) { + $profile = array_shift($r); + if (!intval($profile['is_default'])) { + $is_default_profile = 0; + } + } + } + + $srcX = intval($_POST['xstart']); + $srcY = intval($_POST['ystart']); + $srcW = intval($_POST['xfinal']) - $srcX; + $srcH = intval($_POST['yfinal']) - $srcY; + + $r = q( + "SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND imgscale = %d LIMIT 1", + dbesc($image_id), + dbesc($channel['channel_id']), + intval($scale) + ); + if ($r) { + $base_image = array_shift($r); + $base_image['content'] = (($base_image['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); + + $im = photo_factory($base_image['content'], $base_image['mimetype']); + if ($im->is_valid()) { + $im->cropImage(300, $srcX, $srcY, $srcW, $srcH); + + $aid = 0; + + $p = [ + 'aid' => $aid, + 'uid' => $channel['channel_id'], + 'resource_id' => $base_image['resource_id'], + 'filename' => $base_image['filename'], + 'album' => t('Profile Photos'), + 'os_path' => $base_image['os_path'], + 'display_path' => $base_image['display_path'], + 'created' => $base_image['created'], + 'edited' => $base_image['edited'] + ]; + + $p['imgscale'] = PHOTO_RES_PROFILE_300; + $p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL); + + $r1 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_300); + + $im->scaleImage(80); + $p['imgscale'] = PHOTO_RES_PROFILE_80; + + $r2 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_80); + + $im->scaleImage(48); + $p['imgscale'] = PHOTO_RES_PROFILE_48; + + $r3 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_48); + + if ($r1 === false || $r2 === false || $r3 === false) { + // if one failed, delete them all so we can start over. + notice(t('Image resize failed.') . EOL); + $x = q( + "delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d ) ", + dbesc($base_image['resource_id']), + $channel['channel_id'], + intval(PHOTO_RES_PROFILE_300), + intval(PHOTO_RES_PROFILE_80), + intval(PHOTO_RES_PROFILE_48) + ); + return; + } + + + $r = q( + "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND resource_id != '%s' AND uid = %d", - intval(PHOTO_NORMAL), - intval(PHOTO_PROFILE), - dbesc($base_image['resource_id']), - intval($channel['channel_id']) - ); - - // We'll set the updated profile-photo timestamp even if it isn't the default profile, - // so that browsers will do a cache update unconditionally - // Also set links back to site-specific profile photo url in case it was - // changed to a generic URL by a clone operation. Otherwise the new photo may - // not get pushed to other sites correctly. - - $r = q("UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE), + dbesc($base_image['resource_id']), + intval($channel['channel_id']) + ); + + // We'll set the updated profile-photo timestamp even if it isn't the default profile, + // so that browsers will do a cache update unconditionally + // Also set links back to site-specific profile photo url in case it was + // changed to a generic URL by a clone operation. Otherwise the new photo may + // not get pushed to other sites correctly. + + $r = q( + "UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s'", - dbesc($im->getType()), - dbesc(datetime_convert()), - dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']), - dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']), - dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']), - dbesc($channel['xchan_hash']) - ); + dbesc($im->getType()), + dbesc(datetime_convert()), + dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']), + dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']), + dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']), + dbesc($channel['xchan_hash']) + ); - // Similarly, tell the nav bar to bypass the cache and update the avatar image. - $_SESSION['reload_avatar'] = true; + // Similarly, tell the nav bar to bypass the cache and update the avatar image. + $_SESSION['reload_avatar'] = true; - Config::Set('system','site_icon_url',z_root() . '/photo/profile/m/' . $channel['channel_id']); + Config::Set('system', 'site_icon_url', z_root() . '/photo/profile/m/' . $channel['channel_id']); - info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); - - } - else { - notice( t('Unable to process image') . EOL); - } - } - - goaway(z_root() . '/admin'); - } - - // A new photo was uploaded. Store it and save some important details - // in App::$data for use in the cropping function - - - $hash = photo_new_resource(); - $importing = false; - $smallest = 0; - + info(t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); + } else { + notice(t('Unable to process image') . EOL); + } + } - if ($_REQUEST['importfile']) { - $hash = $_REQUEST['importfile']; - $importing = true; - } - else { + goaway(z_root() . '/admin'); + } - $matches = []; - $partial = false; + // A new photo was uploaded. Store it and save some important details + // in App::$data for use in the cropping function - if (array_key_exists('HTTP_CONTENT_RANGE',$_SERVER)) { - $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/',$_SERVER['HTTP_CONTENT_RANGE'],$matches); - if ($pm) { - logger('Content-Range: ' . print_r($matches,true), LOGGER_DEBUG); - $partial = true; - } - } - if ($partial) { - $x = save_chunk($channel,$matches[1],$matches[2],$matches[3]); + $hash = photo_new_resource(); + $importing = false; + $smallest = 0; - if ($x['partial']) { - header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); - json_return_and_die($x); - } - else { - header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); - $_FILES['userfile'] = [ - 'name' => $x['name'], - 'type' => $x['type'], - 'tmp_name' => $x['tmp_name'], - 'error' => $x['error'], - 'size' => $x['size'] - ]; - } - } - else { - if (! array_key_exists('userfile',$_FILES)) { - $_FILES['userfile'] = [ - 'name' => $_FILES['files']['name'], - 'type' => $_FILES['files']['type'], - 'tmp_name' => $_FILES['files']['tmp_name'], - 'error' => $_FILES['files']['error'], - 'size' => $_FILES['files']['size'] - ]; - } - } + if ($_REQUEST['importfile']) { + $hash = $_REQUEST['importfile']; + $importing = true; + } else { + $matches = []; + $partial = false; - $res = attach_store($channel, $channel['channel_hash'], '', array('album' => t('Profile Photos'), 'hash' => $hash)); - - logger('attach_store: ' . print_r($res,true), LOGGER_DEBUG); + if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) { + $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches); + if ($pm) { + logger('Content-Range: ' . print_r($matches, true), LOGGER_DEBUG); + $partial = true; + } + } - json_return_and_die([ 'message' => $hash ]); - } - - if (($res && intval($res['data']['is_photo'])) || $importing) { - $i = q("select * from photo where resource_id = '%s' and uid = %d order by imgscale", - dbesc($hash), - intval($channel['channel_hash']) - ); - - if (! $i) { - notice( t('Image upload failed.') . EOL ); - return; - } - $os_storage = false; - - foreach ($i as $ii) { - if (intval($ii['imgscale']) < PHOTO_RES_640) { - $smallest = intval($ii['imgscale']); - $os_storage = intval($ii['os_storage']); - $imagedata = $ii['content']; - $filetype = $ii['mimetype']; - } - } - } - - $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata)); - $ph = photo_factory($imagedata, $filetype); - - if (! $ph->is_valid()) { - notice( t('Unable to process image.') . EOL ); - return; - } - - return $this->profile_photo_crop_ui_head($ph, $hash, $smallest); + if ($partial) { + $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]); - // This will "fall through" to the get() method, and since - // App::$data['imagecrop'] is set, it will proceed to cropping - // rather than present the upload form - } - - - /* @brief Generate content of profile-photo view - * - * @return void - * - */ - - - function get() { - - if (! is_site_admin()) { - notice( t('Permission denied.') . EOL ); - return; - } - - $channel = get_sys_channel(); - $pf = 0; - $newuser = false; - - if (argc() == 3 && argv(2) === 'new') { - $newuser = true; - } + if ($x['partial']) { + header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); + json_return_and_die($x); + } else { + header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); - if (argv(2) === 'reset') { - Config::Delete('system','site_icon_url'); - } + $_FILES['userfile'] = [ + 'name' => $x['name'], + 'type' => $x['type'], + 'tmp_name' => $x['tmp_name'], + 'error' => $x['error'], + 'size' => $x['size'] + ]; + } + } else { + if (!array_key_exists('userfile', $_FILES)) { + $_FILES['userfile'] = [ + 'name' => $_FILES['files']['name'], + 'type' => $_FILES['files']['type'], + 'tmp_name' => $_FILES['files']['tmp_name'], + 'error' => $_FILES['files']['error'], + 'size' => $_FILES['files']['size'] + ]; + } + } - if (argv(2) === 'use') { - if (argc() < 4) { - notice( t('Permission denied.') . EOL ); - return; - }; - - $resource_id = argv(3); - - $pf = (($_REQUEST['pf']) ? intval($_REQUEST['pf']) : 0); + $res = attach_store($channel, $channel['channel_hash'], '', array('album' => t('Profile Photos'), 'hash' => $hash)); - $c = q("select id, is_default from profile where uid = %d", - intval($channel['channel_id']) - ); + logger('attach_store: ' . print_r($res, true), LOGGER_DEBUG); - $multi_profiles = true; + json_return_and_die(['message' => $hash]); + } - if (($c) && (count($c) === 1) && (intval($c[0]['is_default']))) { - $_REQUEST['profile'] = $c[0]['id']; - $multi_profiles = false; - } - else { - $_REQUEST['profile'] = $pf; - } + if (($res && intval($res['data']['is_photo'])) || $importing) { + $i = q( + "select * from photo where resource_id = '%s' and uid = %d order by imgscale", + dbesc($hash), + intval($channel['channel_hash']) + ); - $r = q("SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC", - intval($channel['channel_id']), - dbesc($resource_id) - ); - if (! $r) { - notice( t('Photo not available.') . EOL ); - return; - } - $havescale = false; - foreach ($r as $rr) { - if ($rr['imgscale'] == PHOTO_RES_PROFILE_80) { - $havescale = true; - } - } - - // set an already loaded and cropped photo as profile photo - - if ($havescale) { - // unset any existing profile photos - $r = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d", - intval(PHOTO_NORMAL), - intval(PHOTO_PROFILE), - intval($channel['channel_id']) - ); - - $r = q("UPDATE photo SET photo_usage = %d WHERE uid = %d AND resource_id = '%s'", - intval(PHOTO_PROFILE), - intval($channel['channel_id']), - dbesc($resource_id) - ); - - $r = q("UPDATE xchan set xchan_photo_date = '%s' where xchan_hash = '%s'", - dbesc(datetime_convert()), - dbesc($channel['xchan_hash']) - ); - - goaway(z_root() . '/admin'); - } - - $r = q("SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", - intval($r[0]['id']), - intval($channel['channel_id']) - - ); - if (! $r) { - notice( t('Photo not available.') . EOL ); - return; - } - - if (intval($r[0]['os_storage'])) { - $data = @file_get_contents(dbunescbin($r[0]['content'])); - } - else { - $data = dbunescbin($r[0]['content']); - } - - $ph = photo_factory($data, $r[0]['mimetype']); - $smallest = 0; - if ($ph->is_valid()) { - // go ahead as if we have just uploaded a new photo to crop - $i = q("select resource_id, imgscale from photo where resource_id = '%s' and uid = %d order by imgscale", - dbesc($r[0]['resource_id']), - intval($channel['channel_id']) - ); - - if ($i) { - $hash = $i[0]['resource_id']; - foreach ($i as $ii) { - if (intval($ii['imgscale']) < PHOTO_RES_640) { - $smallest = intval($ii['imgscale']); - } - } - } - } - - if ($multi_profiles) { - App::$data['importfile'] = $resource_id; - } - else { - $this->profile_photo_crop_ui_head($ph, $hash, $smallest); - } + if (!$i) { + notice(t('Image upload failed.') . EOL); + return; + } + $os_storage = false; - // falls through with App::$data['imagecrop'] set so we go straight to the cropping section + foreach ($i as $ii) { + if (intval($ii['imgscale']) < PHOTO_RES_640) { + $smallest = intval($ii['imgscale']); + $os_storage = intval($ii['os_storage']); + $imagedata = $ii['content']; + $filetype = $ii['mimetype']; + } + } + } - } - - // present an upload form + $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata)); + $ph = photo_factory($imagedata, $filetype); - $profiles = q("select id, profile_name as name, is_default from profile where uid = %d order by id asc", - intval($channel['channel_id']) - ); + if (!$ph->is_valid()) { + notice(t('Unable to process image.') . EOL); + return; + } - if ($profiles) { - for ($x = 0; $x < count($profiles); $x ++) { - $profiles[$x]['selected'] = false; - if ($pf && $profiles[$x]['id'] == $pf) { - $profiles[$x]['selected'] = true; - } - if ((! $pf) && $profiles[$x]['is_default']) { - $profiles[$x]['selected'] = true; - } - } - } + return $this->profile_photo_crop_ui_head($ph, $hash, $smallest); - $importing = ((array_key_exists('importfile',App::$data)) ? true : false); - - if (! array_key_exists('imagecrop', App::$data)) { - - $tpl = get_markup_template('admin_profile_photo.tpl'); - - $o .= replace_macros($tpl, [ - '$user' => $channel['channel_address'], - '$channel_id' => $channel['channel_id'], - '$info' => ((count($profiles) > 1) ? t('Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile') : t('Your site photo is visible to anybody on the internet and may be distributed to other websites.')), - '$importfile' => (($importing) ? App::$data['importfile'] : ''), - '$lbl_upfile' => t('Upload File:'), - '$lbl_profiles' => t('Select a profile:'), - '$title' => (($importing) ? t('Use Photo for Site Logo') : t('Change Site Logo')), - '$submit' => (($importing) ? t('Use') : t('Upload')), - '$profiles' => $profiles, - '$single' => ((count($profiles) == 1) ? true : false), - '$profile0' => $profiles[0], - '$embedPhotos' => t('Use a photo from your albums'), - '$embedPhotosModalTitle' => t('Use a photo from your albums'), - '$embedPhotosModalCancel' => t('Cancel'), - '$embedPhotosModalOK' => t('OK'), - '$modalchooseimages' => t('Choose images to embed'), - '$modalchoosealbum' => t('Choose an album'), - '$modaldiffalbum' => t('Choose a different album'), - '$modalerrorlist' => t('Error getting album list'), - '$modalerrorlink' => t('Error getting photo link'), - '$modalerroralbum' => t('Error getting album'), - '$form_security_token' => get_form_security_token("profile_photo"), - '$select' => t('Select previously uploaded photo'), - ]); - - call_hooks('profile_photo_content_end', $o); - return $o; - } - else { + // This will "fall through" to the get() method, and since + // App::$data['imagecrop'] is set, it will proceed to cropping + // rather than present the upload form + } - // present a cropping form - $filename = App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution']; - $resolution = App::$data['imagecrop_resolution']; - $o .= replace_macros(get_markup_template('admin_cropbody.tpl'), [ - '$filename' => $filename, - '$profile' => intval($_REQUEST['profile']), - '$resource' => App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution'], - '$image_url' => z_root() . '/photo/' . $filename, - '$title' => t('Crop Image'), - '$desc' => t('Please adjust the image cropping for optimum viewing.'), - '$form_security_token' => get_form_security_token("profile_photo"), - '$done' => t('Done Editing') - ]); - return $o; - } - } - - /* @brief Generate the UI for photo-cropping - * - * @param $ph Photo-Factory - * @return void - * - */ - - function profile_photo_crop_ui_head($ph, $hash, $smallest) { - $max_length = get_config('system','max_image_length', MAX_IMAGE_LENGTH); + /* @brief Generate content of profile-photo view + * + * @return void + * + */ - if ($max_length > 0) { - $ph->scaleImage($max_length); - } - - App::$data['width'] = $ph->getWidth(); - App::$data['height'] = $ph->getHeight(); - - if (App::$data['width'] < 500 || App::$data['height'] < 500) { - $ph->scaleImageUp(400); - App::$data['width'] = $ph->getWidth(); - App::$data['height'] = $ph->getHeight(); - } - - App::$data['imagecrop'] = $hash; - App::$data['imagecrop_resolution'] = $smallest; - App::$page['htmlhead'] .= replace_macros(get_markup_template('crophead.tpl'), []); - return; - } + + public function get() + { + + if (!is_site_admin()) { + notice(t('Permission denied.') . EOL); + return; + } + + $channel = get_sys_channel(); + $pf = 0; + $newuser = false; + + if (argc() == 3 && argv(2) === 'new') { + $newuser = true; + } + + if (argv(2) === 'reset') { + Config::Delete('system', 'site_icon_url'); + } + + if (argv(2) === 'use') { + if (argc() < 4) { + notice(t('Permission denied.') . EOL); + return; + } + + $resource_id = argv(3); + + $pf = (($_REQUEST['pf']) ? intval($_REQUEST['pf']) : 0); + + $c = q( + "select id, is_default from profile where uid = %d", + intval($channel['channel_id']) + ); + + $multi_profiles = true; + + if (($c) && (count($c) === 1) && (intval($c[0]['is_default']))) { + $_REQUEST['profile'] = $c[0]['id']; + $multi_profiles = false; + } else { + $_REQUEST['profile'] = $pf; + } + + $r = q( + "SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC", + intval($channel['channel_id']), + dbesc($resource_id) + ); + if (!$r) { + notice(t('Photo not available.') . EOL); + return; + } + $havescale = false; + foreach ($r as $rr) { + if ($rr['imgscale'] == PHOTO_RES_PROFILE_80) { + $havescale = true; + } + } + + // set an already loaded and cropped photo as profile photo + + if ($havescale) { + // unset any existing profile photos + $r = q( + "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d", + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE), + intval($channel['channel_id']) + ); + + $r = q( + "UPDATE photo SET photo_usage = %d WHERE uid = %d AND resource_id = '%s'", + intval(PHOTO_PROFILE), + intval($channel['channel_id']), + dbesc($resource_id) + ); + + $r = q( + "UPDATE xchan set xchan_photo_date = '%s' where xchan_hash = '%s'", + dbesc(datetime_convert()), + dbesc($channel['xchan_hash']) + ); + + goaway(z_root() . '/admin'); + } + + $r = q( + "SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", + intval($r[0]['id']), + intval($channel['channel_id']) + ); + if (!$r) { + notice(t('Photo not available.') . EOL); + return; + } + + if (intval($r[0]['os_storage'])) { + $data = @file_get_contents(dbunescbin($r[0]['content'])); + } else { + $data = dbunescbin($r[0]['content']); + } + + $ph = photo_factory($data, $r[0]['mimetype']); + $smallest = 0; + if ($ph->is_valid()) { + // go ahead as if we have just uploaded a new photo to crop + $i = q( + "select resource_id, imgscale from photo where resource_id = '%s' and uid = %d order by imgscale", + dbesc($r[0]['resource_id']), + intval($channel['channel_id']) + ); + + if ($i) { + $hash = $i[0]['resource_id']; + foreach ($i as $ii) { + if (intval($ii['imgscale']) < PHOTO_RES_640) { + $smallest = intval($ii['imgscale']); + } + } + } + } + + if ($multi_profiles) { + App::$data['importfile'] = $resource_id; + } else { + $this->profile_photo_crop_ui_head($ph, $hash, $smallest); + } + + // falls through with App::$data['imagecrop'] set so we go straight to the cropping section + } + + // present an upload form + + $profiles = q( + "select id, profile_name as name, is_default from profile where uid = %d order by id asc", + intval($channel['channel_id']) + ); + + if ($profiles) { + for ($x = 0; $x < count($profiles); $x++) { + $profiles[$x]['selected'] = false; + if ($pf && $profiles[$x]['id'] == $pf) { + $profiles[$x]['selected'] = true; + } + if ((!$pf) && $profiles[$x]['is_default']) { + $profiles[$x]['selected'] = true; + } + } + } + + $importing = ((array_key_exists('importfile', App::$data)) ? true : false); + + if (!array_key_exists('imagecrop', App::$data)) { + $tpl = get_markup_template('admin_profile_photo.tpl'); + + $o .= replace_macros($tpl, [ + '$user' => $channel['channel_address'], + '$channel_id' => $channel['channel_id'], + '$info' => ((count($profiles) > 1) ? t('Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile') : t('Your site photo is visible to anybody on the internet and may be distributed to other websites.')), + '$importfile' => (($importing) ? App::$data['importfile'] : ''), + '$lbl_upfile' => t('Upload File:'), + '$lbl_profiles' => t('Select a profile:'), + '$title' => (($importing) ? t('Use Photo for Site Logo') : t('Change Site Logo')), + '$submit' => (($importing) ? t('Use') : t('Upload')), + '$profiles' => $profiles, + '$single' => ((count($profiles) == 1) ? true : false), + '$profile0' => $profiles[0], + '$embedPhotos' => t('Use a photo from your albums'), + '$embedPhotosModalTitle' => t('Use a photo from your albums'), + '$embedPhotosModalCancel' => t('Cancel'), + '$embedPhotosModalOK' => t('OK'), + '$modalchooseimages' => t('Choose images to embed'), + '$modalchoosealbum' => t('Choose an album'), + '$modaldiffalbum' => t('Choose a different album'), + '$modalerrorlist' => t('Error getting album list'), + '$modalerrorlink' => t('Error getting photo link'), + '$modalerroralbum' => t('Error getting album'), + '$form_security_token' => get_form_security_token("profile_photo"), + '$select' => t('Select previously uploaded photo'), + ]); + + call_hooks('profile_photo_content_end', $o); + return $o; + } else { + // present a cropping form + + $filename = App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution']; + $resolution = App::$data['imagecrop_resolution']; + $o .= replace_macros(get_markup_template('admin_cropbody.tpl'), [ + '$filename' => $filename, + '$profile' => intval($_REQUEST['profile']), + '$resource' => App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution'], + '$image_url' => z_root() . '/photo/' . $filename, + '$title' => t('Crop Image'), + '$desc' => t('Please adjust the image cropping for optimum viewing.'), + '$form_security_token' => get_form_security_token("profile_photo"), + '$done' => t('Done Editing') + ]); + return $o; + } + } + + /* @brief Generate the UI for photo-cropping + * + * @param $ph Photo-Factory + * @return void + * + */ + + public function profile_photo_crop_ui_head($ph, $hash, $smallest) + { + $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH); + + if ($max_length > 0) { + $ph->scaleImage($max_length); + } + + App::$data['width'] = $ph->getWidth(); + App::$data['height'] = $ph->getHeight(); + + if (App::$data['width'] < 500 || App::$data['height'] < 500) { + $ph->scaleImageUp(400); + App::$data['width'] = $ph->getWidth(); + App::$data['height'] = $ph->getHeight(); + } + + App::$data['imagecrop'] = $hash; + App::$data['imagecrop_resolution'] = $smallest; + App::$page['htmlhead'] .= replace_macros(get_markup_template('crophead.tpl'), []); + return; + } } diff --git a/Zotlabs/Module/Admin/Profs.php b/Zotlabs/Module/Admin/Profs.php index 9e5949a9e..4a09d372c 100644 --- a/Zotlabs/Module/Admin/Profs.php +++ b/Zotlabs/Module/Admin/Profs.php @@ -2,189 +2,195 @@ namespace Zotlabs\Module\Admin; +class Profs +{ -class Profs { + public function post() + { - function post() { - - if(array_key_exists('basic',$_REQUEST)) { - $arr = explode(',',$_REQUEST['basic']); - array_walk($arr,'array_trim'); - $narr = []; - if(count($arr)) { - foreach($arr as $a) { - if(strlen($a)) { - $narr[] = $a; - } - } - } - if(! $narr) - del_config('system','profile_fields_basic'); - else - set_config('system','profile_fields_basic',$narr); + if (array_key_exists('basic', $_REQUEST)) { + $arr = explode(',', $_REQUEST['basic']); + array_walk($arr, 'array_trim'); + $narr = []; + if (count($arr)) { + foreach ($arr as $a) { + if (strlen($a)) { + $narr[] = $a; + } + } + } + if (!$narr) { + del_config('system', 'profile_fields_basic'); + } else { + set_config('system', 'profile_fields_basic', $narr); + } - if(array_key_exists('advanced',$_REQUEST)) { - $arr = explode(',',$_REQUEST['advanced']); - array_walk($arr,'array_trim'); - $narr = []; - if(count($arr)) { - foreach($arr as $a) { - if(strlen($a)) { - $narr[] = $a; - } - } - } - if(! $narr) - del_config('system','profile_fields_advanced'); - else - set_config('system','profile_fields_advanced',$narr); - - } - goaway(z_root() . '/admin/profs'); - } - - - if(array_key_exists('field_name',$_REQUEST)) { - if($_REQUEST['id']) { - $r = q("update profdef set field_name = '%s', field_type = '%s', field_desc = '%s' field_help = '%s', field_inputs = '%s' where id = %d", - dbesc($_REQUEST['field_name']), - dbesc($_REQUEST['field_type']), - dbesc($_REQUEST['field_desc']), - dbesc($_REQUEST['field_help']), - dbesc($_REQUEST['field_inputs']), - intval($_REQUEST['id']) - ); - } - else { - $r = q("insert into profdef ( field_name, field_type, field_desc, field_help, field_inputs ) values ( '%s' , '%s', '%s', '%s', '%s' )", - dbesc($_REQUEST['field_name']), - dbesc($_REQUEST['field_type']), - dbesc($_REQUEST['field_desc']), - dbesc($_REQUEST['field_help']), - dbesc($_REQUEST['field_inputs']) - ); - } - } - - - // add to chosen array basic or advanced - - goaway(z_root() . '/admin/profs'); - } - - function get() { - - if((argc() > 3) && argv(2) == 'drop' && intval(argv(3))) { - $r = q("delete from profdef where id = %d", - intval(argv(3)) - ); - // remove from allowed fields - - goaway(z_root() . '/admin/profs'); - } - - if((argc() > 2) && argv(2) === 'new') { - return replace_macros(get_markup_template('profdef_edit.tpl'),array( - '$header' => t('New Profile Field'), - '$field_name' => array('field_name',t('Field nickname'),$_REQUEST['field_name'],t('System name of field')), - '$field_type' => array('field_type',t('Input type'),(($_REQUEST['field_type']) ? $_REQUEST['field_type'] : 'text'),''), - '$field_desc' => array('field_desc',t('Field Name'),$_REQUEST['field_desc'],t('Label on profile pages')), - '$field_help' => array('field_help',t('Help text'),$_REQUEST['field_help'],t('Additional info (optional)')), - '$submit' => t('Save') - )); - } - - if((argc() > 2) && intval(argv(2))) { - $r = q("select * from profdef where id = %d limit 1", - intval(argv(2)) - ); - if(! $r) { - notice( t('Field definition not found') . EOL); - goaway(z_root() . '/admin/profs'); - } - - return replace_macros(get_markup_template('profdef_edit.tpl'),array( - '$id' => intval($r[0]['id']), - '$header' => t('Edit Profile Field'), - '$field_name' => array('field_name',t('Field nickname'),$r[0]['field_name'],t('System name of field')), - '$field_type' => array('field_type',t('Input type'),$r[0]['field_type'],''), - '$field_desc' => array('field_desc',t('Field Name'),$r[0]['field_desc'],t('Label on profile pages')), - '$field_help' => array('field_help',t('Help text'),$r[0]['field_help'],t('Additional info (optional)')), - '$submit' => t('Save') - )); - } - - $basic = ''; - $barr = []; - $fields = get_profile_fields_basic(); - - if(! $fields) - $fields = get_profile_fields_basic(1); - if($fields) { - foreach($fields as $k => $v) { - if($basic) - $basic .= ', '; - $basic .= trim($k); - $barr[] = trim($k); - } - } - - $advanced = ''; - $fields = get_profile_fields_advanced(); - if(! $fields) - $fields = get_profile_fields_advanced(1); - if($fields) { - foreach($fields as $k => $v) { - if(in_array(trim($k),$barr)) - continue; - if($advanced) - $advanced .= ', '; - $advanced .= trim($k); - } - } - - $all = ''; - $fields = get_profile_fields_advanced(1); - if($fields) { - foreach($fields as $k => $v) { - if($all) - $all .= ', '; - $all .= trim($k); - } - } - - $r = q("select * from profdef where true"); - if($r) { - foreach($r as $rr) { - if($all) - $all .= ', '; - $all .= $rr['field_name']; - } - } - - - $o = replace_macros(get_markup_template('admin_profiles.tpl'),array( - '$title' => t('Profile Fields'), - '$basic' => array('basic',t('Basic Profile Fields'),$basic,''), - '$advanced' => array('advanced',t('Advanced Profile Fields'),$advanced,t('(In addition to basic fields)')), - '$all' => $all, - '$all_desc' => t('All available fields'), - '$cust_field_desc' => t('Custom Fields'), - '$cust_fields' => $r, - '$edit' => t('Edit'), - '$drop' => t('Delete'), - '$new' => t('Create Custom Field'), - '$submit' => t('Submit') - )); - - return $o; - - - } + if (array_key_exists('advanced', $_REQUEST)) { + $arr = explode(',', $_REQUEST['advanced']); + array_walk($arr, 'array_trim'); + $narr = []; + if (count($arr)) { + foreach ($arr as $a) { + if (strlen($a)) { + $narr[] = $a; + } + } + } + if (!$narr) { + del_config('system', 'profile_fields_advanced'); + } else { + set_config('system', 'profile_fields_advanced', $narr); + } + } + goaway(z_root() . '/admin/profs'); + } + if (array_key_exists('field_name', $_REQUEST)) { + if ($_REQUEST['id']) { + $r = q( + "update profdef set field_name = '%s', field_type = '%s', field_desc = '%s' field_help = '%s', field_inputs = '%s' where id = %d", + dbesc($_REQUEST['field_name']), + dbesc($_REQUEST['field_type']), + dbesc($_REQUEST['field_desc']), + dbesc($_REQUEST['field_help']), + dbesc($_REQUEST['field_inputs']), + intval($_REQUEST['id']) + ); + } else { + $r = q( + "insert into profdef ( field_name, field_type, field_desc, field_help, field_inputs ) values ( '%s' , '%s', '%s', '%s', '%s' )", + dbesc($_REQUEST['field_name']), + dbesc($_REQUEST['field_type']), + dbesc($_REQUEST['field_desc']), + dbesc($_REQUEST['field_help']), + dbesc($_REQUEST['field_inputs']) + ); + } + } + // add to chosen array basic or advanced -} \ No newline at end of file + goaway(z_root() . '/admin/profs'); + } + + public function get() + { + + if ((argc() > 3) && argv(2) == 'drop' && intval(argv(3))) { + $r = q( + "delete from profdef where id = %d", + intval(argv(3)) + ); + // remove from allowed fields + + goaway(z_root() . '/admin/profs'); + } + + if ((argc() > 2) && argv(2) === 'new') { + return replace_macros(get_markup_template('profdef_edit.tpl'), array( + '$header' => t('New Profile Field'), + '$field_name' => array('field_name', t('Field nickname'), $_REQUEST['field_name'], t('System name of field')), + '$field_type' => array('field_type', t('Input type'), (($_REQUEST['field_type']) ? $_REQUEST['field_type'] : 'text'), ''), + '$field_desc' => array('field_desc', t('Field Name'), $_REQUEST['field_desc'], t('Label on profile pages')), + '$field_help' => array('field_help', t('Help text'), $_REQUEST['field_help'], t('Additional info (optional)')), + '$submit' => t('Save') + )); + } + + if ((argc() > 2) && intval(argv(2))) { + $r = q( + "select * from profdef where id = %d limit 1", + intval(argv(2)) + ); + if (!$r) { + notice(t('Field definition not found') . EOL); + goaway(z_root() . '/admin/profs'); + } + + return replace_macros(get_markup_template('profdef_edit.tpl'), array( + '$id' => intval($r[0]['id']), + '$header' => t('Edit Profile Field'), + '$field_name' => array('field_name', t('Field nickname'), $r[0]['field_name'], t('System name of field')), + '$field_type' => array('field_type', t('Input type'), $r[0]['field_type'], ''), + '$field_desc' => array('field_desc', t('Field Name'), $r[0]['field_desc'], t('Label on profile pages')), + '$field_help' => array('field_help', t('Help text'), $r[0]['field_help'], t('Additional info (optional)')), + '$submit' => t('Save') + )); + } + + $basic = ''; + $barr = []; + $fields = get_profile_fields_basic(); + + if (!$fields) { + $fields = get_profile_fields_basic(1); + } + if ($fields) { + foreach ($fields as $k => $v) { + if ($basic) { + $basic .= ', '; + } + $basic .= trim($k); + $barr[] = trim($k); + } + } + + $advanced = ''; + $fields = get_profile_fields_advanced(); + if (!$fields) { + $fields = get_profile_fields_advanced(1); + } + if ($fields) { + foreach ($fields as $k => $v) { + if (in_array(trim($k), $barr)) { + continue; + } + if ($advanced) { + $advanced .= ', '; + } + $advanced .= trim($k); + } + } + + $all = ''; + $fields = get_profile_fields_advanced(1); + if ($fields) { + foreach ($fields as $k => $v) { + if ($all) { + $all .= ', '; + } + $all .= trim($k); + } + } + + $r = q("select * from profdef where true"); + if ($r) { + foreach ($r as $rr) { + if ($all) { + $all .= ', '; + } + $all .= $rr['field_name']; + } + } + + + $o = replace_macros(get_markup_template('admin_profiles.tpl'), array( + '$title' => t('Profile Fields'), + '$basic' => array('basic', t('Basic Profile Fields'), $basic, ''), + '$advanced' => array('advanced', t('Advanced Profile Fields'), $advanced, t('(In addition to basic fields)')), + '$all' => $all, + '$all_desc' => t('All available fields'), + '$cust_field_desc' => t('Custom Fields'), + '$cust_fields' => $r, + '$edit' => t('Edit'), + '$drop' => t('Delete'), + '$new' => t('Create Custom Field'), + '$submit' => t('Submit') + )); + + return $o; + } +} diff --git a/Zotlabs/Module/Admin/Queue.php b/Zotlabs/Module/Admin/Queue.php index defcffc14..136dd46f5 100644 --- a/Zotlabs/Module/Admin/Queue.php +++ b/Zotlabs/Module/Admin/Queue.php @@ -4,48 +4,46 @@ namespace Zotlabs\Module\Admin; use Zotlabs\Lib\Queue as ZQueue; -class Queue { - - function get() { +class Queue +{ - $o = ''; - - $expert = ((array_key_exists('expert',$_REQUEST)) ? intval($_REQUEST['expert']) : 0); - - if($_REQUEST['drophub']) { - hubloc_mark_as_down($_REQUEST['drophub']); - ZQueue::remove_by_posturl($_REQUEST['drophub']); - } - - if($_REQUEST['emptyhub']) { - ZQueue::remove_by_posturl($_REQUEST['emptyhub']); - } - - $r = q("select count(outq_posturl) as total, max(outq_priority) as priority, outq_posturl from outq + public function get() + { + + $o = ''; + + $expert = ((array_key_exists('expert', $_REQUEST)) ? intval($_REQUEST['expert']) : 0); + + if ($_REQUEST['drophub']) { + hubloc_mark_as_down($_REQUEST['drophub']); + ZQueue::remove_by_posturl($_REQUEST['drophub']); + } + + if ($_REQUEST['emptyhub']) { + ZQueue::remove_by_posturl($_REQUEST['emptyhub']); + } + + $r = q("select count(outq_posturl) as total, max(outq_priority) as priority, outq_posturl from outq where outq_delivered = 0 group by outq_posturl order by total desc"); - - for($x = 0; $x < count($r); $x ++) { - $r[$x]['eurl'] = urlencode($r[$x]['outq_posturl']); - $r[$x]['connected'] = datetime_convert('UTC',date_default_timezone_get(),$r[$x]['connected'],'Y-m-d'); - } - - $o = replace_macros(get_markup_template('admin_queue.tpl'), array( - '$banner' => t('Queue Statistics'), - '$numentries' => t('Total Entries'), - '$priority' => t('Priority'), - '$desturl' => t('Destination URL'), - '$nukehub' => t('Mark hub permanently offline'), - '$empty' => t('Empty queue for this hub'), - '$lastconn' => t('Last known contact'), - '$hasentries' => ((count($r)) ? true : false), - '$entries' => $r, - '$expert' => $expert - )); - - return $o; - } - + for ($x = 0; $x < count($r); $x++) { + $r[$x]['eurl'] = urlencode($r[$x]['outq_posturl']); + $r[$x]['connected'] = datetime_convert('UTC', date_default_timezone_get(), $r[$x]['connected'], 'Y-m-d'); + } + $o = replace_macros(get_markup_template('admin_queue.tpl'), array( + '$banner' => t('Queue Statistics'), + '$numentries' => t('Total Entries'), + '$priority' => t('Priority'), + '$desturl' => t('Destination URL'), + '$nukehub' => t('Mark hub permanently offline'), + '$empty' => t('Empty queue for this hub'), + '$lastconn' => t('Last known contact'), + '$hasentries' => ((count($r)) ? true : false), + '$entries' => $r, + '$expert' => $expert + )); -} \ No newline at end of file + return $o; + } +} diff --git a/Zotlabs/Module/Admin/Security.php b/Zotlabs/Module/Admin/Security.php index 7b900c2cf..70c5673fe 100644 --- a/Zotlabs/Module/Admin/Security.php +++ b/Zotlabs/Module/Admin/Security.php @@ -2,186 +2,187 @@ namespace Zotlabs\Module\Admin; +class Security +{ -class Security { + public function post() + { + check_form_security_token_redirectOnErr('/admin/security', 'admin_security'); - function post() { - check_form_security_token_redirectOnErr('/admin/security', 'admin_security'); - - $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); - set_config('system','allowed_email', $allowed_email); + $allowed_email = ((x($_POST, 'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); + set_config('system', 'allowed_email', $allowed_email); - $not_allowed_email = ((x($_POST,'not_allowed_email')) ? notags(trim($_POST['not_allowed_email'])) : ''); - set_config('system','not_allowed_email', $not_allowed_email); + $not_allowed_email = ((x($_POST, 'not_allowed_email')) ? notags(trim($_POST['not_allowed_email'])) : ''); + set_config('system', 'not_allowed_email', $not_allowed_email); - $anonymous_comments = ((x($_POST,'anonymous_comments')) ? intval($_POST['anonymous_comments']) : 0); - set_config('system','anonymous_comments', $anonymous_comments); - - $block_public = ((x($_POST,'block_public')) ? True : False); - set_config('system','block_public',$block_public); + $anonymous_comments = ((x($_POST, 'anonymous_comments')) ? intval($_POST['anonymous_comments']) : 0); + set_config('system', 'anonymous_comments', $anonymous_comments); - $block_public_search = ((x($_POST,'block_public_search')) ? 1 : 0); - set_config('system','block_public_search',$block_public_search); + $block_public = ((x($_POST, 'block_public')) ? true : false); + set_config('system', 'block_public', $block_public); - $block_public_dir = ((x($_POST,'block_public_directory')) ? True : False); - set_config('system', 'block_public_directory', $block_public_dir); + $block_public_search = ((x($_POST, 'block_public_search')) ? 1 : 0); + set_config('system', 'block_public_search', $block_public_search); - $localdir_hide = ((x($_POST,'localdir_hide')) ? 1 : 0); - set_config('system','localdir_hide',$localdir_hide); + $block_public_dir = ((x($_POST, 'block_public_directory')) ? true : false); + set_config('system', 'block_public_directory', $block_public_dir); - $cloud_noroot = ((x($_POST,'cloud_noroot')) ? 1 : 0); - set_config('system','cloud_disable_siteroot',1 - $cloud_noroot); + $localdir_hide = ((x($_POST, 'localdir_hide')) ? 1 : 0); + set_config('system', 'localdir_hide', $localdir_hide); - $cloud_disksize = ((x($_POST,'cloud_disksize')) ? 1 : 0); - set_config('system','cloud_report_disksize',$cloud_disksize); + $cloud_noroot = ((x($_POST, 'cloud_noroot')) ? 1 : 0); + set_config('system', 'cloud_disable_siteroot', 1 - $cloud_noroot); - $thumbnail_security = ((x($_POST,'thumbnail_security')) ? intval($_POST['thumbnail_security']) : 0); - set_config('system', 'thumbnail_security' , $thumbnail_security); + $cloud_disksize = ((x($_POST, 'cloud_disksize')) ? 1 : 0); + set_config('system', 'cloud_report_disksize', $cloud_disksize); - $inline_pdf = ((x($_POST,'inline_pdf')) ? intval($_POST['inline_pdf']) : 0); - set_config('system', 'inline_pdf' , $inline_pdf); + $thumbnail_security = ((x($_POST, 'thumbnail_security')) ? intval($_POST['thumbnail_security']) : 0); + set_config('system', 'thumbnail_security', $thumbnail_security); - $ws = $this->trim_array_elems(explode("\n",$_POST['allowed_sites'])); - set_config('system','allowed_sites',$ws); - - $bs = $this->trim_array_elems(explode("\n",$_POST['denied_sites'])); - set_config('system','denied_sites',$bs); - - $wc = $this->trim_array_elems(explode("\n",$_POST['allowed_channels'])); - set_config('system','allowed_channels',$wc); - - $bc = $this->trim_array_elems(explode("\n",$_POST['denied_channels'])); - set_config('system','denied_channels',$bc); + $inline_pdf = ((x($_POST, 'inline_pdf')) ? intval($_POST['inline_pdf']) : 0); + set_config('system', 'inline_pdf', $inline_pdf); - $ws = $this->trim_array_elems(explode("\n",$_POST['pubstream_allowed_sites'])); - set_config('system','pubstream_allowed_sites',$ws); - - $bs = $this->trim_array_elems(explode("\n",$_POST['pubstream_denied_sites'])); - set_config('system','pubstream_denied_sites',$bs); - - $wc = $this->trim_array_elems(explode("\n",$_POST['pubstream_allowed_channels'])); - set_config('system','pubstream_allowed_channels',$wc); - - $bc = $this->trim_array_elems(explode("\n",$_POST['pubstream_denied_channels'])); - set_config('system','pubstream_denied_channels',$bc); + $ws = $this->trim_array_elems(explode("\n", $_POST['allowed_sites'])); + set_config('system', 'allowed_sites', $ws); - $embed_sslonly = ((x($_POST,'embed_sslonly')) ? True : False); - set_config('system','embed_sslonly',$embed_sslonly); - - $we = $this->trim_array_elems(explode("\n",$_POST['embed_allow'])); - set_config('system','embed_allow',$we); - - $be = $this->trim_array_elems(explode("\n",$_POST['embed_deny'])); - set_config('system','embed_deny',$be); - - $ts = ((x($_POST,'transport_security')) ? True : False); - set_config('system','transport_security_header',$ts); + $bs = $this->trim_array_elems(explode("\n", $_POST['denied_sites'])); + set_config('system', 'denied_sites', $bs); - $cs = ((x($_POST,'content_security')) ? True : False); - set_config('system','content_security_policy',$cs); + $wc = $this->trim_array_elems(explode("\n", $_POST['allowed_channels'])); + set_config('system', 'allowed_channels', $wc); - goaway(z_root() . '/admin/security'); - } - - + $bc = $this->trim_array_elems(explode("\n", $_POST['denied_channels'])); + set_config('system', 'denied_channels', $bc); - function get() { - - $allowedsites = get_config('system','allowed_sites'); - $allowedsites_str = ((is_array($allowedsites)) ? implode("\n",$allowedsites) : ''); - - $deniedsites = get_config('system','denied_sites'); - $deniedsites_str = ((is_array($deniedsites)) ? implode("\n",$deniedsites) : ''); - - - $allowedchannels = get_config('system','allowed_channels'); - $allowedchannels_str = ((is_array($allowedchannels)) ? implode("\n",$allowedchannels) : ''); - - $deniedchannels = get_config('system','denied_channels'); - $deniedchannels_str = ((is_array($deniedchannels)) ? implode("\n",$deniedchannels) : ''); + $ws = $this->trim_array_elems(explode("\n", $_POST['pubstream_allowed_sites'])); + set_config('system', 'pubstream_allowed_sites', $ws); - $psallowedsites = get_config('system','pubstream_allowed_sites'); - $psallowedsites_str = ((is_array($psallowedsites)) ? implode("\n",$psallowedsites) : ''); - - $psdeniedsites = get_config('system','pubstream_denied_sites'); - $psdeniedsites_str = ((is_array($psdeniedsites)) ? implode("\n",$psdeniedsites) : ''); - - - $psallowedchannels = get_config('system','pubstream_allowed_channels'); - $psallowedchannels_str = ((is_array($psallowedchannels)) ? implode("\n",$psallowedchannels) : ''); - - $psdeniedchannels = get_config('system','pubstream_denied_channels'); - $psdeniedchannels_str = ((is_array($psdeniedchannels)) ? implode("\n",$psdeniedchannels) : ''); + $bs = $this->trim_array_elems(explode("\n", $_POST['pubstream_denied_sites'])); + set_config('system', 'pubstream_denied_sites', $bs); - $allowedembeds = get_config('system','embed_allow'); - $allowedembeds_str = ((is_array($allowedembeds)) ? implode("\n",$allowedembeds) : ''); - - $deniedembeds = get_config('system','embed_deny'); - $deniedembeds_str = ((is_array($deniedembeds)) ? implode("\n",$deniedembeds) : ''); - - $embed_coop = intval(get_config('system','embed_coop')); - - if((! $allowedembeds) && (! $deniedembeds)) { - $embedhelp1 = t("By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."); - } + $wc = $this->trim_array_elems(explode("\n", $_POST['pubstream_allowed_channels'])); + set_config('system', 'pubstream_allowed_channels', $wc); - $embedhelp2 = t("The recommended setting is to only allow unfiltered HTML from the following sites:"); - $embedhelp3 = t("https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"); - $embedhelp4 = t("All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."); - - $t = get_markup_template('admin_security.tpl'); - return replace_macros($t, array( - '$title' => t('Administration'), - '$page' => t('Security'), - '$form_security_token' => get_form_security_token('admin_security'), - '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.")), - '$block_public_search' => array('block_public_search', t("Block public search"), get_config('system','block_public_search', 1), t("Prevent access to search content unless you are currently authenticated.")), - '$block_public_dir' => [ 'block_public_directory', t('Block directory from visitors'), get_config('system','block_public_directory',true), t('Only allow authenticated access to directory.') ], - '$localdir_hide' => [ 'localdir_hide', t('Hide local directory'), intval(get_config('system','localdir_hide')), t('Only use the global directory') ], - '$cloud_noroot' => [ 'cloud_noroot', t('Provide a cloud root directory'), 1 - intval(get_config('system','cloud_disable_siteroot',true)), t('The cloud root directory lists all channel names which provide public files. Otherwise only the names of connections are shown.') ], - '$cloud_disksize' => [ 'cloud_disksize', t('Show total disk space available to cloud uploads'), intval(get_config('system','cloud_report_disksize')), '' ], - '$thumbnail_security' => [ 'thumbnail_security', t("Allow SVG thumbnails in file browser"), get_config('system','thumbnail_security',0), t("WARNING: SVG images may contain malicious code.") ], + $bc = $this->trim_array_elems(explode("\n", $_POST['pubstream_denied_channels'])); + set_config('system', 'pubstream_denied_channels', $bc); - '$inline_pdf' => [ 'inline_pdf', t("Allow embedded (inline) PDF files"), get_config('system','inline_pdf',0), '' ], - '$anonymous_comments' => [ 'anonymous_comments', t('Permit anonymous comments'), intval(get_config('system','anonymous_comments')), t('Moderation will be performed by channels that select this comment option.') ], - '$transport_security' => array('transport_security', t('Set "Transport Security" HTTP header'),intval(get_config('system','transport_security_header')),''), - '$content_security' => array('content_security', t('Set "Content Security Policy" HTTP header'),intval(get_config('system','content_security_policy')),''), - '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), - '$not_allowed_email' => array('not_allowed_email', t("Not allowed email domains"), get_config('system','not_allowed_email'), t("Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined.")), - '$allowed_sites' => array('allowed_sites', t('Allow communications only from these sites'), $allowedsites_str, t('One site per line. Leave empty to allow communication from anywhere by default')), - '$denied_sites' => array('denied_sites', t('Block communications from these sites'), $deniedsites_str, ''), - '$allowed_channels' => array('allowed_channels', t('Allow communications only from these channels'), $allowedchannels_str, t('One channel (hash) per line. Leave empty to allow communication from any channel by default')), - '$denied_channels' => array('denied_channels', t('Block communications from these channels'), $deniedchannels_str, ''), + $embed_sslonly = ((x($_POST, 'embed_sslonly')) ? true : false); + set_config('system', 'embed_sslonly', $embed_sslonly); - '$psallowed_sites' => array('pubstream_allowed_sites', t('Allow public stream communications only from these sites'), $psallowedsites_str, t('One site per line. Leave empty to allow communication from anywhere by default')), - '$psdenied_sites' => array('pubstream_denied_sites', t('Block public stream communications from these sites'), $psdeniedsites_str, ''), - '$psallowed_channels' => array('pubstream_allowed_channels', t('Allow public stream communications only from these channels'), $psallowedchannels_str, t('One channel (hash) per line. Leave empty to allow communication from any channel by default')), - '$psdenied_channels' => array('pubstream_denied_channels', t('Block public stream communications from these channels'), $psdeniedchannels_str, ''), + $we = $this->trim_array_elems(explode("\n", $_POST['embed_allow'])); + set_config('system', 'embed_allow', $we); + + $be = $this->trim_array_elems(explode("\n", $_POST['embed_deny'])); + set_config('system', 'embed_deny', $be); + + $ts = ((x($_POST, 'transport_security')) ? true : false); + set_config('system', 'transport_security_header', $ts); + + $cs = ((x($_POST, 'content_security')) ? true : false); + set_config('system', 'content_security_policy', $cs); + + goaway(z_root() . '/admin/security'); + } - '$embed_sslonly' => array('embed_sslonly',t('Only allow embeds from secure (SSL) websites and links.'), intval(get_config('system','embed_sslonly')),''), - '$embed_allow' => array('embed_allow', t('Allow unfiltered embedded HTML content only from these domains'), $allowedembeds_str, t('One site per line. By default embedded content is filtered.')), - '$embed_deny' => array('embed_deny', t('Block embedded HTML from these domains'), $deniedembeds_str, ''), - -// '$embed_coop' => array('embed_coop', t('Cooperative embed security'), $embed_coop, t('Enable to share embed security with other compatible sites/hubs')), + public function get() + { - '$submit' => t('Submit') - )); - } + $allowedsites = get_config('system', 'allowed_sites'); + $allowedsites_str = ((is_array($allowedsites)) ? implode("\n", $allowedsites) : ''); + + $deniedsites = get_config('system', 'denied_sites'); + $deniedsites_str = ((is_array($deniedsites)) ? implode("\n", $deniedsites) : ''); - function trim_array_elems($arr) { - $narr = []; - - if($arr && is_array($arr)) { - for($x = 0; $x < count($arr); $x ++) { - $y = trim($arr[$x]); - if($y) - $narr[] = $y; - } - } - return $narr; - } - - -} \ No newline at end of file + $allowedchannels = get_config('system', 'allowed_channels'); + $allowedchannels_str = ((is_array($allowedchannels)) ? implode("\n", $allowedchannels) : ''); + + $deniedchannels = get_config('system', 'denied_channels'); + $deniedchannels_str = ((is_array($deniedchannels)) ? implode("\n", $deniedchannels) : ''); + + $psallowedsites = get_config('system', 'pubstream_allowed_sites'); + $psallowedsites_str = ((is_array($psallowedsites)) ? implode("\n", $psallowedsites) : ''); + + $psdeniedsites = get_config('system', 'pubstream_denied_sites'); + $psdeniedsites_str = ((is_array($psdeniedsites)) ? implode("\n", $psdeniedsites) : ''); + + + $psallowedchannels = get_config('system', 'pubstream_allowed_channels'); + $psallowedchannels_str = ((is_array($psallowedchannels)) ? implode("\n", $psallowedchannels) : ''); + + $psdeniedchannels = get_config('system', 'pubstream_denied_channels'); + $psdeniedchannels_str = ((is_array($psdeniedchannels)) ? implode("\n", $psdeniedchannels) : ''); + + $allowedembeds = get_config('system', 'embed_allow'); + $allowedembeds_str = ((is_array($allowedembeds)) ? implode("\n", $allowedembeds) : ''); + + $deniedembeds = get_config('system', 'embed_deny'); + $deniedembeds_str = ((is_array($deniedembeds)) ? implode("\n", $deniedembeds) : ''); + + $embed_coop = intval(get_config('system', 'embed_coop')); + + if ((!$allowedembeds) && (!$deniedembeds)) { + $embedhelp1 = t("By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."); + } + + $embedhelp2 = t("The recommended setting is to only allow unfiltered HTML from the following sites:"); + $embedhelp3 = t("https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"); + $embedhelp4 = t("All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."); + + $t = get_markup_template('admin_security.tpl'); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Security'), + '$form_security_token' => get_form_security_token('admin_security'), + '$block_public' => array('block_public', t("Block public"), get_config('system', 'block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.")), + '$block_public_search' => array('block_public_search', t("Block public search"), get_config('system', 'block_public_search', 1), t("Prevent access to search content unless you are currently authenticated.")), + '$block_public_dir' => ['block_public_directory', t('Block directory from visitors'), get_config('system', 'block_public_directory', true), t('Only allow authenticated access to directory.')], + '$localdir_hide' => ['localdir_hide', t('Hide local directory'), intval(get_config('system', 'localdir_hide')), t('Only use the global directory')], + '$cloud_noroot' => ['cloud_noroot', t('Provide a cloud root directory'), 1 - intval(get_config('system', 'cloud_disable_siteroot', true)), t('The cloud root directory lists all channel names which provide public files. Otherwise only the names of connections are shown.')], + '$cloud_disksize' => ['cloud_disksize', t('Show total disk space available to cloud uploads'), intval(get_config('system', 'cloud_report_disksize')), ''], + '$thumbnail_security' => ['thumbnail_security', t("Allow SVG thumbnails in file browser"), get_config('system', 'thumbnail_security', 0), t("WARNING: SVG images may contain malicious code.")], + + '$inline_pdf' => ['inline_pdf', t("Allow embedded (inline) PDF files"), get_config('system', 'inline_pdf', 0), ''], + '$anonymous_comments' => ['anonymous_comments', t('Permit anonymous comments'), intval(get_config('system', 'anonymous_comments')), t('Moderation will be performed by channels that select this comment option.')], + '$transport_security' => array('transport_security', t('Set "Transport Security" HTTP header'), intval(get_config('system', 'transport_security_header')), ''), + '$content_security' => array('content_security', t('Set "Content Security Policy" HTTP header'), intval(get_config('system', 'content_security_policy')), ''), + '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system', 'allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), + '$not_allowed_email' => array('not_allowed_email', t("Not allowed email domains"), get_config('system', 'not_allowed_email'), t("Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined.")), + '$allowed_sites' => array('allowed_sites', t('Allow communications only from these sites'), $allowedsites_str, t('One site per line. Leave empty to allow communication from anywhere by default')), + '$denied_sites' => array('denied_sites', t('Block communications from these sites'), $deniedsites_str, ''), + '$allowed_channels' => array('allowed_channels', t('Allow communications only from these channels'), $allowedchannels_str, t('One channel (hash) per line. Leave empty to allow communication from any channel by default')), + '$denied_channels' => array('denied_channels', t('Block communications from these channels'), $deniedchannels_str, ''), + + '$psallowed_sites' => array('pubstream_allowed_sites', t('Allow public stream communications only from these sites'), $psallowedsites_str, t('One site per line. Leave empty to allow communication from anywhere by default')), + '$psdenied_sites' => array('pubstream_denied_sites', t('Block public stream communications from these sites'), $psdeniedsites_str, ''), + '$psallowed_channels' => array('pubstream_allowed_channels', t('Allow public stream communications only from these channels'), $psallowedchannels_str, t('One channel (hash) per line. Leave empty to allow communication from any channel by default')), + '$psdenied_channels' => array('pubstream_denied_channels', t('Block public stream communications from these channels'), $psdeniedchannels_str, ''), + + + '$embed_sslonly' => array('embed_sslonly', t('Only allow embeds from secure (SSL) websites and links.'), intval(get_config('system', 'embed_sslonly')), ''), + '$embed_allow' => array('embed_allow', t('Allow unfiltered embedded HTML content only from these domains'), $allowedembeds_str, t('One site per line. By default embedded content is filtered.')), + '$embed_deny' => array('embed_deny', t('Block embedded HTML from these domains'), $deniedembeds_str, ''), + +// '$embed_coop' => array('embed_coop', t('Cooperative embed security'), $embed_coop, t('Enable to share embed security with other compatible sites/hubs')), + + '$submit' => t('Submit') + )); + } + + + public function trim_array_elems($arr) + { + $narr = []; + + if ($arr && is_array($arr)) { + for ($x = 0; $x < count($arr); $x++) { + $y = trim($arr[$x]); + if ($y) { + $narr[] = $y; + } + } + } + return $narr; + } +} diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index 37956c31a..f31f3a58f 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -6,364 +6,374 @@ use App; use Zotlabs\Lib\System; use Zotlabs\Access\PermissionRoles; -class Site { +class Site +{ - /** - * @brief POST handler for Admin Site Page. - * - */ - function post() { + /** + * @brief POST handler for Admin Site Page. + * + */ + public function post() + { - if(! is_site_admin()) { - return; - } - - if (! x($_POST, 'page_site')) { - return; - } + if (!is_site_admin()) { + return; + } - $sys = get_sys_channel(); + if (!x($_POST, 'page_site')) { + return; + } - check_form_security_token_redirectOnErr('/admin/site', 'admin_site'); + $sys = get_sys_channel(); - $sitename = ((x($_POST,'sitename')) ? notags(trim($_POST['sitename'])) : App::get_hostname()); + check_form_security_token_redirectOnErr('/admin/site', 'admin_site'); - $admininfo = ((x($_POST,'admininfo')) ? trim($_POST['admininfo']) : false); - $siteinfo = ((x($_POST,'siteinfo')) ? trim($_POST['siteinfo']) : ''); - $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : 'en'); - $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : ''); -// $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : ''); -// $site_channel = ((x($_POST,'site_channel')) ? notags(trim($_POST['site_channel'])) : ''); - $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); + $sitename = ((x($_POST, 'sitename')) ? notags(trim($_POST['sitename'])) : App::get_hostname()); - $register_policy = ((x($_POST,'register_policy')) ? intval(trim($_POST['register_policy'])) : 0); - $minimum_age = ((x($_POST,'minimum_age')) ? intval(trim($_POST['minimum_age'])) : 13); - $access_policy = ((x($_POST,'access_policy')) ? intval(trim($_POST['access_policy'])) : 0); - $invite_only = ((x($_POST,'invite_only')) ? True : False); - $abandon_days = ((x($_POST,'abandon_days')) ? intval(trim($_POST['abandon_days'])) : 0); + $admininfo = ((x($_POST, 'admininfo')) ? trim($_POST['admininfo']) : false); + $siteinfo = ((x($_POST, 'siteinfo')) ? trim($_POST['siteinfo']) : ''); + $language = ((x($_POST, 'language')) ? notags(trim($_POST['language'])) : 'en'); + $theme = ((x($_POST, 'theme')) ? notags(trim($_POST['theme'])) : ''); +// $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : ''); +// $site_channel = ((x($_POST,'site_channel')) ? notags(trim($_POST['site_channel'])) : ''); + $maximagesize = ((x($_POST, 'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); - $register_text = ((x($_POST,'register_text')) ? notags(trim($_POST['register_text'])) : ''); - $site_sellpage = ((x($_POST,'site_sellpage')) ? notags(trim($_POST['site_sellpage'])) : ''); - $site_location = ((x($_POST,'site_location')) ? notags(trim($_POST['site_location'])) : ''); - $frontpage = ((x($_POST,'frontpage')) ? notags(trim($_POST['frontpage'])) : ''); - $firstpage = ((x($_POST,'firstpage')) ? notags(trim($_POST['firstpage'])) : 'profiles'); - $first_page = ((x($_POST,'first_page')) ? notags(trim($_POST['first_page'])) : 'profiles'); - // check value after trim - if(! $first_page) { - $first_page = 'profiles'; - } - $mirror_frontpage = ((x($_POST,'mirror_frontpage')) ? intval(trim($_POST['mirror_frontpage'])) : 0); - $directory_server = ((x($_POST,'directory_server')) ? trim($_POST['directory_server']) : ''); - $force_publish = ((x($_POST,'publish_all')) ? True : False); - $open_pubstream = ((x($_POST,'open_pubstream')) ? True : False); - $public_stream_mode = ((x($_POST,'public_stream_mode')) ? intval($_POST['public_stream_mode']) : PUBLIC_STREAM_NONE); - $animations = ((x($_POST,'animations')) ? True : False); - $login_on_homepage = ((x($_POST,'login_on_homepage')) ? True : False); - $enable_context_help = ((x($_POST,'enable_context_help')) ? True : False); - $global_directory = ((x($_POST,'directory_submit_url')) ? notags(trim($_POST['directory_submit_url'])) : ''); - $no_community_page = !((x($_POST,'no_community_page')) ? True : False); - $default_expire_days = ((array_key_exists('default_expire_days',$_POST)) ? intval($_POST['default_expire_days']) : 0); - $active_expire_days = ((array_key_exists('active_expire_days',$_POST)) ? intval($_POST['active_expire_days']) : 7); - $max_imported_follow = ((x($_POST,'max_imported_follow')) ? intval(trim($_POST['max_imported_follow'])) : MAX_IMPORTED_FOLLOW); + $register_policy = ((x($_POST, 'register_policy')) ? intval(trim($_POST['register_policy'])) : 0); + $minimum_age = ((x($_POST, 'minimum_age')) ? intval(trim($_POST['minimum_age'])) : 13); + $access_policy = ((x($_POST, 'access_policy')) ? intval(trim($_POST['access_policy'])) : 0); + $invite_only = ((x($_POST, 'invite_only')) ? true : false); + $abandon_days = ((x($_POST, 'abandon_days')) ? intval(trim($_POST['abandon_days'])) : 0); - $reply_address = ((array_key_exists('reply_address',$_POST) && trim($_POST['reply_address'])) ? trim($_POST['reply_address']) : 'noreply@' . \App::get_hostname()); - $from_email = ((array_key_exists('from_email',$_POST) && trim($_POST['from_email'])) ? trim($_POST['from_email']) : 'Administrator@' . \App::get_hostname()); - $from_email_name = ((array_key_exists('from_email_name',$_POST) && trim($_POST['from_email_name'])) ? trim($_POST['from_email_name']) : \Zotlabs\Lib\System::get_site_name()); + $register_text = ((x($_POST, 'register_text')) ? notags(trim($_POST['register_text'])) : ''); + $site_sellpage = ((x($_POST, 'site_sellpage')) ? notags(trim($_POST['site_sellpage'])) : ''); + $site_location = ((x($_POST, 'site_location')) ? notags(trim($_POST['site_location'])) : ''); + $frontpage = ((x($_POST, 'frontpage')) ? notags(trim($_POST['frontpage'])) : ''); + $firstpage = ((x($_POST, 'firstpage')) ? notags(trim($_POST['firstpage'])) : 'profiles'); + $first_page = ((x($_POST, 'first_page')) ? notags(trim($_POST['first_page'])) : 'profiles'); + // check value after trim + if (!$first_page) { + $first_page = 'profiles'; + } + $mirror_frontpage = ((x($_POST, 'mirror_frontpage')) ? intval(trim($_POST['mirror_frontpage'])) : 0); + $directory_server = ((x($_POST, 'directory_server')) ? trim($_POST['directory_server']) : ''); + $force_publish = ((x($_POST, 'publish_all')) ? true : false); + $open_pubstream = ((x($_POST, 'open_pubstream')) ? true : false); + $public_stream_mode = ((x($_POST, 'public_stream_mode')) ? intval($_POST['public_stream_mode']) : PUBLIC_STREAM_NONE); + $animations = ((x($_POST, 'animations')) ? true : false); + $login_on_homepage = ((x($_POST, 'login_on_homepage')) ? true : false); + $enable_context_help = ((x($_POST, 'enable_context_help')) ? true : false); + $global_directory = ((x($_POST, 'directory_submit_url')) ? notags(trim($_POST['directory_submit_url'])) : ''); + $no_community_page = !((x($_POST, 'no_community_page')) ? true : false); + $default_expire_days = ((array_key_exists('default_expire_days', $_POST)) ? intval($_POST['default_expire_days']) : 0); + $active_expire_days = ((array_key_exists('active_expire_days', $_POST)) ? intval($_POST['active_expire_days']) : 7); + $max_imported_follow = ((x($_POST, 'max_imported_follow')) ? intval(trim($_POST['max_imported_follow'])) : MAX_IMPORTED_FOLLOW); - $verifyssl = ((x($_POST,'verifyssl')) ? True : False); - $proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['proxyuser'])) : ''); - $proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['proxy'])) : ''); - $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); - $post_timeout = ((x($_POST,'post_timeout')) ? intval(trim($_POST['post_timeout'])) : 90); - $show_like_counts = ((x($_POST,'show_like_counts')) ? intval(trim($_POST['show_like_counts'])) : 0); - $cache_images = ((x($_POST,'cache_images')) ? intval(trim($_POST['cache_images'])) : 0); - $delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0); - $delivery_batch_count = ((x($_POST,'delivery_batch_count') && $_POST['delivery_batch_count'] > 0)? intval(trim($_POST['delivery_batch_count'])) : 3); - $poll_interval = ((x($_POST,'poll_interval')) ? intval(trim($_POST['poll_interval'])) : 0); - $maxloadavg = ((x($_POST,'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50); -// $feed_contacts = ((x($_POST,'feed_contacts')) ? intval($_POST['feed_contacts']) : 0); - $ap_contacts = ((x($_POST,'ap_contacts')) ? intval($_POST['ap_contacts']) : 0); - $verify_email = ((x($_POST,'verify_email')) ? 1 : 0); - $imagick_path = ((x($_POST,'imagick_path')) ? trim($_POST['imagick_path']) : ''); - $force_queue = ((intval($_POST['force_queue']) > 0) ? intval($_POST['force_queue']) : 3000); - $pub_incl = escape_tags(trim($_POST['pub_incl'])); - $pub_excl = escape_tags(trim($_POST['pub_excl'])); + $reply_address = ((array_key_exists('reply_address', $_POST) && trim($_POST['reply_address'])) ? trim($_POST['reply_address']) : 'noreply@' . App::get_hostname()); + $from_email = ((array_key_exists('from_email', $_POST) && trim($_POST['from_email'])) ? trim($_POST['from_email']) : 'Administrator@' . App::get_hostname()); + $from_email_name = ((array_key_exists('from_email_name', $_POST) && trim($_POST['from_email_name'])) ? trim($_POST['from_email_name']) : System::get_site_name()); - $permissions_role = escape_tags(trim($_POST['permissions_role'])); + $verifyssl = ((x($_POST, 'verifyssl')) ? true : false); + $proxyuser = ((x($_POST, 'proxyuser')) ? notags(trim($_POST['proxyuser'])) : ''); + $proxy = ((x($_POST, 'proxy')) ? notags(trim($_POST['proxy'])) : ''); + $timeout = ((x($_POST, 'timeout')) ? intval(trim($_POST['timeout'])) : 60); + $post_timeout = ((x($_POST, 'post_timeout')) ? intval(trim($_POST['post_timeout'])) : 90); + $show_like_counts = ((x($_POST, 'show_like_counts')) ? intval(trim($_POST['show_like_counts'])) : 0); + $cache_images = ((x($_POST, 'cache_images')) ? intval(trim($_POST['cache_images'])) : 0); + $delivery_interval = ((x($_POST, 'delivery_interval')) ? intval(trim($_POST['delivery_interval'])) : 0); + $delivery_batch_count = ((x($_POST, 'delivery_batch_count') && $_POST['delivery_batch_count'] > 0) ? intval(trim($_POST['delivery_batch_count'])) : 3); + $poll_interval = ((x($_POST, 'poll_interval')) ? intval(trim($_POST['poll_interval'])) : 0); + $maxloadavg = ((x($_POST, 'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50); +// $feed_contacts = ((x($_POST,'feed_contacts')) ? intval($_POST['feed_contacts']) : 0); + $ap_contacts = ((x($_POST, 'ap_contacts')) ? intval($_POST['ap_contacts']) : 0); + $verify_email = ((x($_POST, 'verify_email')) ? 1 : 0); + $imagick_path = ((x($_POST, 'imagick_path')) ? trim($_POST['imagick_path']) : ''); + $force_queue = ((intval($_POST['force_queue']) > 0) ? intval($_POST['force_queue']) : 3000); + $pub_incl = escape_tags(trim($_POST['pub_incl'])); + $pub_excl = escape_tags(trim($_POST['pub_excl'])); -// set_config('system', 'feed_contacts', $feed_contacts); - set_config('system', 'activitypub', $ap_contacts); - set_config('system', 'delivery_interval', $delivery_interval); - set_config('system', 'delivery_batch_count', $delivery_batch_count); - set_config('system', 'poll_interval', $poll_interval); - set_config('system', 'maxloadavg', $maxloadavg); - set_config('system', 'frontpage', $frontpage); - set_config('system', 'cache_images', $cache_images); - set_config('system', 'sellpage', $site_sellpage); - set_config('system', 'workflow_channel_next', $first_page); - set_config('system', 'site_location', $site_location); - set_config('system', 'mirror_frontpage', $mirror_frontpage); - set_config('system', 'sitename', $sitename); - set_config('system', 'login_on_homepage', $login_on_homepage); - set_config('system', 'enable_context_help', $enable_context_help); - set_config('system', 'verify_email', $verify_email); - set_config('system', 'default_expire_days', $default_expire_days); - set_config('system', 'active_expire_days', $active_expire_days); - set_config('system', 'reply_address', $reply_address); - set_config('system', 'from_email', $from_email); - set_config('system', 'from_email_name' , $from_email_name); - set_config('system', 'imagick_convert_path' , $imagick_path); - set_config('system', 'default_permissions_role', $permissions_role); - set_config('system', 'show_like_counts', $show_like_counts); - set_config('system', 'pubstream_incl',$pub_incl); - set_config('system', 'pubstream_excl',$pub_excl); - set_config('system', 'max_imported_follow', $max_imported_follow); - set_config('system', 'animated_avatars', $animations); - + $permissions_role = escape_tags(trim($_POST['permissions_role'])); - if ($directory_server) { - set_config('system','directory_server',$directory_server); - } - - if ($admininfo == '') { - del_config('system', 'admininfo'); - } - else { - require_once('include/text.php'); - linkify_tags($admininfo, local_channel()); - set_config('system', 'admininfo', $admininfo); - } - set_config('system','siteinfo',$siteinfo); - - // sync sitename and siteinfo updates to the system channel - - q("update profile set about = '%s' where uid = %d and is_default = 1", - dbesc($siteinfo), - intval($sys['channel_id']) - ); - q("update profile set fullname = '%s' where uid = %d and is_default = 1", - dbesc($sitename), - intval($sys['channel_id']) - ); - q("update channel set channel_name = '%s' where channel_id = %d", - dbesc($sitename), - intval($sys['channel_id']) - ); - q("update xchan set xchan_name = '%s' , xchan_name_updated = '%s' where xchan_hash = '%s'", - dbesc($sitename), - dbesc(datetime_convert()), - dbesc($sys['channel_hash']) - ); - - set_config('system', 'language', $language); - set_config('system', 'theme', $theme); - // set_config('system','site_channel', $site_channel); - set_config('system','maximagesize', $maximagesize); - - set_config('system','register_policy', $register_policy); - set_config('system','minimum_age', $minimum_age); - set_config('system','invitation_only', $invite_only); - set_config('system','access_policy', $access_policy); - set_config('system','account_abandon_days', $abandon_days); - set_config('system','register_text', $register_text); - set_config('system','publish_all', $force_publish); - set_config('system','public_stream_mode', $public_stream_mode); - set_config('system','open_pubstream', $open_pubstream); - set_config('system','force_queue_threshold', $force_queue); - if ($global_directory == '') { - del_config('system', 'directory_submit_url'); - } else { - set_config('system', 'directory_submit_url', $global_directory); - } - - set_config('system','no_community_page', $no_community_page); - set_config('system','no_utf', $no_utf); - set_config('system','verifyssl', $verifyssl); - set_config('system','proxyuser', $proxyuser); - set_config('system','proxy', $proxy); - set_config('system','curl_timeout', $timeout); - set_config('system','curl_post_timeout', $post_timeout); - - info( t('Site settings updated.') . EOL); - goaway(z_root() . '/admin/site' ); - } - - /** - * @brief Admin page site. - * - * @return string with HTML - */ - - function get() { - - /* Installed langs */ - $lang_choices = []; - $langs = glob('view/*/strings.php'); - - if (is_array($langs) && count($langs)) { - if (! in_array('view/en/strings.php',$langs)) - $langs[] = 'view/en/'; - asort($langs); - foreach ($langs as $l) { - $t = explode("/",$l); - $lang_choices[$t[1]] = $t[1]; - } - } - - /* Installed themes */ - $theme_choices_mobile["---"] = t("Default"); - $theme_choices = []; - $files = glob('view/theme/*'); - if ($files) { - foreach ($files as $file) { - $vars = ''; - $f = basename($file); - - $info = get_theme_info($f); - $compatible = check_plugin_versions($info); - if (! $compatible) { - $theme_choices[$f] = $theme_choices_mobile[$f] = sprintf(t('%s - (Incompatible)'), $f); - continue; - } - - if (file_exists($file . '/library')) - continue; - if (file_exists($file . '/mobile')) - $vars = t('mobile'); - if (file_exists($file . '/experimental')) - $vars .= t('experimental'); - if (file_exists($file . '/unsupported')) - $vars .= t('unsupported'); - if ($vars) { - $theme_choices[$f] = $f . ' (' . $vars . ')'; - $theme_choices_mobile[$f] = $f . ' (' . $vars . ')'; - } - else { - $theme_choices[$f] = $f; - $theme_choices_mobile[$f] = $f; - } - } - } - - $dir_choices = null; - $dirmode = get_config('system','directory_mode'); - $realm = get_directory_realm(); - - // directory server should not be set or settable unless we are a directory client - // avoid older redmatrix servers which don't have modern encryption - - if ($dirmode == DIRECTORY_MODE_NORMAL) { - $x = q("select site_url from site where site_flags in (%d,%d) and site_realm = '%s' and site_dead = 0", - intval(DIRECTORY_MODE_SECONDARY), - intval(DIRECTORY_MODE_PRIMARY), - dbesc($realm) - ); - if ($x) { - $dir_choices = []; - foreach ($x as $xx) { - $dir_choices[$xx['site_url']] = $xx['site_url']; - } - } - } +// set_config('system', 'feed_contacts', $feed_contacts); + set_config('system', 'activitypub', $ap_contacts); + set_config('system', 'delivery_interval', $delivery_interval); + set_config('system', 'delivery_batch_count', $delivery_batch_count); + set_config('system', 'poll_interval', $poll_interval); + set_config('system', 'maxloadavg', $maxloadavg); + set_config('system', 'frontpage', $frontpage); + set_config('system', 'cache_images', $cache_images); + set_config('system', 'sellpage', $site_sellpage); + set_config('system', 'workflow_channel_next', $first_page); + set_config('system', 'site_location', $site_location); + set_config('system', 'mirror_frontpage', $mirror_frontpage); + set_config('system', 'sitename', $sitename); + set_config('system', 'login_on_homepage', $login_on_homepage); + set_config('system', 'enable_context_help', $enable_context_help); + set_config('system', 'verify_email', $verify_email); + set_config('system', 'default_expire_days', $default_expire_days); + set_config('system', 'active_expire_days', $active_expire_days); + set_config('system', 'reply_address', $reply_address); + set_config('system', 'from_email', $from_email); + set_config('system', 'from_email_name', $from_email_name); + set_config('system', 'imagick_convert_path', $imagick_path); + set_config('system', 'default_permissions_role', $permissions_role); + set_config('system', 'show_like_counts', $show_like_counts); + set_config('system', 'pubstream_incl', $pub_incl); + set_config('system', 'pubstream_excl', $pub_excl); + set_config('system', 'max_imported_follow', $max_imported_follow); + set_config('system', 'animated_avatars', $animations); - /* Admin Info */ - - $admininfo = get_config('system', 'admininfo'); + if ($directory_server) { + set_config('system', 'directory_server', $directory_server); + } - /* Register policy */ - $register_choices = [ - REGISTER_CLOSED => t("No"), - REGISTER_APPROVE => t("Yes - with approval"), - REGISTER_OPEN => t("Yes") - ]; + if ($admininfo == '') { + del_config('system', 'admininfo'); + } else { + require_once('include/text.php'); + linkify_tags($admininfo, local_channel()); + set_config('system', 'admininfo', $admininfo); + } + set_config('system', 'siteinfo', $siteinfo); - /* Acess policy */ - $access_choices = [ - ACCESS_PRIVATE => t("My site is not a public server"), - ACCESS_FREE => t("My site provides free public access"), - ACCESS_PAID => t("My site provides paid public access"), - ACCESS_TIERED => t("My site provides free public access and premium paid plans") - ]; + // sync sitename and siteinfo updates to the system channel - $perm_roles = PermissionRoles::roles(); - $default_role = get_config('system','default_permissions_role','social'); + q( + "update profile set about = '%s' where uid = %d and is_default = 1", + dbesc($siteinfo), + intval($sys['channel_id']) + ); + q( + "update profile set fullname = '%s' where uid = %d and is_default = 1", + dbesc($sitename), + intval($sys['channel_id']) + ); + q( + "update channel set channel_name = '%s' where channel_id = %d", + dbesc($sitename), + intval($sys['channel_id']) + ); + q( + "update xchan set xchan_name = '%s' , xchan_name_updated = '%s' where xchan_hash = '%s'", + dbesc($sitename), + dbesc(datetime_convert()), + dbesc($sys['channel_hash']) + ); - $role = [ 'permissions_role' , t('Default permission role for new accounts'), $default_role, t('This role will be used for the first channel created after registration.'),$perm_roles ]; + set_config('system', 'language', $language); + set_config('system', 'theme', $theme); + // set_config('system','site_channel', $site_channel); + set_config('system', 'maximagesize', $maximagesize); + + set_config('system', 'register_policy', $register_policy); + set_config('system', 'minimum_age', $minimum_age); + set_config('system', 'invitation_only', $invite_only); + set_config('system', 'access_policy', $access_policy); + set_config('system', 'account_abandon_days', $abandon_days); + set_config('system', 'register_text', $register_text); + set_config('system', 'publish_all', $force_publish); + set_config('system', 'public_stream_mode', $public_stream_mode); + set_config('system', 'open_pubstream', $open_pubstream); + set_config('system', 'force_queue_threshold', $force_queue); + if ($global_directory == '') { + del_config('system', 'directory_submit_url'); + } else { + set_config('system', 'directory_submit_url', $global_directory); + } + + set_config('system', 'no_community_page', $no_community_page); + set_config('system', 'no_utf', $no_utf); + set_config('system', 'verifyssl', $verifyssl); + set_config('system', 'proxyuser', $proxyuser); + set_config('system', 'proxy', $proxy); + set_config('system', 'curl_timeout', $timeout); + set_config('system', 'curl_post_timeout', $post_timeout); + + info(t('Site settings updated.') . EOL); + goaway(z_root() . '/admin/site'); + } + + /** + * @brief Admin page site. + * + * @return string with HTML + */ + + public function get() + { + + /* Installed langs */ + $lang_choices = []; + $langs = glob('view/*/strings.php'); + + if (is_array($langs) && count($langs)) { + if (!in_array('view/en/strings.php', $langs)) { + $langs[] = 'view/en/'; + } + asort($langs); + foreach ($langs as $l) { + $t = explode("/", $l); + $lang_choices[$t[1]] = $t[1]; + } + } + + /* Installed themes */ + $theme_choices_mobile["---"] = t("Default"); + $theme_choices = []; + $files = glob('view/theme/*'); + if ($files) { + foreach ($files as $file) { + $vars = ''; + $f = basename($file); + + $info = get_theme_info($f); + $compatible = check_plugin_versions($info); + if (!$compatible) { + $theme_choices[$f] = $theme_choices_mobile[$f] = sprintf(t('%s - (Incompatible)'), $f); + continue; + } + + if (file_exists($file . '/library')) { + continue; + } + if (file_exists($file . '/mobile')) { + $vars = t('mobile'); + } + if (file_exists($file . '/experimental')) { + $vars .= t('experimental'); + } + if (file_exists($file . '/unsupported')) { + $vars .= t('unsupported'); + } + if ($vars) { + $theme_choices[$f] = $f . ' (' . $vars . ')'; + $theme_choices_mobile[$f] = $f . ' (' . $vars . ')'; + } else { + $theme_choices[$f] = $f; + $theme_choices_mobile[$f] = $f; + } + } + } + + $dir_choices = null; + $dirmode = get_config('system', 'directory_mode'); + $realm = get_directory_realm(); + + // directory server should not be set or settable unless we are a directory client + // avoid older redmatrix servers which don't have modern encryption + + if ($dirmode == DIRECTORY_MODE_NORMAL) { + $x = q( + "select site_url from site where site_flags in (%d,%d) and site_realm = '%s' and site_dead = 0", + intval(DIRECTORY_MODE_SECONDARY), + intval(DIRECTORY_MODE_PRIMARY), + dbesc($realm) + ); + if ($x) { + $dir_choices = []; + foreach ($x as $xx) { + $dir_choices[$xx['site_url']] = $xx['site_url']; + } + } + } - $homelogin = get_config('system','login_on_homepage'); - $enable_context_help = get_config('system','enable_context_help'); + /* Admin Info */ - return replace_macros(get_markup_template('admin_site.tpl'), [ - '$title' => t('Administration'), - '$page' => t('Site'), - '$submit' => t('Submit'), - '$h_basic' => t('Site Configuration'), - '$registration' => t('Registration'), - '$upload' => t('File upload'), - '$corporate' => t('Policies'), - '$advanced' => t('Advanced'), - '$baseurl' => z_root(), - '$sitename' => [ 'sitename', t("Site name"), htmlspecialchars(get_config('system','sitename', App::get_hostname()), ENT_QUOTES, 'UTF-8'),'' ], - '$admininfo' => [ 'admininfo', t("Administrator Information"), $admininfo, t("Contact information for site administrators. Displayed on siteinfo page. BBCode may be used here.") ], - '$siteinfo' => [ 'siteinfo', t('Site Information'), get_config('system','siteinfo'), t("Publicly visible description of this site. Displayed on siteinfo page. BBCode may be used here.") ], - '$language' => [ 'language', t("System language"), get_config('system','language','en'), "", $lang_choices ], - '$theme' => [ 'theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices ], -// '$theme_mobile' => [ 'theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile ], -// '$site_channel' => [ 'site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel") ], - '$ap_contacts' => [ 'ap_contacts', t('ActivityPub protocol'),get_config('system','activitypub', ACTIVITYPUB_ENABLED),t('Provides access to software supporting the ActivityPub protocol.') ], - '$maximagesize' => [ 'maximagesize', t("Maximum image size"), intval(get_config('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.") ], - '$cache_images' => [ 'cache_images', t('Cache all public images'), intval(get_config('system','cache_images',1)), t('If disabled, proxy non-SSL images, but do not store locally') ], - '$register_policy' => [ 'register_policy', t("Does this site allow new member registration?"), get_config('system','register_policy'), "", $register_choices ], - '$invite_only' => [ 'invite_only', t("Invitation only"), get_config('system','invitation_only'), t("Only allow new member registrations with an invitation code. New member registration must be allowed for this to work.") ], - '$invite_working' => defined('INVITE_WORKING'), - '$minimum_age' => [ 'minimum_age', t("Minimum age"), (x(get_config('system','minimum_age'))?get_config('system','minimum_age'):13), t("Minimum age (in years) for who may register on this site.") ], - '$access_policy' => [ 'access_policy', t("Which best describes the types of account offered by this hub?"), get_config('system','access_policy'), t("If a public server policy is selected, this information may be displayed on the public server site list."), $access_choices ], - '$register_text' => [ 'register_text', t("Register text"), htmlspecialchars(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.") ], - '$role' => $role, - '$frontpage' => [ 'frontpage', t("Site homepage to show visitors (default: login box)"), get_config('system','frontpage'), t("example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file.") ], - '$mirror_frontpage' => [ 'mirror_frontpage', t("Preserve site homepage URL"), get_config('system','mirror_frontpage'), t('Present the site homepage in a frame at the original location instead of redirecting') ], - '$abandon_days' => [ 'abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.') ], - '$block_public_dir' => [ 'block_public_directory', t('Block directory from visitors'), get_config('system','block_public_directory',true), t('Only allow authenticated access to directory.') ], - '$verify_email' => [ 'verify_email', t("Verify Email Addresses"), get_config('system','verify_email'), t("Check to verify email addresses used in account registration (recommended).") ], - '$force_publish' => [ 'publish_all', t("Force publish in directory"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.") ], + $admininfo = get_config('system', 'admininfo'); - '$public_stream_mode' => [ 'public_stream_mode', t('Public stream'), intval(get_config('system','public_stream_mode',0)), t('Provide a Public stream on your site. This content is unmoderated.'), [ - 0 => t('the Public stream is disabled'), - 1 => t('the Public stream contains public conversations from this site only'), - 2 => t('the Public stream contains public conversations from anywhere on the internet'), - ]], - - '$open_pubstream' => [ 'open_pubstream', t('Allow anybody on the internet to access the Public stream'), get_config('system','open_pubstream',0), t('Default is to only allow viewing by site members. Warning: this content is unmoderated.') ], - '$show_like_counts' => [ 'show_like_counts', t('Show numbers of likes and dislikes in conversations'), get_config('system','show_like_counts',1), t('If disabled, the presence of likes and dislikes will be shown, but without totals.') ], - '$animations' => [ 'animations', t('Permit animated profile photos'), get_config('system','animated_avatars',true), t('Changing this may take several days to work through the system') ], - '$incl' => [ 'pub_incl',t('Only import Public stream posts with this text'), get_config('system','pubstream_incl'),t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts') ], - '$excl' => [ 'pub_excl',t('Do not import Public stream posts with this text'), get_config('system','pubstream_excl'),t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts') ], - '$max_imported_follow' => [ 'max_imported_follow', t('Maximum number of imported friends of friends'), get_config('system','max_imported_follow', MAX_IMPORTED_FOLLOW), t('Warning: higher numbers will improve the quality of friend suggestions and directory results but can exponentially increase resource usage') ], - '$login_on_homepage' => [ 'login_on_homepage', t("Login on Homepage"),((intval($homelogin) || $homelogin === false) ? 1 : '') , t("Present a login box to visitors on the home page if no other content has been configured.") ], - '$enable_context_help' => [ 'enable_context_help', t("Enable context help"),((intval($enable_context_help) === 1 || $enable_context_help === false) ? 1 : 0) , t("Display contextual help for the current page when the help button is pressed.") ], - '$reply_address' => [ 'reply_address', t('Reply-to email address for system generated email.'), get_config('system','reply_address','noreply@' . \App::get_hostname()),'' ], - '$from_email' => [ 'from_email', t('Sender (From) email address for system generated email.'), get_config('system','from_email','Administrator@' . \App::get_hostname()),'' ], - '$from_email_name' => [ 'from_email_name', t('Display name of email sender for system generated email.'), get_config('system','from_email_name',\Zotlabs\Lib\System::get_site_name()),'' ], - '$directory_server' => (($dir_choices) ? [ 'directory_server', t("Directory Server URL"), get_config('system','directory_server'), t("Default directory server"), $dir_choices ] : null), - '$proxyuser' => [ 'proxyuser', t("Proxy user"), get_config('system','proxyuser'), "" ], - '$proxy' => [ 'proxy', t("Proxy URL"), get_config('system','proxy'), "" ], - '$timeout' => [ 'timeout', t("Network fetch timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).") ], - '$post_timeout' => [ 'post_timeout', t("Network post timeout"), (x(get_config('system','curl_post_timeout'))?get_config('system','curl_post_timeout'):90), t("Value is in seconds. Set to 0 for unlimited (not recommended).") ], - '$delivery_interval' => [ 'delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.") ], - '$delivery_batch_count' => [ 'delivery_batch_count', t('Deliveries per process'),(x(get_config('system','delivery_batch_count'))?get_config('system','delivery_batch_count'):3), t("Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5.") ], - '$force_queue' => [ 'force_queue', t("Queue Threshold"), get_config('system','force_queue_threshold',3000), t("Always defer immediate delivery if queue contains more than this number of entries.") ], - '$poll_interval' => [ 'poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.") ], - '$imagick_path' => [ 'imagick_path', t("Path to ImageMagick convert program"), get_config('system','imagick_convert_path'), t("If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert") ], - '$maxloadavg' => [ 'maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.") ], - '$default_expire_days' => [ 'default_expire_days', t('Expiration period in days for imported streams and cached images'), intval(get_config('system','default_expire_days',60)), t('0 for no expiration of imported content') ], - '$active_expire_days' => [ 'active_expire_days', t('Do not expire any posts which have comments less than this many days ago'), intval(get_config('system','active_expire_days',7)), '' ], - '$sellpage' => [ 'site_sellpage', t('Public servers: Optional landing (marketing) webpage for new registrants'), get_config('system','sellpage',''), sprintf( t('Create this page first. Default is %s/register'),z_root()) ], - '$first_page' => [ 'first_page', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Default: profiles') ], - '$location' => [ 'site_location', t('Site location'), get_config('system','site_location',''), t('Region or country - shared with other sites') ], - '$form_security_token' => get_form_security_token("admin_site"), - ]); - } + /* Register policy */ + $register_choices = [ + REGISTER_CLOSED => t("No"), + REGISTER_APPROVE => t("Yes - with approval"), + REGISTER_OPEN => t("Yes") + ]; + /* Acess policy */ + $access_choices = [ + ACCESS_PRIVATE => t("My site is not a public server"), + ACCESS_FREE => t("My site provides free public access"), + ACCESS_PAID => t("My site provides paid public access"), + ACCESS_TIERED => t("My site provides free public access and premium paid plans") + ]; + + $perm_roles = PermissionRoles::roles(); + $default_role = get_config('system', 'default_permissions_role', 'social'); + + $role = ['permissions_role', t('Default permission role for new accounts'), $default_role, t('This role will be used for the first channel created after registration.'), $perm_roles]; + + + $homelogin = get_config('system', 'login_on_homepage'); + $enable_context_help = get_config('system', 'enable_context_help'); + + return replace_macros(get_markup_template('admin_site.tpl'), [ + '$title' => t('Administration'), + '$page' => t('Site'), + '$submit' => t('Submit'), + '$h_basic' => t('Site Configuration'), + '$registration' => t('Registration'), + '$upload' => t('File upload'), + '$corporate' => t('Policies'), + '$advanced' => t('Advanced'), + '$baseurl' => z_root(), + '$sitename' => ['sitename', t("Site name"), htmlspecialchars(get_config('system', 'sitename', App::get_hostname()), ENT_QUOTES, 'UTF-8'), ''], + '$admininfo' => ['admininfo', t("Administrator Information"), $admininfo, t("Contact information for site administrators. Displayed on siteinfo page. BBCode may be used here.")], + '$siteinfo' => ['siteinfo', t('Site Information'), get_config('system', 'siteinfo'), t("Publicly visible description of this site. Displayed on siteinfo page. BBCode may be used here.")], + '$language' => ['language', t("System language"), get_config('system', 'language', 'en'), "", $lang_choices], + '$theme' => ['theme', t("System theme"), get_config('system', 'theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices], +// '$theme_mobile' => [ 'theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile ], +// '$site_channel' => [ 'site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel") ], + '$ap_contacts' => ['ap_contacts', t('ActivityPub protocol'), get_config('system', 'activitypub', ACTIVITYPUB_ENABLED), t('Provides access to software supporting the ActivityPub protocol.')], + '$maximagesize' => ['maximagesize', t("Maximum image size"), intval(get_config('system', 'maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")], + '$cache_images' => ['cache_images', t('Cache all public images'), intval(get_config('system', 'cache_images', 1)), t('If disabled, proxy non-SSL images, but do not store locally')], + '$register_policy' => ['register_policy', t("Does this site allow new member registration?"), get_config('system', 'register_policy'), "", $register_choices], + '$invite_only' => ['invite_only', t("Invitation only"), get_config('system', 'invitation_only'), t("Only allow new member registrations with an invitation code. New member registration must be allowed for this to work.")], + '$invite_working' => defined('INVITE_WORKING'), + '$minimum_age' => ['minimum_age', t("Minimum age"), (x(get_config('system', 'minimum_age')) ? get_config('system', 'minimum_age') : 13), t("Minimum age (in years) for who may register on this site.")], + '$access_policy' => ['access_policy', t("Which best describes the types of account offered by this hub?"), get_config('system', 'access_policy'), t("If a public server policy is selected, this information may be displayed on the public server site list."), $access_choices], + '$register_text' => ['register_text', t("Register text"), htmlspecialchars(get_config('system', 'register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")], + '$role' => $role, + '$frontpage' => ['frontpage', t("Site homepage to show visitors (default: login box)"), get_config('system', 'frontpage'), t("example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file.")], + '$mirror_frontpage' => ['mirror_frontpage', t("Preserve site homepage URL"), get_config('system', 'mirror_frontpage'), t('Present the site homepage in a frame at the original location instead of redirecting')], + '$abandon_days' => ['abandon_days', t('Accounts abandoned after x days'), get_config('system', 'account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')], + '$block_public_dir' => ['block_public_directory', t('Block directory from visitors'), get_config('system', 'block_public_directory', true), t('Only allow authenticated access to directory.')], + '$verify_email' => ['verify_email', t("Verify Email Addresses"), get_config('system', 'verify_email'), t("Check to verify email addresses used in account registration (recommended).")], + '$force_publish' => ['publish_all', t("Force publish in directory"), get_config('system', 'publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")], + + '$public_stream_mode' => ['public_stream_mode', t('Public stream'), intval(get_config('system', 'public_stream_mode', 0)), t('Provide a Public stream on your site. This content is unmoderated.'), [ + 0 => t('the Public stream is disabled'), + 1 => t('the Public stream contains public conversations from this site only'), + 2 => t('the Public stream contains public conversations from anywhere on the internet'), + ]], + + '$open_pubstream' => ['open_pubstream', t('Allow anybody on the internet to access the Public stream'), get_config('system', 'open_pubstream', 0), t('Default is to only allow viewing by site members. Warning: this content is unmoderated.')], + '$show_like_counts' => ['show_like_counts', t('Show numbers of likes and dislikes in conversations'), get_config('system', 'show_like_counts', 1), t('If disabled, the presence of likes and dislikes will be shown, but without totals.')], + '$animations' => ['animations', t('Permit animated profile photos'), get_config('system', 'animated_avatars', true), t('Changing this may take several days to work through the system')], + '$incl' => ['pub_incl', t('Only import Public stream posts with this text'), get_config('system', 'pubstream_incl'), t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')], + '$excl' => ['pub_excl', t('Do not import Public stream posts with this text'), get_config('system', 'pubstream_excl'), t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')], + '$max_imported_follow' => ['max_imported_follow', t('Maximum number of imported friends of friends'), get_config('system', 'max_imported_follow', MAX_IMPORTED_FOLLOW), t('Warning: higher numbers will improve the quality of friend suggestions and directory results but can exponentially increase resource usage')], + '$login_on_homepage' => ['login_on_homepage', t("Login on Homepage"), ((intval($homelogin) || $homelogin === false) ? 1 : ''), t("Present a login box to visitors on the home page if no other content has been configured.")], + '$enable_context_help' => ['enable_context_help', t("Enable context help"), ((intval($enable_context_help) === 1 || $enable_context_help === false) ? 1 : 0), t("Display contextual help for the current page when the help button is pressed.")], + '$reply_address' => ['reply_address', t('Reply-to email address for system generated email.'), get_config('system', 'reply_address', 'noreply@' . App::get_hostname()), ''], + '$from_email' => ['from_email', t('Sender (From) email address for system generated email.'), get_config('system', 'from_email', 'Administrator@' . App::get_hostname()), ''], + '$from_email_name' => ['from_email_name', t('Display name of email sender for system generated email.'), get_config('system', 'from_email_name', System::get_site_name()), ''], + '$directory_server' => (($dir_choices) ? ['directory_server', t("Directory Server URL"), get_config('system', 'directory_server'), t("Default directory server"), $dir_choices] : null), + '$proxyuser' => ['proxyuser', t("Proxy user"), get_config('system', 'proxyuser'), ""], + '$proxy' => ['proxy', t("Proxy URL"), get_config('system', 'proxy'), ""], + '$timeout' => ['timeout', t("Network fetch timeout"), (x(get_config('system', 'curl_timeout')) ? get_config('system', 'curl_timeout') : 60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")], + '$post_timeout' => ['post_timeout', t("Network post timeout"), (x(get_config('system', 'curl_post_timeout')) ? get_config('system', 'curl_post_timeout') : 90), t("Value is in seconds. Set to 0 for unlimited (not recommended).")], + '$delivery_interval' => ['delivery_interval', t("Delivery interval"), (x(get_config('system', 'delivery_interval')) ? get_config('system', 'delivery_interval') : 2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")], + '$delivery_batch_count' => ['delivery_batch_count', t('Deliveries per process'), (x(get_config('system', 'delivery_batch_count')) ? get_config('system', 'delivery_batch_count') : 3), t("Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5.")], + '$force_queue' => ['force_queue', t("Queue Threshold"), get_config('system', 'force_queue_threshold', 3000), t("Always defer immediate delivery if queue contains more than this number of entries.")], + '$poll_interval' => ['poll_interval', t("Poll interval"), (x(get_config('system', 'poll_interval')) ? get_config('system', 'poll_interval') : 2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")], + '$imagick_path' => ['imagick_path', t("Path to ImageMagick convert program"), get_config('system', 'imagick_convert_path'), t("If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert")], + '$maxloadavg' => ['maxloadavg', t("Maximum Load Average"), ((intval(get_config('system', 'maxloadavg')) > 0) ? get_config('system', 'maxloadavg') : 50), t("Maximum system load before delivery and poll processes are deferred - default 50.")], + '$default_expire_days' => ['default_expire_days', t('Expiration period in days for imported streams and cached images'), intval(get_config('system', 'default_expire_days', 60)), t('0 for no expiration of imported content')], + '$active_expire_days' => ['active_expire_days', t('Do not expire any posts which have comments less than this many days ago'), intval(get_config('system', 'active_expire_days', 7)), ''], + '$sellpage' => ['site_sellpage', t('Public servers: Optional landing (marketing) webpage for new registrants'), get_config('system', 'sellpage', ''), sprintf(t('Create this page first. Default is %s/register'), z_root())], + '$first_page' => ['first_page', t('Page to display after creating a new channel'), get_config('system', 'workflow_channel_next', 'profiles'), t('Default: profiles')], + '$location' => ['site_location', t('Site location'), get_config('system', 'site_location', ''), t('Region or country - shared with other sites')], + '$form_security_token' => get_form_security_token("admin_site"), + ]); + } } diff --git a/Zotlabs/Module/Admin/Themes.php b/Zotlabs/Module/Admin/Themes.php index d88648c8c..20bbd508b 100644 --- a/Zotlabs/Module/Admin/Themes.php +++ b/Zotlabs/Module/Admin/Themes.php @@ -2,227 +2,240 @@ namespace Zotlabs\Module\Admin; -use \Michelf\MarkdownExtra; +use App; +use Michelf\MarkdownExtra; /** * @brief Admin area theme settings. */ -class Themes { +class Themes +{ - /** - * @brief - * - */ - function post() { + /** + * @brief + * + */ + public function post() + { - $theme = argv(2); - if (is_file("view/theme/$theme/php/config.php")){ - require_once("view/theme/$theme/php/config.php"); - /// @FIXME add parent theme if derived - if (function_exists('theme_admin_post')){ - theme_admin_post($a); - } - } - info(t('Theme settings updated.')); - if(is_ajax()) - return; + $theme = argv(2); + if (is_file("view/theme/$theme/php/config.php")) { + require_once("view/theme/$theme/php/config.php"); + /// @FIXME add parent theme if derived + if (function_exists('theme_admin_post')) { + theme_admin_post($a); + } + } + info(t('Theme settings updated.')); + if (is_ajax()) { + return; + } - goaway(z_root() . '/admin/themes/' . $theme ); - } + goaway(z_root() . '/admin/themes/' . $theme); + } - /** - * @brief Themes admin page. - * - * @return string with parsed HTML - */ - function get(){ - $allowed_themes_str = get_config('system', 'allowed_themes'); - $allowed_themes_raw = explode(',', $allowed_themes_str); - $allowed_themes = []; - if(count($allowed_themes_raw)) - foreach($allowed_themes_raw as $x) - if(strlen(trim($x))) - $allowed_themes[] = trim($x); + /** + * @brief Themes admin page. + * + * @return string with parsed HTML + */ + public function get() + { + $allowed_themes_str = get_config('system', 'allowed_themes'); + $allowed_themes_raw = explode(',', $allowed_themes_str); + $allowed_themes = []; + if (count($allowed_themes_raw)) { + foreach ($allowed_themes_raw as $x) { + if (strlen(trim($x))) { + $allowed_themes[] = trim($x); + } + } + } - $themes = []; - $files = glob('view/theme/*'); - if($files) { - foreach($files as $file) { - $f = basename($file); - $is_experimental = intval(file_exists($file . '/.experimental')); - $is_supported = 1-(intval(file_exists($file . '/.unsupported'))); // Is not used yet - $is_allowed = intval(in_array($f,$allowed_themes)); - $themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed); - } - } + $themes = []; + $files = glob('view/theme/*'); + if ($files) { + foreach ($files as $file) { + $f = basename($file); + $is_experimental = intval(file_exists($file . '/.experimental')); + $is_supported = 1 - (intval(file_exists($file . '/.unsupported'))); // Is not used yet + $is_allowed = intval(in_array($f, $allowed_themes)); + $themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed); + } + } - if(! count($themes)) { - notice( t('No themes found.')); - return ''; - } + if (!count($themes)) { + notice(t('No themes found.')); + return ''; + } - /* - * Single theme - */ + /* + * Single theme + */ - if (\App::$argc == 3){ - $theme = \App::$argv[2]; - if(! is_dir("view/theme/$theme")){ - notice( t("Item not found.") ); - return ''; - } + if (App::$argc == 3) { + $theme = App::$argv[2]; + if (!is_dir("view/theme/$theme")) { + notice(t("Item not found.")); + return ''; + } - if (x($_GET,"a") && $_GET['a']=="t"){ - check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't'); + if (x($_GET, "a") && $_GET['a'] == "t") { + check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't'); - // Toggle theme status + // Toggle theme status - $this->toggle_theme($themes, $theme, $result); - $s = $this->rebuild_theme_table($themes); - if($result) - info( sprintf('Theme %s enabled.', $theme)); - else - info( sprintf('Theme %s disabled.', $theme)); + $this->toggle_theme($themes, $theme, $result); + $s = $this->rebuild_theme_table($themes); + if ($result) { + info(sprintf('Theme %s enabled.', $theme)); + } else { + info(sprintf('Theme %s disabled.', $theme)); + } - set_config('system', 'allowed_themes', $s); - goaway(z_root() . '/admin/themes' ); - } + set_config('system', 'allowed_themes', $s); + goaway(z_root() . '/admin/themes'); + } - // display theme details + // display theme details - if ($this->theme_status($themes,$theme)) { - $status="on"; $action= t("Disable"); - } else { - $status="off"; $action= t("Enable"); - } + if ($this->theme_status($themes, $theme)) { + $status = "on"; + $action = t("Disable"); + } else { + $status = "off"; + $action = t("Enable"); + } - $readme=Null; - if (is_file("view/theme/$theme/README.md")){ - $readme = file_get_contents("view/theme/$theme/README.md"); - $readme = MarkdownExtra::defaultTransform($readme); - } else if (is_file("view/theme/$theme/README")){ - $readme = ''. file_get_contents("view/theme/$theme/README") .''; - } + $readme = null; + if (is_file("view/theme/$theme/README.md")) { + $readme = file_get_contents("view/theme/$theme/README.md"); + $readme = MarkdownExtra::defaultTransform($readme); + } elseif (is_file("view/theme/$theme/README")) { + $readme = '' . file_get_contents("view/theme/$theme/README") . ''; + } - $admin_form = ''; - if (is_file("view/theme/$theme/php/config.php")){ - require_once("view/theme/$theme/php/config.php"); - if(function_exists("theme_admin")){ - $admin_form = theme_admin($a); - } - } + $admin_form = ''; + if (is_file("view/theme/$theme/php/config.php")) { + require_once("view/theme/$theme/php/config.php"); + if (function_exists("theme_admin")) { + $admin_form = theme_admin($a); + } + } - $screenshot = array( get_theme_screenshot($theme), t('Screenshot')); - if(! stristr($screenshot[0],$theme)) - $screenshot = null; + $screenshot = array(get_theme_screenshot($theme), t('Screenshot')); + if (!stristr($screenshot[0], $theme)) { + $screenshot = null; + } - $t = get_markup_template('admin_plugins_details.tpl'); - return replace_macros($t, array( - '$title' => t('Administration'), - '$page' => t('Themes'), - '$toggle' => t('Toggle'), - '$settings' => t('Settings'), - '$baseurl' => z_root(), + $t = get_markup_template('admin_plugins_details.tpl'); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Themes'), + '$toggle' => t('Toggle'), + '$settings' => t('Settings'), + '$baseurl' => z_root(), - '$plugin' => $theme, - '$status' => $status, - '$action' => $action, - '$info' => get_theme_info($theme), - '$function' => 'themes', - '$admin_form' => $admin_form, - '$str_author' => t('Author: '), - '$str_maintainer' => t('Maintainer: '), - '$screenshot' => $screenshot, - '$readme' => $readme, + '$plugin' => $theme, + '$status' => $status, + '$action' => $action, + '$info' => get_theme_info($theme), + '$function' => 'themes', + '$admin_form' => $admin_form, + '$str_author' => t('Author: '), + '$str_maintainer' => t('Maintainer: '), + '$screenshot' => $screenshot, + '$readme' => $readme, - '$form_security_token' => get_form_security_token('admin_themes'), - )); - } + '$form_security_token' => get_form_security_token('admin_themes'), + )); + } - /* - * List themes - */ + /* + * List themes + */ - $xthemes = []; - if($themes) { - foreach($themes as $th) { - $xthemes[] = array($th['name'],(($th['allowed']) ? "on" : "off"), get_theme_info($th['name'])); - } - } + $xthemes = []; + if ($themes) { + foreach ($themes as $th) { + $xthemes[] = array($th['name'], (($th['allowed']) ? "on" : "off"), get_theme_info($th['name'])); + } + } - $t = get_markup_template('admin_plugins.tpl'); - return replace_macros($t, array( - '$title' => t('Administration'), - '$page' => t('Themes'), - '$submit' => t('Submit'), - '$baseurl' => z_root(), - '$function' => 'themes', - '$plugins' => $xthemes, - '$experimental' => t('[Experimental]'), - '$unsupported' => t('[Unsupported]'), - '$form_security_token' => get_form_security_token('admin_themes'), - )); - } + $t = get_markup_template('admin_plugins.tpl'); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Themes'), + '$submit' => t('Submit'), + '$baseurl' => z_root(), + '$function' => 'themes', + '$plugins' => $xthemes, + '$experimental' => t('[Experimental]'), + '$unsupported' => t('[Unsupported]'), + '$form_security_token' => get_form_security_token('admin_themes'), + )); + } - /** - * @brief Toggle a theme. - * - * @param array &$themes - * @param[in] string $th - * @param[out] int &$result - */ - function toggle_theme(&$themes, $th, &$result) { - for($x = 0; $x < count($themes); $x ++) { - if($themes[$x]['name'] === $th) { - if($themes[$x]['allowed']) { - $themes[$x]['allowed'] = 0; - $result = 0; - } - else { - $themes[$x]['allowed'] = 1; - $result = 1; - } - } - } - } + /** + * @brief Toggle a theme. + * + * @param array &$themes + * @param[in] string $th + * @param[out] int &$result + */ + public function toggle_theme(&$themes, $th, &$result) + { + for ($x = 0; $x < count($themes); $x++) { + if ($themes[$x]['name'] === $th) { + if ($themes[$x]['allowed']) { + $themes[$x]['allowed'] = 0; + $result = 0; + } else { + $themes[$x]['allowed'] = 1; + $result = 1; + } + } + } + } - /** - * @param array $themes - * @param string $th - * @return int - */ - function theme_status($themes, $th) { - for($x = 0; $x < count($themes); $x ++) { - if($themes[$x]['name'] === $th) { - if($themes[$x]['allowed']) { - return 1; - } - else { - return 0; - } - } - } - return 0; - } - - /** - * @param array $themes - * @return string - */ - function rebuild_theme_table($themes) { - $o = ''; - if(count($themes)) { - foreach($themes as $th) { - if($th['allowed']) { - if(strlen($o)) - $o .= ','; - $o .= $th['name']; - } - } - } - return $o; - } + /** + * @param array $themes + * @param string $th + * @return int + */ + public function theme_status($themes, $th) + { + for ($x = 0; $x < count($themes); $x++) { + if ($themes[$x]['name'] === $th) { + if ($themes[$x]['allowed']) { + return 1; + } else { + return 0; + } + } + } + return 0; + } + /** + * @param array $themes + * @return string + */ + public function rebuild_theme_table($themes) + { + $o = ''; + if (count($themes)) { + foreach ($themes as $th) { + if ($th['allowed']) { + if (strlen($o)) { + $o .= ','; + } + $o .= $th['name']; + } + } + } + return $o; + } } diff --git a/Zotlabs/Module/Affinity.php b/Zotlabs/Module/Affinity.php index de5cd79b5..1df26928b 100644 --- a/Zotlabs/Module/Affinity.php +++ b/Zotlabs/Module/Affinity.php @@ -4,88 +4,89 @@ namespace Zotlabs\Module; use Zotlabs\Lib\Apps; use Zotlabs\Lib\Libsync; +use Zotlabs\Web\Controller; -class Affinity extends \Zotlabs\Web\Controller { +class Affinity extends Controller +{ - function post() { + public function post() + { - if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Friend Zoom'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Friend Zoom'))) { return; } - if($_POST['affinity-submit']) { - $cmax = intval($_POST['affinity_cmax']); - if($cmax < 0 || $cmax > 99) - $cmax = 99; - $cmin = intval($_POST['affinity_cmin']); - if($cmin < 0 || $cmin > 99) - $cmin = 0; - set_pconfig(local_channel(),'affinity','cmin',0); - set_pconfig(local_channel(),'affinity','cmax',$cmax); + if ($_POST['affinity-submit']) { + $cmax = intval($_POST['affinity_cmax']); + if ($cmax < 0 || $cmax > 99) { + $cmax = 99; + } + $cmin = intval($_POST['affinity_cmin']); + if ($cmin < 0 || $cmin > 99) { + $cmin = 0; + } + set_pconfig(local_channel(), 'affinity', 'cmin', 0); + set_pconfig(local_channel(), 'affinity', 'cmax', $cmax); - info( t('Friend Zoom settings updated.') . EOL); + info(t('Friend Zoom settings updated.') . EOL); + } - } - - Libsync::build_sync_packet(); - - } + Libsync::build_sync_packet(); + } - function get() { + public function get() + { $desc = t('This app (when installed) presents a slider control in your connection editor and also on your stream page. The slider represents your degree of friendship with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream.'); $text = '' . $desc . ''; - if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Friend Zoom'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Friend Zoom'))) { return $text; } - $text .= EOL . t('The number below represents the default maximum slider position for your stream page as a percentage.') . EOL . EOL; + $text .= EOL . t('The number below represents the default maximum slider position for your stream page as a percentage.') . EOL . EOL; - $setting_fields = $text; + $setting_fields = $text; - $cmax = intval(get_pconfig(local_channel(),'affinity','cmax')); - $cmax = (($cmax) ? $cmax : 99); -// $setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array( -// '$field' => array('affinity_cmax', t('Default maximum affinity level'), $cmax, t('0-99 default 99')) -// )); + $cmax = intval(get_pconfig(local_channel(), 'affinity', 'cmax')); + $cmax = (($cmax) ? $cmax : 99); +// $setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array( +// '$field' => array('affinity_cmax', t('Default maximum affinity level'), $cmax, t('0-99 default 99')) +// )); - if(Apps::system_app_installed(local_channel(),'Friend Zoom')) { + if (Apps::system_app_installed(local_channel(), 'Friend Zoom')) { + $labels = array( + 0 => t('Me'), + 20 => t('Family'), + 40 => t('Friends'), + 60 => t('Peers'), + 80 => t('Connections'), + 99 => t('All') + ); + call_hooks('affinity_labels', $labels); - $labels = array( - 0 => t('Me'), - 20 => t('Family'), - 40 => t('Friends'), - 60 => t('Peers'), - 80 => t('Connections'), - 99 => t('All') - ); - call_hooks('affinity_labels',$labels); - - $tpl = get_markup_template('affinity.tpl'); - $x = replace_macros($tpl, [ - '$cmin' => 0, - '$cmax' => $cmax, - '$lbl' => t('Default friend zoom in/out'), - '$refresh' => t('Refresh'), - '$labels' => $labels, - ]); - - - $arr = array('html' => $x); - call_hooks('affinity_slider',$arr); - $setting_fields .= $arr['html']; - } - - $s .= replace_macros(get_markup_template('generic_app_settings.tpl'), array( - '$addon' => array('affinity', '' . t('Friend Zoom Settings'), '', t('Submit')), - '$content' => $setting_fields - )); - - return $s; - } + $tpl = get_markup_template('affinity.tpl'); + $x = replace_macros($tpl, [ + '$cmin' => 0, + '$cmax' => $cmax, + '$lbl' => t('Default friend zoom in/out'), + '$refresh' => t('Refresh'), + '$labels' => $labels, + ]); -} \ No newline at end of file + $arr = array('html' => $x); + call_hooks('affinity_slider', $arr); + $setting_fields .= $arr['html']; + } + + $s .= replace_macros(get_markup_template('generic_app_settings.tpl'), array( + '$addon' => array('affinity', '' . t('Friend Zoom Settings'), '', t('Submit')), + '$content' => $setting_fields + )); + + return $s; + } +} diff --git a/Zotlabs/Module/Album.php b/Zotlabs/Module/Album.php index 2102fd876..dda4d9bce 100644 --- a/Zotlabs/Module/Album.php +++ b/Zotlabs/Module/Album.php @@ -1,4 +1,5 @@ 1) { - $channel = channelx_by_nick(argv(1)); - } - if (! $channel) { - http_status_exit(404,'Not found.'); - } + $channel = null; - $sql_extra = permissions_sql($channel['channel_id'],$observer_xchan); + if (argc() > 1) { + $channel = channelx_by_nick(argv(1)); + } + if (!$channel) { + http_status_exit(404, 'Not found.'); + } - if (argc() > 2) { - $folder = argv(2); - $r = q("select * from attach where is_dir = 1 and hash = '%s' and uid = %d $sql_extra limit 1", - dbesc($folder), - intval($channel['channel_id']) - ); - $allowed = (($r) ? attach_can_view($channel['channel_id'],$observer_xchan,$r[0]['hash'],$bear) : false); - } - else { - $folder = EMPTY_STR; - $allowed = perm_is_allowed($channel['channel_id'],$observer_xchan,'view_storage'); - } + $sql_extra = permissions_sql($channel['channel_id'], $observer_xchan); - if (! $allowed) { - http_status_exit(403,'Permission denied.'); - } + if (argc() > 2) { + $folder = argv(2); + $r = q( + "select * from attach where is_dir = 1 and hash = '%s' and uid = %d $sql_extra limit 1", + dbesc($folder), + intval($channel['channel_id']) + ); + $allowed = (($r) ? attach_can_view($channel['channel_id'], $observer_xchan, $r[0]['hash'], $bear) : false); + } else { + $folder = EMPTY_STR; + $allowed = perm_is_allowed($channel['channel_id'], $observer_xchan, 'view_storage'); + } - $x = q("select * from attach where folder = '%s' and uid = %d $sql_extra", - dbesc($folder), - intval($channel['channel_id']) - ); + if (!$allowed) { + http_status_exit(403, 'Permission denied.'); + } - $contents = []; + $x = q( + "select * from attach where folder = '%s' and uid = %d $sql_extra", + dbesc($folder), + intval($channel['channel_id']) + ); - if ($x) { - foreach ($x as $xv) { - if (intval($xv['is_dir'])) { - continue; - } - if (! attach_can_view($channel['channel_id'],$observer_xchan,$xv['hash'],$bear)) { - continue; - } - if (intval($xv['is_photo'])) { - $contents[] = z_root() . '/photo/' . $xv['hash']; - } - } - } - - $obj = Activity::encode_simple_collection($contents, App::$query_string, 'OrderedCollection', count($contents)); - as_return_and_die($obj,$channel); + $contents = []; - } + if ($x) { + foreach ($x as $xv) { + if (intval($xv['is_dir'])) { + continue; + } + if (!attach_can_view($channel['channel_id'], $observer_xchan, $xv['hash'], $bear)) { + continue; + } + if (intval($xv['is_photo'])) { + $contents[] = z_root() . '/photo/' . $xv['hash']; + } + } + } - } -} \ No newline at end of file + $obj = Activity::encode_simple_collection($contents, App::$query_string, 'OrderedCollection', count($contents)); + as_return_and_die($obj, $channel); + } + } +} diff --git a/Zotlabs/Module/Ap_probe.php b/Zotlabs/Module/Ap_probe.php index d5599df27..478a1eb62 100644 --- a/Zotlabs/Module/Ap_probe.php +++ b/Zotlabs/Module/Ap_probe.php @@ -1,4 +1,5 @@ t('ActivityPub Probe Diagnostic'), + '$resource' => ['resource', t('Object URL'), $_REQUEST['resource'], EMPTY_STR], + '$authf' => ['authf', t('Authenticated fetch'), $_REQUEST['authf'], EMPTY_STR, [t('No'), t('Yes')]], + '$submit' => t('Submit') + ]); - $o = replace_macros(get_markup_template('ap_probe.tpl'), [ - '$page_title' => t('ActivityPub Probe Diagnostic'), - '$resource' => [ 'resource', t('Object URL') , $_REQUEST['resource'], EMPTY_STR ], - '$authf' => [ 'authf', t('Authenticated fetch'), $_REQUEST['authf'], EMPTY_STR, [ t('No'), t('Yes') ] ], - '$submit' => t('Submit') - ]); + if (x($_REQUEST, 'resource')) { + $resource = $_REQUEST['resource']; + if ($_REQUEST['authf']) { + $channel = App::get_channel(); + if (!$channel) { + $channel = get_sys_channel(); + } + } - if (x($_REQUEST,'resource')) { - $resource = $_REQUEST['resource']; - if ($_REQUEST['authf']) { - $channel = App::get_channel(); - if (! $channel) { - $channel = get_sys_channel(); - } - } + $x = Activity::fetch($resource, $channel, null, true); - $x = Activity::fetch($resource,$channel,null,true); + if ($x) { + $o .= '' . str_replace('\\n', "\n", htmlspecialchars(json_encode($x, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT))) . ''; + } + } - if ($x) { - $o .= '' . str_replace('\\n',"\n",htmlspecialchars(json_encode($x,JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT))) . ''; - } - - } - - return $o; - } - + return $o; + } } diff --git a/Zotlabs/Module/Api.php b/Zotlabs/Module/Api.php index e47dff5f4..a64a7fad6 100644 --- a/Zotlabs/Module/Api.php +++ b/Zotlabs/Module/Api.php @@ -1,4 +1,5 @@ "; var_dump($e); - killme(); - } - - - if(x($_POST,'oauth_yes')){ - - $app = $this->oauth_get_client($request); - if (is_null($app)) - return "Invalid request. Unknown token."; + public function get() + { - $consumer = new OAuth1Consumer($app['client_id'], $app['pw'], $app['redirect_uri']); - - $verifier = md5($app['secret'] . local_channel()); - set_config('oauth', $verifier, local_channel()); - - - if($consumer->callback_url != null) { - $params = $request->get_parameters(); - $glue = '?'; - if(strstr($consumer->callback_url,$glue)) - $glue = '?'; - goaway($consumer->callback_url . $glue . "oauth_token=" . OAuth1Util::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuth1Util::urlencode_rfc3986($verifier)); - killme(); - } - - $tpl = get_markup_template("oauth_authorize_done.tpl"); - $o = replace_macros($tpl, array( - '$title' => t('Authorize application connection'), - '$info' => t('Return to your app and insert this Security Code:'), - '$code' => $verifier, - )); - - return $o; - } - - - if(! local_channel()) { - // TODO: we need login form to redirect to this page - notice( t('Please login to continue.') . EOL ); - return login(false,'api-login',$request->get_parameters()); - } - - $app = $this->oauth_get_client($request); - if (is_null($app)) - return "Invalid request. Unknown token."; - - $tpl = get_markup_template('oauth_authorize.tpl'); - $o = replace_macros($tpl, array( - '$title' => t('Authorize application connection'), - '$app' => $app, - '$authorize' => t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'), - '$yes' => t('Yes'), - '$no' => t('No'), - )); - - // echo ""; var_dump($app); killme(); - - return $o; - } - - echo api_call(); - killme(); - } + if (App::$cmd === 'api/oauth/authorize') { + /* + * api/oauth/authorize interact with the user. return a standard page + */ - function oauth_get_client($request){ + App::$page['template'] = 'minimal'; - $params = $request->get_parameters(); - $token = $params['oauth_token']; - - $r = q("SELECT clients.* FROM clients, tokens WHERE clients.client_id = tokens.client_id + // get consumer/client from request token + try { + $request = OAuth1Request::from_request(); + } catch (Exception $e) { + logger('OAuth exception: ' . print_r($e, true)); + // echo ""; var_dump($e); + killme(); + } + + + if (x($_POST, 'oauth_yes')) { + $app = $this->oauth_get_client($request); + if (is_null($app)) { + return "Invalid request. Unknown token."; + } + + $consumer = new OAuth1Consumer($app['client_id'], $app['pw'], $app['redirect_uri']); + + $verifier = md5($app['secret'] . local_channel()); + set_config('oauth', $verifier, local_channel()); + + + if ($consumer->callback_url != null) { + $params = $request->get_parameters(); + $glue = '?'; + if (strstr($consumer->callback_url, $glue)) { + $glue = '?'; + } + goaway($consumer->callback_url . $glue . "oauth_token=" . OAuth1Util::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuth1Util::urlencode_rfc3986($verifier)); + killme(); + } + + $tpl = get_markup_template("oauth_authorize_done.tpl"); + $o = replace_macros($tpl, array( + '$title' => t('Authorize application connection'), + '$info' => t('Return to your app and insert this Security Code:'), + '$code' => $verifier, + )); + + return $o; + } + + + if (!local_channel()) { + // TODO: we need login form to redirect to this page + notice(t('Please login to continue.') . EOL); + return login(false, 'api-login', $request->get_parameters()); + } + + $app = $this->oauth_get_client($request); + if (is_null($app)) { + return "Invalid request. Unknown token."; + } + + $tpl = get_markup_template('oauth_authorize.tpl'); + $o = replace_macros($tpl, array( + '$title' => t('Authorize application connection'), + '$app' => $app, + '$authorize' => t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'), + '$yes' => t('Yes'), + '$no' => t('No'), + )); + + // echo ""; var_dump($app); killme(); + + return $o; + } + + echo api_call(); + killme(); + } + + public function oauth_get_client($request) + { + + $params = $request->get_parameters(); + $token = $params['oauth_token']; + + $r = q( + "SELECT clients.* FROM clients, tokens WHERE clients.client_id = tokens.client_id AND tokens.id = '%s' AND tokens.auth_scope = 'request' ", - dbesc($token) - ); - if($r) - return $r[0]; + dbesc($token) + ); + if ($r) { + return $r[0]; + } - return null; - - } - + return null; + } } diff --git a/Zotlabs/Module/Appman.php b/Zotlabs/Module/Appman.php index eecf1f95b..8963b3f6b 100644 --- a/Zotlabs/Module/Appman.php +++ b/Zotlabs/Module/Appman.php @@ -1,149 +1,153 @@ intval($_REQUEST['uid']), - 'url' => escape_tags($_REQUEST['url']), - 'guid' => escape_tags($_REQUEST['guid']), - 'author' => escape_tags($_REQUEST['author']), - 'addr' => escape_tags($_REQUEST['addr']), - 'name' => escape_tags($_REQUEST['name']), - 'desc' => escape_tags($_REQUEST['desc']), - 'photo' => escape_tags($_REQUEST['photo']), - 'version' => escape_tags($_REQUEST['version']), - 'price' => escape_tags($_REQUEST['price']), - 'page' => escape_tags($_REQUEST['sellpage']), // do not use 'page' as a request variable here as it conflicts with pagination - 'requires' => escape_tags($_REQUEST['requires']), - 'system' => intval($_REQUEST['system']), - 'plugin' => escape_tags($_REQUEST['plugin']), - 'sig' => escape_tags($_REQUEST['sig']), - 'categories' => escape_tags($_REQUEST['categories']) - ]; - - $_REQUEST['appid'] = Apps::app_install(local_channel(),$arr); - - if (Apps::app_installed(local_channel(),$arr)) { - info( t('App installed.') . EOL); - } + public function post() + { - goaway(z_root() . '/apps'); - } - - - $papp = Apps::app_decode($_POST['papp']); - - if (! is_array($papp)) { - notice( t('Malformed app.') . EOL); - return; - } - - if ($_POST['install']) { - Apps::app_install(local_channel(),$papp); - if (Apps::app_installed(local_channel(),$papp)) - info( t('App installed.') . EOL); - } - - if ($_POST['delete']) { - Apps::app_destroy(local_channel(),$papp); - } + if (!local_channel()) { + return; + } - if ($_POST['edit']) { - return; - } + if ($_POST['url']) { + $arr = [ + 'uid' => intval($_REQUEST['uid']), + 'url' => escape_tags($_REQUEST['url']), + 'guid' => escape_tags($_REQUEST['guid']), + 'author' => escape_tags($_REQUEST['author']), + 'addr' => escape_tags($_REQUEST['addr']), + 'name' => escape_tags($_REQUEST['name']), + 'desc' => escape_tags($_REQUEST['desc']), + 'photo' => escape_tags($_REQUEST['photo']), + 'version' => escape_tags($_REQUEST['version']), + 'price' => escape_tags($_REQUEST['price']), + 'page' => escape_tags($_REQUEST['sellpage']), // do not use 'page' as a request variable here as it conflicts with pagination + 'requires' => escape_tags($_REQUEST['requires']), + 'system' => intval($_REQUEST['system']), + 'plugin' => escape_tags($_REQUEST['plugin']), + 'sig' => escape_tags($_REQUEST['sig']), + 'categories' => escape_tags($_REQUEST['categories']) + ]; - if ($_POST['feature']) { - Apps::app_feature(local_channel(), $papp, $_POST['feature']); - } + $_REQUEST['appid'] = Apps::app_install(local_channel(), $arr); - if ($_POST['pin']) { - Apps::app_feature(local_channel(), $papp, $_POST['pin']); - } + if (Apps::app_installed(local_channel(), $arr)) { + info(t('App installed.') . EOL); + } - if ($_SESSION['return_url']) { - goaway(z_root() . '/' . $_SESSION['return_url']); - } - - goaway(z_root() . '/apps'); - } - - - function get() { - - if (! local_channel()) { - notice( t('Permission denied.') . EOL); - return; - } + goaway(z_root() . '/apps'); + } - $channel = App::get_channel(); - if (argc() > 3) { - if(argv(2) === 'moveup') { - Apps::moveup(local_channel(),argv(1),argv(3)); - } - if(argv(2) === 'movedown') { - Apps::movedown(local_channel(),argv(1),argv(3)); - } - goaway(z_root() . '/apporder'); - } + $papp = Apps::app_decode($_POST['papp']); - $app = null; - $embed = null; - if ($_REQUEST['appid']) { - $r = q("select * from app where app_id = '%s' and app_channel = %d limit 1", - dbesc($_REQUEST['appid']), - dbesc(local_channel()) - ); - if ($r) { - $app = $r[0]; + if (!is_array($papp)) { + notice(t('Malformed app.') . EOL); + return; + } - $term = q("select * from term where otype = %d and oid = %d and uid = %d", - intval(TERM_OBJ_APP), - intval($r[0]['id']), - intval(local_channel()) - ); - if ($term) { - $app['categories'] = array_elm_to_str($term,'term'); - } - } + if ($_POST['install']) { + Apps::app_install(local_channel(), $papp); + if (Apps::app_installed(local_channel(), $papp)) { + info(t('App installed.') . EOL); + } + } - $embed = [ 'embed', t('Embed code'), Apps::app_encode($app,true), EMPTY_STR, 'onclick="this.select();"' ]; - } - - return replace_macros(get_markup_template('app_create.tpl'), [ - '$banner' => (($app) ? t('Edit App') : t('Create App')), - '$app' => $app, - '$guid' => (($app) ? $app['app_id'] : EMPTY_STR), - '$author' => (($app) ? $app['app_author'] : $channel['channel_hash']), - '$addr' => (($app) ? $app['app_addr'] : $channel['xchan_addr']), - '$name' => [ 'name', t('Name of app'),(($app) ? $app['app_name'] : EMPTY_STR), t('Required') ], - '$url' => [ 'url', t('Location (URL) of app'),(($app) ? $app['app_url'] : EMPTY_STR), t('Required') ], - '$desc' => [ 'desc', t('Description'),(($app) ? $app['app_desc'] : EMPTY_STR), EMPTY_STR], - '$photo' => [ 'photo', t('Photo icon URL'),(($app) ? $app['app_photo'] : EMPTY_STR), t('80 x 80 pixels - optional') ], - '$categories' => [ 'categories',t('Categories (optional, comma separated list)'),(($app) ? $app['categories'] : EMPTY_STR), EMPTY_STR ], - '$version' => [ 'version', t('Version ID'),(($app) ? $app['app_version'] : EMPTY_STR), EMPTY_STR ], - '$price' => [ 'price', t('Price of app'),(($app) ? $app['app_price'] : EMPTY_STR), EMPTY_STR ], - '$page' => [ 'sellpage', t('Location (URL) to purchase app'),(($app) ? $app['app_page'] : EMPTY_STR), EMPTY_STR ], - '$system' => (($app) ? intval($app['app_system']) : 0), - '$plugin' => (($app) ? $app['app_plugin'] : EMPTY_STR), - '$requires' => (($app) ? $app['app_requires'] : EMPTY_STR), - '$embed' => $embed, - '$submit' => t('Submit') - ]); - - } - + if ($_POST['delete']) { + Apps::app_destroy(local_channel(), $papp); + } + + if ($_POST['edit']) { + return; + } + + if ($_POST['feature']) { + Apps::app_feature(local_channel(), $papp, $_POST['feature']); + } + + if ($_POST['pin']) { + Apps::app_feature(local_channel(), $papp, $_POST['pin']); + } + + if ($_SESSION['return_url']) { + goaway(z_root() . '/' . $_SESSION['return_url']); + } + + goaway(z_root() . '/apps'); + } + + + public function get() + { + + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } + + $channel = App::get_channel(); + + if (argc() > 3) { + if (argv(2) === 'moveup') { + Apps::moveup(local_channel(), argv(1), argv(3)); + } + if (argv(2) === 'movedown') { + Apps::movedown(local_channel(), argv(1), argv(3)); + } + goaway(z_root() . '/apporder'); + } + + $app = null; + $embed = null; + if ($_REQUEST['appid']) { + $r = q( + "select * from app where app_id = '%s' and app_channel = %d limit 1", + dbesc($_REQUEST['appid']), + dbesc(local_channel()) + ); + if ($r) { + $app = $r[0]; + + $term = q( + "select * from term where otype = %d and oid = %d and uid = %d", + intval(TERM_OBJ_APP), + intval($r[0]['id']), + intval(local_channel()) + ); + if ($term) { + $app['categories'] = array_elm_to_str($term, 'term'); + } + } + + $embed = ['embed', t('Embed code'), Apps::app_encode($app, true), EMPTY_STR, 'onclick="this.select();"']; + } + + return replace_macros(get_markup_template('app_create.tpl'), [ + '$banner' => (($app) ? t('Edit App') : t('Create App')), + '$app' => $app, + '$guid' => (($app) ? $app['app_id'] : EMPTY_STR), + '$author' => (($app) ? $app['app_author'] : $channel['channel_hash']), + '$addr' => (($app) ? $app['app_addr'] : $channel['xchan_addr']), + '$name' => ['name', t('Name of app'), (($app) ? $app['app_name'] : EMPTY_STR), t('Required')], + '$url' => ['url', t('Location (URL) of app'), (($app) ? $app['app_url'] : EMPTY_STR), t('Required')], + '$desc' => ['desc', t('Description'), (($app) ? $app['app_desc'] : EMPTY_STR), EMPTY_STR], + '$photo' => ['photo', t('Photo icon URL'), (($app) ? $app['app_photo'] : EMPTY_STR), t('80 x 80 pixels - optional')], + '$categories' => ['categories', t('Categories (optional, comma separated list)'), (($app) ? $app['categories'] : EMPTY_STR), EMPTY_STR], + '$version' => ['version', t('Version ID'), (($app) ? $app['app_version'] : EMPTY_STR), EMPTY_STR], + '$price' => ['price', t('Price of app'), (($app) ? $app['app_price'] : EMPTY_STR), EMPTY_STR], + '$page' => ['sellpage', t('Location (URL) to purchase app'), (($app) ? $app['app_page'] : EMPTY_STR), EMPTY_STR], + '$system' => (($app) ? intval($app['app_system']) : 0), + '$plugin' => (($app) ? $app['app_plugin'] : EMPTY_STR), + '$requires' => (($app) ? $app['app_requires'] : EMPTY_STR), + '$embed' => $embed, + '$submit' => t('Submit') + ]); + } } diff --git a/Zotlabs/Module/Apporder.php b/Zotlabs/Module/Apporder.php index f7a2463a4..a4f90ba2d 100644 --- a/Zotlabs/Module/Apporder.php +++ b/Zotlabs/Module/Apporder.php @@ -5,49 +5,50 @@ namespace Zotlabs\Module; use Zotlabs\Web\Controller; use Zotlabs\Lib\Apps; -class Apporder extends \Zotlabs\Web\Controller { +class Apporder extends Controller +{ - function get() { + public function get() + { - if (! local_channel()) { - return; - } + if (!local_channel()) { + return; + } - nav_set_selected('Order Apps'); + nav_set_selected('Order Apps'); - foreach ( [ 'nav_featured_app', 'nav_pinned_app' ] as $l ) { - $syslist = []; - $list = Apps::app_list(local_channel(), false, [ $l ]); - if ($list) { - foreach ($list as $li) { - $syslist[] = Apps::app_encode($li); - } - } - - Apps::translate_system_apps($syslist); + foreach (['nav_featured_app', 'nav_pinned_app'] as $l) { + $syslist = []; + $list = Apps::app_list(local_channel(), false, [$l]); + if ($list) { + foreach ($list as $li) { + $syslist[] = Apps::app_encode($li); + } + } - usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare'); + Apps::translate_system_apps($syslist); - $syslist = Apps::app_order(local_channel(),$syslist, $l); + usort($syslist, 'Zotlabs\\Lib\\Apps::app_name_compare'); - foreach ($syslist as $app) { - if ($l === 'nav_pinned_app') { - $navbar_apps[] = Apps::app_render($app,'nav-order-pinned'); - } - else { - $nav_apps[] = Apps::app_render($app,'nav-order'); - } - } - } + $syslist = Apps::app_order(local_channel(), $syslist, $l); - return replace_macros(get_markup_template('apporder.tpl'), [ - '$arrange' => t('Arrange Apps'), - '$header' => [ t('Change order of pinned navbar apps'), t('Change order of app tray apps') ], - '$desc' => [ t('Use arrows to move the corresponding app left (top) or right (bottom) in the navbar'), - t('Use arrows to move the corresponding app up or down in the app tray') ], - '$nav_apps' => $nav_apps, - '$navbar_apps' => $navbar_apps - ]); - } + foreach ($syslist as $app) { + if ($l === 'nav_pinned_app') { + $navbar_apps[] = Apps::app_render($app, 'nav-order-pinned'); + } else { + $nav_apps[] = Apps::app_render($app, 'nav-order'); + } + } + } + + return replace_macros(get_markup_template('apporder.tpl'), [ + '$arrange' => t('Arrange Apps'), + '$header' => [t('Change order of pinned navbar apps'), t('Change order of app tray apps')], + '$desc' => [t('Use arrows to move the corresponding app left (top) or right (bottom) in the navbar'), + t('Use arrows to move the corresponding app up or down in the app tray')], + '$nav_apps' => $nav_apps, + '$navbar_apps' => $navbar_apps + ]); + } } diff --git a/Zotlabs/Module/Apps.php b/Zotlabs/Module/Apps.php index 45e2af577..86c5a4de7 100644 --- a/Zotlabs/Module/Apps.php +++ b/Zotlabs/Module/Apps.php @@ -1,60 +1,66 @@ get_config('system','sitename'), - '$cat' => $cat, - '$title' => (($available) ? t('Available Apps') : t('Installed Apps')), - '$apps' => $apps, - '$authed' => ((local_channel()) ? true : false), - '$manage' => (($available) ? EMPTY_STR : t('Manage apps')), - '$create' => (($mode == 'edit') ? t('Create Custom App') : '') - )); - - } - + $apps = []; + + if (local_channel()) { + Zlib\Apps::import_system_apps(); + $syslist = []; + $cat = ((array_key_exists('cat', $_GET) && $_GET['cat']) ? [escape_tags($_GET['cat'])] : ''); + $list = Zlib\Apps::app_list((($available) ? 0 : local_channel()), (($mode == 'edit') ? true : false), $cat); + if ($list) { + foreach ($list as $x) { + $syslist[] = Zlib\Apps::app_encode($x); + } + } + Zlib\Apps::translate_system_apps($syslist); + } else { + $syslist = Zlib\Apps::get_system_apps(true); + } + + usort($syslist, 'Zotlabs\\Lib\\Apps::app_name_compare'); + + // logger('apps: ' . print_r($syslist,true)); + + foreach ($syslist as $app) { + $apps[] = Zlib\Apps::app_render($app, (($available) ? 'install' : $mode)); + } + + // @TODO not ready for prime time. The manage url redirects to installed apps + // and we need to edit available apps + $sys_edit = false; // (local_channel() && is_sys_channel(local_channel())); + + return replace_macros(get_markup_template('myapps.tpl'), array( + '$sitename' => get_config('system', 'sitename'), + '$cat' => $cat, + '$title' => (($available) ? t('Available Apps') : t('Installed Apps')), + '$apps' => $apps, + '$authed' => ((local_channel()) ? true : false), + '$manage' => (($available && ! $sys_edit) ? EMPTY_STR : t('Manage apps')), + '$create' => (($mode == 'edit') ? t('Create Custom App') : '') + )); + } } diff --git a/Zotlabs/Module/Apschema.php b/Zotlabs/Module/Apschema.php index 0b0d15bcc..9b5c68e0b 100644 --- a/Zotlabs/Module/Apschema.php +++ b/Zotlabs/Module/Apschema.php @@ -5,21 +5,18 @@ namespace Zotlabs\Module; use Zotlabs\Web\Controller; use Zotlabs\Lib\Activity; -class Apschema extends Controller { +class Apschema extends Controller +{ - function init() { + public function init() + { - $arr = [ - '@context' => array_merge(['as' => 'https://www.w3.org/ns/activitystreams#'], Activity::ap_schema()) - ]; + $arr = [ + '@context' => array_merge(['as' => 'https://www.w3.org/ns/activitystreams#'], Activity::ap_schema()) + ]; - header('Content-Type: application/ld+json'); - echo json_encode($arr,JSON_UNESCAPED_SLASHES); - killme(); - - } - - - - -} \ No newline at end of file + header('Content-Type: application/ld+json'); + echo json_encode($arr, JSON_UNESCAPED_SLASHES); + killme(); + } +} diff --git a/Zotlabs/Module/Attach.php b/Zotlabs/Module/Attach.php index 20b74614a..4c45b2bee 100644 --- a/Zotlabs/Module/Attach.php +++ b/Zotlabs/Module/Attach.php @@ -1,52 +1,58 @@ 2) ? intval(argv(2)) : 0)); - - if(! $r['success']) { - notice( $r['message'] . EOL); - return; - } - - $c = q("select channel_address from channel where channel_id = %d limit 1", - intval($r['data']['uid']) - ); - - if(! $c) - return; - - header('Content-type: ' . $r['data']['filetype']); - header('Content-Disposition: attachment; filename="' . $r['data']['filename'] . '"'); - if(intval($r['data']['os_storage'])) { - $fname = dbunescbin($r['data']['content']); - if(strpos($fname,'store') !== false) - $istream = fopen($fname,'rb'); - else - $istream = fopen('store/' . $c[0]['channel_address'] . '/' . $fname,'rb'); - $ostream = fopen('php://output','wb'); - if($istream && $ostream) { - pipe_streams($istream,$ostream); - fclose($istream); - fclose($ostream); - } - } - else - echo dbunescbin($r['data']['content']); - killme(); - - } - + public function init() + { + + if (argc() < 2) { + notice(t('Item not available.') . EOL); + return; + } + + $r = attach_by_hash(argv(1), get_observer_hash(), ((argc() > 2) ? intval(argv(2)) : 0)); + + if (!$r['success']) { + notice($r['message'] . EOL); + return; + } + + $c = q( + "select channel_address from channel where channel_id = %d limit 1", + intval($r['data']['uid']) + ); + + if (!$c) { + return; + } + + header('Content-type: ' . $r['data']['filetype']); + header('Content-Disposition: attachment; filename="' . $r['data']['filename'] . '"'); + if (intval($r['data']['os_storage'])) { + $fname = dbunescbin($r['data']['content']); + if (strpos($fname, 'store') !== false) { + $istream = fopen($fname, 'rb'); + } else { + $istream = fopen('store/' . $c[0]['channel_address'] . '/' . $fname, 'rb'); + } + $ostream = fopen('php://output', 'wb'); + if ($istream && $ostream) { + pipe_streams($istream, $ostream); + fclose($istream); + fclose($ostream); + } + } else { + echo dbunescbin($r['data']['content']); + } + killme(); + } } diff --git a/Zotlabs/Module/Authorize.php b/Zotlabs/Module/Authorize.php index 709d76c18..25f04e3d3 100644 --- a/Zotlabs/Module/Authorize.php +++ b/Zotlabs/Module/Authorize.php @@ -10,134 +10,133 @@ use Zotlabs\Identity\OAuth2Storage; use OAuth2\Request; use OAuth2\Response; +class Authorize extends Controller +{ -class Authorize extends Controller { + public function get() + { + if (!local_channel()) { + return login(); + } else { + $name = $_REQUEST['client_name']; + if (!$name) { + $name = (($_REQUEST['client_id']) ?: t('Unknown App')); + } - function get() { - if (! local_channel()) { - return login(); - } - else { + $app = [ + 'name' => $name, + 'icon' => (x($_REQUEST, 'logo_uri') ? $_REQUEST['logo_uri'] : z_root() . '/images/icons/plugin.png'), + 'url' => (x($_REQUEST, 'client_uri') ? $_REQUEST['client_uri'] : ''), + ]; - $name = $_REQUEST['client_name']; - if(! $name) { - $name = (($_REQUEST['client_id']) ?: t('Unknown App')); - } + $link = (($app['url']) ? '' . $app['name'] . ' ' : $app['name']); - $app = [ - 'name' => $name, - 'icon' => (x($_REQUEST, 'logo_uri') ? $_REQUEST['logo_uri'] : z_root() . '/images/icons/plugin.png'), - 'url' => (x($_REQUEST, 'client_uri') ? $_REQUEST['client_uri'] : ''), - ]; + $o .= replace_macros(get_markup_template('oauth_authorize.tpl'), [ + '$title' => t('Authorize'), + '$authorize' => sprintf(t('Do you authorize the app %s to access your channel data?'), $link), + '$app' => $app, + '$yes' => t('Allow'), + '$no' => t('Deny'), + '$client_id' => (x($_REQUEST, 'client_id') ? $_REQUEST['client_id'] : ''), + '$redirect_uri' => (x($_REQUEST, 'redirect_uri') ? $_REQUEST['redirect_uri'] : ''), + '$state' => (x($_REQUEST, 'state') ? $_REQUEST['state'] : ''), + ]); + return $o; + } + } - $link = (($app['url']) ? '' . $app['name'] . ' ' : $app['name']); + public function post() + { + if (!local_channel()) { + return; + } - $o .= replace_macros(get_markup_template('oauth_authorize.tpl'), [ - '$title' => t('Authorize'), - '$authorize' => sprintf( t('Do you authorize the app %s to access your channel data?'), $link ), - '$app' => $app, - '$yes' => t('Allow'), - '$no' => t('Deny'), - '$client_id' => (x($_REQUEST, 'client_id') ? $_REQUEST['client_id'] : ''), - '$redirect_uri' => (x($_REQUEST, 'redirect_uri') ? $_REQUEST['redirect_uri'] : ''), - '$state' => (x($_REQUEST, 'state') ? $_REQUEST['state'] : ''), - ]); - return $o; - } - } + $storage = new OAuth2Storage(DBA::$dba->db); + $s = new OAuth2Server($storage); - function post() { - if (! local_channel()) { - return; - } + // TODO: The automatic client registration protocol below should adhere more + // closely to "OAuth 2.0 Dynamic Client Registration Protocol" defined + // at https://tools.ietf.org/html/rfc7591 - $storage = new OAuth2Storage(DBA::$dba->db); - $s = new OAuth2Server($storage); + // If no client_id was provided, generate a new one. + if (x($_POST, 'client_name')) { + $client_name = $_POST['client_name']; + } else { + $client_name = $_POST['client_name'] = EMPTY_STR; + } - // TODO: The automatic client registration protocol below should adhere more - // closely to "OAuth 2.0 Dynamic Client Registration Protocol" defined - // at https://tools.ietf.org/html/rfc7591 + // If no client_id was provided, generate a new one. + if (x($_POST, 'client_id')) { + $client_id = $_POST['client_id']; + } else { + $client_id = $_POST['client_id'] = random_string(16); + } - // If no client_id was provided, generate a new one. - if (x($_POST, 'client_name')) { - $client_name = $_POST['client_name']; - } else { - $client_name = $_POST['client_name'] = EMPTY_STR; - } + // If no redirect_uri was provided, generate a fake one. + if (x($_POST, 'redirect_uri')) { + $redirect_uri = $_POST['redirect_uri']; + } else { + $redirect_uri = $_POST['redirect_uri'] = 'https://fake.example.com/oauth'; + } - // If no client_id was provided, generate a new one. - if (x($_POST, 'client_id')) { - $client_id = $_POST['client_id']; - } else { - $client_id = $_POST['client_id'] = random_string(16); - } + $request = Request::createFromGlobals(); + $response = new Response(); - // If no redirect_uri was provided, generate a fake one. - if (x($_POST, 'redirect_uri')) { - $redirect_uri = $_POST['redirect_uri']; - } else { - $redirect_uri = $_POST['redirect_uri'] = 'https://fake.example.com/oauth'; - } + // Note, "sub" field must match type and content. $user_id is used to populate - make sure it's a string. + $channel = channelx_by_n(local_channel()); + $user_id = $channel['channel_id']; - $request = Request::createFromGlobals(); - $response = new Response(); + $client_found = false; + $client = $storage->getClientDetails($client_id); - // Note, "sub" field must match type and content. $user_id is used to populate - make sure it's a string. - $channel = channelx_by_n(local_channel()); - $user_id = $channel['channel_id']; + logger('client: ' . print_r($client, true), LOGGER_DATA); - $client_found = false; - $client = $storage->getClientDetails($client_id); - - logger('client: ' . print_r($client,true),LOGGER_DATA); - - if ($client) { - if (intval($client['user_id']) === 0 || intval($client['user_id']) === intval($user_id)) { - $client_found = true; - $client_name = $client['client_name']; - $client_secret = $client['client_secret']; - // Until "Dynamic Client Registration" is fully tested - allow new clients to assign their own secret in the REQUEST - if (! $client_secret) { - $client_secret = ((isset($_REQUEST['client_secret'])) ? $_REQUEST['client_secret'] : random_string(16)); - } - $grant_types = $client['grant_types']; - // Client apps are registered per channel + if ($client) { + if (intval($client['user_id']) === 0 || intval($client['user_id']) === intval($user_id)) { + $client_found = true; + $client_name = $client['client_name']; + $client_secret = $client['client_secret']; + // Until "Dynamic Client Registration" is fully tested - allow new clients to assign their own secret in the REQUEST + if (!$client_secret) { + $client_secret = ((isset($_REQUEST['client_secret'])) ? $_REQUEST['client_secret'] : random_string(16)); + } + $grant_types = $client['grant_types']; + // Client apps are registered per channel -logger('client_id: ' . $client_id); -logger('client_secret: ' . $client_secret); -logger('redirect_uri: ' . $redirect_uri); -logger('grant_types: ' . $_REQUEST['grant_types']); -logger('scope: ' . $_REQUEST['scope']); -logger('user_id: ' . $user_id); -logger('client_name: ' . $client_name); + logger('client_id: ' . $client_id); + logger('client_secret: ' . $client_secret); + logger('redirect_uri: ' . $redirect_uri); + logger('grant_types: ' . $_REQUEST['grant_types']); + logger('scope: ' . $_REQUEST['scope']); + logger('user_id: ' . $user_id); + logger('client_name: ' . $client_name); - $storage->setClientDetails($client_id, $client_secret, $redirect_uri, $grant_types, $_REQUEST['scope'], $user_id, $client_name); - } - } - if (! $client_found) { - $response->send(); - killme(); - } + $storage->setClientDetails($client_id, $client_secret, $redirect_uri, $grant_types, $_REQUEST['scope'], $user_id, $client_name); + } + } + if (!$client_found) { + $response->send(); + killme(); + } - $response->setParameter('client_secret', $client['client_secret']); + $response->setParameter('client_secret', $client['client_secret']); - // validate the authorize request - if (!$s->validateAuthorizeRequest($request, $response)) { - $response->send(); - killme(); - } + // validate the authorize request + if (!$s->validateAuthorizeRequest($request, $response)) { + $response->send(); + killme(); + } - // print the authorization code if the user has authorized your client - $is_authorized = ($_POST['authorize'] === 'allow'); - $s->handleAuthorizeRequest($request, $response, $is_authorized, $user_id); - if ($is_authorized) { - $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=') + 5, 40); - logger('Authorization Code: ' . $code); - } - - $response->send(); - killme(); - } + // print the authorization code if the user has authorized your client + $is_authorized = ($_POST['authorize'] === 'allow'); + $s->handleAuthorizeRequest($request, $response, $is_authorized, $user_id); + if ($is_authorized) { + $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=') + 5, 40); + logger('Authorization Code: ' . $code); + } + $response->send(); + killme(); + } } diff --git a/Zotlabs/Module/Block.php b/Zotlabs/Module/Block.php index 72dc3a7b3..4b16d03bd 100644 --- a/Zotlabs/Module/Block.php +++ b/Zotlabs/Module/Block.php @@ -1,91 +1,97 @@ 1 && argv(1) === 'sys' && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - \App::$is_sys = true; - } - } - - if(argc() > 1) - $which = argv(1); - else - return; - - Libprofile::load($which); - - } - - - function get() { - - if(! \App::$profile) { - notice( t('Requested profile is not available.') . EOL ); - \App::$error = 404; - return; - } - - $which = argv(1); - - $_SESSION['return_url'] = \App::$query_string; - - $uid = local_channel(); - $owner = 0; - $channel = null; - $observer = \App::get_observer(); - - $channel = \App::get_channel(); - - if(\App::$is_sys && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - $uid = $owner = intval($sys['channel_id']); - $channel = $sys; - $observer = $sys; - } - } - - if(! $owner) { - // Figure out who the page owner is. - $r = q("select channel_id from channel where channel_address = '%s'", - dbesc($which) - ); - if($r) { - $owner = intval($r[0]['channel_id']); - } - } - - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - - $perms = get_all_perms($owner,$ob_hash); - - if(! $perms['write_pages']) { - notice( t('Permission denied.') . EOL); - return; - } - - // Block design features from visitors - - if((! $uid) || ($uid != $owner)) { - notice( t('Permission denied.') . EOL); - return; - } - - $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); + public function init() + { - $x = array( - 'webpage' => ITEM_TYPE_BLOCK, - 'is_owner' => true, - 'nickname' => \App::$profile['channel_address'], - 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'bang' => '', - 'showacl' => false, - 'visitor' => true, - 'mimetype' => $mimetype, - 'mimeselect' => true, - 'hide_location' => true, - 'ptlabel' => t('Block Name'), - 'profile_uid' => intval($owner), - 'expanded' => true, - 'novoting' => true, - 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true - ); - - if($_REQUEST['title']) - $x['title'] = $_REQUEST['title']; - if($_REQUEST['body']) - $x['body'] = $_REQUEST['body']; - if($_REQUEST['pagetitle']) - $x['pagetitle'] = $_REQUEST['pagetitle']; - - $editor = status_editor($x); - + if (argc() > 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + App::$is_sys = true; + } + } - $r = q("select iconfig.iid, iconfig.k, iconfig.v, mid, title, body, mimetype, created, edited from iconfig + if (argc() > 1) { + $which = argv(1); + } else { + return; + } + + Libprofile::load($which); + } + + + public function get() + { + + if (!App::$profile) { + notice(t('Requested profile is not available.') . EOL); + App::$error = 404; + return; + } + + $which = argv(1); + + $_SESSION['return_url'] = App::$query_string; + + $uid = local_channel(); + $owner = 0; + $channel = null; + $observer = App::get_observer(); + + $channel = App::get_channel(); + + if (App::$is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } + } + + if (!$owner) { + // Figure out who the page owner is. + $r = q( + "select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if ($r) { + $owner = intval($r[0]['channel_id']); + } + } + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner, $ob_hash); + + if (!$perms['write_pages']) { + notice(t('Permission denied.') . EOL); + return; + } + + // Block design features from visitors + + if ((!$uid) || ($uid != $owner)) { + notice(t('Permission denied.') . EOL); + return; + } + + $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner, 'system', 'page_mimetype')); + + $x = array( + 'webpage' => ITEM_TYPE_BLOCK, + 'is_owner' => true, + 'nickname' => App::$profile['channel_address'], + 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'bang' => '', + 'showacl' => false, + 'visitor' => true, + 'mimetype' => $mimetype, + 'mimeselect' => true, + 'hide_location' => true, + 'ptlabel' => t('Block Name'), + 'profile_uid' => intval($owner), + 'expanded' => true, + 'novoting' => true, + 'bbco_autocomplete' => 'bbcode', + 'bbcode' => true + ); + + if ($_REQUEST['title']) { + $x['title'] = $_REQUEST['title']; + } + if ($_REQUEST['body']) { + $x['body'] = $_REQUEST['body']; + } + if ($_REQUEST['pagetitle']) { + $x['pagetitle'] = $_REQUEST['pagetitle']; + } + + $editor = status_editor($x); + + + $r = q( + "select iconfig.iid, iconfig.k, iconfig.v, mid, title, body, mimetype, created, edited from iconfig left join item on iconfig.iid = item.id where uid = %d and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' and item_type = %d order by item.created desc", - intval($owner), - intval(ITEM_TYPE_BLOCK) - ); - - $pages = null; - - if($r) { - $pages = []; - foreach($r as $rr) { - $element_arr = array( - 'type' => 'block', - 'title' => $rr['title'], - 'body' => $rr['body'], - 'created' => $rr['created'], - 'edited' => $rr['edited'], - 'mimetype' => $rr['mimetype'], - 'pagetitle' => $rr['v'], - 'mid' => $rr['mid'] - ); - $pages[$rr['iid']][] = array( - 'url' => $rr['iid'], - 'name' => $rr['v'], - 'title' => $rr['title'], - 'created' => $rr['created'], - 'edited' => $rr['edited'], - 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]' - ); - } - } - - //Build the base URL for edit links - $url = z_root() . '/editblock/' . $which; - - $o .= replace_macros(get_markup_template('blocklist.tpl'), array( - '$baseurl' => $url, - '$title' => t('Blocks'), - '$name' => t('Block Name'), - '$blocktitle' => t('Block Title'), - '$created' => t('Created'), - '$edited' => t('Edited'), - '$create' => t('Create'), - '$edit' => t('Edit'), - '$share' => t('Share'), - '$delete' => t('Delete'), - '$editor' => $editor, - '$pages' => $pages, - '$channel' => $which, - '$view' => t('View'), - '$preview' => '1', - )); - - return $o; - } - + intval($owner), + intval(ITEM_TYPE_BLOCK) + ); + + $pages = null; + + if ($r) { + $pages = []; + foreach ($r as $rr) { + $element_arr = array( + 'type' => 'block', + 'title' => $rr['title'], + 'body' => $rr['body'], + 'created' => $rr['created'], + 'edited' => $rr['edited'], + 'mimetype' => $rr['mimetype'], + 'pagetitle' => $rr['v'], + 'mid' => $rr['mid'] + ); + $pages[$rr['iid']][] = array( + 'url' => $rr['iid'], + 'name' => $rr['v'], + 'title' => $rr['title'], + 'created' => $rr['created'], + 'edited' => $rr['edited'], + 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]' + ); + } + } + + //Build the base URL for edit links + $url = z_root() . '/editblock/' . $which; + + $o .= replace_macros(get_markup_template('blocklist.tpl'), array( + '$baseurl' => $url, + '$title' => t('Blocks'), + '$name' => t('Block Name'), + '$blocktitle' => t('Block Title'), + '$created' => t('Created'), + '$edited' => t('Edited'), + '$create' => t('Create'), + '$edit' => t('Edit'), + '$share' => t('Share'), + '$delete' => t('Delete'), + '$editor' => $editor, + '$pages' => $pages, + '$channel' => $which, + '$view' => t('View'), + '$preview' => '1', + )); + + return $o; + } } diff --git a/Zotlabs/Module/Ca.php b/Zotlabs/Module/Ca.php index 93d6438ca..96caace69 100644 --- a/Zotlabs/Module/Ca.php +++ b/Zotlabs/Module/Ca.php @@ -1,44 +1,66 @@ 1) { - $path = 'cache/img/' . substr(argv(1),0,2) . '/' . argv(1); + /** + * get + * + * @return void + */ + public function get() + { + if (argc() > 1) { + $path = 'cache/img/' . substr(argv(1), 0, 2) . '/' . argv(1); - if (file_exists($path) && filesize($path)) { - $x = @getimagesize($path); - if ($x) { - header('Content-Type: ' . $x['mime']); - } + if (file_exists($path) && filesize($path)) { + $x = @getimagesize($path); + if ($x) { + header('Content-Type: ' . $x['mime']); + } - $cache = intval(get_config('system','photo_cache_time')); - if (! $cache) { - $cache = (3600 * 24); // 1 day - } - header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $cache) . ' GMT'); - // Set browser cache age as $cache. But set timeout of 'shared caches' - // much lower in the event that infrastructure caching is present. - $smaxage = intval($cache/12); - header('Cache-Control: s-maxage=' . $smaxage . '; max-age=' . $cache . ';'); - - $infile = fopen($path,'rb'); - $outfile = fopen('php://output','wb'); - if ($infile && $outfile) { - pipe_streams($infile,$outfile); - } - fclose($infile); - fclose($outfile); - killme(); - } + $cache = intval(get_config('system', 'photo_cache_time')); + if (!$cache) { + $cache = (3600 * 24); // 1 day + } + header( + 'Expires: ' . gmdate('D, d M Y H:i:s', time() + $cache) + . ' GMT' + ); + // Set browser cache age as $cache. But set timeout of + // 'shared caches' much lower in the event that infrastructure + // caching is present. + $smaxage = intval($cache / 12); + header( + 'Cache-Control: s-maxage=' . $smaxage + . '; max-age=' . $cache . ';' + ); - if ($_GET['url']) { - goaway($url); - } - } - http_status_exit(404,'Not found'); - } -} \ No newline at end of file + $infile = fopen($path, 'rb'); + $outfile = fopen('php://output', 'wb'); + if ($infile && $outfile) { + pipe_streams($infile, $outfile); + } + fclose($infile); + fclose($outfile); + killme(); + } + + if ($_GET['url']) { + goaway($url); + } + } + http_status_exit(404, 'Not found'); + } +} diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php index d40f8a4f5..877356004 100644 --- a/Zotlabs/Module/Cal.php +++ b/Zotlabs/Module/Cal.php @@ -1,12 +1,10 @@ 1) { - $nick = argv(1); - - Libprofile::load($nick); - - $channelx = channelx_by_nick($nick); - - if(! $channelx) - return; - - \App::$data['channel'] = $channelx; - - $observer = \App::get_observer(); - \App::$data['observer'] = $observer; - - $observer_xchan = (($observer) ? $observer['xchan_hash'] : ''); - - head_set_icon(\App::$data['channel']['xchan_photo_s']); - - \App::$page['htmlhead'] .= "" ; - - } - - return; - } - - - - function get() { - - if(observer_prohibited()) { - return; - } - - $channel = null; - - if(argc() > 1) { - $channel = channelx_by_nick(argv(1)); - } - - - if(! $channel) { - notice( t('Channel not found.') . EOL); - return; - } - - // since we don't currently have an event permission - use the stream permission - - if(! perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_stream')) { - notice( t('Permissions denied.') . EOL); - return; - } + public function init() + { + if (observer_prohibited()) { + return; + } - nav_set_selected('Calendar'); - - $sql_extra = permissions_sql($channel['channel_id'],get_observer_hash(),'event'); + $o = ''; - $first_day = intval(get_pconfig($channel['channel_id'],'system','cal_first_day',0)); - - $htpl = get_markup_template('event_head.tpl'); - \App::$page['htmlhead'] .= replace_macros($htpl,array( - '$baseurl' => z_root(), - '$module_url' => '/cal/' . $channel['channel_address'], - '$modparams' => 2, - '$lang' => \App::$language, - '$first_day' => $first_day - )); - - $o = ''; - - $mode = 'view'; - $y = 0; - $m = 0; - $ignored = ((x($_REQUEST,'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : ''); - - // logger('args: ' . print_r(\App::$argv,true)); - - if(argc() > 3 && intval(argv(2)) && intval(argv(3))) { - $mode = 'view'; - $y = intval(argv(2)); - $m = intval(argv(3)); - } - if(argc() <= 3) { - $mode = 'view'; - $event_id = argv(2); - } - - if($mode == 'view') { - - /* edit/create form */ - if($event_id) { - $r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1", - dbesc($event_id), - intval($channel['channel_id']) - ); - if(count($r)) - $orig_event = $r[0]; - } - - - // Passed parameters overrides anything found in the DB - if(!x($orig_event)) - $orig_event = []; - - - - $tz = date_default_timezone_get(); - if(x($orig_event)) - $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC'); - - $syear = datetime_convert('UTC', $tz, $sdt, 'Y'); - $smonth = datetime_convert('UTC', $tz, $sdt, 'm'); - $sday = datetime_convert('UTC', $tz, $sdt, 'd'); - $shour = datetime_convert('UTC', $tz, $sdt, 'H'); - $sminute = datetime_convert('UTC', $tz, $sdt, 'i'); - - $stext = datetime_convert('UTC',$tz,$sdt); - $stext = substr($stext,0,14) . "00:00"; - - $fyear = datetime_convert('UTC', $tz, $fdt, 'Y'); - $fmonth = datetime_convert('UTC', $tz, $fdt, 'm'); - $fday = datetime_convert('UTC', $tz, $fdt, 'd'); - $fhour = datetime_convert('UTC', $tz, $fdt, 'H'); - $fminute = datetime_convert('UTC', $tz, $fdt, 'i'); - - $ftext = datetime_convert('UTC',$tz,$fdt); - $ftext = substr($ftext,0,14) . "00:00"; - - $type = ((x($orig_event)) ? $orig_event['etype'] : 'event'); - - $f = get_config('system','event_input_format'); - if(! $f) - $f = 'ymd'; - - $catsenabled = Apps::system_app_installed(local_channel(),'Categories'); - - - $show_bd = perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_contacts'); - if(! $show_bd) { - $sql_extra .= " and event.etype != 'birthday' "; - } - - - $category = ''; - - $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); - $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); - if(! $y) - $y = intval($thisyear); - if(! $m) - $m = intval($thismonth); - - // Put some limits on dates. The PHP date functions don't seem to do so well before 1900. - // An upper limit was chosen to keep search engines from exploring links millions of years in the future. - - if($y < 1901) - $y = 1900; - if($y > 2099) - $y = 2100; - - $nextyear = $y; - $nextmonth = $m + 1; - if($nextmonth > 12) { - $nextmonth = 1; - $nextyear ++; - } - - $prevyear = $y; - if($m > 1) - $prevmonth = $m - 1; - else { - $prevmonth = 12; - $prevyear --; - } - - $dim = get_dim($y,$m); - $start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0); - $finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59); - - - if (argv(2) === 'json'){ - if (x($_GET,'start')) $start = $_GET['start']; - if (x($_GET,'end')) $finish = $_GET['end']; - } - - $start = datetime_convert('UTC','UTC',$start); - $finish = datetime_convert('UTC','UTC',$finish); - - $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start); - $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish); - + if (argc() > 1) { + $nick = argv(1); - if(! perm_is_allowed(\App::$profile['uid'],get_observer_hash(),'view_contacts')) - $sql_extra .= " and etype != 'birthday' "; + Libprofile::load($nick); - if (x($_GET,'id')){ - $r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan + $channelx = channelx_by_nick($nick); + + if (!$channelx) { + return; + } + + App::$data['channel'] = $channelx; + + $observer = App::get_observer(); + App::$data['observer'] = $observer; + + $observer_xchan = (($observer) ? $observer['xchan_hash'] : ''); + + head_set_icon(App::$data['channel']['xchan_photo_s']); + + App::$page['htmlhead'] .= ""; + } + + return; + } + + + public function get() + { + + if (observer_prohibited()) { + return; + } + + $channel = null; + + if (argc() > 1) { + $channel = channelx_by_nick(argv(1)); + } + + + if (!$channel) { + notice(t('Channel not found.') . EOL); + return; + } + + // since we don't currently have an event permission - use the stream permission + + if (!perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_stream')) { + notice(t('Permissions denied.') . EOL); + return; + } + + nav_set_selected('Calendar'); + + $sql_extra = permissions_sql($channel['channel_id'], get_observer_hash(), 'event'); + + $first_day = intval(get_pconfig($channel['channel_id'], 'system', 'cal_first_day', 0)); + + $htpl = get_markup_template('event_head.tpl'); + App::$page['htmlhead'] .= replace_macros($htpl, array( + '$baseurl' => z_root(), + '$module_url' => '/cal/' . $channel['channel_address'], + '$modparams' => 2, + '$lang' => App::$language, + '$first_day' => $first_day + )); + + $o = ''; + + $mode = 'view'; + $y = 0; + $m = 0; + $ignored = ((x($_REQUEST, 'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : ''); + + // logger('args: ' . print_r(\App::$argv,true)); + + if (argc() > 3 && intval(argv(2)) && intval(argv(3))) { + $mode = 'view'; + $y = intval(argv(2)); + $m = intval(argv(3)); + } + if (argc() <= 3) { + $mode = 'view'; + $event_id = argv(2); + } + + if ($mode == 'view') { + /* edit/create form */ + if ($event_id) { + $r = q( + "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1", + dbesc($event_id), + intval($channel['channel_id']) + ); + if (count($r)) { + $orig_event = $r[0]; + } + } + + + // Passed parameters overrides anything found in the DB + if (!x($orig_event)) { + $orig_event = []; + } + + + $tz = date_default_timezone_get(); + if (x($orig_event)) { + $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC'); + } + + $syear = datetime_convert('UTC', $tz, $sdt, 'Y'); + $smonth = datetime_convert('UTC', $tz, $sdt, 'm'); + $sday = datetime_convert('UTC', $tz, $sdt, 'd'); + $shour = datetime_convert('UTC', $tz, $sdt, 'H'); + $sminute = datetime_convert('UTC', $tz, $sdt, 'i'); + + $stext = datetime_convert('UTC', $tz, $sdt); + $stext = substr($stext, 0, 14) . "00:00"; + + $fyear = datetime_convert('UTC', $tz, $fdt, 'Y'); + $fmonth = datetime_convert('UTC', $tz, $fdt, 'm'); + $fday = datetime_convert('UTC', $tz, $fdt, 'd'); + $fhour = datetime_convert('UTC', $tz, $fdt, 'H'); + $fminute = datetime_convert('UTC', $tz, $fdt, 'i'); + + $ftext = datetime_convert('UTC', $tz, $fdt); + $ftext = substr($ftext, 0, 14) . "00:00"; + + $type = ((x($orig_event)) ? $orig_event['etype'] : 'event'); + + $f = get_config('system', 'event_input_format'); + if (!$f) { + $f = 'ymd'; + } + + $catsenabled = Apps::system_app_installed(local_channel(), 'Categories'); + + + $show_bd = perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_contacts'); + if (!$show_bd) { + $sql_extra .= " and event.etype != 'birthday' "; + } + + + $category = ''; + + $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y'); + $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm'); + if (!$y) { + $y = intval($thisyear); + } + if (!$m) { + $m = intval($thismonth); + } + + // Put some limits on dates. The PHP date functions don't seem to do so well before 1900. + // An upper limit was chosen to keep search engines from exploring links millions of years in the future. + + if ($y < 1901) { + $y = 1900; + } + if ($y > 2099) { + $y = 2100; + } + + $nextyear = $y; + $nextmonth = $m + 1; + if ($nextmonth > 12) { + $nextmonth = 1; + $nextyear++; + } + + $prevyear = $y; + if ($m > 1) { + $prevmonth = $m - 1; + } else { + $prevmonth = 12; + $prevyear--; + } + + $dim = get_dim($y, $m); + $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0); + $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59); + + + if (argv(2) === 'json') { + if (x($_GET, 'start')) { + $start = $_GET['start']; + } + if (x($_GET, 'end')) { + $finish = $_GET['end']; + } + } + + $start = datetime_convert('UTC', 'UTC', $start); + $finish = datetime_convert('UTC', 'UTC', $finish); + + $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start); + $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish); + + + if (!perm_is_allowed(App::$profile['uid'], get_observer_hash(), 'view_contacts')) { + $sql_extra .= " and etype != 'birthday' "; + } + + if (x($_GET, 'id')) { + $r = q( + "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d $sql_extra limit 1", - intval($channel['channel_id']), - intval($_GET['id']) - ); - } - else { - // fixed an issue with "nofinish" events not showing up in the calendar. - // There's still an issue if the finish date crosses the end of month. - // Noting this for now - it will need to be fixed here and in Friendica. - // Ultimately the finish date shouldn't be involved in the query. - - $r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan + intval($channel['channel_id']), + intval($_GET['id']) + ); + } else { + // fixed an issue with "nofinish" events not showing up in the calendar. + // There's still an issue if the finish date crosses the end of month. + // Noting this for now - it will need to be fixed here and in Friendica. + // Ultimately the finish date shouldn't be involved in the query. + + $r = q( + "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan from event left join item on event_hash = resource_id where resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) OR ( adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) $sql_extra ", - intval($channel['channel_id']), - dbesc($start), - dbesc($finish), - dbesc($adjust_start), - dbesc($adjust_finish) - ); - - } - - $links = []; - - if($r) { - xchan_query($r); - $r = fetch_post_tags($r,true); - - $r = sort_by_date($r); - } - - if($r) { - foreach($r as $rr) { - $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j')); - if(! x($links,$j)) - $links[$j] = z_root() . '/' . \App::$cmd . '#link-' . $j; - } - } - - $events=[]; - - $last_date = ''; - $fmt = t('l, F j'); - - if($r) { - - foreach($r as $rr) { - - $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j')); - $d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], $fmt) : datetime_convert('UTC','UTC',$rr['dtstart'],$fmt)); - $d = day_translate($d); - - $start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'c') : datetime_convert('UTC','UTC',$rr['dtstart'],'c')); - if ($rr['nofinish']){ - $end = null; - } else { - $end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtend'], 'c') : datetime_convert('UTC','UTC',$rr['dtend'],'c')); - } - - - $is_first = ($d !== $last_date); - - $last_date = $d; - - $edit = false; - - $drop = false; - - $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8')); - if(! $title) { - list($title, $_trash) = explode("
'; + $o .= t('Create personal planning cards'); + return $o; + } - $o = 'Cards App (Not Installed):
'; - $o .= t('Create personal planning cards'); - return $o; - } + nav_set_selected('Cards'); - nav_set_selected('Cards'); - - head_add_link([ - 'rel' => 'alternate', - 'type' => 'application/json+oembed', - 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string), - 'title' => 'oembed' - ]); + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string), + 'title' => 'oembed' + ]); - $category = (($_REQUEST['cat']) ? escape_tags(trim($_REQUEST['cat'])) : ''); + $category = (($_REQUEST['cat']) ? escape_tags(trim($_REQUEST['cat'])) : ''); - if($category) { - $sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY)); - } + if ($category) { + $sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY)); + } - $which = argv(1); + $which = argv(1); - $selected_card = ((argc() > 2) ? argv(2) : ''); + $selected_card = ((argc() > 2) ? argv(2) : ''); - $_SESSION['return_url'] = App::$query_string; + $_SESSION['return_url'] = App::$query_string; - $uid = local_channel(); - $owner = App::$profile_uid; - $observer = App::get_observer(); + $uid = local_channel(); + $owner = App::$profile_uid; + $observer = App::get_observer(); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - if(! perm_is_allowed($owner, $ob_hash, 'view_pages')) { - notice( t('Permission denied.') . EOL); - return; - } + if (!perm_is_allowed($owner, $ob_hash, 'view_pages')) { + notice(t('Permission denied.') . EOL); + return; + } - $is_owner = ($uid && $uid == $owner); + $is_owner = ($uid && $uid == $owner); - $channel = channelx_by_n($owner); + $channel = channelx_by_n($owner); - if($channel) { - $channel_acl = [ - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'] - ]; - } - else { - $channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; - } + if ($channel) { + $channel_acl = [ + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ]; + } else { + $channel_acl = ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']; + } + if (perm_is_allowed($owner, $ob_hash, 'write_pages')) { + $x = [ + 'webpage' => ITEM_TYPE_CARD, + 'is_owner' => true, + 'content_label' => t('Add Card'), + 'button' => t('Create'), + 'nickname' => $channel['channel_address'], + 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] + || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'acl' => (($is_owner) ? populate_acl( + $channel_acl, + false, + PermissionDescription::fromGlobalPermission('view_pages') + ) : ''), + 'permissions' => $channel_acl, + 'showacl' => (($is_owner) ? true : false), + 'visitor' => true, + 'hide_location' => false, + 'hide_voting' => false, + 'profile_uid' => intval($owner), + 'mimetype' => 'text/x-multicode', + 'mimeselect' => false, + 'layoutselect' => false, + 'expanded' => false, + 'novoting' => false, + 'catsenabled' => Apps::system_app_installed($owner, 'Categories'), + 'bbco_autocomplete' => 'bbcode', + 'bbcode' => true + ]; - if(perm_is_allowed($owner, $ob_hash, 'write_pages')) { + if ($_REQUEST['title']) { + $x['title'] = $_REQUEST['title']; + } + if ($_REQUEST['body']) { + $x['body'] = $_REQUEST['body']; + } - $x = [ - 'webpage' => ITEM_TYPE_CARD, - 'is_owner' => true, - 'content_label' => t('Add Card'), - 'button' => t('Create'), - 'nickname' => $channel['channel_address'], - 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] - || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => (($is_owner) ? populate_acl($channel_acl, false, - PermissionDescription::fromGlobalPermission('view_pages')) : ''), - 'permissions' => $channel_acl, - 'showacl' => (($is_owner) ? true : false), - 'visitor' => true, - 'hide_location' => false, - 'hide_voting' => false, - 'profile_uid' => intval($owner), - 'mimetype' => 'text/x-multicode', - 'mimeselect' => false, - 'layoutselect' => false, - 'expanded' => false, - 'novoting' => false, - 'catsenabled' => Apps::system_app_installed($owner, 'Categories'), - 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true - ]; - - if($_REQUEST['title']) - $x['title'] = $_REQUEST['title']; - if($_REQUEST['body']) - $x['body'] = $_REQUEST['body']; - - $editor = status_editor($x); - } - else { - $editor = ''; - } + $editor = status_editor($x); + } else { + $editor = ''; + } - $itemspage = get_pconfig(local_channel(),'system','itemspage'); - App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); - $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); + $itemspage = get_pconfig(local_channel(), 'system', 'itemspage'); + App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); + $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); - $sql_extra = item_permissions_sql($owner); - $sql_item = ''; + $sql_extra = item_permissions_sql($owner); + $sql_item = ''; - if($selected_card) { - $r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1", - dbesc($selected_card) - ); - if($r) { - $sql_item = "and item.id = " . intval($r[0]['iid']) . " "; - } - } + if ($selected_card) { + $r = q( + "select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1", + dbesc($selected_card) + ); + if ($r) { + $sql_item = "and item.id = " . intval($r[0]['iid']) . " "; + } + } - $r = q("select * from item + $r = q( + "select * from item where uid = %d and item_type = %d $sql_extra $sql_item order by item.created desc $pager_sql", - intval($owner), - intval(ITEM_TYPE_CARD) - ); + intval($owner), + intval(ITEM_TYPE_CARD) + ); - $item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0 + $item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_blocked = 0 "; - $items_result = []; - if($r) { + $items_result = []; + if ($r) { + $pager_total = count($r); - $pager_total = count($r); + $parents_str = ids_to_querystr($r, 'id'); - $parents_str = ids_to_querystr($r, 'id'); - - $items = q("SELECT item.*, item.id AS item_id + $items = q( + "SELECT item.*, item.id AS item_id FROM item WHERE item.uid = %d $item_normal AND item.parent IN ( %s ) $sql_extra $sql_extra2 ", - intval(App::$profile['profile_uid']), - dbesc($parents_str) - ); - if($items) { - xchan_query($items); - $items = fetch_post_tags($items, true); - $items_result = conv_sort($items, 'updated'); - } - } + intval(App::$profile['profile_uid']), + dbesc($parents_str) + ); + if ($items) { + xchan_query($items); + $items = fetch_post_tags($items, true); + $items_result = conv_sort($items, 'updated'); + } + } - $mode = 'cards'; + $mode = 'cards'; - if(get_pconfig(local_channel(),'system','articles_list_mode') && (! $selected_card)) - $page_mode = 'pager_list'; - else - $page_mode = 'traditional'; + if (get_pconfig(local_channel(), 'system', 'articles_list_mode') && (!$selected_card)) { + $page_mode = 'pager_list'; + } else { + $page_mode = 'traditional'; + } - $content = conversation($items_result, $mode, false, $page_mode); + $content = conversation($items_result, $mode, false, $page_mode); - $o = replace_macros(get_markup_template('cards.tpl'), [ - '$title' => t('Cards'), - '$editor' => $editor, - '$content' => $content, - '$pager' => alt_pager($pager_total) - ]); - - return $o; - } + $o = replace_macros(get_markup_template('cards.tpl'), [ + '$title' => t('Cards'), + '$editor' => $editor, + '$content' => $content, + '$pager' => alt_pager($pager_total) + ]); + return $o; + } } diff --git a/Zotlabs/Module/Categories.php b/Zotlabs/Module/Categories.php index 4d0af6a6a..e168bc6fe 100644 --- a/Zotlabs/Module/Categories.php +++ b/Zotlabs/Module/Categories.php @@ -9,35 +9,34 @@ use Zotlabs\Lib\Libprofile; use Zotlabs\Web\Controller; use Zotlabs\Render\Comanche; -class Categories extends Controller { +class Categories extends Controller +{ - function init() { + public function init() + { - if(local_channel()) { - $channel = App::get_channel(); - if($channel && $channel['channel_address']) { - $which = $channel['channel_address']; - } - Libprofile::load($which,0); - } - - } + if (local_channel()) { + $channel = App::get_channel(); + if ($channel && $channel['channel_address']) { + $which = $channel['channel_address']; + } + Libprofile::load($which, 0); + } + } - function get() { + public function get() + { $desc = t('This app allows you to add categories to posts and events.'); $text = '' . $desc . ''; - if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Categories'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Categories'))) { return $text; } - $c = new Comanche; - return $c->widget('catcloud',EMPTY_STR); - - } - - + $c = new Comanche(); + return $c->widget('catcloud', EMPTY_STR); + } } diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php index 40626e5bb..ceb364c6e 100644 --- a/Zotlabs/Module/Cdav.php +++ b/Zotlabs/Module/Cdav.php @@ -1,10 +1,30 @@ $c, 'account' => $a[0] ]; - $channel_login = $c['channel_id']; - } - } - } - if(! $record) - continue; - - if($record) { - $verified = HTTPSig::verify('',$record['channel']['channel_pubkey']); - if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) { - $record = null; - } - if($record['account']) { - authenticate_success($record['account']); - if($channel_login) { - change_channel($channel_login); - } - } - break; - } - } - } - } - } - - - /** - * This server combines both CardDAV and CalDAV functionality into a single - * server. It is assumed that the server runs at the root of a HTTP domain (be - * that a domainname-based vhost or a specific TCP port. - * - * This example also assumes that you're using SQLite and the database has - * already been setup (along with the database tables). - * - * You may choose to use MySQL instead, just change the PDO connection - * statement. - */ - - /** - * UTC or GMT is easy to work with, and usually recommended for any - * application. - */ - date_default_timezone_set('UTC'); - - /** - * Make sure this setting is turned on and reflect the root url for your WebDAV - * server. - * - * This can be for example the root / or a complete path to your server script. - */ - - $baseUri = '/cdav/'; - - /** - * Database - * - */ - - $pdo = DBA::$dba->db; - - // Autoloader - require_once 'vendor/autoload.php'; - - /** - * The backends. Yes we do really need all of them. - * - * This allows any developer to subclass just any of them and hook into their - * own backend systems. - */ - - $auth = new BasicAuth(); - $auth->setRealm(ucfirst(System::get_platform_name()) . ' ' . 'CalDAV/CardDAV'); - - if (local_channel()) { - - logger('loggedin'); - - if ((argv(1) == 'addressbooks') && (! Apps::system_app_installed(local_channel(), 'CardDAV'))) { - killme(); - } - - $channel = App::get_channel(); - $auth->setCurrentUser($channel['channel_address']); - $auth->channel_id = $channel['channel_id']; - $auth->channel_hash = $channel['channel_hash']; - $auth->channel_account_id = $channel['channel_account_id']; - if ($channel['channel_timezone']) { - $auth->setTimezone($channel['channel_timezone']); - } - $auth->observer = $channel['channel_hash']; - - $principalUri = 'principals/' . $channel['channel_address']; - if (!cdav_principal($principalUri)) { - $this->activate($pdo, $channel); - if (!cdav_principal($principalUri)) { - return; - } - } - - } - - - $principalBackend = new \Sabre\DAVACL\PrincipalBackend\PDO($pdo); - $carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo); - $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo); - - /** - * The directory tree - * - * Basically this is an array which contains the 'top-level' directories in the - * WebDAV server. - */ - - $nodes = [ - // /principals - new \Sabre\CalDAV\Principal\Collection($principalBackend), +class Cdav extends Controller +{ + + public function init() + { + + $record = null; + $channel_login = false; + + if ((argv(1) !== 'calendar') && (argv(1) !== 'addressbook')) { + foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $head) { + /* Basic authentication */ + + if (array_key_exists($head, $_SERVER) && substr(trim($_SERVER[$head]), 0, 5) === 'Basic') { + $userpass = @base64_decode(substr(trim($_SERVER[$head]), 6)); + if (strlen($userpass)) { + list($name, $password) = explode(':', $userpass); + $_SERVER['PHP_AUTH_USER'] = $name; + $_SERVER['PHP_AUTH_PW'] = $password; + } + break; + } + + /* Signature authentication */ + + if (array_key_exists($head, $_SERVER) && substr(trim($_SERVER[$head]), 0, 9) === 'Signature') { + if ($head !== 'HTTP_AUTHORIZATION') { + $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head]; + continue; + } + + $sigblock = HTTPSig::parse_sigheader($_SERVER[$head]); + if ($sigblock) { + $keyId = str_replace('acct:', '', $sigblock['keyId']); + if ($keyId) { + $r = q( + "select * from hubloc where hubloc_addr = '%s' limit 1", + dbesc($keyId) + ); + if ($r) { + $c = channelx_by_hash($r[0]['hubloc_hash']); + if ($c) { + $a = q( + "select * from account where account_id = %d limit 1", + intval($c['channel_account_id']) + ); + if ($a) { + $record = ['channel' => $c, 'account' => $a[0]]; + $channel_login = $c['channel_id']; + } + } + } + if (!$record) { + continue; + } + + if ($record) { + $verified = HTTPSig::verify('', $record['channel']['channel_pubkey']); + if (!($verified && $verified['header_signed'] && $verified['header_valid'])) { + $record = null; + } + if ($record['account']) { + authenticate_success($record['account']); + if ($channel_login) { + change_channel($channel_login); + } + } + break; + } + } + } + } + } + + + /** + * This server combines both CardDAV and CalDAV functionality into a single + * server. It is assumed that the server runs at the root of a HTTP domain (be + * that a domainname-based vhost or a specific TCP port. + * + * This example also assumes that you're using SQLite and the database has + * already been setup (along with the database tables). + * + * You may choose to use MySQL instead, just change the PDO connection + * statement. + */ + + /** + * UTC or GMT is easy to work with, and usually recommended for any + * application. + */ + date_default_timezone_set('UTC'); + + /** + * Make sure this setting is turned on and reflect the root url for your WebDAV + * server. + * + * This can be for example the root / or a complete path to your server script. + */ + + $baseUri = '/cdav/'; + + /** + * Database + * + */ + + $pdo = DBA::$dba->db; + + // Autoloader + require_once 'vendor/autoload.php'; + + /** + * The backends. Yes we do really need all of them. + * + * This allows any developer to subclass just any of them and hook into their + * own backend systems. + */ + + $auth = new BasicAuth(); + $auth->setRealm(ucfirst(System::get_platform_name()) . ' ' . 'CalDAV/CardDAV'); + + if (local_channel()) { + logger('loggedin'); + + if ((argv(1) == 'addressbooks') && (!Apps::system_app_installed(local_channel(), 'CardDAV'))) { + killme(); + } + + $channel = App::get_channel(); + $auth->setCurrentUser($channel['channel_address']); + $auth->channel_id = $channel['channel_id']; + $auth->channel_hash = $channel['channel_hash']; + $auth->channel_account_id = $channel['channel_account_id']; + if ($channel['channel_timezone']) { + $auth->setTimezone($channel['channel_timezone']); + } + $auth->observer = $channel['channel_hash']; + + $principalUri = 'principals/' . $channel['channel_address']; + if (!cdav_principal($principalUri)) { + $this->activate($pdo, $channel); + if (!cdav_principal($principalUri)) { + return; + } + } + } + + + $principalBackend = new \Sabre\DAVACL\PrincipalBackend\PDO($pdo); + $carddavBackend = new PDO($pdo); + $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo); + + /** + * The directory tree + * + * Basically this is an array which contains the 'top-level' directories in the + * WebDAV server. + */ + + $nodes = [ + // /principals + new Collection($principalBackend), + + // /calendars + new CalendarRoot($principalBackend, $caldavBackend), + + // /addressbook + new AddressBookRoot($principalBackend, $carddavBackend) + ]; + + + // The object tree needs in turn to be passed to the server class + + $server = new Server($nodes); + + if (isset($baseUri)) { + $server->setBaseUri($baseUri); + } + + // Plugins + $server->addPlugin(new \Sabre\DAV\Auth\Plugin($auth)); + //$server->addPlugin(new \Sabre\DAV\Browser\Plugin()); + $server->addPlugin(new \Sabre\DAV\Sync\Plugin()); + $server->addPlugin(new \Sabre\DAV\Sharing\Plugin()); + $server->addPlugin(new \Sabre\DAVACL\Plugin()); + + // CalDAV plugins + $server->addPlugin(new \Sabre\CalDAV\Plugin()); + $server->addPlugin(new SharingPlugin()); + //$server->addPlugin(new \Sabre\CalDAV\Schedule\Plugin()); + $server->addPlugin(new ICSExportPlugin()); + + // CardDAV plugins + $server->addPlugin(new Plugin()); + $server->addPlugin(new VCFExportPlugin()); + + // And off we go! + $server->exec(); + + killme(); + } + } + + public function post() + { + + if (!local_channel()) { + return; + } + + if ((argv(1) === 'addressbook') && (!Apps::system_app_installed(local_channel(), 'CardDAV'))) { + return; + } + + $channel = App::get_channel(); + $principalUri = 'principals/' . $channel['channel_address']; + + if (!cdav_principal($principalUri)) { + return; + } + + $pdo = DBA::$dba->db; + + require_once 'vendor/autoload.php'; + + if (argc() == 2 && argv(1) === 'calendar') { + $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo); + $calendars = $caldavBackend->getCalendarsForUser($principalUri); + + // create new calendar + if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['create']) { + do { + $duplicate = false; + $calendarUri = random_string(40); + + $r = q( + "SELECT uri FROM calendarinstances WHERE principaluri = '%s' AND uri = '%s' LIMIT 1", + dbesc($principalUri), + dbesc($calendarUri) + ); + + if ($r) { + $duplicate = true; + } + } while ($duplicate == true); - // /calendars - new \Sabre\CalDAV\CalendarRoot($principalBackend, $caldavBackend), + $properties = [ + '{DAV:}displayname' => $_REQUEST['{DAV:}displayname'], + '{http://apple.com/ns/ical/}calendar-color' => $_REQUEST['color'], + '{urn:ietf:params:xml:ns:caldav}calendar-description' => $channel['channel_name'] + ]; + + $id = $caldavBackend->createCalendar($principalUri, $calendarUri, $properties); + + // set new calendar to be visible + set_pconfig(local_channel(), 'cdav_calendar', $id[0], 1); + } + + //create new calendar object via ajax request + if ($_REQUEST['submit'] === 'create_event' && $_REQUEST['title'] && $_REQUEST['target'] && $_REQUEST['dtstart']) { + $id = explode(':', $_REQUEST['target']); + + if (!cdav_perms($id[0], $calendars, true)) { + return; + } + + $title = $_REQUEST['title']; + $start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']); + $dtstart = new DateTime($start); + if ($_REQUEST['dtend']) { + $end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']); + $dtend = new DateTime($end); + } + $description = $_REQUEST['description']; + $location = $_REQUEST['location']; + + do { + $duplicate = false; + $objectUri = random_string(40) . '.ics'; + + $r = q( + "SELECT uri FROM calendarobjects WHERE calendarid = %s AND uri = '%s' LIMIT 1", + intval($id[0]), + dbesc($objectUri) + ); + + if (count($r)) { + $duplicate = true; + } + } while ($duplicate == true); + + + $vcalendar = new VCalendar([ + 'VEVENT' => [ + 'SUMMARY' => $title, + 'DTSTART' => $dtstart + ] + ]); + if ($dtend) { + $vcalendar->VEVENT->add('DTEND', $dtend); + $vcalendar->VEVENT->DTEND['TZID'] = App::$timezone; + } + if ($description) { + $vcalendar->VEVENT->add('DESCRIPTION', $description); + } + if ($location) { + $vcalendar->VEVENT->add('LOCATION', $location); + } + + $vcalendar->VEVENT->DTSTART['TZID'] = App::$timezone; + + $calendarData = $vcalendar->serialize(); + + $caldavBackend->createCalendarObject($id, $objectUri, $calendarData); + + killme(); + } + + // edit calendar name and color + if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['edit'] && $_REQUEST['id']) { + $id = explode(':', $_REQUEST['id']); + + if (!cdav_perms($id[0], $calendars)) { + return; + } + + $mutations = [ + '{DAV:}displayname' => $_REQUEST['{DAV:}displayname'], + '{http://apple.com/ns/ical/}calendar-color' => $_REQUEST['color'] + ]; + + $patch = new PropPatch($mutations); + + $caldavBackend->updateCalendar($id, $patch); + + $patch->commit(); + } + + // edit calendar object via ajax request + if ($_REQUEST['submit'] === 'update_event' && $_REQUEST['uri'] && $_REQUEST['title'] && $_REQUEST['target'] && $_REQUEST['dtstart']) { + $id = explode(':', $_REQUEST['target']); + + if (!cdav_perms($id[0], $calendars, true)) { + return; + } + + $uri = $_REQUEST['uri']; + $title = $_REQUEST['title']; + $start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']); + $dtstart = new DateTime($start); + if ($_REQUEST['dtend']) { + $end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']); + $dtend = new DateTime($end); + } + $description = $_REQUEST['description']; + $location = $_REQUEST['location']; + + $object = $caldavBackend->getCalendarObject($id, $uri); + + $vcalendar = Reader::read($object['calendardata']); + + if ($title) { + $vcalendar->VEVENT->SUMMARY = $title; + } + if ($dtstart) { + $vcalendar->VEVENT->DTSTART = $dtstart; + } + if ($dtend) { + $vcalendar->VEVENT->DTEND = $dtend; + } else { + unset($vcalendar->VEVENT->DTEND); + } + if ($description) { + $vcalendar->VEVENT->DESCRIPTION = $description; + } + if ($location) { + $vcalendar->VEVENT->LOCATION = $location; + } + + $calendarData = $vcalendar->serialize(); + + $caldavBackend->updateCalendarObject($id, $uri, $calendarData); + killme(); + } + + // delete calendar object via ajax request + if ($_REQUEST['delete'] && $_REQUEST['uri'] && $_REQUEST['target']) { + $id = explode(':', $_REQUEST['target']); + + if (!cdav_perms($id[0], $calendars, true)) { + return; + } + + $uri = $_REQUEST['uri']; + + $caldavBackend->deleteCalendarObject($id, $uri); + killme(); + } + + // edit calendar object date/timeme via ajax request (drag and drop) + if ($_REQUEST['update'] && $_REQUEST['id'] && $_REQUEST['uri']) { + $id = [$_REQUEST['id'][0], $_REQUEST['id'][1]]; - // /addressbook - new \Sabre\CardDAV\AddressBookRoot($principalBackend, $carddavBackend) - ]; + if (!cdav_perms($id[0], $calendars, true)) { + return; + } + $uri = $_REQUEST['uri']; + $start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']); + $dtstart = new DateTime($start); + if ($_REQUEST['dtend']) { + $end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']); + $dtend = new DateTime($end); + } - // The object tree needs in turn to be passed to the server class + $object = $caldavBackend->getCalendarObject($id, $uri); - $server = new \Sabre\DAV\Server($nodes); - - if (isset($baseUri)) { - $server->setBaseUri($baseUri); - } - - // Plugins - $server->addPlugin(new \Sabre\DAV\Auth\Plugin($auth)); - //$server->addPlugin(new \Sabre\DAV\Browser\Plugin()); - $server->addPlugin(new \Sabre\DAV\Sync\Plugin()); - $server->addPlugin(new \Sabre\DAV\Sharing\Plugin()); - $server->addPlugin(new \Sabre\DAVACL\Plugin()); - - // CalDAV plugins - $server->addPlugin(new \Sabre\CalDAV\Plugin()); - $server->addPlugin(new \Sabre\CalDAV\SharingPlugin()); - //$server->addPlugin(new \Sabre\CalDAV\Schedule\Plugin()); - $server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin()); - - // CardDAV plugins - $server->addPlugin(new \Sabre\CardDAV\Plugin()); - $server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin()); - - // And off we go! - $server->exec(); - - killme(); - - } - - } - - function post() { - - if (! local_channel()) - return; - - if ((argv(1) === 'addressbook') && (! Apps::system_app_installed(local_channel(), 'CardDAV'))) { - return; - } - - $channel = App::get_channel(); - $principalUri = 'principals/' . $channel['channel_address']; - - if (!cdav_principal($principalUri)) - return; - - $pdo = DBA::$dba->db; - - require_once 'vendor/autoload.php'; - - if (argc() == 2 && argv(1) === 'calendar') { - - $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo); - $calendars = $caldavBackend->getCalendarsForUser($principalUri); - - // create new calendar - if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['create']) { - do { - $duplicate = false; - $calendarUri = random_string(40); - - $r = q("SELECT uri FROM calendarinstances WHERE principaluri = '%s' AND uri = '%s' LIMIT 1", - dbesc($principalUri), - dbesc($calendarUri) - ); - - if ($r) { - $duplicate = true; - } - } while ($duplicate == true); - - $properties = [ - '{DAV:}displayname' => $_REQUEST['{DAV:}displayname'], - '{http://apple.com/ns/ical/}calendar-color' => $_REQUEST['color'], - '{urn:ietf:params:xml:ns:caldav}calendar-description' => $channel['channel_name'] - ]; - - $id = $caldavBackend->createCalendar($principalUri, $calendarUri, $properties); - - // set new calendar to be visible - set_pconfig(local_channel(), 'cdav_calendar' , $id[0], 1); - } - - //create new calendar object via ajax request - if ($_REQUEST['submit'] === 'create_event' && $_REQUEST['title'] && $_REQUEST['target'] && $_REQUEST['dtstart']) { - - $id = explode(':', $_REQUEST['target']); - - if (!cdav_perms($id[0],$calendars,true)) - return; - - $title = $_REQUEST['title']; - $start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']); - $dtstart = new DateTime($start); - if ($_REQUEST['dtend']) { - $end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']); - $dtend = new DateTime($end); - } - $description = $_REQUEST['description']; - $location = $_REQUEST['location']; - - do { - $duplicate = false; - $objectUri = random_string(40) . '.ics'; - - $r = q("SELECT uri FROM calendarobjects WHERE calendarid = %s AND uri = '%s' LIMIT 1", - intval($id[0]), - dbesc($objectUri) - ); - - if (count($r)) - $duplicate = true; - } while ($duplicate == true); - - - $vcalendar = new \Sabre\VObject\Component\VCalendar([ - 'VEVENT' => [ - 'SUMMARY' => $title, - 'DTSTART' => $dtstart - ] - ]); - if($dtend) { - $vcalendar->VEVENT->add('DTEND', $dtend); - $vcalendar->VEVENT->DTEND['TZID'] = App::$timezone; - } - if($description) - $vcalendar->VEVENT->add('DESCRIPTION', $description); - if($location) - $vcalendar->VEVENT->add('LOCATION', $location); - - $vcalendar->VEVENT->DTSTART['TZID'] = App::$timezone; - - $calendarData = $vcalendar->serialize(); - - $caldavBackend->createCalendarObject($id, $objectUri, $calendarData); - - killme(); - } - - // edit calendar name and color - if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['edit'] && $_REQUEST['id']) { - - $id = explode(':', $_REQUEST['id']); - - if (! cdav_perms($id[0],$calendars)) { - return; - } - - $mutations = [ - '{DAV:}displayname' => $_REQUEST['{DAV:}displayname'], - '{http://apple.com/ns/ical/}calendar-color' => $_REQUEST['color'] - ]; - - $patch = new \Sabre\DAV\PropPatch($mutations); - - $caldavBackend->updateCalendar($id, $patch); - - $patch->commit(); - } - - // edit calendar object via ajax request - if ($_REQUEST['submit'] === 'update_event' && $_REQUEST['uri'] && $_REQUEST['title'] && $_REQUEST['target'] && $_REQUEST['dtstart']) { - - $id = explode(':', $_REQUEST['target']); - - if (!cdav_perms($id[0],$calendars,true)) - return; - - $uri = $_REQUEST['uri']; - $title = $_REQUEST['title']; - $start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']); - $dtstart = new DateTime($start); - if ($_REQUEST['dtend']) { - $end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']); - $dtend = new DateTime($end); - } - $description = $_REQUEST['description']; - $location = $_REQUEST['location']; - - $object = $caldavBackend->getCalendarObject($id, $uri); - - $vcalendar = \Sabre\VObject\Reader::read($object['calendardata']); - - if ($title) { - $vcalendar->VEVENT->SUMMARY = $title; - } - if ($dtstart) { - $vcalendar->VEVENT->DTSTART = $dtstart; - } - if ($dtend) { - $vcalendar->VEVENT->DTEND = $dtend; - } - else { - unset($vcalendar->VEVENT->DTEND); - } - if ($description) { - $vcalendar->VEVENT->DESCRIPTION = $description; - } - if ($location) { - $vcalendar->VEVENT->LOCATION = $location; - } - - $calendarData = $vcalendar->serialize(); - - $caldavBackend->updateCalendarObject($id, $uri, $calendarData); - killme(); - } - - // delete calendar object via ajax request - if ($_REQUEST['delete'] && $_REQUEST['uri'] && $_REQUEST['target']) { - - $id = explode(':', $_REQUEST['target']); - - if (!cdav_perms($id[0],$calendars,true)) { - return; - } - - $uri = $_REQUEST['uri']; - - $caldavBackend->deleteCalendarObject($id, $uri); - killme(); - } - - // edit calendar object date/timeme via ajax request (drag and drop) - if ($_REQUEST['update'] && $_REQUEST['id'] && $_REQUEST['uri']) { - - $id = [$_REQUEST['id'][0], $_REQUEST['id'][1]]; - - if (! cdav_perms($id[0],$calendars,true)) { - return; - } - - $uri = $_REQUEST['uri']; - $start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']); - $dtstart = new DateTime($start); - if($_REQUEST['dtend']) { - $end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']); - $dtend = new DateTime($end); - } - - $object = $caldavBackend->getCalendarObject($id, $uri); - - $vcalendar = \Sabre\VObject\Reader::read($object['calendardata']); - - if ($dtstart) { - $vcalendar->VEVENT->DTSTART = $dtstart; - } - if ($dtend) { - $vcalendar->VEVENT->DTEND = $dtend; - } - else { - unset($vcalendar->VEVENT->DTEND); - } - - $calendarData = $vcalendar->serialize(); - - $caldavBackend->updateCalendarObject($id, $uri, $calendarData); - - killme(); - } - - // share a calendar - this only works on local system (with channels on the same server) - if ($_REQUEST['sharee'] && $_REQUEST['share']) { - - $id = [intval($_REQUEST['calendarid']), intval($_REQUEST['instanceid'])]; - - if (! cdav_perms($id[0],$calendars)) { - return; - } - - $hash = $_REQUEST['sharee']; - - $sharee_arr = channelx_by_hash($hash); - - $sharee = new \Sabre\DAV\Xml\Element\Sharee(); - - $sharee->href = 'mailto:' . $sharee_arr['xchan_addr']; - $sharee->principal = 'principals/' . $sharee_arr['channel_address']; - $sharee->access = intval($_REQUEST['access']); - $sharee->properties = ['{DAV:}displayname' => $channel['channel_name']]; - - $caldavBackend->updateInvites($id, [$sharee]); - } - } - - if (argc() >= 2 && argv(1) === 'addressbook') { - - $carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo); - $addressbooks = $carddavBackend->getAddressBooksForUser($principalUri); - - // create new addressbook - if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['create']) { - do { - $duplicate = false; - $addressbookUri = random_string(20); - - $r = q("SELECT uri FROM addressbooks WHERE principaluri = '%s' AND uri = '%s' LIMIT 1", - dbesc($principalUri), - dbesc($addressbookUri) - ); - - if ($r) { - $duplicate = true; - } - } while ($duplicate == true); - - $properties = ['{DAV:}displayname' => $_REQUEST['{DAV:}displayname']]; - - $carddavBackend->createAddressBook($principalUri, $addressbookUri, $properties); - } - - // edit addressbook - if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['edit'] && intval($_REQUEST['id'])) { - - $id = $_REQUEST['id']; - - if (! cdav_perms($id,$addressbooks)) { - return; - } - - $mutations = [ - '{DAV:}displayname' => $_REQUEST['{DAV:}displayname'] - ]; - - $patch = new \Sabre\DAV\PropPatch($mutations); - - $carddavBackend->updateAddressBook($id, $patch); - - $patch->commit(); - } - - // create addressbook card - if ($_REQUEST['create'] && $_REQUEST['target'] && $_REQUEST['fn']) { - $id = $_REQUEST['target']; - - do { - $duplicate = false; - $uri = random_string(40) . '.vcf'; - - $r = q("SELECT uri FROM cards WHERE addressbookid = %s AND uri = '%s' LIMIT 1", - intval($id), - dbesc($uri) - ); - - if ($r) { - $duplicate = true; - } - } while ($duplicate == true); - - // TODO: this mostly duplictes the procedure in update addressbook card. - // Should move this part to a function to avoid duplication - $fn = $_REQUEST['fn']; - - $vcard = new \Sabre\VObject\Component\VCard([ - 'FN' => $fn, - 'N' => array_reverse(explode(' ', $fn)) - ]); - - $org = $_REQUEST['org']; - if ($org) { - $vcard->ORG = $org; - } - - $title = $_REQUEST['title']; - if ($title) { - $vcard->TITLE = $title; - } - - $tel = $_REQUEST['tel']; - $tel_type = $_REQUEST['tel_type']; - if ($tel) { - $i = 0; - foreach ($tel as $item) { - if ($item) { - $vcard->add('TEL', $item, ['type' => $tel_type[$i]]); - } - $i++; - } - } - - $email = $_REQUEST['email']; - $email_type = $_REQUEST['email_type']; - if ($email) { - $i = 0; - foreach ($email as $item) { - if ($item) { - $vcard->add('EMAIL', $item, ['type' => $email_type[$i]]); - } - $i++; - } - } - - $impp = $_REQUEST['impp']; - $impp_type = $_REQUEST['impp_type']; - if ($impp) { - $i = 0; - foreach ($impp as $item) { - if ($item) { - $vcard->add('IMPP', $item, ['type' => $impp_type[$i]]); - } - $i++; - } - } - - $url = $_REQUEST['url']; - $url_type = $_REQUEST['url_type']; - if ($url) { - $i = 0; - foreach ($url as $item) { - if ($item) { - $vcard->add('URL', $item, ['type' => $url_type[$i]]); - } - $i++; - } - } - - $adr = $_REQUEST['adr']; - $adr_type = $_REQUEST['adr_type']; - - if ($adr) { - $i = 0; - foreach ($adr as $item) { - if ($item) { - $vcard->add('ADR', $item, ['type' => $adr_type[$i]]); - } - $i++; - } - } - - $note = $_REQUEST['note']; - if ($note) { - $vcard->NOTE = $note; - } - - $cardData = $vcard->serialize(); - - $carddavBackend->createCard($id, $uri, $cardData); - - } - - // edit addressbook card - if ($_REQUEST['update'] && $_REQUEST['uri'] && $_REQUEST['target']) { - - $id = $_REQUEST['target']; - - if (!cdav_perms($id,$addressbooks)) { - return; - } - - $uri = $_REQUEST['uri']; - - $object = $carddavBackend->getCard($id, $uri); - $vcard = \Sabre\VObject\Reader::read($object['carddata']); - - $fn = $_REQUEST['fn']; - if ($fn) { - $vcard->FN = $fn; - $vcard->N = array_reverse(explode(' ', $fn)); - } - - $org = $_REQUEST['org']; - if ($org) { - $vcard->ORG = $org; - } - else { - unset($vcard->ORG); - } - - $title = $_REQUEST['title']; - if ($title) { - $vcard->TITLE = $title; - } - else { - unset($vcard->TITLE); - } - - $tel = $_REQUEST['tel']; - $tel_type = $_REQUEST['tel_type']; - if ($tel) { - $i = 0; - unset($vcard->TEL); - foreach ($tel as $item) { - if ($item) { - $vcard->add('TEL', $item, ['type' => $tel_type[$i]]); - } - $i++; - } - } - else { - unset($vcard->TEL); - } - - $email = $_REQUEST['email']; - $email_type = $_REQUEST['email_type']; - if ($email) { - $i = 0; - unset($vcard->EMAIL); - foreach ($email as $item) { - if ($item) { - $vcard->add('EMAIL', $item, ['type' => $email_type[$i]]); - } - $i++; - } - } - else { - unset($vcard->EMAIL); - } - - $impp = $_REQUEST['impp']; - $impp_type = $_REQUEST['impp_type']; - if ($impp) { - $i = 0; - unset($vcard->IMPP); - foreach ($impp as $item) { - if ($item) { - $vcard->add('IMPP', $item, ['type' => $impp_type[$i]]); - } - $i++; - } - } - else { - unset($vcard->IMPP); - } - - $url = $_REQUEST['url']; - $url_type = $_REQUEST['url_type']; - if ($url) { - $i = 0; - unset($vcard->URL); - foreach ($url as $item) { - if ($item) { - $vcard->add('URL', $item, ['type' => $url_type[$i]]); - } - $i++; - } - } - else { - unset($vcard->URL); - } - - $adr = $_REQUEST['adr']; - $adr_type = $_REQUEST['adr_type']; - if ($adr) { - $i = 0; - unset($vcard->ADR); - foreach ($adr as $item) { - if ($item) { - $vcard->add('ADR', $item, ['type' => $adr_type[$i]]); - } - $i++; - } - } - else { - unset($vcard->ADR); - } - - $note = $_REQUEST['note']; - if ($note) { - $vcard->NOTE = $note; - } - else { - unset($vcard->NOTE); - } - - $cardData = $vcard->serialize(); - - $carddavBackend->updateCard($id, $uri, $cardData); - } - - // delete addressbook card - if ($_REQUEST['delete'] && $_REQUEST['uri'] && $_REQUEST['target']) { - - $id = $_REQUEST['target']; - - if (!cdav_perms($id,$addressbooks)) { - return; - } - - $uri = $_REQUEST['uri']; - - $carddavBackend->deleteCard($id, $uri); - } - } - - // Import calendar or addressbook - if (($_FILES) && array_key_exists('userfile',$_FILES) && intval($_FILES['userfile']['size']) && $_REQUEST['target']) { - - $src = $_FILES['userfile']['tmp_name']; - - if ($src) { - - if ($_REQUEST['c_upload']) { - if ($_REQUEST['target'] == 'calendar') { - $result = parse_ical_file($src,local_channel()); - if ($result) { - info( t('Calendar entries imported.') . EOL); - } - else { - notice( t('No calendar entries found.') . EOL); - } - - @unlink($src); - return; - } - - $id = explode(':', $_REQUEST['target']); - $ext = 'ics'; - $table = 'calendarobjects'; - $column = 'calendarid'; - $objects = new \Sabre\VObject\Splitter\ICalendar(@file_get_contents($src)); - $profile = \Sabre\VObject\Node::PROFILE_CALDAV; - $backend = new \Sabre\CalDAV\Backend\PDO($pdo); - } - - if ($_REQUEST['a_upload']) { - $id[] = intval($_REQUEST['target']); - $ext = 'vcf'; - $table = 'cards'; - $column = 'addressbookid'; - $objects = new \Sabre\VObject\Splitter\VCard(@file_get_contents($src)); - $profile = \Sabre\VObject\Node::PROFILE_CARDDAV; - $backend = new \Sabre\CardDAV\Backend\PDO($pdo); - } - - while ($object = $objects->getNext()) { - - if ($_REQUEST['a_upload']) { - $object = $object->convert(\Sabre\VObject\Document::VCARD40); - } - - $ret = $object->validate($profile & \Sabre\VObject\Node::REPAIR); - - // level 3 Means that the document is invalid, - // level 2 means a warning. A warning means it's valid but it could cause interopability issues, - // level 1 means that there was a problem earlier, but the problem was automatically repaired. - - if ($ret[0]['level'] < 3) { - do { - $duplicate = false; - $objectUri = random_string(40) . '.' . $ext; - - $r = q("SELECT uri FROM $table WHERE $column = %d AND uri = '%s' LIMIT 1", - dbesc($id[0]), - dbesc($objectUri) - ); - - if ($r) { - $duplicate = true; - } - } while ($duplicate == true); - - if ($_REQUEST['c_upload']) { - $backend->createCalendarObject($id, $objectUri, $object->serialize()); - } - - if ($_REQUEST['a_upload']) { - $backend->createCard($id[0], $objectUri, $object->serialize()); - } - } - else { - if ($_REQUEST['c_upload']) { - notice( '' . t('INVALID EVENT DISMISSED!') . '' . EOL . - '' . t('Summary: ') . '' . (($object->VEVENT->SUMMARY) ? $object->VEVENT->SUMMARY : t('Unknown')) . EOL . - '' . t('Date: ') . '' . (($object->VEVENT->DTSTART) ? $object->VEVENT->DTSTART : t('Unknown')) . EOL . - '' . t('Reason: ') . '' . $ret[0]['message'] . EOL - ); - } - - if ($_REQUEST['a_upload']) { - notice( '' . t('INVALID CARD DISMISSED!') . '' . EOL . - '' . t('Name: ') . '' . (($object->FN) ? $object->FN : t('Unknown')) . EOL . - '' . t('Reason: ') . '' . $ret[0]['message'] . EOL - ); - } - } - } - } - @unlink($src); - } - } - - function get() { - - if (! local_channel()) { - return; - } - - if ((argv(1) === 'addressbook') && (! Apps::system_app_installed(local_channel(), 'CardDAV'))) { - // Do not display any associated widgets at this point - App::$pdl = ''; - - $o = '' . t('CardDAV App') . ' (' . t('Not Installed') . '):
'; - $o .= t('CalDAV capable addressbook'); - return $o; - } - - App::$profile_uid = local_channel(); - - $channel = App::get_channel(); - $principalUri = 'principals/' . $channel['channel_address']; - - $pdo = DBA::$dba->db; - - require_once 'vendor/autoload.php'; - - head_add_css('cdav.css'); - - if (! cdav_principal($principalUri)) { - $this->activate($pdo, $channel); - if (! cdav_principal($principalUri)) { - return; - } - } - - if (argv(1) === 'calendar') { - nav_set_selected('Calendar'); - $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo); - $calendars = $caldavBackend->getCalendarsForUser($principalUri); - } - - // Display calendar(s) here - if(argc() <= 3 && argv(1) === 'calendar') { - - head_add_css('/library/fullcalendar/packages/core/main.min.css'); - head_add_css('/library/fullcalendar/packages/daygrid/main.min.css'); - head_add_css('/library/fullcalendar/packages/timegrid/main.min.css'); - head_add_css('/library/fullcalendar/packages/list/main.min.css'); - head_add_css('cdav_calendar.css'); - - head_add_js('/library/fullcalendar/packages/core/main.min.js'); - head_add_js('/library/fullcalendar/packages/interaction/main.min.js'); - head_add_js('/library/fullcalendar/packages/daygrid/main.min.js'); - head_add_js('/library/fullcalendar/packages/timegrid/main.min.js'); - head_add_js('/library/fullcalendar/packages/list/main.min.js'); - - $sources = ''; - $resource_id = ''; - $resource = null; - - if (argc() == 3) { - $resource_id = argv(2); - } - - if ($resource_id) { - $r = q("SELECT event.*, item.author_xchan, item.owner_xchan, item.plink, item.id as item_id FROM event LEFT JOIN item ON event.event_hash = item.resource_id + $vcalendar = Reader::read($object['calendardata']); + + if ($dtstart) { + $vcalendar->VEVENT->DTSTART = $dtstart; + } + if ($dtend) { + $vcalendar->VEVENT->DTEND = $dtend; + } else { + unset($vcalendar->VEVENT->DTEND); + } + + $calendarData = $vcalendar->serialize(); + + $caldavBackend->updateCalendarObject($id, $uri, $calendarData); + + killme(); + } + + // share a calendar - this only works on local system (with channels on the same server) + if ($_REQUEST['sharee'] && $_REQUEST['share']) { + $id = [intval($_REQUEST['calendarid']), intval($_REQUEST['instanceid'])]; + + if (!cdav_perms($id[0], $calendars)) { + return; + } + + $hash = $_REQUEST['sharee']; + + $sharee_arr = channelx_by_hash($hash); + + $sharee = new Sharee(); + + $sharee->href = 'mailto:' . $sharee_arr['xchan_addr']; + $sharee->principal = 'principals/' . $sharee_arr['channel_address']; + $sharee->access = intval($_REQUEST['access']); + $sharee->properties = ['{DAV:}displayname' => $channel['channel_name']]; + + $caldavBackend->updateInvites($id, [$sharee]); + } + } + + if (argc() >= 2 && argv(1) === 'addressbook') { + $carddavBackend = new PDO($pdo); + $addressbooks = $carddavBackend->getAddressBooksForUser($principalUri); + + // create new addressbook + if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['create']) { + do { + $duplicate = false; + $addressbookUri = random_string(20); + + $r = q( + "SELECT uri FROM addressbooks WHERE principaluri = '%s' AND uri = '%s' LIMIT 1", + dbesc($principalUri), + dbesc($addressbookUri) + ); + + if ($r) { + $duplicate = true; + } + } while ($duplicate == true); + + $properties = ['{DAV:}displayname' => $_REQUEST['{DAV:}displayname']]; + + $carddavBackend->createAddressBook($principalUri, $addressbookUri, $properties); + } + + // edit addressbook + if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['edit'] && intval($_REQUEST['id'])) { + $id = $_REQUEST['id']; + + if (!cdav_perms($id, $addressbooks)) { + return; + } + + $mutations = [ + '{DAV:}displayname' => $_REQUEST['{DAV:}displayname'] + ]; + + $patch = new PropPatch($mutations); + + $carddavBackend->updateAddressBook($id, $patch); + + $patch->commit(); + } + + // create addressbook card + if ($_REQUEST['create'] && $_REQUEST['target'] && $_REQUEST['fn']) { + $id = $_REQUEST['target']; + + do { + $duplicate = false; + $uri = random_string(40) . '.vcf'; + + $r = q( + "SELECT uri FROM cards WHERE addressbookid = %s AND uri = '%s' LIMIT 1", + intval($id), + dbesc($uri) + ); + + if ($r) { + $duplicate = true; + } + } while ($duplicate == true); + + // TODO: this mostly duplictes the procedure in update addressbook card. + // Should move this part to a function to avoid duplication + $fn = $_REQUEST['fn']; + + $vcard = new \Sabre\VObject\Component\VCard([ + 'FN' => $fn, + 'N' => array_reverse(explode(' ', $fn)) + ]); + + $org = $_REQUEST['org']; + if ($org) { + $vcard->ORG = $org; + } + + $title = $_REQUEST['title']; + if ($title) { + $vcard->TITLE = $title; + } + + $tel = $_REQUEST['tel']; + $tel_type = $_REQUEST['tel_type']; + if ($tel) { + $i = 0; + foreach ($tel as $item) { + if ($item) { + $vcard->add('TEL', $item, ['type' => $tel_type[$i]]); + } + $i++; + } + } + + $email = $_REQUEST['email']; + $email_type = $_REQUEST['email_type']; + if ($email) { + $i = 0; + foreach ($email as $item) { + if ($item) { + $vcard->add('EMAIL', $item, ['type' => $email_type[$i]]); + } + $i++; + } + } + + $impp = $_REQUEST['impp']; + $impp_type = $_REQUEST['impp_type']; + if ($impp) { + $i = 0; + foreach ($impp as $item) { + if ($item) { + $vcard->add('IMPP', $item, ['type' => $impp_type[$i]]); + } + $i++; + } + } + + $url = $_REQUEST['url']; + $url_type = $_REQUEST['url_type']; + if ($url) { + $i = 0; + foreach ($url as $item) { + if ($item) { + $vcard->add('URL', $item, ['type' => $url_type[$i]]); + } + $i++; + } + } + + $adr = $_REQUEST['adr']; + $adr_type = $_REQUEST['adr_type']; + + if ($adr) { + $i = 0; + foreach ($adr as $item) { + if ($item) { + $vcard->add('ADR', $item, ['type' => $adr_type[$i]]); + } + $i++; + } + } + + $note = $_REQUEST['note']; + if ($note) { + $vcard->NOTE = $note; + } + + $cardData = $vcard->serialize(); + + $carddavBackend->createCard($id, $uri, $cardData); + } + + // edit addressbook card + if ($_REQUEST['update'] && $_REQUEST['uri'] && $_REQUEST['target']) { + $id = $_REQUEST['target']; + + if (!cdav_perms($id, $addressbooks)) { + return; + } + + $uri = $_REQUEST['uri']; + + $object = $carddavBackend->getCard($id, $uri); + $vcard = Reader::read($object['carddata']); + + $fn = $_REQUEST['fn']; + if ($fn) { + $vcard->FN = $fn; + $vcard->N = array_reverse(explode(' ', $fn)); + } + + $org = $_REQUEST['org']; + if ($org) { + $vcard->ORG = $org; + } else { + unset($vcard->ORG); + } + + $title = $_REQUEST['title']; + if ($title) { + $vcard->TITLE = $title; + } else { + unset($vcard->TITLE); + } + + $tel = $_REQUEST['tel']; + $tel_type = $_REQUEST['tel_type']; + if ($tel) { + $i = 0; + unset($vcard->TEL); + foreach ($tel as $item) { + if ($item) { + $vcard->add('TEL', $item, ['type' => $tel_type[$i]]); + } + $i++; + } + } else { + unset($vcard->TEL); + } + + $email = $_REQUEST['email']; + $email_type = $_REQUEST['email_type']; + if ($email) { + $i = 0; + unset($vcard->EMAIL); + foreach ($email as $item) { + if ($item) { + $vcard->add('EMAIL', $item, ['type' => $email_type[$i]]); + } + $i++; + } + } else { + unset($vcard->EMAIL); + } + + $impp = $_REQUEST['impp']; + $impp_type = $_REQUEST['impp_type']; + if ($impp) { + $i = 0; + unset($vcard->IMPP); + foreach ($impp as $item) { + if ($item) { + $vcard->add('IMPP', $item, ['type' => $impp_type[$i]]); + } + $i++; + } + } else { + unset($vcard->IMPP); + } + + $url = $_REQUEST['url']; + $url_type = $_REQUEST['url_type']; + if ($url) { + $i = 0; + unset($vcard->URL); + foreach ($url as $item) { + if ($item) { + $vcard->add('URL', $item, ['type' => $url_type[$i]]); + } + $i++; + } + } else { + unset($vcard->URL); + } + + $adr = $_REQUEST['adr']; + $adr_type = $_REQUEST['adr_type']; + if ($adr) { + $i = 0; + unset($vcard->ADR); + foreach ($adr as $item) { + if ($item) { + $vcard->add('ADR', $item, ['type' => $adr_type[$i]]); + } + $i++; + } + } else { + unset($vcard->ADR); + } + + $note = $_REQUEST['note']; + if ($note) { + $vcard->NOTE = $note; + } else { + unset($vcard->NOTE); + } + + $cardData = $vcard->serialize(); + + $carddavBackend->updateCard($id, $uri, $cardData); + } + + // delete addressbook card + if ($_REQUEST['delete'] && $_REQUEST['uri'] && $_REQUEST['target']) { + $id = $_REQUEST['target']; + + if (!cdav_perms($id, $addressbooks)) { + return; + } + + $uri = $_REQUEST['uri']; + + $carddavBackend->deleteCard($id, $uri); + } + } + + // Import calendar or addressbook + if (($_FILES) && array_key_exists('userfile', $_FILES) && intval($_FILES['userfile']['size']) && $_REQUEST['target']) { + $src = $_FILES['userfile']['tmp_name']; + + if ($src) { + if ($_REQUEST['c_upload']) { + if ($_REQUEST['target'] == 'calendar') { + $result = parse_ical_file($src, local_channel()); + if ($result) { + info(t('Calendar entries imported.') . EOL); + } else { + notice(t('No calendar entries found.') . EOL); + } + + @unlink($src); + return; + } + + $id = explode(':', $_REQUEST['target']); + $ext = 'ics'; + $table = 'calendarobjects'; + $column = 'calendarid'; + $objects = new ICalendar(@file_get_contents($src)); + $profile = Node::PROFILE_CALDAV; + $backend = new \Sabre\CalDAV\Backend\PDO($pdo); + } + + if ($_REQUEST['a_upload']) { + $id[] = intval($_REQUEST['target']); + $ext = 'vcf'; + $table = 'cards'; + $column = 'addressbookid'; + $objects = new VCard(@file_get_contents($src)); + $profile = Node::PROFILE_CARDDAV; + $backend = new PDO($pdo); + } + + while ($object = $objects->getNext()) { + if ($_REQUEST['a_upload']) { + $object = $object->convert(Document::VCARD40); + } + + $ret = $object->validate($profile & Node::REPAIR); + + // level 3 Means that the document is invalid, + // level 2 means a warning. A warning means it's valid but it could cause interopability issues, + // level 1 means that there was a problem earlier, but the problem was automatically repaired. + + if ($ret[0]['level'] < 3) { + do { + $duplicate = false; + $objectUri = random_string(40) . '.' . $ext; + + $r = q( + "SELECT uri FROM $table WHERE $column = %d AND uri = '%s' LIMIT 1", + dbesc($id[0]), + dbesc($objectUri) + ); + + if ($r) { + $duplicate = true; + } + } while ($duplicate == true); + + if ($_REQUEST['c_upload']) { + $backend->createCalendarObject($id, $objectUri, $object->serialize()); + } + + if ($_REQUEST['a_upload']) { + $backend->createCard($id[0], $objectUri, $object->serialize()); + } + } else { + if ($_REQUEST['c_upload']) { + notice('' . t('INVALID EVENT DISMISSED!') . '' . EOL . + '' . t('Summary: ') . '' . (($object->VEVENT->SUMMARY) ? $object->VEVENT->SUMMARY : t('Unknown')) . EOL . + '' . t('Date: ') . '' . (($object->VEVENT->DTSTART) ? $object->VEVENT->DTSTART : t('Unknown')) . EOL . + '' . t('Reason: ') . '' . $ret[0]['message'] . EOL); + } + + if ($_REQUEST['a_upload']) { + notice('' . t('INVALID CARD DISMISSED!') . '' . EOL . + '' . t('Name: ') . '' . (($object->FN) ? $object->FN : t('Unknown')) . EOL . + '' . t('Reason: ') . '' . $ret[0]['message'] . EOL); + } + } + } + } + @unlink($src); + } + } + + public function get() + { + + if (!local_channel()) { + return; + } + + if ((argv(1) === 'addressbook') && (!Apps::system_app_installed(local_channel(), 'CardDAV'))) { + // Do not display any associated widgets at this point + App::$pdl = ''; + + $o = '' . t('CardDAV App') . ' (' . t('Not Installed') . '):
'; + $o .= t('CalDAV capable addressbook'); + return $o; + } + + App::$profile_uid = local_channel(); + + $channel = App::get_channel(); + $principalUri = 'principals/' . $channel['channel_address']; + + $pdo = DBA::$dba->db; + + require_once 'vendor/autoload.php'; + + head_add_css('cdav.css'); + + if (!cdav_principal($principalUri)) { + $this->activate($pdo, $channel); + if (!cdav_principal($principalUri)) { + return; + } + } + + if (argv(1) === 'calendar') { + nav_set_selected('Calendar'); + $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo); + $calendars = $caldavBackend->getCalendarsForUser($principalUri); + } + + // Display calendar(s) here + if (argc() <= 3 && argv(1) === 'calendar') { + head_add_css('/library/fullcalendar/packages/core/main.min.css'); + head_add_css('/library/fullcalendar/packages/daygrid/main.min.css'); + head_add_css('/library/fullcalendar/packages/timegrid/main.min.css'); + head_add_css('/library/fullcalendar/packages/list/main.min.css'); + head_add_css('cdav_calendar.css'); + + head_add_js('/library/fullcalendar/packages/core/main.min.js'); + head_add_js('/library/fullcalendar/packages/interaction/main.min.js'); + head_add_js('/library/fullcalendar/packages/daygrid/main.min.js'); + head_add_js('/library/fullcalendar/packages/timegrid/main.min.js'); + head_add_js('/library/fullcalendar/packages/list/main.min.js'); + + $sources = ''; + $resource_id = ''; + $resource = null; + + if (argc() == 3) { + $resource_id = argv(2); + } + + if ($resource_id) { + $r = q( + "SELECT event.*, item.author_xchan, item.owner_xchan, item.plink, item.id as item_id FROM event LEFT JOIN item ON event.event_hash = item.resource_id WHERE event.uid = %d AND event.event_hash = '%s' LIMIT 1", - intval(local_channel()), - dbesc($resource_id) - ); - if ($r) { - xchan_query($r); - $r = fetch_post_tags($r,true); + intval(local_channel()), + dbesc($resource_id) + ); + if ($r) { + xchan_query($r); + $r = fetch_post_tags($r, true); - $r[0]['dtstart'] = (($r[0]['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$r[0]['dtstart'], 'c') : datetime_convert('UTC','UTC',$r[0]['dtstart'],'c')); - $r[0]['dtend'] = (($r[0]['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$r[0]['dtend'], 'c') : datetime_convert('UTC','UTC',$r[0]['dtend'],'c')); + $r[0]['dtstart'] = (($r[0]['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $r[0]['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $r[0]['dtstart'], 'c')); + $r[0]['dtend'] = (($r[0]['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $r[0]['dtend'], 'c') : datetime_convert('UTC', 'UTC', $r[0]['dtend'], 'c')); - $r[0]['plink'] = [$r[0]['plink'], t('Link to source')]; + $r[0]['plink'] = [$r[0]['plink'], t('Link to source')]; - $resource = $r[0]; + $resource = $r[0]; - $catsenabled = Apps::system_app_installed(local_channel(), 'Categories'); + $catsenabled = Apps::system_app_installed(local_channel(), 'Categories'); - $categories = ''; - if ($catsenabled){ - if($r[0]['term']) { - $categories = array_elm_to_str(get_terms_oftype($r[0]['term'], TERM_CATEGORY), 'term'); - } - } + $categories = ''; + if ($catsenabled) { + if ($r[0]['term']) { + $categories = array_elm_to_str(get_terms_oftype($r[0]['term'], TERM_CATEGORY), 'term'); + } + } - if ($r[0]['dismissed'] == 0) { - q("UPDATE event SET dismissed = 1 WHERE event.uid = %d AND event.event_hash = '%s'", - intval(local_channel()), - dbesc($resource_id) - ); - } - } - } + if ($r[0]['dismissed'] == 0) { + q( + "UPDATE event SET dismissed = 1 WHERE event.uid = %d AND event.event_hash = '%s'", + intval(local_channel()), + dbesc($resource_id) + ); + } + } + } - if (get_pconfig(local_channel(), 'cdav_calendar', 'calendar')) { - $sources .= '{ + if (get_pconfig(local_channel(), 'cdav_calendar', 'calendar')) { + $sources .= '{ id: \'calendar\', url: \'/calendar/json/\', color: \'#3a87ad\' }, '; - } + } - $calendars[] = [ - 'displayname' => $channel['channel_name'], - 'id' => 'calendar' - ]; + $calendars[] = [ + 'displayname' => $channel['channel_name'], + 'id' => 'calendar' + ]; - foreach ($calendars as $calendar) { - $editable = (($calendar['share-access'] == 2) ? 'false' : 'true'); // false/true must be string since we're passing it to javascript - $color = (($calendar['{http://apple.com/ns/ical/}calendar-color']) ? $calendar['{http://apple.com/ns/ical/}calendar-color'] : '#6cad39'); - $sharer = (($calendar['share-access'] == 3) ? $calendar['{urn:ietf:params:xml:ns:caldav}calendar-description'] : ''); - $switch = get_pconfig(local_channel(), 'cdav_calendar', $calendar['id'][0]); - if ($switch) { - $sources .= '{ + foreach ($calendars as $calendar) { + $editable = (($calendar['share-access'] == 2) ? 'false' : 'true'); // false/true must be string since we're passing it to javascript + $color = (($calendar['{http://apple.com/ns/ical/}calendar-color']) ? $calendar['{http://apple.com/ns/ical/}calendar-color'] : '#6cad39'); + $sharer = (($calendar['share-access'] == 3) ? $calendar['{urn:ietf:params:xml:ns:caldav}calendar-description'] : ''); + $switch = get_pconfig(local_channel(), 'cdav_calendar', $calendar['id'][0]); + if ($switch) { + $sources .= '{ id: ' . $calendar['id'][0] . ', url: \'/cdav/calendar/json/' . $calendar['id'][0] . '/' . $calendar['id'][1] . '\', color: \'' . $color . '\' }, '; - } - - if ($calendar['share-access'] != 2) { - $writable_calendars[] = [ - 'displayname' => $calendar['{DAV:}displayname'], - 'sharer' => $sharer, - 'id' => $calendar['id'] - ]; - } - } - - $sources = rtrim($sources, ', '); - - $first_day = feature_enabled(local_channel(), 'cal_first_day'); - $first_day = (($first_day) ? $first_day : 0); - - $title = ['title', t('Event title')]; - $dtstart = ['dtstart', t('Start date and time')]; - $dtend = ['dtend', t('End date and time')]; - $description = ['description', t('Description')]; - $location = ['location', t('Location')]; - - $catsenabled = Apps::system_app_installed(local_channel(), 'Categories'); - - require_once('include/acl_selectors.php'); - - $accesslist = new \Zotlabs\Access\AccessControl($channel); - $perm_defaults = $accesslist->get(); - - $acl = populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream')); - - $permissions = $perm_defaults; - - $o .= replace_macros(get_markup_template('cdav_calendar.tpl'), [ - '$sources' => $sources, - '$color' => $color, - '$lang' => App::$language, - '$timezone' => App::$timezone, - '$first_day' => $first_day, - '$prev' => t('Previous'), - '$next' => t('Next'), - '$today' => t('Today'), - '$month' => t('Month'), - '$week' => t('Week'), - '$day' => t('Day'), - '$list_month' => t('List month'), - '$list_week' => t('List week'), - '$list_day' => t('List day'), - '$title' => $title, - '$calendars' => $calendars, - '$writable_calendars' => $writable_calendars, - '$dtstart' => $dtstart, - '$dtend' => $dtend, - '$description' => $description, - '$location' => $location, - '$more' => t('More'), - '$less' => t('Less'), - '$update' => t('Update'), - '$calendar_select_label' => t('Select calendar'), - '$calendar_optiopns_label' => [t('Channel Calendars'), t('CalDAV Calendars')], - '$delete' => t('Delete'), - '$delete_all' => t('Delete all'), - '$cancel' => t('Cancel'), - '$create' => t('Create'), - '$recurrence_warning' => t('Sorry! Editing of recurrent events is not yet implemented.'), - '$channel_hash' => $channel['channel_hash'], - '$acl' => $acl, - '$lockstate' => (($accesslist->is_private()) ? 'lock' : 'unlock'), - '$allow_cid' => acl2json($permissions['allow_cid']), - '$allow_gid' => acl2json($permissions['allow_gid']), - '$deny_cid' => acl2json($permissions['deny_cid']), - '$deny_gid' => acl2json($permissions['deny_gid']), - '$catsenabled' => $catsenabled, - '$categories_label' => t('Categories'), - '$resource' => json_encode($resource), - '$categories' => $categories - ]); - - return $o; - - } - - // Provide json data for calendar - if (argc() == 5 && argv(1) === 'calendar' && argv(2) === 'json' && intval(argv(3)) && intval(argv(4))) { - - $events = []; - - $id = [argv(3), argv(4)]; - - if (! cdav_perms($id[0],$calendars)) { - json_return_and_die($events); - } - - if (x($_GET,'start')) { - $start = new \DateTime($_GET['start']); - } - if (x($_GET,'end')) { - $end = new \DateTime($_GET['end']); - } - - $filters['name'] = 'VCALENDAR'; - $filters['prop-filters'][0]['name'] = 'VEVENT'; - $filters['comp-filters'][0]['name'] = 'VEVENT'; - $filters['comp-filters'][0]['time-range']['start'] = $start; - $filters['comp-filters'][0]['time-range']['end'] = $end; - - $uris = $caldavBackend->calendarQuery($id, $filters); - - if ($uris) { - $objects = $caldavBackend->getMultipleCalendarObjects($id, $uris); - foreach ($objects as $object) { - - $vcalendar = \Sabre\VObject\Reader::read($object['calendardata']); - - if (isset($vcalendar->VEVENT->RRULE)) { - // expanding recurrent events seems to loose timezone info - // save it here so we can add it later - $recurrent_timezone = (string)$vcalendar->VEVENT->DTSTART['TZID']; - $vcalendar = $vcalendar->expand($start, $end); - } - - foreach ($vcalendar->VEVENT as $vevent) { - $title = (string)$vevent->SUMMARY; - $dtstart = (string)$vevent->DTSTART; - $dtend = (string)$vevent->DTEND; - $description = (string)$vevent->DESCRIPTION; - $location = (string)$vevent->LOCATION; - $timezone = (string)$vevent->DTSTART['TZID']; - $rw = ((cdav_perms($id[0],$calendars,true)) ? true : false); - $editable = $rw ? true : false; - $recurrent = ((isset($vevent->{'RECURRENCE-ID'})) ? true : false); - - if ($recurrent) { - $editable = false; - $timezone = $recurrent_timezone; - } - - $allDay = false; - - // allDay event rules - if (!strpos($dtstart, 'T') && !strpos($dtend, 'T')) { - $allDay = true; - } - if (strpos($dtstart, 'T000000') && strpos($dtend, 'T000000')) { - $allDay = true; - } - - $events[] = [ - 'calendar_id' => $id, - 'uri' => $object['uri'], - 'title' => $title, - 'start' => datetime_convert($timezone, $timezone, $dtstart, 'c'), - 'end' => (($dtend) ? datetime_convert($timezone, $timezone, $dtend, 'c') : ''), - 'description' => $description, - 'location' => $location, - 'allDay' => $allDay, - 'editable' => $editable, - 'recurrent' => $recurrent, - 'rw' => $rw - ]; - } - } - } - json_return_and_die($events); - } - - // enable/disable calendars - if (argc() == 5 && argv(1) === 'calendar' && argv(2) === 'switch' && argv(3) && (argv(4) == 1 || argv(4) == 0)) { - $id = argv(3); - - if (! cdav_perms($id,$calendars)) { - killme(); - } - - set_pconfig(local_channel(), 'cdav_calendar' , argv(3), argv(4)); - killme(); - } - - // drop calendar - if (argc() == 5 && argv(1) === 'calendar' && argv(2) === 'drop' && intval(argv(3)) && intval(argv(4))) { - $id = [argv(3), argv(4)]; - - if (! cdav_perms($id[0],$calendars)) { - killme(); - } - - $caldavBackend->deleteCalendar($id); - killme(); - } - - // drop sharee - if (argc() == 6 && argv(1) === 'calendar' && argv(2) === 'dropsharee' && intval(argv(3)) && intval(argv(4))) { - - $id = [argv(3), argv(4)]; - $hash = argv(5); - - if (! cdav_perms($id[0],$calendars)) { - killme(); - } - - $sharee_arr = channelx_by_hash($hash); - - $sharee = new \Sabre\DAV\Xml\Element\Sharee(); - - $sharee->href = 'mailto:' . $sharee_arr['xchan_addr']; - $sharee->principal = 'principals/' . $sharee_arr['channel_address']; - $sharee->access = 4; - $caldavBackend->updateInvites($id, [$sharee]); - - killme(); - } - - - if (argv(1) === 'addressbook') { - nav_set_selected('CardDAV'); - $carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo); - $addressbooks = $carddavBackend->getAddressBooksForUser($principalUri); - } - - // Display Adressbook here - if (argc() == 3 && argv(1) === 'addressbook' && intval(argv(2))) { - - $id = argv(2); - - $displayname = cdav_perms($id,$addressbooks); - - if (! $displayname) { - return; - } - - head_add_css('cdav_addressbook.css'); - - $o = ''; - - $sabrecards = $carddavBackend->getCards($id); - foreach ($sabrecards as $sabrecard) { - $uris[] = $sabrecard['uri']; - } - - if ($uris) { - $objects = $carddavBackend->getMultipleCards($id, $uris); - - foreach ($objects as $object) { - $vcard = \Sabre\VObject\Reader::read($object['carddata']); - - $photo = ''; - if ($vcard->PHOTO) { - $photo_value = strtolower($vcard->PHOTO->getValueType()); // binary or uri - if ($photo_value === 'binary') { - $photo_type = strtolower($vcard->PHOTO['TYPE']); // mime jpeg, png or gif - $photo = 'data:image/' . $photo_type . ';base64,' . base64_encode((string)$vcard->PHOTO); - } - else { - $url = parse_url((string)$vcard->PHOTO); - $photo = 'data:' . $url['path']; - } - } - - $fn = ''; - if ($vcard->FN) { - $fn = (string)$vcard->FN; - } - - $org = ''; - if ($vcard->ORG) { - $org = (string)$vcard->ORG; - } - - $title = ''; - if ($vcard->TITLE) { - $title = (string)$vcard->TITLE; - } - - $tels = []; - if ($vcard->TEL) { - foreach ($vcard->TEL as $tel) { - $type = (($tel['TYPE']) ? translate_type((string)$tel['TYPE']) : ''); - $tels[] = [ - 'type' => $type, - 'nr' => (string)$tel - ]; - } - } - - $emails = []; - if ($vcard->EMAIL) { - foreach ($vcard->EMAIL as $email) { - $type = (($email['TYPE']) ? translate_type((string)$email['TYPE']) : ''); - $emails[] = [ - 'type' => $type, - 'address' => (string)$email - ]; - } - } - - $impps = []; - if ($vcard->IMPP) { - foreach ($vcard->IMPP as $impp) { - $type = (($impp['TYPE']) ? translate_type((string)$impp['TYPE']) : ''); - $impps[] = [ - 'type' => $type, - 'address' => (string)$impp - ]; - } - } - - $urls = []; - if ($vcard->URL) { - foreach ($vcard->URL as $url) { - $type = (($url['TYPE']) ? translate_type((string)$url['TYPE']) : ''); - $urls[] = [ - 'type' => $type, - 'address' => (string)$url - ]; - } - } - - $adrs = []; - if ($vcard->ADR) { - foreach ($vcard->ADR as $adr) { - $type = (($adr['TYPE']) ? translate_type((string)$adr['TYPE']) : ''); - $adrs[] = [ - 'type' => $type, - 'address' => $adr->getParts() - ]; - } - } - - $note = ''; - if ($vcard->NOTE) { - $note = (string)$vcard->NOTE; - } - - $cards[] = [ - 'id' => $object['id'], - 'uri' => $object['uri'], - 'photo' => $photo, - 'fn' => $fn, - 'org' => $org, - 'title' => $title, - 'tels' => $tels, - 'emails' => $emails, - 'impps' => $impps, - 'urls' => $urls, - 'adrs' => $adrs, - 'note' => $note - ]; - } - - usort($cards, function($a, $b) { return strcasecmp($a['fn'], $b['fn']); }); - } - - $o .= replace_macros(get_markup_template('cdav_addressbook.tpl'), [ - '$id' => $id, - '$cards' => $cards, - '$displayname' => $displayname, - '$name_label' => t('Name'), - '$org_label' => t('Organisation'), - '$title_label' => t('Title'), - '$tel_label' => t('Phone'), - '$email_label' => t('Email'), - '$impp_label' => t('Instant messenger'), - '$url_label' => t('Website'), - '$adr_label' => t('Address'), - '$note_label' => t('Note'), - '$mobile' => t('Mobile'), - '$home' => t('Home'), - '$work' => t('Work'), - '$other' => t('Other'), - '$add_card' => t('Add Contact'), - '$add_field' => t('Add Field'), - '$create' => t('Create'), - '$update' => t('Update'), - '$delete' => t('Delete'), - '$cancel' => t('Cancel'), - '$po_box' => t('P.O. Box'), - '$extra' => t('Additional'), - '$street' => t('Street'), - '$locality' => t('Locality'), - '$region' => t('Region'), - '$zip_code' => t('ZIP Code'), - '$country' => t('Country') - ]); - - return $o; - } - - // delete addressbook - if (argc() > 3 && argv(1) === 'addressbook' && argv(2) === 'drop' && intval(argv(3))) { - $id = argv(3); - - if (! cdav_perms($id,$addressbooks)) { - return; - } - - $carddavBackend->deleteAddressBook($id); - killme(); - } - - } - - function activate($pdo, $channel) { - - if (! $channel) { - return; - } - - $uri = 'principals/' . $channel['channel_address']; - - - $r = q("select * from principals where uri = '%s' limit 1", - dbesc($uri) - ); - if($r) { - $r = q("update principals set email = '%s', displayname = '%s' where uri = '%s' ", - dbesc($channel['xchan_addr']), - dbesc($channel['channel_name']), - dbesc($uri) - ); - } - else { - $r = q("insert into principals ( uri, email, displayname ) values('%s','%s','%s') ", - dbesc($uri), - dbesc($channel['xchan_addr']), - dbesc($channel['channel_name']) - ); - - // create default calendar - $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo); - $properties = [ - '{DAV:}displayname' => t('Default Calendar'), - '{http://apple.com/ns/ical/}calendar-color' => '#6cad39', - '{urn:ietf:params:xml:ns:caldav}calendar-description' => $channel['channel_name'] - ]; - - $id = $caldavBackend->createCalendar($uri, 'default', $properties); - set_pconfig(local_channel(), 'cdav_calendar' , $id[0], 1); - set_pconfig(local_channel(), 'cdav_calendar' , 'calendar', 1); - - // create default addressbook - $carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo); - $properties = ['{DAV:}displayname' => t('Default Addressbook')]; - $carddavBackend->createAddressBook($uri, 'default', $properties); - - } - } - + } + + if ($calendar['share-access'] != 2) { + $writable_calendars[] = [ + 'displayname' => $calendar['{DAV:}displayname'], + 'sharer' => $sharer, + 'id' => $calendar['id'] + ]; + } + } + + $sources = rtrim($sources, ', '); + + $first_day = feature_enabled(local_channel(), 'cal_first_day'); + $first_day = (($first_day) ? $first_day : 0); + + $title = ['title', t('Event title')]; + $dtstart = ['dtstart', t('Start date and time')]; + $dtend = ['dtend', t('End date and time')]; + $description = ['description', t('Description')]; + $location = ['location', t('Location')]; + + $catsenabled = Apps::system_app_installed(local_channel(), 'Categories'); + + require_once('include/acl_selectors.php'); + + $accesslist = new AccessControl($channel); + $perm_defaults = $accesslist->get(); + + $acl = populate_acl($perm_defaults, false, PermissionDescription::fromGlobalPermission('view_stream')); + + $permissions = $perm_defaults; + + $o .= replace_macros(get_markup_template('cdav_calendar.tpl'), [ + '$sources' => $sources, + '$color' => $color, + '$lang' => App::$language, + '$timezone' => App::$timezone, + '$first_day' => $first_day, + '$prev' => t('Previous'), + '$next' => t('Next'), + '$today' => t('Today'), + '$month' => t('Month'), + '$week' => t('Week'), + '$day' => t('Day'), + '$list_month' => t('List month'), + '$list_week' => t('List week'), + '$list_day' => t('List day'), + '$title' => $title, + '$calendars' => $calendars, + '$writable_calendars' => $writable_calendars, + '$dtstart' => $dtstart, + '$dtend' => $dtend, + '$description' => $description, + '$location' => $location, + '$more' => t('More'), + '$less' => t('Less'), + '$update' => t('Update'), + '$calendar_select_label' => t('Select calendar'), + '$calendar_optiopns_label' => [t('Channel Calendars'), t('CalDAV Calendars')], + '$delete' => t('Delete'), + '$delete_all' => t('Delete all'), + '$cancel' => t('Cancel'), + '$create' => t('Create'), + '$recurrence_warning' => t('Sorry! Editing of recurrent events is not yet implemented.'), + '$channel_hash' => $channel['channel_hash'], + '$acl' => $acl, + '$lockstate' => (($accesslist->is_private()) ? 'lock' : 'unlock'), + '$allow_cid' => acl2json($permissions['allow_cid']), + '$allow_gid' => acl2json($permissions['allow_gid']), + '$deny_cid' => acl2json($permissions['deny_cid']), + '$deny_gid' => acl2json($permissions['deny_gid']), + '$catsenabled' => $catsenabled, + '$categories_label' => t('Categories'), + '$resource' => json_encode($resource), + '$categories' => $categories + ]); + + return $o; + } + + // Provide json data for calendar + if (argc() == 5 && argv(1) === 'calendar' && argv(2) === 'json' && intval(argv(3)) && intval(argv(4))) { + $events = []; + + $id = [argv(3), argv(4)]; + + if (!cdav_perms($id[0], $calendars)) { + json_return_and_die($events); + } + + if (x($_GET, 'start')) { + $start = new DateTime($_GET['start']); + } + if (x($_GET, 'end')) { + $end = new DateTime($_GET['end']); + } + + $filters['name'] = 'VCALENDAR'; + $filters['prop-filters'][0]['name'] = 'VEVENT'; + $filters['comp-filters'][0]['name'] = 'VEVENT'; + $filters['comp-filters'][0]['time-range']['start'] = $start; + $filters['comp-filters'][0]['time-range']['end'] = $end; + + $uris = $caldavBackend->calendarQuery($id, $filters); + + if ($uris) { + $objects = $caldavBackend->getMultipleCalendarObjects($id, $uris); + foreach ($objects as $object) { + $vcalendar = Reader::read($object['calendardata']); + + if (isset($vcalendar->VEVENT->RRULE)) { + // expanding recurrent events seems to loose timezone info + // save it here so we can add it later + $recurrent_timezone = (string)$vcalendar->VEVENT->DTSTART['TZID']; + $vcalendar = $vcalendar->expand($start, $end); + } + + foreach ($vcalendar->VEVENT as $vevent) { + $title = (string)$vevent->SUMMARY; + $dtstart = (string)$vevent->DTSTART; + $dtend = (string)$vevent->DTEND; + $description = (string)$vevent->DESCRIPTION; + $location = (string)$vevent->LOCATION; + $timezone = (string)$vevent->DTSTART['TZID']; + $rw = ((cdav_perms($id[0], $calendars, true)) ? true : false); + $editable = $rw ? true : false; + $recurrent = ((isset($vevent->{'RECURRENCE-ID'})) ? true : false); + + if ($recurrent) { + $editable = false; + $timezone = $recurrent_timezone; + } + + $allDay = false; + + // allDay event rules + if (!strpos($dtstart, 'T') && !strpos($dtend, 'T')) { + $allDay = true; + } + if (strpos($dtstart, 'T000000') && strpos($dtend, 'T000000')) { + $allDay = true; + } + + $events[] = [ + 'calendar_id' => $id, + 'uri' => $object['uri'], + 'title' => $title, + 'start' => datetime_convert($timezone, $timezone, $dtstart, 'c'), + 'end' => (($dtend) ? datetime_convert($timezone, $timezone, $dtend, 'c') : ''), + 'description' => $description, + 'location' => $location, + 'allDay' => $allDay, + 'editable' => $editable, + 'recurrent' => $recurrent, + 'rw' => $rw + ]; + } + } + } + json_return_and_die($events); + } + + // enable/disable calendars + if (argc() == 5 && argv(1) === 'calendar' && argv(2) === 'switch' && argv(3) && (argv(4) == 1 || argv(4) == 0)) { + $id = argv(3); + + if (!cdav_perms($id, $calendars)) { + killme(); + } + + set_pconfig(local_channel(), 'cdav_calendar', argv(3), argv(4)); + killme(); + } + + // drop calendar + if (argc() == 5 && argv(1) === 'calendar' && argv(2) === 'drop' && intval(argv(3)) && intval(argv(4))) { + $id = [argv(3), argv(4)]; + + if (!cdav_perms($id[0], $calendars)) { + killme(); + } + + $caldavBackend->deleteCalendar($id); + killme(); + } + + // drop sharee + if (argc() == 6 && argv(1) === 'calendar' && argv(2) === 'dropsharee' && intval(argv(3)) && intval(argv(4))) { + $id = [argv(3), argv(4)]; + $hash = argv(5); + + if (!cdav_perms($id[0], $calendars)) { + killme(); + } + + $sharee_arr = channelx_by_hash($hash); + + $sharee = new Sharee(); + + $sharee->href = 'mailto:' . $sharee_arr['xchan_addr']; + $sharee->principal = 'principals/' . $sharee_arr['channel_address']; + $sharee->access = 4; + $caldavBackend->updateInvites($id, [$sharee]); + + killme(); + } + + + if (argv(1) === 'addressbook') { + nav_set_selected('CardDAV'); + $carddavBackend = new PDO($pdo); + $addressbooks = $carddavBackend->getAddressBooksForUser($principalUri); + } + + // Display Adressbook here + if (argc() == 3 && argv(1) === 'addressbook' && intval(argv(2))) { + $id = argv(2); + + $displayname = cdav_perms($id, $addressbooks); + + if (!$displayname) { + return; + } + + head_add_css('cdav_addressbook.css'); + + $o = ''; + + $sabrecards = $carddavBackend->getCards($id); + foreach ($sabrecards as $sabrecard) { + $uris[] = $sabrecard['uri']; + } + + if ($uris) { + $objects = $carddavBackend->getMultipleCards($id, $uris); + + foreach ($objects as $object) { + $vcard = Reader::read($object['carddata']); + + $photo = ''; + if ($vcard->PHOTO) { + $photo_value = strtolower($vcard->PHOTO->getValueType()); // binary or uri + if ($photo_value === 'binary') { + $photo_type = strtolower($vcard->PHOTO['TYPE']); // mime jpeg, png or gif + $photo = 'data:image/' . $photo_type . ';base64,' . base64_encode((string)$vcard->PHOTO); + } else { + $url = parse_url((string)$vcard->PHOTO); + $photo = 'data:' . $url['path']; + } + } + + $fn = ''; + if ($vcard->FN) { + $fn = (string)$vcard->FN; + } + + $org = ''; + if ($vcard->ORG) { + $org = (string)$vcard->ORG; + } + + $title = ''; + if ($vcard->TITLE) { + $title = (string)$vcard->TITLE; + } + + $tels = []; + if ($vcard->TEL) { + foreach ($vcard->TEL as $tel) { + $type = (($tel['TYPE']) ? translate_type((string)$tel['TYPE']) : ''); + $tels[] = [ + 'type' => $type, + 'nr' => (string)$tel + ]; + } + } + + $emails = []; + if ($vcard->EMAIL) { + foreach ($vcard->EMAIL as $email) { + $type = (($email['TYPE']) ? translate_type((string)$email['TYPE']) : ''); + $emails[] = [ + 'type' => $type, + 'address' => (string)$email + ]; + } + } + + $impps = []; + if ($vcard->IMPP) { + foreach ($vcard->IMPP as $impp) { + $type = (($impp['TYPE']) ? translate_type((string)$impp['TYPE']) : ''); + $impps[] = [ + 'type' => $type, + 'address' => (string)$impp + ]; + } + } + + $urls = []; + if ($vcard->URL) { + foreach ($vcard->URL as $url) { + $type = (($url['TYPE']) ? translate_type((string)$url['TYPE']) : ''); + $urls[] = [ + 'type' => $type, + 'address' => (string)$url + ]; + } + } + + $adrs = []; + if ($vcard->ADR) { + foreach ($vcard->ADR as $adr) { + $type = (($adr['TYPE']) ? translate_type((string)$adr['TYPE']) : ''); + $adrs[] = [ + 'type' => $type, + 'address' => $adr->getParts() + ]; + } + } + + $note = ''; + if ($vcard->NOTE) { + $note = (string)$vcard->NOTE; + } + + $cards[] = [ + 'id' => $object['id'], + 'uri' => $object['uri'], + 'photo' => $photo, + 'fn' => $fn, + 'org' => $org, + 'title' => $title, + 'tels' => $tels, + 'emails' => $emails, + 'impps' => $impps, + 'urls' => $urls, + 'adrs' => $adrs, + 'note' => $note + ]; + } + + usort($cards, function ($a, $b) { + return strcasecmp($a['fn'], $b['fn']); + }); + } + + $o .= replace_macros(get_markup_template('cdav_addressbook.tpl'), [ + '$id' => $id, + '$cards' => $cards, + '$displayname' => $displayname, + '$name_label' => t('Name'), + '$org_label' => t('Organisation'), + '$title_label' => t('Title'), + '$tel_label' => t('Phone'), + '$email_label' => t('Email'), + '$impp_label' => t('Instant messenger'), + '$url_label' => t('Website'), + '$adr_label' => t('Address'), + '$note_label' => t('Note'), + '$mobile' => t('Mobile'), + '$home' => t('Home'), + '$work' => t('Work'), + '$other' => t('Other'), + '$add_card' => t('Add Contact'), + '$add_field' => t('Add Field'), + '$create' => t('Create'), + '$update' => t('Update'), + '$delete' => t('Delete'), + '$cancel' => t('Cancel'), + '$po_box' => t('P.O. Box'), + '$extra' => t('Additional'), + '$street' => t('Street'), + '$locality' => t('Locality'), + '$region' => t('Region'), + '$zip_code' => t('ZIP Code'), + '$country' => t('Country') + ]); + + return $o; + } + + // delete addressbook + if (argc() > 3 && argv(1) === 'addressbook' && argv(2) === 'drop' && intval(argv(3))) { + $id = argv(3); + + if (!cdav_perms($id, $addressbooks)) { + return; + } + + $carddavBackend->deleteAddressBook($id); + killme(); + } + } + + public function activate($pdo, $channel) + { + + if (!$channel) { + return; + } + + $uri = 'principals/' . $channel['channel_address']; + + + $r = q( + "select * from principals where uri = '%s' limit 1", + dbesc($uri) + ); + if ($r) { + $r = q( + "update principals set email = '%s', displayname = '%s' where uri = '%s' ", + dbesc($channel['xchan_addr']), + dbesc($channel['channel_name']), + dbesc($uri) + ); + } else { + $r = q( + "insert into principals ( uri, email, displayname ) values('%s','%s','%s') ", + dbesc($uri), + dbesc($channel['xchan_addr']), + dbesc($channel['channel_name']) + ); + + // create default calendar + $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo); + $properties = [ + '{DAV:}displayname' => t('Default Calendar'), + '{http://apple.com/ns/ical/}calendar-color' => '#6cad39', + '{urn:ietf:params:xml:ns:caldav}calendar-description' => $channel['channel_name'] + ]; + + $id = $caldavBackend->createCalendar($uri, 'default', $properties); + set_pconfig(local_channel(), 'cdav_calendar', $id[0], 1); + set_pconfig(local_channel(), 'cdav_calendar', 'calendar', 1); + + // create default addressbook + $carddavBackend = new PDO($pdo); + $properties = ['{DAV:}displayname' => t('Default Addressbook')]; + $carddavBackend->createAddressBook($uri, 'default', $properties); + } + } } diff --git a/Zotlabs/Module/Changeaddr.php b/Zotlabs/Module/Changeaddr.php index 3ab6495b0..5e4ad254d 100644 --- a/Zotlabs/Module/Changeaddr.php +++ b/Zotlabs/Module/Changeaddr.php @@ -10,103 +10,107 @@ use Zotlabs\Web\Controller; * Provided for those situations which require it. * Must be manually configured by the admin before use. */ - - -class Changeaddr extends Controller { - - function post() { - - if (! get_config('system','allow_nick_change')) { - return; - } - - if (! local_channel()) { - return; - } - - if (isset($_SESSION['delegate']) && $_SESSION['delegate']) { - return; - } - - if ((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password'])))) - return; - - if ((! x($_POST,'verify')) || (! strlen(trim($_POST['verify'])))) - return; - - if ($_POST['verify'] !== $_SESSION['remove_account_verify']) - return; - - - $account = App::get_account(); - $channel = App::get_channel(); - - $x = account_verify_password($account['account_email'],$_POST['qxz_password']); - if (! ($x && $x['account'])) { - return; - } - - if ($account['account_password_changed'] > NULL_DATE) { - $d1 = datetime_convert('UTC','UTC','now - 48 hours'); - if ($account['account_password_changed'] > $d1) { - notice( t('Channel name changes are not allowed within 48 hours of changing the account password.') . EOL); - return; - } - } - - $new_address = trim($_POST['newname']); - - if ($new_address === $channel['channel_address']) - return; - - if ($new_address === 'sys') { - notice( t('Reserved nickname. Please choose another.') . EOL); - return; - } - - if (check_webbie(array($new_address)) !== $new_address) { - notice( t('Nickname has unsupported characters or is already being used on this site.') . EOL); - return $ret; - } - - channel_change_address($channel,$new_address); - - goaway(z_root() . '/changeaddr'); - - } - - - function get() { - - if (! get_config('system','allow_nick_change')) { - notice(t('Feature has been disabled') . EOL); - return; - } - if (! local_channel()) { - goaway(z_root()); - } - - $channel = App::get_channel(); +class Changeaddr extends Controller +{ - $hash = random_string(); - - $_SESSION['remove_account_verify'] = $hash; - - $tpl = get_markup_template('channel_rename.tpl'); - $o .= replace_macros($tpl, [ - '$basedir' => z_root(), - '$hash' => $hash, - '$title' => t('Change channel nickname/address'), - '$desc' => array(t('WARNING: '), t('Any/all connections on other networks will be lost!')), - '$passwd' => t('Please enter your password for verification:'), - '$newname' => [ 'newname', t('New channel address'),$channel['channel_address'], ''], - '$submit' => t('Rename Channel') - ]); - - return $o; - - } - + public function post() + { + + if (!get_config('system', 'allow_nick_change')) { + return; + } + + if (!local_channel()) { + return; + } + + if (isset($_SESSION['delegate']) && $_SESSION['delegate']) { + return; + } + + if ((!x($_POST, 'qxz_password')) || (!strlen(trim($_POST['qxz_password'])))) { + return; + } + + if ((!x($_POST, 'verify')) || (!strlen(trim($_POST['verify'])))) { + return; + } + + if ($_POST['verify'] !== $_SESSION['remove_account_verify']) { + return; + } + + + $account = App::get_account(); + $channel = App::get_channel(); + + $x = account_verify_password($account['account_email'], $_POST['qxz_password']); + if (!($x && $x['account'])) { + return; + } + + if ($account['account_password_changed'] > NULL_DATE) { + $d1 = datetime_convert('UTC', 'UTC', 'now - 48 hours'); + if ($account['account_password_changed'] > $d1) { + notice(t('Channel name changes are not allowed within 48 hours of changing the account password.') . EOL); + return; + } + } + + $new_address = trim($_POST['newname']); + + if ($new_address === $channel['channel_address']) { + return; + } + + if ($new_address === 'sys') { + notice(t('Reserved nickname. Please choose another.') . EOL); + return; + } + + if (check_webbie(array($new_address)) !== $new_address) { + notice(t('Nickname has unsupported characters or is already being used on this site.') . EOL); + return $ret; + } + + channel_change_address($channel, $new_address); + + goaway(z_root() . '/changeaddr'); + } + + + public function get() + { + + if (!get_config('system', 'allow_nick_change')) { + notice(t('Feature has been disabled') . EOL); + return; + } + + + if (!local_channel()) { + goaway(z_root()); + } + + $channel = App::get_channel(); + + $hash = random_string(); + + $_SESSION['remove_account_verify'] = $hash; + + $tpl = get_markup_template('channel_rename.tpl'); + $o .= replace_macros($tpl, [ + '$basedir' => z_root(), + '$hash' => $hash, + '$title' => t('Change channel nickname/address'), + '$desc' => array(t('WARNING: '), t('Any/all connections on other networks will be lost!')), + '$passwd' => t('Please enter your password for verification:'), + '$newname' => ['newname', t('New channel address'), $channel['channel_address'], ''], + '$submit' => t('Rename Channel') + ]); + + return $o; + } } diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 80d3a9e8f..b7265e92d 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -10,10 +10,10 @@ use Zotlabs\Lib\LDSignatures; use Zotlabs\Lib\Crypto; use Zotlabs\Lib\PConfig; use Zotlabs\Web\HTTPSig; - use App; use Zotlabs\Web\Controller; use Zotlabs\Lib\PermissionDescription; +use Zotlabs\Widget\Pinned; require_once('include/items.php'); require_once('include/security.php'); @@ -25,605 +25,589 @@ require_once('include/acl_selectors.php'); * @brief Channel Controller * */ +class Channel extends Controller +{ -class Channel extends Controller { + // State passed in from the Update module. - // State passed in from the Update module. - - public $profile_uid = 0; - public $loading = 0; - public $updating = 0; + public $profile_uid = 0; + public $loading = 0; + public $updating = 0; - function init() { + public function init() + { - if (isset($_GET['search']) && (in_array(substr($_GET['search'],0,1),[ '@', '!', '?']) || strpos($_GET['search'],'https://') === 0)) { - goaway(z_root() . '/search' . '?f=&search=' . urlencode($_GET['search'])); - } + if (isset($_GET['search']) && (in_array(substr($_GET['search'], 0, 1), ['@', '!', '?']) || strpos($_GET['search'], 'https://') === 0)) { + goaway(z_root() . '/search' . '?f=&search=' . urlencode($_GET['search'])); + } - $which = null; - if (argc() > 1) { - $which = argv(1); - } - if (! $which) { - if (local_channel()) { - $channel = App::get_channel(); - if ($channel && $channel['channel_address']) { - $which = $channel['channel_address']; - } - } - } - if (! $which) { - notice( t('You must be logged in to see this page.') . EOL ); - return; - } + $which = null; + if (argc() > 1) { + $which = argv(1); + } + if (!$which) { + if (local_channel()) { + $channel = App::get_channel(); + if ($channel && $channel['channel_address']) { + $which = $channel['channel_address']; + } + } + } + if (!$which) { + notice(t('You must be logged in to see this page.') . EOL); + return; + } - $profile = 0; - $channel = App::get_channel(); + $profile = 0; + $channel = App::get_channel(); - if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) { - $which = $channel['channel_address']; - $profile = argv(1); - } + if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) { + $which = $channel['channel_address']; + $profile = argv(1); + } - $channel = channelx_by_nick($which, true); - if (! $channel) { - http_status_exit(404, 'Not found'); - } - if ($channel['channel_removed']) { - http_status_exit(410,'Gone'); - } + $channel = channelx_by_nick($which, true); + if (!$channel) { + http_status_exit(404, 'Not found'); + } + if ($channel['channel_removed']) { + http_status_exit(410, 'Gone'); + } - if (get_pconfig($channel['channel_id'],'system','noindex')) { - App::$meta->set('robots', 'noindex, noarchive'); - } + if (get_pconfig($channel['channel_id'], 'system', 'noindex')) { + App::$meta->set('robots', 'noindex, noarchive'); + } - head_add_link( [ - 'rel' => 'alternate', - 'type' => 'application/atom+xml', - 'title' => t('Only posts'), - 'href' => z_root() . '/feed/' . $which - ]); - - - - // An ActivityStreams actor record is more or less required for ActivityStreams compliance - // unless the actor object is inlined into every activity/object. This implies that it - // is more or less required for the Zot6 protocol, which uses ActivityStreams as a content - // serialisation and which doesn't always include the full actor record with every - // activity/object. - - // "more or less" means it isn't spelled out in the ActivityStreams spec, but a number of - // things will break in subtle ways if it isn't provided. - - // The ActivityPub protocol requires an 'inbox', which will not be present in this record - // if/when the ActivityPub protocol is disabled. This will be the case when using the Redmatrix - // fork of Zap; which disables ActivityPub connectivity by default. - - if (ActivityStreams::is_as_request()) { - - // Somebody may attempt an ActivityStreams fetch on one of our message permalinks - // Make it do the right thing. - - $mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : ''); - $mid = unpack_link_id($mid); - - if ($mid) { - $obj = null; - if (strpos($mid, z_root() . '/item/') === 0) { - App::$argc = 2; - App::$argv = [ 'item', basename($mid) ]; - $obj = new Item(); - } - if (strpos($mid, z_root() . '/activity/') === 0) { - App::$argc = 2; - App::$argv = [ 'activity', basename($mid) ]; - $obj = new Activity(); - } - if ($obj) { - $obj->init(); - } - } - if (intval($channel['channel_system'])) { - goaway(z_root()); - } - as_return_and_die(Activity::encode_person($channel,true,true),$channel); - } - - // handle zot6 channel discovery - - if(Libzot::is_zot_request()) { - - $sigdata = HTTPSig::verify(file_get_contents('php://input'), EMPTY_STR, 'zot6'); - - if($sigdata && $sigdata['signer'] && $sigdata['header_valid']) { - $data = json_encode(Libzot::zotinfo([ 'guid_hash' => $channel['channel_hash'], 'target_url' => $sigdata['signer'] ])); - $s = q("select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network in ('nomad','zot6') limit 1", - dbesc($sigdata['signer']) - ); - - if($s && $s[0]['hubloc_sitekey'] && $s[0]['site_crypto']) { - $data = json_encode(Crypto::encapsulate($data,$s[0]['hubloc_sitekey'],Libzot::best_algorithm($s[0]['site_crypto']))); - } - } - else { - $data = json_encode(Libzot::zotinfo([ 'guid_hash' => $channel['channel_hash'] ])); - } - - $headers = [ - 'Content-Type' => 'application/x-nomad+json', - 'Digest' => HTTPSig::generate_digest_header($data), - '(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'] - ]; - $h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel)); - HTTPSig::set_headers($h); - echo $data; - killme(); - } + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/atom+xml', + 'title' => t('Only posts'), + 'href' => z_root() . '/feed/' . $which + ]); - // Run Libprofile::load() here to make sure the theme is set before - // we start loading content + // An ActivityStreams actor record is more or less required for ActivityStreams compliance + // unless the actor object is inlined into every activity/object. This implies that it + // is more or less required for the Zot6 protocol, which uses ActivityStreams as a content + // serialisation and which doesn't always include the full actor record with every + // activity/object. - Libprofile::load($which,$profile); + // "more or less" means it isn't spelled out in the ActivityStreams spec, but a number of + // things will break in subtle ways if it isn't provided. - if (! $_REQUEST['mid']) { + // The ActivityPub protocol requires an 'inbox', which will not be present in this record + // if/when the ActivityPub protocol is disabled. This will be the case when using the Redmatrix + // fork of Zap; which disables ActivityPub connectivity by default. - App::$meta->set('og:title', $channel['channel_name']); - App::$meta->set('og:image', $channel['xchan_photo_l']); - App::$meta->set('og:type','webpage'); - App::$meta->set('og:url:secure_url', channel_url($channel)); - if(App::$profile['about'] && perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_profile')) { - App::$meta->set('og:description', App::$profile['about']); - } - else { - App::$meta->set('og:description', sprintf( t('This is the home page of %s.'), $channel['channel_name'])); - } - } - } + if (ActivityStreams::is_as_request()) { + // Somebody may attempt an ActivityStreams fetch on one of our message permalinks + // Make it do the right thing. - function get() { + $mid = ((x($_REQUEST, 'mid')) ? $_REQUEST['mid'] : ''); + $mid = unpack_link_id($mid); - $noscript_content = get_config('system', 'noscript_content', '1'); + if ($mid) { + $obj = null; + if (strpos($mid, z_root() . '/item/') === 0) { + App::$argc = 2; + App::$argv = ['item', basename($mid)]; + $obj = new Item(); + } + if (strpos($mid, z_root() . '/activity/') === 0) { + App::$argc = 2; + App::$argv = ['activity', basename($mid)]; + $obj = new Activity(); + } + if ($obj) { + $obj->init(); + } + } + if (intval($channel['channel_system'])) { + goaway(z_root()); + } + as_return_and_die(Activity::encode_person($channel, true, true), $channel); + } - $category = $datequery = $datequery2 = ''; + // handle zot6 channel discovery - $mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : ''); - $mid = unpack_link_id($mid); + if (Libzot::is_zot_request()) { + $sigdata = HTTPSig::verify(file_get_contents('php://input'), EMPTY_STR, 'zot6'); - $datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : ''); - $datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : ''); + if ($sigdata && $sigdata['signer'] && $sigdata['header_valid']) { + $data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash'], 'target_url' => $sigdata['signer']])); + $s = q( + "select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network in ('nomad','zot6') limit 1", + dbesc($sigdata['signer']) + ); - if(observer_prohibited(true)) { - return login(); - } + if ($s && $s[0]['hubloc_sitekey'] && $s[0]['site_crypto']) { + $data = json_encode(Crypto::encapsulate($data, $s[0]['hubloc_sitekey'], Libzot::best_algorithm($s[0]['site_crypto']))); + } + } else { + $data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash']])); + } - $category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : ''); - $hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : ''); - $order = ((x($_GET,'order')) ? notags($_GET['order']) : 'post'); - $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); - $search = ((x($_GET,'search')) ? $_GET['search'] : EMPTY_STR); - - $groups = []; - - $o = ''; - - if($this->updating) { - // Ensure we've got a profile owner if updating. - App::$profile['profile_uid'] = App::$profile_uid = $this->profile_uid; - } - - $is_owner = (((local_channel()) && (App::$profile['profile_uid'] == local_channel())) ? true : false); - - $channel = App::get_channel(); - $observer = App::get_observer(); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - - $perms = get_all_perms(App::$profile['profile_uid'],$ob_hash); + $headers = [ + 'Content-Type' => 'application/x-nomad+json', + 'Digest' => HTTPSig::generate_digest_header($data), + '(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'] + ]; + $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel)); + HTTPSig::set_headers($h); + echo $data; + killme(); + } - if ($this->loading && ! $mid) { + // Run Libprofile::load() here to make sure the theme is set before + // we start loading content - $_SESSION['loadtime_channel'] = datetime_convert(); - if ($is_owner) { - PConfig::Set(local_channel(),'system','loadtime_channel',$_SESSION['loadtime_channel']); - } - } + Libprofile::load($which, $profile); + + if (!$_REQUEST['mid']) { + App::$meta->set('og:title', $channel['channel_name']); + App::$meta->set('og:image', $channel['xchan_photo_l']); + App::$meta->set('og:type', 'webpage'); + App::$meta->set('og:url:secure_url', channel_url($channel)); + if (App::$profile['about'] && perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_profile')) { + App::$meta->set('og:description', App::$profile['about']); + } else { + App::$meta->set('og:description', sprintf(t('This is the home page of %s.'), $channel['channel_name'])); + } + } + } + + public function get() + { + + $noscript_content = get_config('system', 'noscript_content', '1'); + + $category = $datequery = $datequery2 = ''; + + $mid = ((x($_REQUEST, 'mid')) ? $_REQUEST['mid'] : ''); + $mid = unpack_link_id($mid); + + $datequery = ((x($_GET, 'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : ''); + $datequery2 = ((x($_GET, 'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : ''); + + if (observer_prohibited(true)) { + return login(); + } + + $category = ((x($_REQUEST, 'cat')) ? $_REQUEST['cat'] : ''); + $hashtags = ((x($_REQUEST, 'tag')) ? $_REQUEST['tag'] : ''); + $order = ((x($_GET, 'order')) ? notags($_GET['order']) : 'post'); + $static = ((array_key_exists('static', $_REQUEST)) ? intval($_REQUEST['static']) : 0); + $search = ((x($_GET, 'search')) ? $_GET['search'] : EMPTY_STR); + + $groups = []; + + $o = ''; + + if ($this->updating) { + // Ensure we've got a profile owner if updating. + App::$profile['profile_uid'] = App::$profile_uid = $this->profile_uid; + } + + $is_owner = (((local_channel()) && (App::$profile['profile_uid'] == local_channel())) ? true : false); + + $channel = App::get_channel(); + $observer = App::get_observer(); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms(App::$profile['profile_uid'], $ob_hash); - - if(! $perms['view_stream']) { - // We may want to make the target of this redirect configurable - if($perms['view_profile']) { - notice( t('Insufficient permissions. Request redirected to profile page.') . EOL); - goaway (z_root() . "/profile/" . App::$profile['channel_address']); - } - notice( t('Permission denied.') . EOL); - return; - } + if ($this->loading && !$mid) { + $_SESSION['loadtime_channel'] = datetime_convert(); + if ($is_owner) { + PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']); + } + } - if(! $this->updating) { - - nav_set_selected('Channel Home'); - - $static = channel_manual_conv_update(App::$profile['profile_uid']); - - // search terms header - if($search) { - $o .= replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8') - )); - } - - $role = get_pconfig(App::$profile['profile_uid'],'system','permissions_role'); - if ($role === 'social_restricted' && (! $ob_hash)) { - // provide warning that content is probably hidden ? - } - - if($channel && $is_owner) { - $channel_acl = array( - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'] - ); - } - else { - $channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; - } + if (!$perms['view_stream']) { + // We may want to make the target of this redirect configurable + if ($perms['view_profile']) { + notice(t('Insufficient permissions. Request redirected to profile page.') . EOL); + goaway(z_root() . "/profile/" . App::$profile['channel_address']); + } + notice(t('Permission denied.') . EOL); + return; + } - if($perms['post_wall']) { + if (!$this->updating) { + nav_set_selected('Channel Home'); - $x = array( - 'is_owner' => $is_owner, - 'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false), - 'default_location' => (($is_owner) ? App::$profile['channel_location'] : ''), - 'nickname' => App::$profile['channel_address'], - 'lockstate' => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'), - 'acl' => (($is_owner) ? populate_acl($channel_acl,true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''), - 'permissions' => $channel_acl, - 'showacl' => (($is_owner) ? 'yes' : ''), - 'bang' => '', - 'visitor' => (($is_owner || $observer) ? true : false), - 'profile_uid' => App::$profile['profile_uid'], - 'editor_autocomplete' => true, - 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true, - 'jotnets' => true, - 'reset' => t('Reset form') - ); + $static = channel_manual_conv_update(App::$profile['profile_uid']); - $o .= status_editor($x); - } + // search terms header + if ($search) { + $o .= replace_macros(get_markup_template("section_title.tpl"), array( + '$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT, 'UTF-8') + )); + } - if (! $mid && ! $search) { - $obj = new \Zotlabs\Widget\Pinned; - $o .= $obj->widget([]); - } - } + $role = get_pconfig(App::$profile['profile_uid'], 'system', 'permissions_role'); + if ($role === 'social_restricted' && (!$ob_hash)) { + // provide warning that content is probably hidden ? + } + + if ($channel && $is_owner) { + $channel_acl = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); + } else { + $channel_acl = ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']; + } - /** - * Get permissions SQL - */ - - $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_deleted = 0 + if ($perms['post_wall']) { + $x = array( + 'is_owner' => $is_owner, + 'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'], 'system', 'use_browser_location')))) ? true : false), + 'default_location' => (($is_owner) ? App::$profile['channel_location'] : ''), + 'nickname' => App::$profile['channel_address'], + 'lockstate' => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'), + 'acl' => (($is_owner) ? populate_acl($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''), + 'permissions' => $channel_acl, + 'showacl' => (($is_owner) ? 'yes' : ''), + 'bang' => '', + 'visitor' => (($is_owner || $observer) ? true : false), + 'profile_uid' => App::$profile['profile_uid'], + 'editor_autocomplete' => true, + 'bbco_autocomplete' => 'bbcode', + 'bbcode' => true, + 'jotnets' => true, + 'reset' => t('Reset form') + ); + + $o .= status_editor($x); + } + + if (!$mid && !$search) { + $obj = new Pinned(); + $o .= $obj->widget([]); + } + } + + + /** + * Get permissions SQL + */ + + $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_pending_remove = 0 and item.item_blocked = 0 "; - if (! $is_owner) - $item_normal .= "and item.item_delayed = 0 "; - $item_normal_update = item_normal_update(); - $sql_extra = item_permissions_sql(App::$profile['profile_uid']); + if (!$is_owner) { + $item_normal .= "and item.item_delayed = 0 "; + } + $item_normal_update = item_normal_update(); + $sql_extra = item_permissions_sql(App::$profile['profile_uid']); - if (get_pconfig(App::$profile['profile_uid'],'system','channel_list_mode') && (! $mid)) { - $page_mode = 'list'; - } - else { - $page_mode = 'client'; - } - - $abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " "; + if (get_pconfig(App::$profile['profile_uid'], 'system', 'channel_list_mode') && (!$mid)) { + $page_mode = 'list'; + } else { + $page_mode = 'client'; + } - $simple_update = (($this->updating) ? " AND item_unseen = 1 " : ''); + $abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " "; - if ($search) { - $search = escape_tags($search); - if(strpos($search,'#') === 0) { - $sql_extra .= term_query('item',substr($search,1),TERM_HASHTAG,TERM_COMMUNITYTAG); - } - else { - $sql_extra .= sprintf(" AND (item.body like '%s' OR item.title like '%s') ", - dbesc(protect_sprintf('%' . $search . '%')), - dbesc(protect_sprintf('%' . $search . '%')) - ); - } - } + $simple_update = (($this->updating) ? " AND item_unseen = 1 " : ''); + + if ($search) { + $search = escape_tags($search); + if (strpos($search, '#') === 0) { + $sql_extra .= term_query('item', substr($search, 1), TERM_HASHTAG, TERM_COMMUNITYTAG); + } else { + $sql_extra .= sprintf( + " AND (item.body like '%s' OR item.title like '%s') ", + dbesc(protect_sprintf('%' . $search . '%')), + dbesc(protect_sprintf('%' . $search . '%')) + ); + } + } - head_add_link([ - 'rel' => 'alternate', - 'type' => 'application/json+oembed', - 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string), - 'title' => 'oembed' - ]); + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string), + 'title' => 'oembed' + ]); - if ($this->updating && isset($_SESSION['loadtime_channel'])) { - $simple_update = " AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime_channel']) . "' "; - } - if ($this->loading) { - $simple_update = ''; - } - - if ($static && $simple_update) { - $simple_update .= " and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; - } - - if (($this->updating) && (! $this->loading)) { - if ($mid) { - $r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal_update + if ($this->updating && isset($_SESSION['loadtime_channel'])) { + $simple_update = " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_channel']) . "' "; + } + if ($this->loading) { + $simple_update = ''; + } + + if ($static && $simple_update) { + $simple_update .= " and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; + } + + if (($this->updating) && (!$this->loading)) { + if ($mid) { + $r = q( + "SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal_update AND item_wall = 1 $simple_update $sql_extra limit 1", - dbesc($mid . '%'), - intval(App::$profile['profile_uid']) - ); - } - else { - $r = q("SELECT parent AS item_id from item + dbesc($mid . '%'), + intval(App::$profile['profile_uid']) + ); + } else { + $r = q( + "SELECT parent AS item_id from item left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) WHERE uid = %d $item_normal_update AND item_wall = 1 $simple_update AND (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra ORDER BY created DESC", - intval(App::$profile['profile_uid']) - ); - } - } - else { + intval(App::$profile['profile_uid']) + ); + } + } else { + if (x($category)) { + $sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY)); + } + if (x($hashtags)) { + $sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG)); + } - if (x($category)) { - $sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'],'item', $category, TERM_CATEGORY)); - } - if (x($hashtags)) { - $sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'],'item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG)); - } + if ($datequery) { + $sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery)))); + $order = 'post'; + } + if ($datequery2) { + $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery2)))); + } - if ($datequery) { - $sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery)))); - $order = 'post'; - } - if ($datequery2) { - $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); - } + if ($datequery || $datequery2) { + $sql_extra2 .= " and item.item_thread_top != 0 "; + } - if ($datequery || $datequery2) { - $sql_extra2 .= " and item.item_thread_top != 0 "; - } + if ($order === 'post') { + $ordering = "created"; + } else { + $ordering = "commented"; + } - if ($order === 'post') { - $ordering = "created"; - } - else { - $ordering = "commented"; - } + $itemspage = get_pconfig(local_channel(), 'system', 'itemspage'); + App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); + $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); - $itemspage = get_pconfig(local_channel(),'system','itemspage'); - App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); - $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); - - if ($noscript_content || $this->loading) { - if ($mid) { - $r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal + if ($noscript_content || $this->loading) { + if ($mid) { + $r = q( + "SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal AND item_wall = 1 $sql_extra limit 1", - dbesc($mid . '%'), - intval(App::$profile['profile_uid']) - ); - if (! $r) { - notice( t('Permission denied.') . EOL); - } - } - else { - $r = q("SELECT DISTINCT item.parent AS item_id, $ordering FROM item + dbesc($mid . '%'), + intval(App::$profile['profile_uid']) + ); + if (!$r) { + notice(t('Permission denied.') . EOL); + } + } else { + $r = q( + "SELECT DISTINCT item.parent AS item_id, $ordering FROM item left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids ) WHERE true and item.uid = %d $item_normal AND (abook.abook_blocked = 0 or abook.abook_flags is null) AND item.item_wall = 1 AND item.item_thread_top = 1 $sql_extra $sql_extra2 ORDER BY $ordering DESC $pager_sql ", - intval(App::$profile['profile_uid']) - ); - } - } - else { - $r = []; - } - } - if ($r) { + intval(App::$profile['profile_uid']) + ); + } + } else { + $r = []; + } + } + if ($r) { + $parents_str = ids_to_querystr($r, 'item_id'); - $parents_str = ids_to_querystr($r,'item_id'); - - $items = q("SELECT item.*, item.id AS item_id + $items = q( + "SELECT item.*, item.id AS item_id FROM item WHERE item.uid = %d $item_normal AND item.parent IN ( %s ) $sql_extra ", - intval(App::$profile['profile_uid']), - dbesc($parents_str) - ); + intval(App::$profile['profile_uid']), + dbesc($parents_str) + ); - xchan_query($items); - $items = fetch_post_tags($items, true); - $items = conv_sort($items,$ordering); + xchan_query($items); + $items = fetch_post_tags($items, true); + $items = conv_sort($items, $ordering); - if ($this->loading && $mid && (! count($items))) { - // This will happen if we don't have sufficient permissions - // to view the parent item (or the item itself if it is toplevel) - notice( t('Permission denied.') . EOL); - } + if ($this->loading && $mid && (!count($items))) { + // This will happen if we don't have sufficient permissions + // to view the parent item (or the item itself if it is toplevel) + notice(t('Permission denied.') . EOL); + } + } else { + $items = []; + } - } - else { - $items = []; - } + if ((!$this->updating) && (!$this->loading)) { + // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, + // because browser prefetching might change it on us. We have to deliver it with the page. - if ((! $this->updating) && (! $this->loading)) { + $maxheight = get_pconfig(App::$profile['profile_uid'], 'system', 'channel_divmore_height'); + if (!$maxheight) { + $maxheight = 400; + } - // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, - // because browser prefetching might change it on us. We have to deliver it with the page. + $o .= '' . "\r\n"; + $o .= "\r\n"; - $maxheight = get_pconfig(App::$profile['profile_uid'],'system','channel_divmore_height'); - if(! $maxheight) - $maxheight = 400; + App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"), array( + '$baseurl' => z_root(), + '$pgtype' => 'channel', + '$uid' => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'), + '$gid' => '0', + '$cid' => '0', + '$cmin' => '(-1)', + '$cmax' => '(-1)', + '$star' => '0', + '$liked' => '0', + '$conv' => '0', + '$spam' => '0', + '$nouveau' => '0', + '$wall' => '1', + '$draft' => '0', + '$fh' => '0', + '$dm' => '0', + '$static' => $static, + '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1), + '$search' => $search, + '$xchan' => '', + '$order' => (($order) ? urlencode($order) : ''), + '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0), + '$file' => '', + '$cats' => (($category) ? urlencode($category) : ''), + '$tags' => (($hashtags) ? urlencode($hashtags) : ''), + '$mid' => (($mid) ? urlencode($mid) : ''), + '$verb' => '', + '$net' => '', + '$dend' => $datequery, + '$dbegin' => $datequery2 + )); + } - $o .= '' . "\r\n"; - $o .= "\r\n"; + $update_unseen = ''; - App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( - '$baseurl' => z_root(), - '$pgtype' => 'channel', - '$uid' => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'), - '$gid' => '0', - '$cid' => '0', - '$cmin' => '(-1)', - '$cmax' => '(-1)', - '$star' => '0', - '$liked' => '0', - '$conv' => '0', - '$spam' => '0', - '$nouveau' => '0', - '$wall' => '1', - '$draft' => '0', - '$fh' => '0', - '$dm' => '0', - '$static' => $static, - '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1), - '$search' => $search, - '$xchan' => '', - '$order' => (($order) ? urlencode($order) : ''), - '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), - '$file' => '', - '$cats' => (($category) ? urlencode($category) : ''), - '$tags' => (($hashtags) ? urlencode($hashtags) : ''), - '$mid' => (($mid) ? urlencode($mid) : ''), - '$verb' => '', - '$net' => '', - '$dend' => $datequery, - '$dbegin' => $datequery2 - )); + if ($page_mode === 'list') { - } + /** + * in "list mode", only mark the parent item and any like activities as "seen". + * We won't distinguish between comment likes and post likes. The important thing + * is that the number of unseen comments will be accurate. The SQL to separate the + * comment likes could also get somewhat hairy. + */ - $update_unseen = ''; + if (isset($parents_str) && $parents_str) { + $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )"; + $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) "; + } + } else { + if (isset($parents_str) && $parents_str) { + $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )"; + } + } - if ($page_mode === 'list') { + if ($is_owner && $update_unseen && (!$_SESSION['sudo'])) { + $x = ['channel_id' => local_channel(), 'update' => 'unset']; + call_hooks('update_unseen', $x); + if ($x['update'] === 'unset' || intval($x['update'])) { + $r = q( + "UPDATE item SET item_unseen = 0 where item_unseen = 1 and item_wall = 1 AND uid = %d $update_unseen", + intval(local_channel()) + ); + } - /** - * in "list mode", only mark the parent item and any like activities as "seen". - * We won't distinguish between comment likes and post likes. The important thing - * is that the number of unseen comments will be accurate. The SQL to separate the - * comment likes could also get somewhat hairy. - */ + $ids = ids_to_array($items, 'item_id'); + $seen = PConfig::Get(local_channel(), 'system', 'seen_items'); + if (!$seen) { + $seen = []; + } + $seen = array_merge($ids, $seen); + PConfig::Set(local_channel(), 'system', 'seen_items', $seen); + } - if (isset($parents_str) && $parents_str) { - $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )"; - $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) "; - } - } - else { - if (isset($parents_str) && $parents_str) { - $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )"; - } - } + $mode = (($search) ? 'search' : 'channel'); - if ($is_owner && $update_unseen && (! $_SESSION['sudo'])) { - $x = [ 'channel_id' => local_channel(), 'update' => 'unset' ]; - call_hooks('update_unseen',$x); - if ($x['update'] === 'unset' || intval($x['update'])) { - $r = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 and item_wall = 1 AND uid = %d $update_unseen", - intval(local_channel()) - ); - } + if ($this->updating) { + $o .= conversation($items, $mode, $this->updating, $page_mode); + } else { + $o .= ''; - $ids = ids_to_array($items,'item_id'); - $seen = PConfig::Get(local_channel(),'system','seen_items'); - if (! $seen) { - $seen = []; - } - $seen = array_merge($ids,$seen); - PConfig::Set(local_channel(),'system','seen_items',$seen); - } + $o .= conversation($items, $mode, $this->updating, $page_mode); - $mode = (($search) ? 'search' : 'channel'); + if ($mid && $items[0]['title']) { + App::$page['title'] = $items[0]['title'] . " - " . App::$page['title']; + } + } - if($this->updating) { - $o .= conversation($items,$mode,$this->updating,$page_mode); - } - else { + // We reset $channel so that info can be obtained for unlogged visitors + $channel = channelx_by_n(App::$profile['profile_uid']); - $o .= ''; + if (isset($_REQUEST['mid']) && $_REQUEST['mid']) { + if (preg_match("/\[[zi]mg(.*?)\]([^\[]+)/is", $items[0]['body'], $matches)) { + $ogimage = $matches[2]; + // Will we use og:image:type someday? We keep this just in case + // $ogimagetype = guess_image_type($ogimage); + } - $o .= conversation($items,$mode,$this->updating,$page_mode); + // some work on post content to generate a description + // almost fully based on work done on Hubzilla by Max Kostikov + $ogdesc = $items[0]['body']; - if ($mid && $items[0]['title']) - App::$page['title'] = $items[0]['title'] . " - " . App::$page['title']; + $ogdesc = str_replace("#^[", "[", $ogdesc); - } + $ogdesc = bbcode($ogdesc, ['tryoembed' => false]); + $ogdesc = trim(html2plain($ogdesc, 0, true)); + $ogdesc = html_entity_decode($ogdesc, ENT_QUOTES, 'UTF-8'); - // We reset $channel so that info can be obtained for unlogged visitors - $channel = channelx_by_n(App::$profile['profile_uid']); + // remove all URLs + $ogdesc = preg_replace("/https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@]+/", "", $ogdesc); - if (isset($_REQUEST['mid']) && $_REQUEST['mid']) { + // shorten description + $ogdesc = substr($ogdesc, 0, 300); + $ogdesc = str_replace("\n", " ", $ogdesc); + while (strpos($ogdesc, " ") !== false) { + $ogdesc = str_replace(" ", " ", $ogdesc); + } + $ogdesc = (strlen($ogdesc) < 298 ? $ogdesc : rtrim(substr($ogdesc, 0, strrpos($ogdesc, " ")), "?.,:;!-") . "..."); - if(preg_match("/\[[zi]mg(.*?)\]([^\[]+)/is", $items[0]['body'], $matches)) { - $ogimage = $matches[2]; - // Will we use og:image:type someday? We keep this just in case - // $ogimagetype = guess_image_type($ogimage); - } + // we can now start loading content - // some work on post content to generate a description - // almost fully based on work done on Hubzilla by Max Kostikov - $ogdesc = $items[0]['body']; + App::$meta->set('og:title', ($items[0]['title'] ? $items[0]['title'] : $channel['channel_name'])); + App::$meta->set('og:image', ($ogimage ? $ogimage : $channel['xchan_photo_l'])); + App::$meta->set('og:type', 'article'); + App::$meta->set('og:url:secure_url', channel_url($channel)); + App::$meta->set('og:description', ($ogdesc ? $ogdesc : sprintf(t('This post was published on the home page of %s.'), $channel['channel_name']))); + } - $ogdesc = str_replace("#^[", "[", $ogdesc); + if ($mid) { + $o .= ''; + } - $ogdesc = bbcode($ogdesc, [ 'tryoembed' => false ]); - $ogdesc = trim(html2plain($ogdesc, 0, true)); - $ogdesc = html_entity_decode($ogdesc, ENT_QUOTES, 'UTF-8'); - - // remove all URLs - $ogdesc = preg_replace("/https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@]+/", "", $ogdesc); - - // shorten description - $ogdesc = substr($ogdesc, 0, 300); - $ogdesc = str_replace("\n", " ", $ogdesc); - while (strpos($ogdesc, " ") !== false) - $ogdesc = str_replace(" ", " ", $ogdesc); - $ogdesc = (strlen($ogdesc) < 298 ? $ogdesc : rtrim(substr($ogdesc, 0, strrpos($ogdesc, " ")), "?.,:;!-") . "..."); - - // we can now start loading content - - App::$meta->set('og:title', ($items[0]['title'] ? $items[0]['title'] : $channel['channel_name'])); - App::$meta->set('og:image', ($ogimage ? $ogimage : $channel['xchan_photo_l'])); - App::$meta->set('og:type', 'article'); - App::$meta->set('og:url:secure_url', channel_url($channel)); - App::$meta->set('og:description', ($ogdesc ? $ogdesc : sprintf( t('This post was published on the home page of %s.'), $channel['channel_name']))); - } - - if ($mid) { - $o .= ''; - } - - return $o; - } + return $o; + } } diff --git a/Zotlabs/Module/Chanview.php b/Zotlabs/Module/Chanview.php index f5eca7db9..5e1b6722e 100644 --- a/Zotlabs/Module/Chanview.php +++ b/Zotlabs/Module/Chanview.php @@ -1,4 +1,5 @@ $url, - '$photo' => get_xconfig(App::$poi['xchan_hash'],'system','cover_photo'), - '$alt' => t('Cover photo for this channel'), - '$about' => $about, - '$followers_txt' => t('Followers'), - '$following_txt' => t('Following'), - '$followers' => $followers, - '$following' => $following, - '$visit' => t('Visit'), - '$full' => t('toggle full screen mode') - ]); - - return $o; - } - } - + $followers = t('Not available'); + $following = t('Not available'); + + $f = get_xconfig(App::$poi['xchan_hash'], 'activitypub', 'collections'); + if ($f && isset($f['followers'])) { + $m = Activity::fetch($f['followers']); + if (is_array($m) && isset($m['totalItems'])) { + $followers = intval($m['totalItems']); + } + } + if ($f && isset($f['following'])) { + $m = Activity::fetch($f['following']); + if (is_array($m) && isset($m['totalItems'])) { + $following = intval($m['totalItems']); + } + } + + $o = replace_macros(get_markup_template('chanview.tpl'), [ + '$url' => $url, + '$photo' => get_xconfig(App::$poi['xchan_hash'], 'system', 'cover_photo'), + '$alt' => t('Cover photo for this channel'), + '$about' => $about, + '$followers_txt' => t('Followers'), + '$following_txt' => t('Following'), + '$followers' => $followers, + '$following' => $following, + '$visit' => t('Visit'), + '$full' => t('toggle full screen mode') + ]); + + return $o; + } + } } diff --git a/Zotlabs/Module/Chat.php b/Zotlabs/Module/Chat.php index 22ed3958b..3cdcb12cd 100644 --- a/Zotlabs/Module/Chat.php +++ b/Zotlabs/Module/Chat.php @@ -1,4 +1,6 @@ - 1) ? argv(1) : null); - if (local_channel() && (! $which)) { - $channel = App::get_channel(); - if ($channel && $channel['channel_address']) { - $which = $channel['channel_address']; - } - } + public function init() + { - if (! $which) { - notice( t('You must be logged in to see this page.') . EOL ); - return; - } - - $profile = 0; - - // Run Libprofile::load() here to make sure the theme is set before - // we start loading content - - Libprofile::load($which,$profile); - - } - - function post() { - - if ($_POST['room_name']) { - $room = strip_tags(trim($_POST['room_name'])); - } - - if ((! $room) || (! local_channel())) { - return; - } - - $channel = App::get_channel(); - - if ($_POST['action'] === 'drop') { - logger('delete chatroom'); - Chatroom::destroy($channel, [ 'cr_name' => $room ] ); - goaway(z_root() . '/chat/' . $channel['channel_address']); - } - - $acl = new AccessControl($channel); - $acl->set_from_array($_REQUEST); - - $arr = $acl->get(); - $arr['name'] = $room; - $arr['expire'] = intval($_POST['chat_expire']); - if (intval($arr['expire']) < 0) { - $arr['expire'] = 0; - } - - Chatroom::create($channel,$arr); - - $x = q("select * from chatroom where cr_name = '%s' and cr_uid = %d limit 1", - dbesc($room), - intval(local_channel()) - ); - - Libsync::build_sync_packet(0, array('chatroom' => $x)); - - if ($x) { - goaway(z_root() . '/chat/' . $channel['channel_address'] . '/' . $x[0]['cr_id']); - } - - // that failed. Try again perhaps? - - goaway(z_root() . '/chat/' . $channel['channel_address'] . '/new'); - - - } - - - function get() { + $which = ((argc() > 1) ? argv(1) : null); + if (local_channel() && (!$which)) { + $channel = App::get_channel(); + if ($channel && $channel['channel_address']) { + $which = $channel['channel_address']; + } + } -// if(! Apps::system_app_installed(App::$profile_uid, 'Chatrooms')) { -// // Do not display any associated widgets at this point -// App::$pdl = ''; + if (!$which) { + notice(t('You must be logged in to see this page.') . EOL); + return; + } + + $profile = 0; + + // Run Libprofile::load() here to make sure the theme is set before + // we start loading content + + Libprofile::load($which, $profile); + } + + public function post() + { + + if ($_POST['room_name']) { + $room = strip_tags(trim($_POST['room_name'])); + } + + if ((!$room) || (!local_channel())) { + return; + } + + $channel = App::get_channel(); + + if ($_POST['action'] === 'drop') { + logger('delete chatroom'); + Chatroom::destroy($channel, ['cr_name' => $room]); + goaway(z_root() . '/chat/' . $channel['channel_address']); + } + + $acl = new AccessControl($channel); + $acl->set_from_array($_REQUEST); + + $arr = $acl->get(); + $arr['name'] = $room; + $arr['expire'] = intval($_POST['chat_expire']); + if (intval($arr['expire']) < 0) { + $arr['expire'] = 0; + } + + Chatroom::create($channel, $arr); + + $x = q( + "select * from chatroom where cr_name = '%s' and cr_uid = %d limit 1", + dbesc($room), + intval(local_channel()) + ); + + Libsync::build_sync_packet(0, array('chatroom' => $x)); + + if ($x) { + goaway(z_root() . '/chat/' . $channel['channel_address'] . '/' . $x[0]['cr_id']); + } + + // that failed. Try again perhaps? + + goaway(z_root() . '/chat/' . $channel['channel_address'] . '/new'); + } + + + public function get() + { + +// if(! Apps::system_app_installed(App::$profile_uid, 'Chatrooms')) { +// // Do not display any associated widgets at this point +// App::$pdl = ''; // -// $o = 'Chatrooms App (Not Installed):
'; -// $o .= t('Access Controlled Chatrooms'); -// return $o; -// } - - if (local_channel()) { - $channel = App::get_channel(); - nav_set_selected('Chatrooms'); - } +// $o = 'Chatrooms App (Not Installed):
'; +// $o .= t('Access Controlled Chatrooms'); +// return $o; +// } - $ob = App::get_observer(); - $observer = get_observer_hash(); - if (! $observer) { - notice( t('Permission denied.') . EOL); - return; - } - - if (! perm_is_allowed(App::$profile['profile_uid'],$observer,'chat')) { - notice( t('Permission denied.') . EOL); - return; - } - - if ((argc() > 3) && intval(argv(2)) && (argv(3) === 'leave')) { - Chatroom::leave($observer,argv(2),$_SERVER['REMOTE_ADDR']); - goaway(z_root() . '/channel/' . argv(1)); - } - - - if ((argc() > 3) && intval(argv(2)) && (argv(3) === 'status')) { - $ret = [ 'success' => false ]; - $room_id = intval(argv(2)); - if (! $room_id || ! $observer) { - return; - } - - $r = q("select * from chatroom where cr_id = %d limit 1", - intval($room_id) - ); - if (! $r) { - json_return_and_die($ret); - } - require_once('include/security.php'); - $sql_extra = permissions_sql($r[0]['cr_uid']); - - $x = q("select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1", - intval($room_id), - intval($r[0]['cr_uid']) - ); - if (! $x) { - json_return_and_die($ret); - } - $y = q("select count(*) as total from chatpresence where cp_room = %d", - intval($room_id) - ); - if ($y) { - $ret['success'] = true; - $ret['chatroom'] = $r[0]['cr_name']; - $ret['inroom'] = $y[0]['total']; - } - - // figure out how to present a timestamp of the last activity, since we don't know the observer's timezone. - - $z = q("select created from chat where chat_room = %d order by created desc limit 1", - intval($room_id) - ); - if ($z) { - $ret['last'] = $z[0]['created']; - } - json_return_and_die($ret); - } - - - if (argc() > 2 && intval(argv(2))) { - - $room_id = intval(argv(2)); - - $x = Chatroom::enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']); - if (! $x) { - return; - } - $x = q("select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1", - intval($room_id), - intval(App::$profile['profile_uid']) - ); - - if ($x) { - $acl = new AccessControl(false); - $acl->set($x[0]); - - $private = $acl->is_private(); - $room_name = $x[0]['cr_name']; - } - else { - notice( t('Room not found') . EOL); - return; - } + if (local_channel()) { + $channel = App::get_channel(); + nav_set_selected('Chatrooms'); + } - $cipher = get_pconfig(local_channel(),'system','default_cipher'); - if (! $cipher) { - $cipher = 'AES-128-CCM'; - } + $ob = App::get_observer(); + $observer = get_observer_hash(); + if (!$observer) { + notice(t('Permission denied.') . EOL); + return; + } - - $o = replace_macros(get_markup_template('chat.tpl'), [ - '$is_owner' => ((local_channel() && local_channel() == $x[0]['cr_uid']) ? true : false), - '$room_name' => $room_name, - '$room_id' => $room_id, - '$baseurl' => z_root(), - '$nickname' => argv(1), - '$submit' => t('Submit'), - '$leave' => t('Leave Room'), - '$drop' => t('Delete Room'), - '$away' => t('I am away right now'), - '$online' => t('I am online'), - '$feature_encrypt' => ((Apps::system_app_installed(local_channel(),'Secrets')) ? true : false), - '$cipher' => $cipher, - '$linkurl' => t('Please enter a link URL:'), - '$encrypt' => t('Encrypt text'), - '$insert' => t('Insert web link') - ]); - return $o; - } + if (!perm_is_allowed(App::$profile['profile_uid'], $observer, 'chat')) { + notice(t('Permission denied.') . EOL); + return; + } - require_once('include/conversation.php'); - - $o = ''; + if ((argc() > 3) && intval(argv(2)) && (argv(3) === 'leave')) { + Chatroom::leave($observer, argv(2), $_SERVER['REMOTE_ADDR']); + goaway(z_root() . '/channel/' . argv(1)); + } - $acl = new AccessControl($channel); - $channel_acl = $acl->get(); - $lockstate = (($channel_acl['allow_cid'] || $channel_acl['allow_gid'] || $channel_acl['deny_cid'] || $channel_acl['deny_gid']) ? 'lock' : 'unlock'); - require_once('include/acl_selectors.php'); + if ((argc() > 3) && intval(argv(2)) && (argv(3) === 'status')) { + $ret = ['success' => false]; + $room_id = intval(argv(2)); + if (!$room_id || !$observer) { + return; + } - $chatroom_new = ''; - if (local_channel()) { - $chatroom_new = replace_macros(get_markup_template('chatroom_new.tpl'),array( - '$header' => t('New Chatroom'), - '$name' => array('room_name',t('Chatroom name'),'', ''), - '$chat_expire' => array('chat_expire',t('Expiration of chats (minutes)'),120,''), - '$permissions' => t('Permissions'), - '$acl' => populate_acl($channel_acl,false), - '$allow_cid' => acl2json($channel_acl['allow_cid']), - '$allow_gid' => acl2json($channel_acl['allow_gid']), - '$deny_cid' => acl2json($channel_acl['deny_cid']), - '$deny_gid' => acl2json($channel_acl['deny_gid']), - '$lockstate' => $lockstate, - '$submit' => t('Submit') - - )); - } + $r = q( + "select * from chatroom where cr_id = %d limit 1", + intval($room_id) + ); + if (!$r) { + json_return_and_die($ret); + } + require_once('include/security.php'); + $sql_extra = permissions_sql($r[0]['cr_uid']); - $rooms = Chatroom::roomlist(App::$profile['profile_uid']); - - $o .= replace_macros(get_markup_template('chatrooms.tpl'), [ - '$header' => sprintf( t('%1$s\'s Chatrooms'), App::$profile['fullname']), - '$name' => t('Name'), - '$baseurl' => z_root(), - '$nickname' => App::$profile['channel_address'], - '$rooms' => $rooms, - '$norooms' => t('No chatrooms available'), - '$newroom' => t('Create New'), - '$is_owner' => ((local_channel() && local_channel() == App::$profile['profile_uid']) ? 1 : 0), - '$chatroom_new' => $chatroom_new, - '$expire' => t('Expiration'), - '$expire_unit' => t('min') //minutes - ]); - - return $o; - - } - + $x = q( + "select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1", + intval($room_id), + intval($r[0]['cr_uid']) + ); + if (!$x) { + json_return_and_die($ret); + } + $y = q( + "select count(*) as total from chatpresence where cp_room = %d", + intval($room_id) + ); + if ($y) { + $ret['success'] = true; + $ret['chatroom'] = $r[0]['cr_name']; + $ret['inroom'] = $y[0]['total']; + } + + // figure out how to present a timestamp of the last activity, since we don't know the observer's timezone. + + $z = q( + "select created from chat where chat_room = %d order by created desc limit 1", + intval($room_id) + ); + if ($z) { + $ret['last'] = $z[0]['created']; + } + json_return_and_die($ret); + } + + + if (argc() > 2 && intval(argv(2))) { + $room_id = intval(argv(2)); + + $x = Chatroom::enter($observer, $room_id, 'online', $_SERVER['REMOTE_ADDR']); + if (!$x) { + return; + } + $x = q( + "select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1", + intval($room_id), + intval(App::$profile['profile_uid']) + ); + + if ($x) { + $acl = new AccessControl(false); + $acl->set($x[0]); + + $private = $acl->is_private(); + $room_name = $x[0]['cr_name']; + } else { + notice(t('Room not found') . EOL); + return; + } + + $cipher = get_pconfig(local_channel(), 'system', 'default_cipher'); + if (!$cipher) { + $cipher = 'AES-128-CCM'; + } + + + $o = replace_macros(get_markup_template('chat.tpl'), [ + '$is_owner' => ((local_channel() && local_channel() == $x[0]['cr_uid']) ? true : false), + '$room_name' => $room_name, + '$room_id' => $room_id, + '$baseurl' => z_root(), + '$nickname' => argv(1), + '$submit' => t('Submit'), + '$leave' => t('Leave Room'), + '$drop' => t('Delete Room'), + '$away' => t('I am away right now'), + '$online' => t('I am online'), + '$feature_encrypt' => ((Apps::system_app_installed(local_channel(), 'Secrets')) ? true : false), + '$cipher' => $cipher, + '$linkurl' => t('Please enter a link URL:'), + '$encrypt' => t('Encrypt text'), + '$insert' => t('Insert web link') + ]); + return $o; + } + + require_once('include/conversation.php'); + + $o = ''; + + $acl = new AccessControl($channel); + $channel_acl = $acl->get(); + + $lockstate = (($channel_acl['allow_cid'] || $channel_acl['allow_gid'] || $channel_acl['deny_cid'] || $channel_acl['deny_gid']) ? 'lock' : 'unlock'); + require_once('include/acl_selectors.php'); + + $chatroom_new = ''; + if (local_channel()) { + $chatroom_new = replace_macros(get_markup_template('chatroom_new.tpl'), array( + '$header' => t('New Chatroom'), + '$name' => array('room_name', t('Chatroom name'), '', ''), + '$chat_expire' => array('chat_expire', t('Expiration of chats (minutes)'), 120, ''), + '$permissions' => t('Permissions'), + '$acl' => populate_acl($channel_acl, false), + '$allow_cid' => acl2json($channel_acl['allow_cid']), + '$allow_gid' => acl2json($channel_acl['allow_gid']), + '$deny_cid' => acl2json($channel_acl['deny_cid']), + '$deny_gid' => acl2json($channel_acl['deny_gid']), + '$lockstate' => $lockstate, + '$submit' => t('Submit') + + )); + } + + $rooms = Chatroom::roomlist(App::$profile['profile_uid']); + + $o .= replace_macros(get_markup_template('chatrooms.tpl'), [ + '$header' => sprintf(t('%1$s\'s Chatrooms'), App::$profile['fullname']), + '$name' => t('Name'), + '$baseurl' => z_root(), + '$nickname' => App::$profile['channel_address'], + '$rooms' => $rooms, + '$norooms' => t('No chatrooms available'), + '$newroom' => t('Create New'), + '$is_owner' => ((local_channel() && local_channel() == App::$profile['profile_uid']) ? 1 : 0), + '$chatroom_new' => $chatroom_new, + '$expire' => t('Expiration'), + '$expire_unit' => t('min') //minutes + ]); + + return $o; + } } diff --git a/Zotlabs/Module/Chatsvc.php b/Zotlabs/Module/Chatsvc.php index a433eca71..c61870934 100644 --- a/Zotlabs/Module/Chatsvc.php +++ b/Zotlabs/Module/Chatsvc.php @@ -1,184 +1,198 @@ - false); - - \App::$data['chat']['room_id'] = intval($_REQUEST['room_id']); - $x = q("select cr_uid from chatroom where cr_id = %d and cr_id != 0 limit 1", - intval(\App::$data['chat']['room_id']) - ); - if(! $x) - json_return_and_die($ret); - - \App::$data['chat']['uid'] = $x[0]['cr_uid']; - - if(! perm_is_allowed(\App::$data['chat']['uid'],get_observer_hash(),'chat')) { - json_return_and_die($ret); - } - - } - - function post() { - - $ret = array('success' => false); - - $room_id = \App::$data['chat']['room_id']; - $text = escape_tags($_REQUEST['chat_text']); - if(! $text) - return; - - $sql_extra = permissions_sql(\App::$data['chat']['uid']); - - $r = q("select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra", - intval(\App::$data['chat']['uid']), - intval(\App::$data['chat']['room_id']) - ); - if(! $r) - json_return_and_die($ret); - - $arr = array( - 'chat_room' => \App::$data['chat']['room_id'], - 'chat_xchan' => get_observer_hash(), - 'chat_text' => $text - ); - - call_hooks('chat_post',$arr); - - $x = q("insert into chat ( chat_room, chat_xchan, created, chat_text ) + public function init() + { + + //logger('chatsvc'); + + $ret = array('success' => false); + + App::$data['chat']['room_id'] = intval($_REQUEST['room_id']); + $x = q( + "select cr_uid from chatroom where cr_id = %d and cr_id != 0 limit 1", + intval(App::$data['chat']['room_id']) + ); + if (!$x) { + json_return_and_die($ret); + } + + App::$data['chat']['uid'] = $x[0]['cr_uid']; + + if (!perm_is_allowed(App::$data['chat']['uid'], get_observer_hash(), 'chat')) { + json_return_and_die($ret); + } + } + + public function post() + { + + $ret = array('success' => false); + + $room_id = App::$data['chat']['room_id']; + $text = escape_tags($_REQUEST['chat_text']); + if (!$text) { + return; + } + + $sql_extra = permissions_sql(App::$data['chat']['uid']); + + $r = q( + "select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra", + intval(App::$data['chat']['uid']), + intval(App::$data['chat']['room_id']) + ); + if (!$r) { + json_return_and_die($ret); + } + + $arr = array( + 'chat_room' => App::$data['chat']['room_id'], + 'chat_xchan' => get_observer_hash(), + 'chat_text' => $text + ); + + call_hooks('chat_post', $arr); + + $x = q( + "insert into chat ( chat_room, chat_xchan, created, chat_text ) values( %d, '%s', '%s', '%s' )", - intval(\App::$data['chat']['room_id']), - dbesc(get_observer_hash()), - dbesc(datetime_convert()), - dbesc(str_rot47(base64url_encode($arr['chat_text']))) - ); - - $ret['success'] = true; - json_return_and_die($ret); - } - - function get() { - - $status = strip_tags($_REQUEST['status']); - $room_id = intval(\App::$data['chat']['room_id']); - $stopped = ((x($_REQUEST,'stopped') && intval($_REQUEST['stopped'])) ? true : false); - - if($status && $room_id) { - - $x = q("select channel_address from channel where channel_id = %d limit 1", - intval(\App::$data['chat']['uid']) - ); - - $r = q("update chatpresence set cp_status = '%s', cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s'", - dbesc($status), - dbesc(datetime_convert()), - intval($room_id), - dbesc(get_observer_hash()), - dbesc($_SERVER['REMOTE_ADDR']) - ); - - goaway(z_root() . '/chat/' . $x[0]['channel_address'] . '/' . $room_id); - } - - if(! $stopped) { - - $lastseen = intval($_REQUEST['last']); - - $ret = array('success' => false); - - $sql_extra = permissions_sql(\App::$data['chat']['uid']); - - $r = q("select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra", - intval(\App::$data['chat']['uid']), - intval(\App::$data['chat']['room_id']) - ); - if(! $r) - json_return_and_die($ret); - - $inroom = []; - - $r = q("select * from chatpresence left join xchan on xchan_hash = cp_xchan where cp_room = %d order by xchan_name", - intval(\App::$data['chat']['room_id']) - ); - if($r) { - foreach($r as $rv) { - if(! $rv['xchan_name']) { - $rv['xchan_hash'] = $rv['cp_xchan']; - $rv['xchan_name'] = substr($rv['cp_xchan'],strrpos($rv['cp_xchan'],'.')+1); - $rv['xchan_addr'] = ''; - $rv['xchan_network'] = 'unknown'; - $rv['xchan_url'] = z_root(); - $rv['xchan_hidden'] = 1; - $rv['xchan_photo_mimetype'] = 'image/png'; - $rv['xchan_photo_l'] = z_root() . '/' . get_default_profile_photo(300); - $rv['xchan_photo_m'] = z_root() . '/' . get_default_profile_photo(80); - $rv['xchan_photo_s'] = z_root() . '/' . get_default_profile_photo(48); + intval(App::$data['chat']['room_id']), + dbesc(get_observer_hash()), + dbesc(datetime_convert()), + dbesc(str_rot47(base64url_encode($arr['chat_text']))) + ); - } + $ret['success'] = true; + json_return_and_die($ret); + } - switch($rv['cp_status']) { - case 'away': - $status = t('Away'); - $status_class = 'away'; - break; - case 'online': - default: - $status = t('Online'); - $status_class = 'online'; - break; - } - - $inroom[] = array('img' => zid($rv['xchan_photo_m']), 'img_type' => $rv['xchan_photo_mimetype'],'name' => $rv['xchan_name'], 'status' => $status, 'status_class' => $status_class); - } - } - - $chats = []; - - $r = q("select * from chat left join xchan on chat_xchan = xchan_hash where chat_room = %d and chat_id > %d order by created", - intval(\App::$data['chat']['room_id']), - intval($lastseen) - ); - if($r) { - foreach($r as $rr) { - $chats[] = array( - 'id' => $rr['chat_id'], - 'img' => zid($rr['xchan_photo_m']), - 'img_type' => $rr['xchan_photo_mimetype'], - 'name' => $rr['xchan_name'], - 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'), - 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'), - 'text' => zidify_links(smilies(bbcode(base64url_decode(str_rot47($rr['chat_text']))))), - 'self' => ((get_observer_hash() == $rr['chat_xchan']) ? 'self' : '') - ); - } - } - } - - $r = q("update chatpresence set cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s'", - dbesc(datetime_convert()), - intval(\App::$data['chat']['room_id']), - dbesc(get_observer_hash()), - dbesc($_SERVER['REMOTE_ADDR']) - ); - - $ret['success'] = true; - if(! $stopped) { - $ret['inroom'] = $inroom; - $ret['chats'] = $chats; - } - json_return_and_die($ret); - - } - - + public function get() + { + + $status = strip_tags($_REQUEST['status']); + $room_id = intval(App::$data['chat']['room_id']); + $stopped = ((x($_REQUEST, 'stopped') && intval($_REQUEST['stopped'])) ? true : false); + + if ($status && $room_id) { + $x = q( + "select channel_address from channel where channel_id = %d limit 1", + intval(App::$data['chat']['uid']) + ); + + $r = q( + "update chatpresence set cp_status = '%s', cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s'", + dbesc($status), + dbesc(datetime_convert()), + intval($room_id), + dbesc(get_observer_hash()), + dbesc($_SERVER['REMOTE_ADDR']) + ); + + goaway(z_root() . '/chat/' . $x[0]['channel_address'] . '/' . $room_id); + } + + if (!$stopped) { + $lastseen = intval($_REQUEST['last']); + + $ret = array('success' => false); + + $sql_extra = permissions_sql(App::$data['chat']['uid']); + + $r = q( + "select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra", + intval(App::$data['chat']['uid']), + intval(App::$data['chat']['room_id']) + ); + if (!$r) { + json_return_and_die($ret); + } + + $inroom = []; + + $r = q( + "select * from chatpresence left join xchan on xchan_hash = cp_xchan where cp_room = %d order by xchan_name", + intval(App::$data['chat']['room_id']) + ); + if ($r) { + foreach ($r as $rv) { + if (!$rv['xchan_name']) { + $rv['xchan_hash'] = $rv['cp_xchan']; + $rv['xchan_name'] = substr($rv['cp_xchan'], strrpos($rv['cp_xchan'], '.') + 1); + $rv['xchan_addr'] = ''; + $rv['xchan_network'] = 'unknown'; + $rv['xchan_url'] = z_root(); + $rv['xchan_hidden'] = 1; + $rv['xchan_photo_mimetype'] = 'image/png'; + $rv['xchan_photo_l'] = z_root() . '/' . get_default_profile_photo(300); + $rv['xchan_photo_m'] = z_root() . '/' . get_default_profile_photo(80); + $rv['xchan_photo_s'] = z_root() . '/' . get_default_profile_photo(48); + } + + switch ($rv['cp_status']) { + case 'away': + $status = t('Away'); + $status_class = 'away'; + break; + case 'online': + default: + $status = t('Online'); + $status_class = 'online'; + break; + } + + $inroom[] = array('img' => zid($rv['xchan_photo_m']), 'img_type' => $rv['xchan_photo_mimetype'], 'name' => $rv['xchan_name'], 'status' => $status, 'status_class' => $status_class); + } + } + + $chats = []; + + $r = q( + "select * from chat left join xchan on chat_xchan = xchan_hash where chat_room = %d and chat_id > %d order by created", + intval(App::$data['chat']['room_id']), + intval($lastseen) + ); + if ($r) { + foreach ($r as $rr) { + $chats[] = array( + 'id' => $rr['chat_id'], + 'img' => zid($rr['xchan_photo_m']), + 'img_type' => $rr['xchan_photo_mimetype'], + 'name' => $rr['xchan_name'], + 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'), + 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'), + 'text' => zidify_links(smilies(bbcode(base64url_decode(str_rot47($rr['chat_text']))))), + 'self' => ((get_observer_hash() == $rr['chat_xchan']) ? 'self' : '') + ); + } + } + } + + $r = q( + "update chatpresence set cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s'", + dbesc(datetime_convert()), + intval(App::$data['chat']['room_id']), + dbesc(get_observer_hash()), + dbesc($_SERVER['REMOTE_ADDR']) + ); + + $ret['success'] = true; + if (!$stopped) { + $ret['inroom'] = $inroom; + $ret['chats'] = $chats; + } + json_return_and_die($ret); + } } diff --git a/Zotlabs/Module/Clients.php b/Zotlabs/Module/Clients.php index 7cf8facd4..2be5e034e 100644 --- a/Zotlabs/Module/Clients.php +++ b/Zotlabs/Module/Clients.php @@ -6,18 +6,18 @@ use Zotlabs\Lib\Apps; use Zotlabs\Lib\Libsync; use Zotlabs\Web\Controller; -class Clients extends Controller { +class Clients extends Controller +{ - function get() { + public function get() + { $desc = t('This app allows you to authorize mobile apps using OAuth and OpenID to access your channel.'); - if(! Apps::system_app_installed(local_channel(),'Clients')) { - return '' . $desc . ''; - } - goaway(z_root() . '/settings/oauth2'); - } - - + if (!Apps::system_app_installed(local_channel(), 'Clients')) { + return '' . $desc . ''; + } + goaway(z_root() . '/settings/oauth2'); + } } diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php index 3c8411420..5694f43fb 100644 --- a/Zotlabs/Module/Cloud.php +++ b/Zotlabs/Module/Cloud.php @@ -1,5 +1,7 @@ 1) { - $which = argv(1); - } - $profile = 0; + $which = null; + if (argc() > 1) { + $which = argv(1); + } + $profile = 0; - if ($which) { - Libprofile::load( $which, $profile); - } + if ($which) { + Libprofile::load($which, $profile); + } - $auth = new BasicAuth(); + $auth = new BasicAuth(); - $ob_hash = get_observer_hash(); + $ob_hash = get_observer_hash(); - if ($ob_hash) { - if (local_channel()) { - $channel = App::get_channel(); - $auth->setCurrentUser($channel['channel_address']); - $auth->channel_id = $channel['channel_id']; - $auth->channel_hash = $channel['channel_hash']; - $auth->channel_account_id = $channel['channel_account_id']; - if ($channel['channel_timezone']) { - $auth->setTimezone($channel['channel_timezone']); - } - } - $auth->observer = $ob_hash; - } + if ($ob_hash) { + if (local_channel()) { + $channel = App::get_channel(); + $auth->setCurrentUser($channel['channel_address']); + $auth->channel_id = $channel['channel_id']; + $auth->channel_hash = $channel['channel_hash']; + $auth->channel_account_id = $channel['channel_account_id']; + if ($channel['channel_timezone']) { + $auth->setTimezone($channel['channel_timezone']); + } + } + $auth->observer = $ob_hash; + } - // if we arrived at this path with any query parameters in the url, build a clean url without - // them and redirect. + // if we arrived at this path with any query parameters in the url, build a clean url without + // them and redirect. - if (! array_key_exists('cloud_sort',$_SESSION)) { - $_SESSION['cloud_sort'] = 'name'; - } + if (!array_key_exists('cloud_sort', $_SESSION)) { + $_SESSION['cloud_sort'] = 'name'; + } - $_SESSION['cloud_sort'] = (($_REQUEST['sort']) ? trim(notags($_REQUEST['sort'])) : $_SESSION['cloud_sort']); + $_SESSION['cloud_sort'] = (($_REQUEST['sort']) ? trim(notags($_REQUEST['sort'])) : $_SESSION['cloud_sort']); - $x = clean_query_string(); - if ($x !== App::$query_string) { - goaway(z_root() . '/' . $x); - } + $x = clean_query_string(); + if ($x !== App::$query_string) { + goaway(z_root() . '/' . $x); + } - $rootDirectory = new Directory('/', $auth); + $rootDirectory = new Directory('/', $auth); - // A SabreDAV server-object - $server = new SDAV\Server($rootDirectory); - // prevent overwriting changes each other with a lock backend - $lockBackend = new SDAV\Locks\Backend\File('cache/locks'); - $lockPlugin = new SDAV\Locks\Plugin($lockBackend); + // A SabreDAV server-object + $server = new SDAV\Server($rootDirectory); + // prevent overwriting changes each other with a lock backend + $lockBackend = new SDAV\Locks\Backend\File('cache/locks'); + $lockPlugin = new SDAV\Locks\Plugin($lockBackend); - $server->addPlugin($lockPlugin); + $server->addPlugin($lockPlugin); - $is_readable = false; + $is_readable = false; - // provide a directory view for the cloud in Hubzilla - $browser = new \Zotlabs\Storage\Browser($auth); - $auth->setBrowserPlugin($browser); + // provide a directory view for the cloud in Hubzilla + $browser = new Browser($auth); + $auth->setBrowserPlugin($browser); - $server->addPlugin($browser); + $server->addPlugin($browser); - // Experimental QuotaPlugin - // require_once('\Zotlabs\Storage/QuotaPlugin.php'); - // $server->addPlugin(new \Zotlabs\Storage\\QuotaPlugin($auth)); + // Experimental QuotaPlugin + // require_once('\Zotlabs\Storage/QuotaPlugin.php'); + // $server->addPlugin(new \Zotlabs\Storage\\QuotaPlugin($auth)); - // over-ride the default XML output on thrown exceptions + // over-ride the default XML output on thrown exceptions - $server->on('exception', [ $this, 'DAVException' ]); + $server->on('exception', [$this, 'DAVException']); - // All we need to do now, is to fire up the server + // All we need to do now, is to fire up the server - $server->exec(); + $server->exec(); - if ($browser->build_page) { - construct_page(); - } - - killme(); - } + if ($browser->build_page) { + construct_page(); + } + + killme(); + } - function DAVException($err) { - - if ($err instanceof \Sabre\DAV\Exception\NotFound) { - notice( t('Not found') . EOL); - } - elseif ($err instanceof \Sabre\DAV\Exception\Forbidden) { - notice( t('Permission denied') . EOL); - } - elseif ($err instanceof \Sabre\DAV\Exception\NotImplemented) { - notice( t('Please refresh page') . EOL); - // It would be nice to do the following on remote authentication - // which provides an unexpected page query param, but we do not - // because if the exception has a different cause, it will loop. - // goaway(z_root() . '/' . App::$query_string); - } - else { - notice( t('Unknown error') . EOL); - } + public function DAVException($err) + { - construct_page(); - - killme(); - } + if ($err instanceof NotFound) { + notice(t('Not found') . EOL); + } elseif ($err instanceof Forbidden) { + notice(t('Permission denied') . EOL); + } elseif ($err instanceof NotImplemented) { + notice(t('Please refresh page') . EOL); + // It would be nice to do the following on remote authentication + // which provides an unexpected page query param, but we do not + // because if the exception has a different cause, it will loop. + // goaway(z_root() . '/' . App::$query_string); + } else { + notice(t('Unknown error') . EOL); + } + construct_page(); + + killme(); + } } - - diff --git a/Zotlabs/Module/Cloud_tiles.php b/Zotlabs/Module/Cloud_tiles.php index da551904f..488d9b0f5 100644 --- a/Zotlabs/Module/Cloud_tiles.php +++ b/Zotlabs/Module/Cloud_tiles.php @@ -2,20 +2,24 @@ namespace Zotlabs\Module; -class Cloud_tiles extends \Zotlabs\Web\Controller { +use Zotlabs\Web\Controller; - function init() { +class Cloud_tiles extends Controller +{ - if(intval($_SESSION['cloud_tiles'])) - $_SESSION['cloud_tiles'] = 0; - else - $_SESSION['cloud_tiles'] = 1; + public function init() + { - if(local_channel()) { - set_pconfig(local_channel(),'system','cloud_tiles',$_SESSION['cloud_tiles']); - } + if (intval($_SESSION['cloud_tiles'])) { + $_SESSION['cloud_tiles'] = 0; + } else { + $_SESSION['cloud_tiles'] = 1; + } - goaway(z_root() . '/' . hex2bin(argv(1))); + if (local_channel()) { + set_pconfig(local_channel(), 'system', 'cloud_tiles', $_SESSION['cloud_tiles']); + } - } -} \ No newline at end of file + goaway(z_root() . '/' . hex2bin(argv(1))); + } +} diff --git a/Zotlabs/Module/Comment_control.php b/Zotlabs/Module/Comment_control.php index 884096e09..7508f069c 100644 --- a/Zotlabs/Module/Comment_control.php +++ b/Zotlabs/Module/Comment_control.php @@ -6,23 +6,24 @@ use Zotlabs\Lib\Apps; use Zotlabs\Lib\Libsync; use Zotlabs\Web\Controller; -class Comment_control extends Controller { +class Comment_control extends Controller +{ - function get() { + public function get() + { $desc = t('This app allows you to select the comment audience and set a length of time that comments on a particular post will be accepted.'); $text = '' . $desc . ''; - if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Comment Control'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Comment Control'))) { return $text; } - $desc = t('This app is installed. A button to control comments may be found below the post editor.'); + $desc = t('This app is installed. A button to control comments may be found below the post editor.'); - $text = '' . $desc . ''; + $text = '' . $desc . ''; - return $text; - - } + return $text; + } } diff --git a/Zotlabs/Module/Common.php b/Zotlabs/Module/Common.php index c7ef39879..3e93f7930 100644 --- a/Zotlabs/Module/Common.php +++ b/Zotlabs/Module/Common.php @@ -1,4 +1,5 @@ 1 && intval(argv(1))) - $channel_id = intval(argv(1)); - else { - notice( t('No channel.') . EOL ); - \App::$error = 404; - return; - } - - $x = q("select channel_address from channel where channel_id = %d limit 1", - intval($channel_id) - ); - - if($x) - Libprofile::load($x[0]['channel_address'],0); - - } - - function get() { - - $o = ''; - - if(! \App::$profile['profile_uid']) - return; - - $observer_hash = get_observer_hash(); - - if(! perm_is_allowed(\App::$profile['profile_uid'],$observer_hash,'view_contacts')) { - notice( t('Permission denied.') . EOL); - return; - } - - $t = count_common_friends(\App::$profile['profile_uid'],$observer_hash); - - if(! $t) { - notice( t('No connections in common.') . EOL); - return; - } - - $r = common_friends(\App::$profile['profile_uid'],$observer_hash); - - if($r) { - foreach($r as $rr) { - $items[] = [ - 'url' => $rr['xchan_url'], - 'name' => $rr['xchan_name'], - 'photo' => $rr['xchan_photo_m'], - 'tags' => '' - ]; - } - } + public function init() + { - $tpl = get_markup_template('common_friends.tpl'); + if (argc() > 1 && intval(argv(1))) { + $channel_id = intval(argv(1)); + } else { + notice(t('No channel.') . EOL); + App::$error = 404; + return; + } - $o = replace_macros($tpl, [ - '$title' => t('View Common Connections'), - '$items' => $items - ]); - - return $o; - } - + $x = q( + "select channel_address from channel where channel_id = %d limit 1", + intval($channel_id) + ); + + if ($x) { + Libprofile::load($x[0]['channel_address'], 0); + } + } + + public function get() + { + + $o = ''; + + if (!App::$profile['profile_uid']) { + return; + } + + $observer_hash = get_observer_hash(); + + if (!perm_is_allowed(App::$profile['profile_uid'], $observer_hash, 'view_contacts')) { + notice(t('Permission denied.') . EOL); + return; + } + + $t = count_common_friends(App::$profile['profile_uid'], $observer_hash); + + if (!$t) { + notice(t('No connections in common.') . EOL); + return; + } + + $r = common_friends(App::$profile['profile_uid'], $observer_hash); + + if ($r) { + foreach ($r as $rr) { + $items[] = [ + 'url' => $rr['xchan_url'], + 'name' => $rr['xchan_name'], + 'photo' => $rr['xchan_photo_m'], + 'tags' => '' + ]; + } + } + + $tpl = get_markup_template('common_friends.tpl'); + + $o = replace_macros($tpl, [ + '$title' => t('View Common Connections'), + '$items' => $items + ]); + + return $o; + } } diff --git a/Zotlabs/Module/Connac.php b/Zotlabs/Module/Connac.php index b919b06c3..057084ab3 100644 --- a/Zotlabs/Module/Connac.php +++ b/Zotlabs/Module/Connac.php @@ -1,4 +1,5 @@ 1) { + App::$data['channel'] = channelx_by_nick(argv(1)); + Libprofile::load(argv(1), EMPTY_STR); + } else { + notice(t('Requested profile is not available.') . EOL); + App::$error = 404; + return; + } + } - function init() { - if(argc() > 1) { - App::$data['channel'] = channelx_by_nick(argv(1)); - Libprofile::load(argv(1),EMPTY_STR); - } - else { - notice( t('Requested profile is not available.') . EOL ); - App::$error = 404; - return; - } - } - - function post() { - - if(! array_key_exists('channel', App::$data)) - return; - - $edit = ((local_channel() && (local_channel() == App::$data['channel']['channel_id'])) ? true : false); - - if($edit) { - $has_premium = ((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0); - $premium = (($_POST['premium']) ? intval($_POST['premium']) : 0); - $text = escape_tags($_POST['text']); - - if($has_premium != $premium) { - $r = q("update channel set channel_pageflags = ( channel_pageflags %s %d ) where channel_id = %d", - db_getfunc('^'), - intval(PAGE_PREMIUM), - intval(local_channel()) - ); - - Run::Summon( [ 'Notifier','refresh_all',App::$data['channel']['channel_id'] ] ); - } - set_pconfig(App::$data['channel']['channel_id'],'system','selltext',$text); - // reload the page completely to get fresh data - goaway(z_root() . '/' . App::$query_string); - - } - - $url = EMPTY_STR; - $observer = App::get_observer(); - if(($observer) && ($_POST['submit'] === t('Continue'))) { - if($observer['xchan_follow']) - $url = sprintf($observer['xchan_follow'],urlencode(channel_reddress(App::$data['channel']))); - if(! $url) { - $r = q("select * from hubloc where hubloc_hash = '%s' order by hubloc_id desc limit 1", - dbesc($observer['xchan_hash']) - ); - if($r) - $url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode(channel_reddress(App::$data['channel'])); - } - } - if($url) - goaway($url . '&confirm=1'); - else - notice('Unable to connect to your home hub location.'); - - } - - - - function get() { - - $edit = ((local_channel() && (local_channel() == App::$data['channel']['channel_id'])) ? true : false); - - $text = get_pconfig(App::$data['channel']['channel_id'],'system','selltext'); - - if($edit) { - - $o = replace_macros(get_markup_template('sellpage_edit.tpl'),array( - '$header' => t('Premium Channel Setup'), - '$address' => App::$data['channel']['channel_address'], - '$premium' => array('premium', t('Enable premium channel connection restrictions'),((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? '1' : ''),''), - '$lbl_about' => t('Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc.'), - '$text' => $text, - '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'), - '$lbl2' => t('Potential connections will then see the following text before proceeding:'), - '$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'), - '$submit' => t('Submit'), - - - )); - return $o; - } - else { - if(! $text) - $text = t('(No specific instructions have been provided by the channel owner.)'); - - $submit = replace_macros(get_markup_template('sellpage_submit.tpl'), array( - '$continue' => t('Continue'), - '$address' => App::$data['channel']['channel_address'] - )); - - $o = replace_macros(get_markup_template('sellpage_view.tpl'),array( - '$header' => t('Restricted or Premium Channel'), - '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'), - '$text' => prepare_text($text), - - '$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'), - '$submit' => $submit, - - )); - - $arr = array('channel' => App::$data['channel'],'observer' => App::get_observer(), 'sellpage' => $o, 'submit' => $submit); - call_hooks('connect_premium', $arr); - $o = $arr['sellpage']; - - } - - return $o; - } + public function post() + { + + if (!array_key_exists('channel', App::$data)) { + return; + } + + $edit = ((local_channel() && (local_channel() == App::$data['channel']['channel_id'])) ? true : false); + + if ($edit) { + $has_premium = ((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0); + $premium = (($_POST['premium']) ? intval($_POST['premium']) : 0); + $text = escape_tags($_POST['text']); + + if ($has_premium != $premium) { + $r = q( + "update channel set channel_pageflags = ( channel_pageflags %s %d ) where channel_id = %d", + db_getfunc('^'), + intval(PAGE_PREMIUM), + intval(local_channel()) + ); + + Run::Summon(['Notifier', 'refresh_all', App::$data['channel']['channel_id']]); + } + set_pconfig(App::$data['channel']['channel_id'], 'system', 'selltext', $text); + // reload the page completely to get fresh data + goaway(z_root() . '/' . App::$query_string); + } + + $url = EMPTY_STR; + $observer = App::get_observer(); + if (($observer) && ($_POST['submit'] === t('Continue'))) { + if ($observer['xchan_follow']) { + $url = sprintf($observer['xchan_follow'], urlencode(channel_reddress(App::$data['channel']))); + } + if (!$url) { + $r = q( + "select * from hubloc where hubloc_hash = '%s' order by hubloc_id desc limit 1", + dbesc($observer['xchan_hash']) + ); + if ($r) { + $url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode(channel_reddress(App::$data['channel'])); + } + } + } + if ($url) { + goaway($url . '&confirm=1'); + } else { + notice('Unable to connect to your home hub location.'); + } + } + + + public function get() + { + + $edit = ((local_channel() && (local_channel() == App::$data['channel']['channel_id'])) ? true : false); + + $text = get_pconfig(App::$data['channel']['channel_id'], 'system', 'selltext'); + + if ($edit) { + $o = replace_macros(get_markup_template('sellpage_edit.tpl'), array( + '$header' => t('Premium Channel Setup'), + '$address' => App::$data['channel']['channel_address'], + '$premium' => array('premium', t('Enable premium channel connection restrictions'), ((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? '1' : ''), ''), + '$lbl_about' => t('Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc.'), + '$text' => $text, + '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'), + '$lbl2' => t('Potential connections will then see the following text before proceeding:'), + '$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'), + '$submit' => t('Submit'), + + + )); + return $o; + } else { + if (!$text) { + $text = t('(No specific instructions have been provided by the channel owner.)'); + } + + $submit = replace_macros(get_markup_template('sellpage_submit.tpl'), array( + '$continue' => t('Continue'), + '$address' => App::$data['channel']['channel_address'] + )); + + $o = replace_macros(get_markup_template('sellpage_view.tpl'), array( + '$header' => t('Restricted or Premium Channel'), + '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'), + '$text' => prepare_text($text), + + '$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'), + '$submit' => $submit, + + )); + + $arr = array('channel' => App::$data['channel'], 'observer' => App::get_observer(), 'sellpage' => $o, 'submit' => $submit); + call_hooks('connect_premium', $arr); + $o = $arr['sellpage']; + } + + return $o; + } } diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php index 4671fbbf7..1230daffe 100644 --- a/Zotlabs/Module/Connections.php +++ b/Zotlabs/Module/Connections.php @@ -1,4 +1,5 @@ array( - 'label' => t('Active Connections'), - 'url' => z_root() . '/connections/active', - 'sel' => ($active) ? 'active' : '', - 'title' => t('Show active connections'), - ), + if (!local_channel()) { + return; + } - 'pending' => array( - 'label' => t('New Connections'), - 'url' => z_root() . '/connections/pending', - 'sel' => ($pending) ? 'active' : '', - 'title' => t('Show pending (new) connections'), - ), - - 'blocked' => array( - 'label' => t('Blocked'), - 'url' => z_root() . '/connections/blocked', - 'sel' => ($blocked) ? 'active' : '', - 'title' => t('Only show blocked connections'), - ), - - 'ignored' => array( - 'label' => t('Ignored'), - 'url' => z_root() . '/connections/ignored', - 'sel' => ($ignored) ? 'active' : '', - 'title' => t('Only show ignored connections'), - ), - - 'archived' => array( - 'label' => t('Archived/Unreachable'), - 'url' => z_root() . '/connections/archived', - 'sel' => ($archived) ? 'active' : '', - 'title' => t('Only show archived/unreachable connections'), - ), - - 'hidden' => array( - 'label' => t('Hidden'), - 'url' => z_root() . '/connections/hidden', - 'sel' => ($hidden) ? 'active' : '', - 'title' => t('Only show hidden connections'), - ), - - 'all' => array( - 'label' => t('All Connections'), - 'url' => z_root() . '/connections/all', - 'sel' => ($all) ? 'active' : '', - 'title' => t('Show all connections'), - ), - - ); - - $searching = false; - if($search) { - $search_hdr = $search; - $search_txt = dbesc(protect_sprintf($search)); - $searching = true; - } - $sql_extra .= (($searching) ? " AND ( xchan_name like '%%$search_txt%%' OR abook_alias like '%%$search_txt%%' ) " : ""); - - if (isset($_REQUEST['gid']) && intval($_REQUEST['gid'])) { - $sql_extra .= " and xchan_hash in ( select xchan from pgrp_member where gid = " . intval($_REQUEST['gid']) . " and uid = " . intval(local_channel()) . " ) "; - } - - $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash + $channel = App::get_channel(); + if ($channel) { + head_set_icon($channel['xchan_photo_s']); + } + } + + public function get() + { + + $sort_type = 0; + $o = ''; + + + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return login(); + } + + nav_set_selected('Connections'); + + $active = false; + $blocked = false; + $hidden = false; + $ignored = false; + $archived = false; + $unblocked = false; + $pending = false; + $unconnected = false; + $all = false; + + if (!(isset($_REQUEST['aj']) && $_REQUEST['aj'])) { + $_SESSION['return_url'] = App::$query_string; + } + + $search_flags = ""; + $head = ''; + + if (argc() == 2) { + switch (argv(1)) { + case 'active': + $search_flags = " and abook_blocked = 0 and abook_ignored = 0 and abook_hidden = 0 and abook_archived = 0 AND abook_not_here = 0 "; + $head = t('Active'); + $active = true; + break; + case 'blocked': + $search_flags = " and abook_blocked = 1 "; + $head = t('Blocked'); + $blocked = true; + break; + case 'ignored': + $search_flags = " and abook_ignored = 1 "; + $head = t('Ignored'); + $ignored = true; + break; + case 'hidden': + $search_flags = " and abook_hidden = 1 "; + $head = t('Hidden'); + $hidden = true; + break; + case 'archived': + $search_flags = " and ( abook_archived = 1 OR abook_not_here = 1) "; + $head = t('Archived/Unreachable'); + $archived = true; + break; + case 'all': + $search_flags = ''; + $head = t('All'); + $all = true; + break; + case 'pending': + $search_flags = " and abook_pending = 1 "; + $head = t('New'); + $pending = true; + break; + case 'ifpending': + case intval(argv(1)): + $r = q( + "SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ", + intval(local_channel()) + ); + if ($r && $r[0]['total']) { + $search_flags = " and abook_pending = 1 "; + if (intval(argv(1))) { + $search_flags .= " and abook_id = " . intval(argv(1)) . " "; + } + $head = t('New'); + $pending = true; + App::$argv[1] = 'pending'; + } else { + $head = t('All'); + $search_flags = ''; + $all = true; + App::$argc = 1; + unset(App::$argv[1]); + } + break; + + default: + $search_flags = " and abook_blocked = 0 and abook_ignored = 0 and abook_hidden = 0 and abook_archived = 0 and abook_not_here = 0 "; + $active = true; + $head = t('Active'); + break; + } + + $sql_extra = $search_flags; + if (argv(1) === 'pending') { + $sql_extra .= " and abook_ignored = 0 "; + } + } else { + $sql_extra = " and abook_blocked = 0 and abook_ignored = 0 and abook_hidden = 0 and abook_archived = 0 and abook_not_here = 0 "; + $active = true; + $head = t('Active'); + } + + $search = ((x($_REQUEST, 'search')) ? notags(trim($_REQUEST['search'])) : ''); + + $tabs = array( + + 'active' => array( + 'label' => t('Active Connections'), + 'url' => z_root() . '/connections/active', + 'sel' => ($active) ? 'active' : '', + 'title' => t('Show active connections'), + ), + + 'pending' => array( + 'label' => t('New Connections'), + 'url' => z_root() . '/connections/pending', + 'sel' => ($pending) ? 'active' : '', + 'title' => t('Show pending (new) connections'), + ), + + 'blocked' => array( + 'label' => t('Blocked'), + 'url' => z_root() . '/connections/blocked', + 'sel' => ($blocked) ? 'active' : '', + 'title' => t('Only show blocked connections'), + ), + + 'ignored' => array( + 'label' => t('Ignored'), + 'url' => z_root() . '/connections/ignored', + 'sel' => ($ignored) ? 'active' : '', + 'title' => t('Only show ignored connections'), + ), + + 'archived' => array( + 'label' => t('Archived/Unreachable'), + 'url' => z_root() . '/connections/archived', + 'sel' => ($archived) ? 'active' : '', + 'title' => t('Only show archived/unreachable connections'), + ), + + 'hidden' => array( + 'label' => t('Hidden'), + 'url' => z_root() . '/connections/hidden', + 'sel' => ($hidden) ? 'active' : '', + 'title' => t('Only show hidden connections'), + ), + + 'all' => array( + 'label' => t('All Connections'), + 'url' => z_root() . '/connections/all', + 'sel' => ($all) ? 'active' : '', + 'title' => t('Show all connections'), + ), + + ); + + $searching = false; + if ($search) { + $search_hdr = $search; + $search_txt = dbesc(protect_sprintf($search)); + $searching = true; + } + $sql_extra .= (($searching) ? " AND ( xchan_name like '%%$search_txt%%' OR abook_alias like '%%$search_txt%%' ) " : ""); + + if (isset($_REQUEST['gid']) && intval($_REQUEST['gid'])) { + $sql_extra .= " and xchan_hash in ( select xchan from pgrp_member where gid = " . intval($_REQUEST['gid']) . " and uid = " . intval(local_channel()) . " ) "; + } + + $r = q( + "SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra ", - intval(local_channel()) - ); - if($r) { - App::set_pager_total($r[0]['total']); - $total = $r[0]['total']; - } + intval(local_channel()) + ); + if ($r) { + App::set_pager_total($r[0]['total']); + $total = $r[0]['total']; + } - $order_q = 'xchan_name'; - if (isset($_REQUEST['order'])) { - switch ($_REQUEST['order']) { - case 'date': - $order_q = 'abook_created desc'; - break; - case 'created': - $order_q = 'abook_created'; - break; - case 'cmax': - $order_q = 'abook_closeness'; - break; - case 'name': - default: - $order_q = 'xchan_name'; - break; - } - } + $order_q = 'xchan_name'; + if (isset($_REQUEST['order'])) { + switch ($_REQUEST['order']) { + case 'date': + $order_q = 'abook_created desc'; + break; + case 'created': + $order_q = 'abook_created'; + break; + case 'cmax': + $order_q = 'abook_closeness'; + break; + case 'name': + default: + $order_q = 'xchan_name'; + break; + } + } - $order = array( - - 'name' => array( - 'label' => t('Name'), - 'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=name', - 'sel' => ((isset($_REQUEST['order']) && $_REQUEST['order'] !== 'name') ? 'active' : ''), - 'title' => t('Order by name'), - ), + $order = array( - 'date' => array( - 'label' => t('Recent'), - 'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=date', - 'sel' => ((isset($_REQUEST['order']) && $_REQUEST['order'] === 'date') ? 'active' : ''), - 'title' => t('Order by recent'), - ), + 'name' => array( + 'label' => t('Name'), + 'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=name', + 'sel' => ((isset($_REQUEST['order']) && $_REQUEST['order'] !== 'name') ? 'active' : ''), + 'title' => t('Order by name'), + ), - 'created' => array( - 'label' => t('Created'), - 'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=created', - 'sel' => ((isset($_REQUEST['order']) && $_REQUEST['order'] === 'created') ? 'active' : ''), - 'title' => t('Order by date'), - ), + 'date' => array( + 'label' => t('Recent'), + 'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=date', + 'sel' => ((isset($_REQUEST['order']) && $_REQUEST['order'] === 'date') ? 'active' : ''), + 'title' => t('Order by recent'), + ), + + 'created' => array( + 'label' => t('Created'), + 'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=created', + 'sel' => ((isset($_REQUEST['order']) && $_REQUEST['order'] === 'created') ? 'active' : ''), + 'title' => t('Order by date'), + ), // reserved for cmax -// 'date' => array( -// 'label' => t(''), -// 'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=date', -// 'sel' => ($_REQUEST['order'] === 'date') ? 'active' : '', -// 'title' => t('Order by recent'), -// ), +// 'date' => array( +// 'label' => t(''), +// 'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=date', +// 'sel' => ($_REQUEST['order'] === 'date') ? 'active' : '', +// 'title' => t('Order by recent'), +// ), - ); + ); - - - $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash + $r = q( + "SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra ORDER BY $order_q LIMIT %d OFFSET %d ", - intval(local_channel()), - intval(App::$pager['itemspage']), - intval(App::$pager['start']) - ); - - $contacts = []; - - if($r) { + intval(local_channel()), + intval(App::$pager['itemspage']), + intval(App::$pager['start']) + ); - vcard_query($r); + $contacts = []; + + if ($r) { + vcard_query($r); - foreach($r as $rr) { - if ((! $blocked) && LibBlock::fetch_by_entity(local_channel(),$rr['xchan_hash'])) { - continue; - } - if($rr['xchan_url']) { + foreach ($r as $rr) { + if ((!$blocked) && LibBlock::fetch_by_entity(local_channel(), $rr['xchan_hash'])) { + continue; + } + if ($rr['xchan_url']) { + if ((isset($rr['vcard']) && $rr['vcard']) && is_array($rr['vcard']['tels']) && $rr['vcard']['tels'][0]['nr']) { + $phone = $rr['vcard']['tels'][0]['nr']; + } else { + $phone = ''; + } - if((isset($rr['vcard']) && $rr['vcard']) && is_array($rr['vcard']['tels']) && $rr['vcard']['tels'][0]['nr']) - $phone = $rr['vcard']['tels'][0]['nr']; - else - $phone = ''; - - $status_str = ''; - $status = array( - ((isset($rr['abook_active']) && intval($rr['abook_active'])) ? t('Active') : ''), - ((intval($rr['abook_pending'])) ? t('Pending approval') : ''), - ((intval($rr['abook_archived'])) ? t('Archived') : ''), - ((intval($rr['abook_hidden'])) ? t('Hidden') : ''), - ((intval($rr['abook_ignored'])) ? t('Ignored') : ''), - ((intval($rr['abook_blocked'])) ? t('Blocked') : ''), - ((intval($rr['abook_not_here'])) ? t('Not connected at this location') : '') - ); + $status_str = ''; + $status = array( + ((isset($rr['abook_active']) && intval($rr['abook_active'])) ? t('Active') : ''), + ((intval($rr['abook_pending'])) ? t('Pending approval') : ''), + ((intval($rr['abook_archived'])) ? t('Archived') : ''), + ((intval($rr['abook_hidden'])) ? t('Hidden') : ''), + ((intval($rr['abook_ignored'])) ? t('Ignored') : ''), + ((intval($rr['abook_blocked'])) ? t('Blocked') : ''), + ((intval($rr['abook_not_here'])) ? t('Not connected at this location') : '') + ); - $oneway = false; - if(! their_perms_contains(local_channel(),$rr['xchan_hash'],'post_comments')) { - $oneway = true; - } - - foreach($status as $str) { - if(!$str) - continue; - $status_str .= $str; - $status_str .= ', '; - } - $status_str = rtrim($status_str, ', '); - - $contacts[] = array( - 'img_hover' => sprintf( t('%1$s [%2$s]'),$rr['xchan_name'],$rr['xchan_url']), - 'edit_hover' => t('Edit connection'), - 'edit' => t('Edit'), - 'delete_hover' => t('Delete connection'), - 'id' => $rr['abook_id'], - 'thumb' => $rr['xchan_photo_m'], - 'name' => $rr['xchan_name'] . (($rr['abook_alias']) ? ' <' . $rr['abook_alias'] . '>' : ''), - 'classes' => ((intval($rr['abook_archived']) || intval($rr['abook_not_here'])) ? 'archived' : ''), - 'link' => z_root() . '/connedit/' . $rr['abook_id'], - 'deletelink' => z_root() . '/connedit/' . intval($rr['abook_id']) . '/drop', - 'delete' => t('Delete'), - 'url' => chanlink_hash($rr['xchan_hash']), - 'webbie_label' => t('Channel address'), - 'webbie' => $rr['xchan_addr'], - 'network_label' => t('Network'), - 'network' => network_to_name($rr['xchan_network']), - 'channel_type' => intval($rr['xchan_type']), - 'call' => t('Call'), - 'phone' => $phone, - 'status_label' => t('Status'), - 'status' => $status_str, - 'connected_label' => t('Connected'), - 'connected' => datetime_convert('UTC',date_default_timezone_get(),$rr['abook_created'], 'c'), - 'approve_hover' => t('Approve connection'), - 'approve' => (($rr['abook_pending']) ? t('Approve') : false), - 'ignore_hover' => t('Ignore connection'), - 'ignore' => ((! $rr['abook_ignored']) ? t('Ignore') : false), - 'recent_label' => t('Recent activity'), - 'recentlink' => z_root() . '/stream/?f=&cid=' . intval($rr['abook_id']), - 'oneway' => $oneway, - 'allow_delete' => ($rr['abook_pending'] || get_pconfig(local_channel(),'system','connections_quick_delete')), - ); - } - } - } - - - if($_REQUEST['aj']) { - if($contacts) { - $o = replace_macros(get_markup_template('contactsajax.tpl'),array( - '$contacts' => $contacts, - '$edit' => t('Edit'), - )); - } - else { - $o = ''; - } - echo $o; - killme(); - } - else { - $o .= ""; - $o .= replace_macros(get_markup_template('connections.tpl'),array( - '$header' => t('Connections') . (($head) ? ': ' . $head : ''), - '$tabs' => $tabs, - '$order' => $order, - '$sort' => t('Filter by'), - '$sortorder' => t('Sort by'), - '$total' => $total, - '$search' => ((isset($search_hdr)) ? $search_hdr : EMPTY_STR), - '$label' => t('Search'), - '$desc' => t('Search your connections'), - '$finding' => (($searching) ? t('Connections search') . ": '" . $search . "'" : ""), - '$submit' => t('Find'), - '$edit' => t('Edit'), - '$cmd' => App::$cmd, - '$contacts' => $contacts, - '$paginate' => paginate($a), - - )); - } - - if(! $contacts) - $o .= ''; - - return $o; - } - + $oneway = false; + if (!their_perms_contains(local_channel(), $rr['xchan_hash'], 'post_comments')) { + $oneway = true; + } + + foreach ($status as $str) { + if (!$str) { + continue; + } + $status_str .= $str; + $status_str .= ', '; + } + $status_str = rtrim($status_str, ', '); + + $contacts[] = array( + 'img_hover' => sprintf(t('%1$s [%2$s]'), $rr['xchan_name'], $rr['xchan_url']), + 'edit_hover' => t('Edit connection'), + 'edit' => t('Edit'), + 'delete_hover' => t('Delete connection'), + 'id' => $rr['abook_id'], + 'thumb' => $rr['xchan_photo_m'], + 'name' => $rr['xchan_name'] . (($rr['abook_alias']) ? ' <' . $rr['abook_alias'] . '>' : ''), + 'classes' => ((intval($rr['abook_archived']) || intval($rr['abook_not_here'])) ? 'archived' : ''), + 'link' => z_root() . '/connedit/' . $rr['abook_id'], + 'deletelink' => z_root() . '/connedit/' . intval($rr['abook_id']) . '/drop', + 'delete' => t('Delete'), + 'url' => chanlink_hash($rr['xchan_hash']), + 'webbie_label' => t('Channel address'), + 'webbie' => $rr['xchan_addr'], + 'network_label' => t('Network'), + 'network' => network_to_name($rr['xchan_network']), + 'channel_type' => intval($rr['xchan_type']), + 'call' => t('Call'), + 'phone' => $phone, + 'status_label' => t('Status'), + 'status' => $status_str, + 'connected_label' => t('Connected'), + 'connected' => datetime_convert('UTC', date_default_timezone_get(), $rr['abook_created'], 'c'), + 'approve_hover' => t('Approve connection'), + 'approve' => (($rr['abook_pending']) ? t('Approve') : false), + 'ignore_hover' => t('Ignore connection'), + 'ignore' => ((!$rr['abook_ignored']) ? t('Ignore') : false), + 'recent_label' => t('Recent activity'), + 'recentlink' => z_root() . '/stream/?f=&cid=' . intval($rr['abook_id']), + 'oneway' => $oneway, + 'allow_delete' => ($rr['abook_pending'] || get_pconfig(local_channel(), 'system', 'connections_quick_delete')), + ); + } + } + } + + + if ($_REQUEST['aj']) { + if ($contacts) { + $o = replace_macros(get_markup_template('contactsajax.tpl'), array( + '$contacts' => $contacts, + '$edit' => t('Edit'), + )); + } else { + $o = ''; + } + echo $o; + killme(); + } else { + $o .= ""; + $o .= replace_macros(get_markup_template('connections.tpl'), array( + '$header' => t('Connections') . (($head) ? ': ' . $head : ''), + '$tabs' => $tabs, + '$order' => $order, + '$sort' => t('Filter by'), + '$sortorder' => t('Sort by'), + '$total' => $total, + '$search' => ((isset($search_hdr)) ? $search_hdr : EMPTY_STR), + '$label' => t('Search'), + '$desc' => t('Search your connections'), + '$finding' => (($searching) ? t('Connections search') . ": '" . $search . "'" : ""), + '$submit' => t('Find'), + '$edit' => t('Edit'), + '$cmd' => App::$cmd, + '$contacts' => $contacts, + '$paginate' => paginate($a), + + )); + } + + if (!$contacts) { + $o .= ''; + } + + return $o; + } } diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 804f32fd5..ac6ef0742 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -1,4 +1,5 @@ = 2) && intval(argv(1))) { - $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash + public function init() + { + + if (!local_channel()) { + return; + } + + if ((argc() >= 2) && intval(argv(1))) { + $r = q( + "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", - intval(local_channel()), - intval(argv(1)) - ); - // Set the person-of-interest for use by widgets that operate on a single pre-defined channel - if ($r) { - App::$poi = array_shift($r); - } - } - - $channel = App::get_channel(); - if ($channel) { - head_set_icon($channel['xchan_photo_s']); - } - } + intval(local_channel()), + intval(argv(1)) + ); + // Set the person-of-interest for use by widgets that operate on a single pre-defined channel + if ($r) { + App::$poi = array_shift($r); + } + } - - /** - * @brief Evaluate posted values and set changes - */ - - function post() { - - if (! local_channel()) { - return; - } - - $contact_id = intval(argv(1)); - if (! $contact_id) { - return; - } - - $channel = App::get_channel(); - - $orig_record = q("SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1", - intval($contact_id), - intval(local_channel()) - ); - - if (! $orig_record) { - notice( t('Could not access contact record.') . EOL); - goaway(z_root() . '/connections'); - } + $channel = App::get_channel(); + if ($channel) { + head_set_icon($channel['xchan_photo_s']); + } + } - $orig_record = array_shift($orig_record); - call_hooks('contact_edit_post', $_POST); - - $vc = get_abconfig(local_channel(),$orig_record['abook_xchan'],'system','vcard'); - $vcard = (($vc) ? Reader::read($vc) : null); - $serialised_vcard = update_vcard($_REQUEST,$vcard); - if ($serialised_vcard) { - set_abconfig(local_channel(),$orig_record['abook_xchan'],'system','vcard',$serialised_vcard); - } + /** + * @brief Evaluate posted values and set changes + */ - $autoperms = null; - $is_self = false; + public function post() + { - if (intval($orig_record['abook_self'])) { - $autoperms = intval($_POST['autoperms']); - $is_self = true; - } - - $profile_id = ((array_key_exists('profile_assign',$_POST)) ? $_POST['profile_assign'] : $orig_record['abook_profile']); + if (!local_channel()) { + return; + } - if ($profile_id) { - $r = q("SELECT profile_guid FROM profile WHERE profile_guid = '%s' AND uid = %d LIMIT 1", - dbesc($profile_id), - intval(local_channel()) - ); - if (! $r) { - notice( t('Could not locate selected profile.') . EOL); - return; - } - } - - $abook_incl = ((array_key_exists('abook_incl',$_POST)) ? escape_tags($_POST['abook_incl']) : $orig_record['abook_incl']); - $abook_excl = ((array_key_exists('abook_excl',$_POST)) ? escape_tags($_POST['abook_excl']) : $orig_record['abook_excl']); - $abook_alias = ((array_key_exists('abook_alias',$_POST)) ? escape_tags(trim($_POST['abook_alias'])) : $orig_record['abook_alias']); + $contact_id = intval(argv(1)); + if (!$contact_id) { + return; + } - $block_announce = ((array_key_exists('block_announce',$_POST)) ? intval($_POST['block_announce']) : 0); - - set_abconfig($channel['channel_id'],$orig_record['abook_xchan'],'system','block_announce',$block_announce); + $channel = App::get_channel(); - $hidden = intval($_POST['hidden']); - - $priority = intval($_POST['poll']); - if ($priority > 5 || $priority < 0) { - $priority = 0; - } - - if (! array_key_exists('closeness',$_POST)) { - $_POST['closeness'] = 80; - } - $closeness = intval($_POST['closeness']); - if ($closeness < 0 || $closeness > 99) { - $closeness = 80; - } - - $all_perms = Permissions::Perms(); + $orig_record = q( + "SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1", + intval($contact_id), + intval(local_channel()) + ); - $p = EMPTY_STR; + if (!$orig_record) { + notice(t('Could not access contact record.') . EOL); + goaway(z_root() . '/connections'); + } - if ($all_perms) { - foreach ($all_perms as $perm => $desc) { - if (array_key_exists('perms_' . $perm, $_POST)) { - if ($p) { - $p .= ','; - } - $p .= $perm; - } - } - set_abconfig($channel['channel_id'],$orig_record['abook_xchan'],'system','my_perms',$p); - if ($autoperms) { - set_pconfig($channel['channel_id'],'system','autoperms',$p); - } - } + $orig_record = array_shift($orig_record); - $new_friend = false; - - if (($_REQUEST['pending']) && intval($orig_record['abook_pending'])) { + call_hooks('contact_edit_post', $_POST); - $new_friend = true; - - // @fixme it won't be common, but when you accept a new connection request - // the permissions will now be that of your permissions role and ignore - // any you may have set manually on the form. We'll probably see a bug if somebody - // tries to set the permissions *and* approve the connection in the same - // request. The workaround is to approve the connection, then go back and - // adjust permissions as desired. - - $p = Permissions::connect_perms(local_channel()); - $my_perms = Permissions::serialise($p['perms']); - if ($my_perms) { - set_abconfig($channel['channel_id'],$orig_record['abook_xchan'],'system','my_perms',$my_perms); - } - } + $vc = get_abconfig(local_channel(), $orig_record['abook_xchan'], 'system', 'vcard'); + $vcard = (($vc) ? Reader::read($vc) : null); + $serialised_vcard = update_vcard($_REQUEST, $vcard); + if ($serialised_vcard) { + set_abconfig(local_channel(), $orig_record['abook_xchan'], 'system', 'vcard', $serialised_vcard); + } - $abook_pending = (($new_friend) ? 0 : $orig_record['abook_pending']); + $autoperms = null; + $is_self = false; - $r = q("UPDATE abook SET abook_profile = '%s', abook_closeness = %d, abook_pending = %d, + if (intval($orig_record['abook_self'])) { + $autoperms = intval($_POST['autoperms']); + $is_self = true; + } + + $profile_id = ((array_key_exists('profile_assign', $_POST)) ? $_POST['profile_assign'] : $orig_record['abook_profile']); + + if ($profile_id) { + $r = q( + "SELECT profile_guid FROM profile WHERE profile_guid = '%s' AND uid = %d LIMIT 1", + dbesc($profile_id), + intval(local_channel()) + ); + if (!$r) { + notice(t('Could not locate selected profile.') . EOL); + return; + } + } + + $abook_incl = ((array_key_exists('abook_incl', $_POST)) ? escape_tags($_POST['abook_incl']) : $orig_record['abook_incl']); + $abook_excl = ((array_key_exists('abook_excl', $_POST)) ? escape_tags($_POST['abook_excl']) : $orig_record['abook_excl']); + $abook_alias = ((array_key_exists('abook_alias', $_POST)) ? escape_tags(trim($_POST['abook_alias'])) : $orig_record['abook_alias']); + + $block_announce = ((array_key_exists('block_announce', $_POST)) ? intval($_POST['block_announce']) : 0); + + set_abconfig($channel['channel_id'], $orig_record['abook_xchan'], 'system', 'block_announce', $block_announce); + + $hidden = intval($_POST['hidden']); + + $priority = intval($_POST['poll']); + if ($priority > 5 || $priority < 0) { + $priority = 0; + } + + if (!array_key_exists('closeness', $_POST)) { + $_POST['closeness'] = 80; + } + $closeness = intval($_POST['closeness']); + if ($closeness < 0 || $closeness > 99) { + $closeness = 80; + } + + $all_perms = Permissions::Perms(); + + $p = EMPTY_STR; + + if ($all_perms) { + foreach ($all_perms as $perm => $desc) { + if (array_key_exists('perms_' . $perm, $_POST)) { + if ($p) { + $p .= ','; + } + $p .= $perm; + } + } + set_abconfig($channel['channel_id'], $orig_record['abook_xchan'], 'system', 'my_perms', $p); + if ($autoperms) { + set_pconfig($channel['channel_id'], 'system', 'autoperms', $p); + } + } + + $new_friend = false; + + if (($_REQUEST['pending']) && intval($orig_record['abook_pending'])) { + $new_friend = true; + + // @fixme it won't be common, but when you accept a new connection request + // the permissions will now be that of your permissions role and ignore + // any you may have set manually on the form. We'll probably see a bug if somebody + // tries to set the permissions *and* approve the connection in the same + // request. The workaround is to approve the connection, then go back and + // adjust permissions as desired. + + $p = Permissions::connect_perms(local_channel()); + $my_perms = Permissions::serialise($p['perms']); + if ($my_perms) { + set_abconfig($channel['channel_id'], $orig_record['abook_xchan'], 'system', 'my_perms', $my_perms); + } + } + + $abook_pending = (($new_friend) ? 0 : $orig_record['abook_pending']); + + $r = q( + "UPDATE abook SET abook_profile = '%s', abook_closeness = %d, abook_pending = %d, abook_incl = '%s', abook_excl = '%s', abook_alias = '%s' where abook_id = %d AND abook_channel = %d", - dbesc($profile_id), - intval($closeness), - intval($abook_pending), - dbesc($abook_incl), - dbesc($abook_excl), - dbesc($abook_alias), - intval($contact_id), - intval(local_channel()) - ); - - if ($r) { - info( t('Connection updated.') . EOL); - } - else { - notice( t('Failed to update connection record.') . EOL); - } - - if (! intval(App::$poi['abook_self'])) { - if ($new_friend) { - Run::Summon( [ 'Notifier', 'permissions_accept', $contact_id ] ); - } + dbesc($profile_id), + intval($closeness), + intval($abook_pending), + dbesc($abook_incl), + dbesc($abook_excl), + dbesc($abook_alias), + intval($contact_id), + intval(local_channel()) + ); - Run::Summon( [ - 'Notifier', - (($new_friend) ? 'permissions_create' : 'permissions_update'), - $contact_id - ]); - } - - if ($new_friend) { - $default_group = $channel['channel_default_group']; - if ($default_group) { - $g = AccessList::rec_byhash(local_channel(),$default_group); - if ($g) { - AccessList::member_add(local_channel(),'',App::$poi['abook_xchan'],$g['id']); - } - } - - // Check if settings permit ("post new friend activity" is allowed, and - // friends in general or this friend in particular aren't hidden) - // and send out a new friend activity - - $pr = q("select * from profile where uid = %d and is_default = 1 and hide_friends = 0", - intval($channel['channel_id']) - ); - if (($pr) && (! intval($orig_record['abook_hidden'])) && (intval(get_pconfig($channel['channel_id'],'system','post_newfriend')))) { - $xarr = []; + if ($r) { + info(t('Connection updated.') . EOL); + } else { + notice(t('Failed to update connection record.') . EOL); + } - $xarr['item_wall'] = 1; - $xarr['item_origin'] = 1; - $xarr['item_thread_top'] = 1; - $xarr['owner_xchan'] = $xarr['author_xchan'] = $channel['channel_hash']; - $xarr['allow_cid'] = $channel['channel_allow_cid']; - $xarr['allow_gid'] = $channel['channel_allow_gid']; - $xarr['deny_cid'] = $channel['channel_deny_cid']; - $xarr['deny_gid'] = $channel['channel_deny_gid']; - $xarr['item_private'] = (($xarr['allow_cid']||$xarr['allow_gid']||$xarr['deny_cid']||$xarr['deny_gid']) ? 1 : 0); - - $xarr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . t('is now connected to') . ' ' . '[zrl=' . App::$poi['xchan_url'] . ']' . App::$poi['xchan_name'] . '[/zrl]'; - - $xarr['body'] .= "\n\n\n" . '[zrl=' . App::$poi['xchan_url'] . '][zmg=80x80]' . App::$poi['xchan_photo_m'] . '[/zmg][/zrl]'; - - post_activity_item($xarr); - - } - - // pull in a bit of content if there is any to pull in - Run::Summon( [ 'Onepoll', $contact_id ]); - } - - // Refresh the structure in memory with the new data - - $r = q("SELECT abook.*, xchan.* + if (!intval(App::$poi['abook_self'])) { + if ($new_friend) { + Run::Summon(['Notifier', 'permissions_accept', $contact_id]); + } + + Run::Summon([ + 'Notifier', + (($new_friend) ? 'permissions_create' : 'permissions_update'), + $contact_id + ]); + } + + if ($new_friend) { + $default_group = $channel['channel_default_group']; + if ($default_group) { + $g = AccessList::rec_byhash(local_channel(), $default_group); + if ($g) { + AccessList::member_add(local_channel(), '', App::$poi['abook_xchan'], $g['id']); + } + } + + // Check if settings permit ("post new friend activity" is allowed, and + // friends in general or this friend in particular aren't hidden) + // and send out a new friend activity + + $pr = q( + "select * from profile where uid = %d and is_default = 1 and hide_friends = 0", + intval($channel['channel_id']) + ); + if (($pr) && (!intval($orig_record['abook_hidden'])) && (intval(get_pconfig($channel['channel_id'], 'system', 'post_newfriend')))) { + $xarr = []; + + $xarr['item_wall'] = 1; + $xarr['item_origin'] = 1; + $xarr['item_thread_top'] = 1; + $xarr['owner_xchan'] = $xarr['author_xchan'] = $channel['channel_hash']; + $xarr['allow_cid'] = $channel['channel_allow_cid']; + $xarr['allow_gid'] = $channel['channel_allow_gid']; + $xarr['deny_cid'] = $channel['channel_deny_cid']; + $xarr['deny_gid'] = $channel['channel_deny_gid']; + $xarr['item_private'] = (($xarr['allow_cid'] || $xarr['allow_gid'] || $xarr['deny_cid'] || $xarr['deny_gid']) ? 1 : 0); + + $xarr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . t('is now connected to') . ' ' . '[zrl=' . App::$poi['xchan_url'] . ']' . App::$poi['xchan_name'] . '[/zrl]'; + + $xarr['body'] .= "\n\n\n" . '[zrl=' . App::$poi['xchan_url'] . '][zmg=80x80]' . App::$poi['xchan_photo_m'] . '[/zmg][/zrl]'; + + post_activity_item($xarr); + } + + // pull in a bit of content if there is any to pull in + Run::Summon(['Onepoll', $contact_id]); + } + + // Refresh the structure in memory with the new data + + $r = q( + "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", - intval(local_channel()), - intval($contact_id) - ); - if ($r) { - App::$poi = array_shift($r); - } - - if ($new_friend) { - $arr = [ 'channel_id' => local_channel(), 'abook' => App::$poi ]; - call_hooks('accept_follow', $arr); - } - - $this->connedit_clone($a); - - if (($_REQUEST['pending']) && (!$_REQUEST['done'])) { - goaway(z_root() . '/connections/ifpending'); - } - - return; - - } - - /* @brief Clone connection - * - * - */ - - function connedit_clone(&$a) { - - if (! App::$poi) { - return; - } - - $channel = App::get_channel(); - - $r = q("SELECT abook.*, xchan.* + intval(local_channel()), + intval($contact_id) + ); + if ($r) { + App::$poi = array_shift($r); + } + + if ($new_friend) { + $arr = ['channel_id' => local_channel(), 'abook' => App::$poi]; + call_hooks('accept_follow', $arr); + } + + $this->connedit_clone($a); + + if (($_REQUEST['pending']) && (!$_REQUEST['done'])) { + goaway(z_root() . '/connections/ifpending'); + } + + return; + } + + /* @brief Clone connection + * + * + */ + + public function connedit_clone(&$a) + { + + if (!App::$poi) { + return; + } + + $channel = App::get_channel(); + + $r = q( + "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", - intval(local_channel()), - intval(App::$poi['abook_id']) - ); - if (! $r) { - return; - } + intval(local_channel()), + intval(App::$poi['abook_id']) + ); + if (!$r) { + return; + } - App::$poi = array_shift($r); - $clone = App::$poi; - - unset($clone['abook_id']); - unset($clone['abook_account']); - unset($clone['abook_channel']); - - $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); - if ($abconfig) { - $clone['abconfig'] = $abconfig; - } - Libsync::build_sync_packet($channel['channel_id'], [ 'abook' => [ $clone ] ] ); - } - - /** - * @brief Generate content of connection edit page - */ - - function get() { - - $sort_type = 0; - $o = EMPTY_STR; - - if (! local_channel()) { - notice( t('Permission denied.') . EOL); - return login(); - } - - $section = ((array_key_exists('section',$_REQUEST)) ? $_REQUEST['section'] : ''); - $channel = App::get_channel(); - - $yes_no = [ t('No'), t('Yes') ]; - - $connect_perms = Permissions::connect_perms(local_channel()); + App::$poi = array_shift($r); + $clone = App::$poi; - $o .= "\n"; - - if (argc() == 3) { - - $contact_id = intval(argv(1)); - if (! $contact_id) { - return; - } - - $cmd = argv(2); - - $orig_record = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash + foreach ($connect_perms['perms'] as $p => $v) { + if ($v) { + $o .= "\$('#me_id_perms_" . $p . "').prop('checked', true); \n"; + } + } + $o .= " }\n\n"; + + if (argc() == 3) { + $contact_id = intval(argv(1)); + if (!$contact_id) { + return; + } + + $cmd = argv(2); + + $orig_record = q( + "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_id = %d AND abook_channel = %d AND abook_self = 0 LIMIT 1", - intval($contact_id), - intval(local_channel()) - ); - - if (! $orig_record) { - notice( t('Could not access address book record.') . EOL); - goaway(z_root() . '/connections'); - } + intval($contact_id), + intval(local_channel()) + ); - $orig_record = array_shift($orig_record); + if (!$orig_record) { + notice(t('Could not access address book record.') . EOL); + goaway(z_root() . '/connections'); + } - if ($cmd === 'update') { - // pull feed and consume it, which should subscribe to the hub. - Run::Summon( [ 'Poller', $contact_id ]); - goaway(z_root() . '/connedit/' . $contact_id); - } + $orig_record = array_shift($orig_record); - if ($cmd === 'fetchvc') { - $url = str_replace('/channel/','/profile/',$orig_record['xchan_url']) . '/vcard'; - $recurse = 0; - $x = z_fetch_url(zid($url),false,$recurse,['session' => true]); - if ($x['success']) { - $h = new HTTPHeaders($x['header']); - $fields = $h->fetcharr(); - if ($fields && array_key_exists('content-type',$fields)) { - $type = explode(';',trim($fields['content-type'])); - if ($type && $type[0] === 'text/vcard' && $x['body']) { - $vc = Reader::read($x['body']); - $vcard = $vc->serialize(); - if ($vcard) { - set_abconfig(local_channel(),$orig_record['abook_xchan'],'system','vcard',$vcard); - $this->connedit_clone($a); - } - } - } - } - goaway(z_root() . '/connedit/' . $contact_id); - } + if ($cmd === 'update') { + // pull feed and consume it, which should subscribe to the hub. + Run::Summon(['Poller', $contact_id]); + goaway(z_root() . '/connedit/' . $contact_id); + } + + if ($cmd === 'fetchvc') { + $url = str_replace('/channel/', '/profile/', $orig_record['xchan_url']) . '/vcard'; + $recurse = 0; + $x = z_fetch_url(zid($url), false, $recurse, ['session' => true]); + if ($x['success']) { + $h = new HTTPHeaders($x['header']); + $fields = $h->fetcharr(); + if ($fields && array_key_exists('content-type', $fields)) { + $type = explode(';', trim($fields['content-type'])); + if ($type && $type[0] === 'text/vcard' && $x['body']) { + $vc = Reader::read($x['body']); + $vcard = $vc->serialize(); + if ($vcard) { + set_abconfig(local_channel(), $orig_record['abook_xchan'], 'system', 'vcard', $vcard); + $this->connedit_clone($a); + } + } + } + } + goaway(z_root() . '/connedit/' . $contact_id); + } - if ($cmd === 'resetphoto') { - q("update xchan set xchan_photo_date = '2001-01-01 00:00:00' where xchan_hash = '%s'", - dbesc($orig_record['xchan_hash']) - ); - $cmd = 'refresh'; - } + if ($cmd === 'resetphoto') { + q( + "update xchan set xchan_photo_date = '2001-01-01 00:00:00' where xchan_hash = '%s'", + dbesc($orig_record['xchan_hash']) + ); + $cmd = 'refresh'; + } - if ($cmd === 'refresh') { + if ($cmd === 'refresh') { if (in_array($orig_record['xchan_network'],['nomad','zot6'])) { - if (! Libzot::refresh($orig_record, App::get_channel())) { - notice( t('Refresh failed - channel is currently unavailable.') ); - } - } - else { - if ($orig_record['xchan_network'] === 'activitypub') { - ActivityPub::discover($orig_record['xchan_hash'],true); - } - // if they are on a different network we'll force a refresh of the connection basic info - Run::Summon( [ 'Notifier', 'permissions_update', $contact_id ]); - } - goaway(z_root() . '/connedit/' . $contact_id); - } + if (!Libzot::refresh($orig_record, App::get_channel())) { + notice(t('Refresh failed - channel is currently unavailable.')); + } + } else { + if ($orig_record['xchan_network'] === 'activitypub') { + ActivityPub::discover($orig_record['xchan_hash'], true); + } + // if they are on a different network we'll force a refresh of the connection basic info + Run::Summon(['Notifier', 'permissions_update', $contact_id]); + } + goaway(z_root() . '/connedit/' . $contact_id); + } - switch ($cmd) { - case 'block': - if (intval($orig_record['abook_blocked'])) { - LibBlock::remove(local_channel(),$orig_record['abook_xchan']); - $sync = [ - 'block_channel_id' => local_channel(), - 'block_entity' => $orig_record['abook_xchan'], - 'block_type' => BLOCKTYPE_CHANNEL, - 'deleted' => true, - ]; - } - else { - LibBlock::store( [ - 'block_channel_id' => local_channel(), - 'block_entity' => $orig_record['abook_xchan'], - 'block_type' => BLOCKTYPE_CHANNEL, - 'block_comment' => t('Added by Connedit') - ]); - $z = q("insert into xign ( uid, xchan ) values ( %d , '%s' ) ", - intval(local_channel()), - dbesc($orig_record['abook_xchan']) - ); - $sync = LibBlock::fetch_by_entity(local_channel(),$orig_record['abook_xchan']); - } - $ignored = [ 'uid' => local_channel(), 'xchan' => $orig_record['abook_xchan'] ]; - Libsync::build_sync_packet(0, [ 'xign' => [ $ignored ], 'block' => [ $sync ]] ); - $flag_result = abook_toggle_flag($orig_record,ABOOK_FLAG_BLOCKED); - break; - case 'ignore': - $flag_result = abook_toggle_flag($orig_record,ABOOK_FLAG_IGNORED); - break; - case 'censor': - $flag_result = abook_toggle_flag($orig_record,ABOOK_FLAG_CENSORED); - break; - case 'archive': - $flag_result = abook_toggle_flag($orig_record,ABOOK_FLAG_ARCHIVED); - break; - case 'hide': - $flag_result = abook_toggle_flag($orig_record,ABOOK_FLAG_HIDDEN); - break; - case 'approve': - if(intval($orig_record['abook_pending'])) { - $flag_result = abook_toggle_flag($orig_record,ABOOK_FLAG_PENDING); - } - break; - default: - break; - } + switch ($cmd) { + case 'block': + if (intval($orig_record['abook_blocked'])) { + LibBlock::remove(local_channel(), $orig_record['abook_xchan']); + $sync = [ + 'block_channel_id' => local_channel(), + 'block_entity' => $orig_record['abook_xchan'], + 'block_type' => BLOCKTYPE_CHANNEL, + 'deleted' => true, + ]; + } else { + LibBlock::store([ + 'block_channel_id' => local_channel(), + 'block_entity' => $orig_record['abook_xchan'], + 'block_type' => BLOCKTYPE_CHANNEL, + 'block_comment' => t('Added by Connedit') + ]); + $z = q( + "insert into xign ( uid, xchan ) values ( %d , '%s' ) ", + intval(local_channel()), + dbesc($orig_record['abook_xchan']) + ); + $sync = LibBlock::fetch_by_entity(local_channel(), $orig_record['abook_xchan']); + } + $ignored = ['uid' => local_channel(), 'xchan' => $orig_record['abook_xchan']]; + Libsync::build_sync_packet(0, ['xign' => [$ignored], 'block' => [$sync]]); + $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_BLOCKED); + break; + case 'ignore': + $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_IGNORED); + break; + case 'censor': + $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_CENSORED); + break; + case 'archive': + $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_ARCHIVED); + break; + case 'hide': + $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_HIDDEN); + break; + case 'approve': + if (intval($orig_record['abook_pending'])) { + $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_PENDING); + } + break; + default: + break; + } - if (isset($flag_result)) { - if ($flag_result) { - $this->connedit_clone($a); - } - else { - notice(t('Unable to set address book parameters.') . EOL); - } - goaway(z_root() . '/connedit/' . $contact_id); - } - - if ($cmd === 'drop') { - if ($orig_record['xchan_network'] === 'activitypub') { - ActivityPub::contact_remove(local_channel(), $orig_record); - } - contact_remove(local_channel(), $orig_record['abook_id'], true); + if (isset($flag_result)) { + if ($flag_result) { + $this->connedit_clone($a); + } else { + notice(t('Unable to set address book parameters.') . EOL); + } + goaway(z_root() . '/connedit/' . $contact_id); + } - // The purge notification is sent to the xchan_hash as the abook record will have just been removed - - Run::Summon( [ 'Notifier' , 'purge', $orig_record['xchan_hash'] ] ); - - Libsync::build_sync_packet(0, [ 'abook' => [ [ 'abook_xchan' => $orig_record['abook_xchan'], 'entry_deleted' => true ] ] ] ); - - info( t('Connection has been removed.') . EOL ); - if (isset($_SESSION['return_url']) && $_SESSION['return_url']) { - goaway(z_root() . '/' . $_SESSION['return_url']); - } - goaway(z_root() . '/contacts'); - } - } - - if (App::$poi) { - - $abook_prev = 0; - $abook_next = 0; + if ($cmd === 'drop') { + if ($orig_record['xchan_network'] === 'activitypub') { + ActivityPub::contact_remove(local_channel(), $orig_record); + } + contact_remove(local_channel(), $orig_record['abook_id'], true); - $contact_id = App::$poi['abook_id']; - $contact = App::$poi; + // The purge notification is sent to the xchan_hash as the abook record will have just been removed - $cn = q("SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 order by xchan_name", - intval(local_channel()) - ); + Run::Summon(['Notifier', 'purge', $orig_record['xchan_hash']]); - if ($cn) { - // store previous/next ids for navigation - $pntotal = count($cn); + Libsync::build_sync_packet(0, ['abook' => [['abook_xchan' => $orig_record['abook_xchan'], 'entry_deleted' => true]]]); - for ($x = 0; $x < $pntotal; $x ++) { - if ($cn[$x]['abook_id'] == $contact_id) { - if ($x === 0) { - $abook_prev = 0; - } - else { - $abook_prev = $cn[$x - 1]['abook_id']; - } - if ($x === $pntotal) { - $abook_next = 0; - } - else { - $abook_next = $cn[$x +1]['abook_id']; - } - } - } - } + info(t('Connection has been removed.') . EOL); + if (isset($_SESSION['return_url']) && $_SESSION['return_url']) { + goaway(z_root() . '/' . $_SESSION['return_url']); + } + goaway(z_root() . '/contacts'); + } + } - $tools = array( - - 'view' => array( - 'label' => t('View Profile'), - 'url' => chanlink_cid($contact['abook_id']), - 'sel' => '', - 'title' => sprintf( t('View %s\'s profile'), $contact['xchan_name']), - ), - - 'refresh' => array( - 'label' => t('Refresh Permissions'), - 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/refresh', - 'sel' => '', - 'title' => t('Fetch updated permissions'), - ), + if (App::$poi) { + $abook_prev = 0; + $abook_next = 0; - 'rephoto' => array( - 'label' => t('Refresh Photo'), - 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/resetphoto', - 'sel' => '', - 'title' => t('Fetch updated photo'), - ), - - 'recent' => array( - 'label' => t('Recent Activity'), - 'url' => z_root() . '/stream/?f=&cid=' . $contact['abook_id'], - 'sel' => '', - 'title' => t('View recent posts and comments'), - ), - - 'block' => array( - 'label' => (intval($contact['abook_blocked']) ? t('Unblock') : t('Block')), - 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/block', - 'sel' => (intval($contact['abook_blocked']) ? 'active' : ''), - 'title' => t('Block (or Unblock) all communications with this connection'), - 'info' => (intval($contact['abook_blocked']) ? t('This connection is blocked') : ''), - ), - - 'ignore' => array( - 'label' => (intval($contact['abook_ignored']) ? t('Unignore') : t('Ignore')), - 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/ignore', - 'sel' => (intval($contact['abook_ignored']) ? 'active' : ''), - 'title' => t('Ignore (or Unignore) all inbound communications from this connection'), - 'info' => (intval($contact['abook_ignored']) ? t('This connection is ignored') : ''), - ), + $contact_id = App::$poi['abook_id']; + $contact = App::$poi; - 'censor' => array( - 'label' => (intval($contact['abook_censor']) ? t('Uncensor') : t('Censor')), - 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/censor', - 'sel' => (intval($contact['abook_censor']) ? 'active' : ''), - 'title' => t('Censor (or Uncensor) images from this connection'), - 'info' => (intval($contact['abook_censor']) ? t('This connection is censored') : ''), - ), + $cn = q( + "SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 order by xchan_name", + intval(local_channel()) + ); - 'archive' => array( - 'label' => (intval($contact['abook_archived']) ? t('Unarchive') : t('Archive')), - 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/archive', - 'sel' => (intval($contact['abook_archived']) ? 'active' : ''), - 'title' => t('Archive (or Unarchive) this connection - mark channel dead but keep content'), - 'info' => (intval($contact['abook_archived']) ? t('This connection is archived') : ''), - ), - - 'hide' => array( - 'label' => (intval($contact['abook_hidden']) ? t('Unhide') : t('Hide')), - 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/hide', - 'sel' => (intval($contact['abook_hidden']) ? 'active' : ''), - 'title' => t('Hide or Unhide this connection from your other connections'), - 'info' => (intval($contact['abook_hidden']) ? t('This connection is hidden') : ''), - ), - - 'delete' => array( - 'label' => t('Delete'), - 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/drop', - 'sel' => '', - 'title' => t('Delete this connection'), - ), - - ); + if ($cn) { + // store previous/next ids for navigation + $pntotal = count($cn); + + for ($x = 0; $x < $pntotal; $x++) { + if ($cn[$x]['abook_id'] == $contact_id) { + if ($x === 0) { + $abook_prev = 0; + } else { + $abook_prev = $cn[$x - 1]['abook_id']; + } + if ($x === $pntotal) { + $abook_next = 0; + } else { + $abook_next = $cn[$x + 1]['abook_id']; + } + } + } + } + + $tools = array( + + 'view' => array( + 'label' => t('View Profile'), + 'url' => chanlink_cid($contact['abook_id']), + 'sel' => '', + 'title' => sprintf(t('View %s\'s profile'), $contact['xchan_name']), + ), + + 'refresh' => array( + 'label' => t('Refresh Permissions'), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/refresh', + 'sel' => '', + 'title' => t('Fetch updated permissions'), + ), + + 'rephoto' => array( + 'label' => t('Refresh Photo'), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/resetphoto', + 'sel' => '', + 'title' => t('Fetch updated photo'), + ), + + 'recent' => array( + 'label' => t('Recent Activity'), + 'url' => z_root() . '/stream/?f=&cid=' . $contact['abook_id'], + 'sel' => '', + 'title' => t('View recent posts and comments'), + ), + + 'block' => array( + 'label' => (intval($contact['abook_blocked']) ? t('Unblock') : t('Block')), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/block', + 'sel' => (intval($contact['abook_blocked']) ? 'active' : ''), + 'title' => t('Block (or Unblock) all communications with this connection'), + 'info' => (intval($contact['abook_blocked']) ? t('This connection is blocked') : ''), + ), + + 'ignore' => array( + 'label' => (intval($contact['abook_ignored']) ? t('Unignore') : t('Ignore')), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/ignore', + 'sel' => (intval($contact['abook_ignored']) ? 'active' : ''), + 'title' => t('Ignore (or Unignore) all inbound communications from this connection'), + 'info' => (intval($contact['abook_ignored']) ? t('This connection is ignored') : ''), + ), + + 'censor' => array( + 'label' => (intval($contact['abook_censor']) ? t('Uncensor') : t('Censor')), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/censor', + 'sel' => (intval($contact['abook_censor']) ? 'active' : ''), + 'title' => t('Censor (or Uncensor) images from this connection'), + 'info' => (intval($contact['abook_censor']) ? t('This connection is censored') : ''), + ), + + 'archive' => array( + 'label' => (intval($contact['abook_archived']) ? t('Unarchive') : t('Archive')), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/archive', + 'sel' => (intval($contact['abook_archived']) ? 'active' : ''), + 'title' => t('Archive (or Unarchive) this connection - mark channel dead but keep content'), + 'info' => (intval($contact['abook_archived']) ? t('This connection is archived') : ''), + ), + + 'hide' => array( + 'label' => (intval($contact['abook_hidden']) ? t('Unhide') : t('Hide')), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/hide', + 'sel' => (intval($contact['abook_hidden']) ? 'active' : ''), + 'title' => t('Hide or Unhide this connection from your other connections'), + 'info' => (intval($contact['abook_hidden']) ? t('This connection is hidden') : ''), + ), + + 'delete' => array( + 'label' => t('Delete'), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/drop', + 'sel' => '', + 'title' => t('Delete this connection'), + ), + + ); - if(in_array($contact['xchan_network'],['nomad','zot6'])) { - $tools['fetchvc'] = [ - 'label' => t('Fetch Vcard'), - 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/fetchvc', - 'sel' => '', - 'title' => t('Fetch electronic calling card for this connection') - ]; - } + if (in_array($contact['xchan_network'], [ 'zot6', 'nomad' ])) { + $tools['fetchvc'] = [ + 'label' => t('Fetch Vcard'), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/fetchvc', + 'sel' => '', + 'title' => t('Fetch electronic calling card for this connection') + ]; + } - $sections = []; + $sections = []; - $sections['perms'] = [ - 'label' => t('Permissions'), - 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=§ion=perms', - 'sel' => '', - 'title' => t('Open Individual Permissions section by default'), - ]; - - $self = false; - - if(intval($contact['abook_self'])) { - $self = true; - $abook_prev = $abook_next = 0; - } - - $vc = get_abconfig(local_channel(),$contact['abook_xchan'],'system','vcard'); + $sections['perms'] = [ + 'label' => t('Permissions'), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=§ion=perms', + 'sel' => '', + 'title' => t('Open Individual Permissions section by default'), + ]; - $vctmp = (($vc) ? Reader::read($vc) : null); - $vcard = (($vctmp) ? get_vcard_array($vctmp,$contact['abook_id']) : [] ); - if(! $vcard) - $vcard['fn'] = $contact['xchan_name']; + $self = false; + + if (intval($contact['abook_self'])) { + $self = true; + $abook_prev = $abook_next = 0; + } + + $vc = get_abconfig(local_channel(), $contact['abook_xchan'], 'system', 'vcard'); + + $vctmp = (($vc) ? Reader::read($vc) : null); + $vcard = (($vctmp) ? get_vcard_array($vctmp, $contact['abook_id']) : []); + if (!$vcard) { + $vcard['fn'] = $contact['xchan_name']; + } - $tpl = get_markup_template("abook_edit.tpl"); - - if(Apps::system_app_installed(local_channel(),'Friend Zoom')) { + $tpl = get_markup_template("abook_edit.tpl"); - $sections['affinity'] = [ - 'label' => t('Friend Zoom'), - 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=§ion=affinity', - 'sel' => '', - 'title' => t('Open Friend Zoom section by default'), - ]; - - $labels = [ - 0 => t('Me'), - 20 => t('Family'), - 40 => t('Friends'), - 60 => t('Peers'), - 80 => t('Connections'), - 99 => t('All') - ]; - call_hooks('affinity_labels',$labels); - - $slider_tpl = get_markup_template('contact_slider.tpl'); - - $slideval = intval($contact['abook_closeness']); - - $slide = replace_macros($slider_tpl,array( - '$min' => 1, - '$val' => $slideval, - '$labels' => $labels, - )); - } + if (Apps::system_app_installed(local_channel(), 'Friend Zoom')) { + $sections['affinity'] = [ + 'label' => t('Friend Zoom'), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=§ion=affinity', + 'sel' => '', + 'title' => t('Open Friend Zoom section by default'), + ]; - if(Apps::system_app_installed(local_channel(),'Content Filter')) { - $sections['filter'] = [ - 'label' => t('Filter'), - 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=§ion=filter', - 'sel' => '', - 'title' => t('Open Custom Filter section by default'), - ]; - } - - $rating_val = 0; - $rating_text = ''; - - $xl = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1", - dbesc($channel['channel_hash']), - dbesc($contact['xchan_hash']) - ); - - if($xl) { - $rating_val = intval($xl[0]['xlink_rating']); - $rating_text = $xl[0]['xlink_rating_text']; - } - - $rating_enabled = get_config('system','rating_enabled'); - - if($rating_enabled) { - $rating = replace_macros(get_markup_template('rating_slider.tpl'),array( - '$min' => -10, - '$val' => $rating_val - )); - } - else { - $rating = false; - } - - - $perms = []; - $channel = App::get_channel(); - - $global_perms = Permissions::Perms(); + $labels = [ + 0 => t('Me'), + 20 => t('Family'), + 40 => t('Friends'), + 60 => t('Peers'), + 80 => t('Connections'), + 99 => t('All') + ]; + call_hooks('affinity_labels', $labels); - $existing = get_all_perms(local_channel(),$contact['abook_xchan'],false); - - $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication'), array(t('No'),t('Yes'))); - - $multiprofs = ((feature_enabled(local_channel(),'multi_profiles')) ? true : false); - - if($slide && !$multiprofs) - $affinity = t('Set Friend Zoom'); - - if(!$slide && $multiprofs) - $affinity = t('Set Profile'); - - if($slide && $multiprofs) - $affinity = t('Set Friend Zoom & Profile'); - - - $theirs = get_abconfig(local_channel(),$contact['abook_xchan'],'system','their_perms',EMPTY_STR); + $slider_tpl = get_markup_template('contact_slider.tpl'); - $their_perms = Permissions::FilledPerms(explode(',',$theirs)); - foreach($global_perms as $k => $v) { - if(! array_key_exists($k,$their_perms)) - $their_perms[$k] = 1; - } + $slideval = intval($contact['abook_closeness']); - $my_perms = explode(',',get_abconfig(local_channel(),$contact['abook_xchan'],'system','my_perms',EMPTY_STR)); + $slide = replace_macros($slider_tpl, array( + '$min' => 1, + '$val' => $slideval, + '$labels' => $labels, + )); + } - foreach($global_perms as $k => $v) { - $thisperm = ((in_array($k,$my_perms)) ? 1 : 0); - - $checkinherited = PermissionLimits::Get(local_channel(),$k); - - // For auto permissions (when $self is true) we don't want to look at existing - // permissions because they are enabled for the channel owner - if((! $self) && ($existing[$k])) - $thisperm = "1"; + if (Apps::system_app_installed(local_channel(), 'Content Filter')) { + $sections['filter'] = [ + 'label' => t('Filter'), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=§ion=filter', + 'sel' => '', + 'title' => t('Open Custom Filter section by default'), + ]; + } - $perms[] = array('perms_' . $k, $v, ((array_key_exists($k,$their_perms)) ? intval($their_perms[$k]) : ''),$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited); - } - - $pcat = new Permcat(local_channel()); - $pcatlist = $pcat->listing(); - $permcats = []; - if($pcatlist) { - foreach($pcatlist as $pc) { - $permcats[$pc['name']] = $pc['localname']; - } - } + $rating_val = 0; + $rating_text = ''; - $locstr = locations_by_netid($contact['xchan_hash']); - if(! $locstr) - $locstr = unpunify($contact['xchan_url']); - - $clone_warn = ''; - $clonable = (in_array($contact['xchan_network'],['nomad','zot6','zot','rss']) ? true : false); - if(! $clonable) { - $clone_warn = ''; - $clone_warn .= ((intval($contact['abook_not_here'])) - ? t('This connection is unreachable from this location.') - : t('This connection may be unreachable from other channel locations.') - ); - $clone_warn .= '
' . t('Location independence is not supported by their network.'); - } - + $xl = q( + "select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1", + dbesc($channel['channel_hash']), + dbesc($contact['xchan_hash']) + ); + + if ($xl) { + $rating_val = intval($xl[0]['xlink_rating']); + $rating_text = $xl[0]['xlink_rating_text']; + } + + $rating_enabled = get_config('system', 'rating_enabled'); + + if ($rating_enabled) { + $rating = replace_macros(get_markup_template('rating_slider.tpl'), array( + '$min' => -10, + '$val' => $rating_val + )); + } else { + $rating = false; + } - if(intval($contact['abook_not_here']) && ! $clonable) - $not_here = t('This connection is unreachable from this location. Location independence is not supported by their network.'); - - $o .= replace_macros($tpl, [ - '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name']) . (($contact['abook_alias']) ? ' <' . $contact['abook_alias'] . '>' : '')), - '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no), - '$permcat' => [ 'permcat', t('Permission role'), '', '' . t('Loading') . '...',$permcats ], - '$permcat_new' => t('Add permission role'), - '$permcat_enable' => feature_enabled(local_channel(),'permcats'), - '$addr' => unpunify($contact['xchan_addr']), - '$primeurl' => unpunify($contact['xchan_url']), - '$block_announce' => [ 'block_announce', t('Ignore shares and repeats this connection posts'), get_abconfig(local_channel(),$contact['xchan_hash'],'system','block_announce',false),t('Note: This is not recommended for Groups.'), [ t('No'), t('Yes') ] ], - '$section' => $section, - '$sections' => $sections, - '$vcard' => $vcard, - '$addr_text' => t('This connection\'s primary address is'), - '$loc_text' => t('Available locations:'), - '$locstr' => $locstr, - '$unclonable' => $clone_warn, - '$notself' => (($self) ? '' : '1'), - '$self' => (($self) ? '1' : ''), - '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), - '$tools_label' => t('Connection Tools'), - '$tools' => (($self) ? '' : $tools), - '$lbl_slider' => t('Slide to adjust your degree of friendship'), - '$lbl_rating' => t('Rating'), - '$lbl_rating_label' => t('Slide to adjust your rating'), - '$lbl_rating_txt' => t('Optionally explain your rating'), - '$connfilter' => Apps::system_app_installed(local_channel(),'Content Filter'), - '$connfilter_label' => t('Custom Filter'), - '$incl' => array('abook_incl',t('Only import posts with this text'), $contact['abook_incl'],t('words one per line or #tags, $categories, /patterns/, or lang=xx, leave blank to import all posts')), - '$excl' => array('abook_excl',t('Do not import posts with this text'), $contact['abook_excl'],t('words one per line or #tags, $categories, /patterns/, or lang=xx, leave blank to import all posts')), - '$alias' => array('abook_alias',t('Nickname'), $contact['abook_alias'],t('optional - allows you to search by a name that you have chosen')), - '$rating_text' => array('rating_text', t('Optionally explain your rating'),$rating_text,''), - '$rating_info' => t('This information is public!'), - '$rating' => $rating, - '$rating_val' => $rating_val, - '$slide' => $slide, - '$affinity' => $affinity, - '$pending_label' => t('Connection Pending Approval'), - '$is_pending' => (intval($contact['abook_pending']) ? 1 : ''), - '$unapproved' => $unapproved, - '$inherited' => t('inherited'), - '$submit' => t('Submit'), - '$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['xchan_name']), - '$close' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 80), - '$them' => t('Their Settings'), - '$me' => t('My Settings'), - '$perms' => $perms, - '$permlbl' => t('Individual Permissions'), - '$permnote' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can not change those settings here.'), - '$permnote_self' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes.'), - '$lastupdtext' => t('Last update:'), - '$last_update' => relative_date($contact['abook_connected']), - '$profile_select' => contact_profile_assign($contact['abook_profile']), - '$multiprofs' => $multiprofs, - '$contact_id' => $contact['abook_id'], - '$name' => $contact['xchan_name'], - '$abook_prev' => $abook_prev, - '$abook_next' => $abook_next, - '$vcard_label' => t('Details'), - '$displayname' => $displayname, - '$name_label' => t('Name'), - '$org_label' => t('Organisation'), - '$title_label' => t('Title'), - '$tel_label' => t('Phone'), - '$email_label' => t('Email'), - '$impp_label' => t('Instant messenger'), - '$url_label' => t('Website'), - '$adr_label' => t('Address'), - '$note_label' => t('Note'), - '$mobile' => t('Mobile'), - '$home' => t('Home'), - '$work' => t('Work'), - '$other' => t('Other'), - '$add_card' => t('Add Contact'), - '$add_field' => t('Add Field'), - '$create' => t('Create'), - '$update' => t('Update'), - '$delete' => t('Delete'), - '$cancel' => t('Cancel'), - '$po_box' => t('P.O. Box'), - '$extra' => t('Additional'), - '$street' => t('Street'), - '$locality' => t('Locality'), - '$region' => t('Region'), - '$zip_code' => t('ZIP Code'), - '$country' => t('Country') - ]); - - $arr = array('contact' => $contact,'output' => $o); - - call_hooks('contact_edit', $arr); - - return $arr['output']; - - } - } + $perms = []; + $channel = App::get_channel(); + + $global_perms = Permissions::Perms(); + + $existing = get_all_perms(local_channel(), $contact['abook_xchan'], false); + + $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication'), array(t('No'), t('Yes'))); + + $multiprofs = ((feature_enabled(local_channel(), 'multi_profiles')) ? true : false); + + if ($slide && !$multiprofs) { + $affinity = t('Set Friend Zoom'); + } + + if (!$slide && $multiprofs) { + $affinity = t('Set Profile'); + } + + if ($slide && $multiprofs) { + $affinity = t('Set Friend Zoom & Profile'); + } + + + $theirs = get_abconfig(local_channel(), $contact['abook_xchan'], 'system', 'their_perms', EMPTY_STR); + + $their_perms = Permissions::FilledPerms(explode(',', $theirs)); + foreach ($global_perms as $k => $v) { + if (!array_key_exists($k, $their_perms)) { + $their_perms[$k] = 1; + } + } + + $my_perms = explode(',', get_abconfig(local_channel(), $contact['abook_xchan'], 'system', 'my_perms', EMPTY_STR)); + + foreach ($global_perms as $k => $v) { + $thisperm = ((in_array($k, $my_perms)) ? 1 : 0); + + $checkinherited = PermissionLimits::Get(local_channel(), $k); + + // For auto permissions (when $self is true) we don't want to look at existing + // permissions because they are enabled for the channel owner + if ((!$self) && ($existing[$k])) { + $thisperm = "1"; + } + + $perms[] = array('perms_' . $k, $v, ((array_key_exists($k, $their_perms)) ? intval($their_perms[$k]) : ''), $thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited); + } + + $pcat = new Permcat(local_channel()); + $pcatlist = $pcat->listing(); + $permcats = []; + if ($pcatlist) { + foreach ($pcatlist as $pc) { + $permcats[$pc['name']] = $pc['localname']; + } + } + + $locstr = locations_by_netid($contact['xchan_hash']); + if (!$locstr) { + $locstr = unpunify($contact['xchan_url']); + } + + $clone_warn = ''; + $clonable = (in_array($contact['xchan_network'], ['nomad', 'zot6', 'zot', 'rss']) ? true : false); + if (!$clonable) { + $clone_warn = ''; + $clone_warn .= ((intval($contact['abook_not_here'])) + ? t('This connection is unreachable from this location.') + : t('This connection may be unreachable from other channel locations.') + ); + $clone_warn .= '
' . t('Location independence is not supported by their network.'); + } + + + if (intval($contact['abook_not_here']) && $unclonable) { + $not_here = t('This connection is unreachable from this location. Location independence is not supported by their network.'); + } + + $o .= replace_macros($tpl, [ + '$header' => (($self) ? t('Connection Default Permissions') : sprintf(t('Connection: %s'), $contact['xchan_name']) . (($contact['abook_alias']) ? ' <' . $contact['abook_alias'] . '>' : '')), + '$autoperms' => array('autoperms', t('Apply these permissions automatically'), ((get_pconfig(local_channel(), 'system', 'autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no), + '$permcat' => ['permcat', t('Permission role'), '', '' . t('Loading') . '...', $permcats], + '$permcat_new' => t('Add permission role'), + '$permcat_enable' => feature_enabled(local_channel(), 'permcats'), + '$addr' => unpunify($contact['xchan_addr']), + '$primeurl' => unpunify($contact['xchan_url']), + '$block_announce' => ['block_announce', t('Ignore shares and repeats this connection posts'), get_abconfig(local_channel(), $contact['xchan_hash'], 'system', 'block_announce', false), t('Note: This is not recommended for Groups.'), [t('No'), t('Yes')]], + '$section' => $section, + '$sections' => $sections, + '$vcard' => $vcard, + '$addr_text' => t('This connection\'s primary address is'), + '$loc_text' => t('Available locations:'), + '$locstr' => $locstr, + '$unclonable' => $clone_warn, + '$notself' => (($self) ? '' : '1'), + '$self' => (($self) ? '1' : ''), + '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), + '$tools_label' => t('Connection Tools'), + '$tools' => (($self) ? '' : $tools), + '$lbl_slider' => t('Slide to adjust your degree of friendship'), + '$lbl_rating' => t('Rating'), + '$lbl_rating_label' => t('Slide to adjust your rating'), + '$lbl_rating_txt' => t('Optionally explain your rating'), + '$connfilter' => Apps::system_app_installed(local_channel(), 'Content Filter'), + '$connfilter_label' => t('Custom Filter'), + '$incl' => array('abook_incl', t('Only import posts with this text'), $contact['abook_incl'], t('words one per line or #tags, $categories, /patterns/, or lang=xx, leave blank to import all posts')), + '$excl' => array('abook_excl', t('Do not import posts with this text'), $contact['abook_excl'], t('words one per line or #tags, $categories, /patterns/, or lang=xx, leave blank to import all posts')), + '$alias' => array('abook_alias', t('Nickname'), $contact['abook_alias'], t('optional - allows you to search by a name that you have chosen')), + '$rating_text' => array('rating_text', t('Optionally explain your rating'), $rating_text, ''), + '$rating_info' => t('This information is public!'), + '$rating' => $rating, + '$rating_val' => $rating_val, + '$slide' => $slide, + '$affinity' => $affinity, + '$pending_label' => t('Connection Pending Approval'), + '$is_pending' => (intval($contact['abook_pending']) ? 1 : ''), + '$unapproved' => $unapproved, + '$inherited' => t('inherited'), + '$submit' => t('Submit'), + '$lbl_vis2' => sprintf(t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['xchan_name']), + '$close' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 80), + '$them' => t('Their Settings'), + '$me' => t('My Settings'), + '$perms' => $perms, + '$permlbl' => t('Individual Permissions'), + '$permnote' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can not change those settings here.'), + '$permnote_self' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes.'), + '$lastupdtext' => t('Last update:'), + '$last_update' => relative_date($contact['abook_connected']), + '$profile_select' => contact_profile_assign($contact['abook_profile']), + '$multiprofs' => $multiprofs, + '$contact_id' => $contact['abook_id'], + '$name' => $contact['xchan_name'], + '$abook_prev' => $abook_prev, + '$abook_next' => $abook_next, + '$vcard_label' => t('Details'), + '$displayname' => $displayname, + '$name_label' => t('Name'), + '$org_label' => t('Organisation'), + '$title_label' => t('Title'), + '$tel_label' => t('Phone'), + '$email_label' => t('Email'), + '$impp_label' => t('Instant messenger'), + '$url_label' => t('Website'), + '$adr_label' => t('Address'), + '$note_label' => t('Note'), + '$mobile' => t('Mobile'), + '$home' => t('Home'), + '$work' => t('Work'), + '$other' => t('Other'), + '$add_card' => t('Add Contact'), + '$add_field' => t('Add Field'), + '$create' => t('Create'), + '$update' => t('Update'), + '$delete' => t('Delete'), + '$cancel' => t('Cancel'), + '$po_box' => t('P.O. Box'), + '$extra' => t('Additional'), + '$street' => t('Street'), + '$locality' => t('Locality'), + '$region' => t('Region'), + '$zip_code' => t('ZIP Code'), + '$country' => t('Country') + ]); + + $arr = array('contact' => $contact, 'output' => $o); + + call_hooks('contact_edit', $arr); + + return $arr['output']; + } + } } diff --git a/Zotlabs/Module/Contactgroup.php b/Zotlabs/Module/Contactgroup.php index 79b743ac8..50100be78 100644 --- a/Zotlabs/Module/Contactgroup.php +++ b/Zotlabs/Module/Contactgroup.php @@ -1,4 +1,5 @@ 2) && (intval(argv(1))) && (argv(2))) { - $r = abook_by_hash(local_channel(), base64url_decode(argv(2))); - if ($r) { - $change = $r['abook_xchan']; - } - } - - if ((argc() > 1) && (intval(argv(1)))) { - - $group = AccessList::by_id(local_channel(),argv(1)); + public function get() + { - if (! $group) { - killme(); - } - - $members = AccessList::members(local_channel(),$group['id']); - $preselected = ids_to_array($members,'xchan_hash'); - - if ($change) { - if (in_array($change,$preselected)) { - AccessList::member_remove(local_channel(),$group['gname'],$change); - } - else { - AccessList::member_add(local_channel(),$group['gname'],$change); - } - } - } - - killme(); - } + if (!local_channel()) { + killme(); + } + + if ((argc() > 2) && (intval(argv(1))) && (argv(2))) { + $r = abook_by_hash(local_channel(), base64url_decode(argv(2))); + if ($r) { + $change = $r['abook_xchan']; + } + } + + if ((argc() > 1) && (intval(argv(1)))) { + $group = AccessList::by_id(local_channel(), argv(1)); + + if (!$group) { + killme(); + } + + $members = AccessList::members(local_channel(), $group['id']); + $preselected = ids_to_array($members, 'xchan_hash'); + + if ($change) { + if (in_array($change, $preselected)) { + AccessList::member_remove(local_channel(), $group['gname'], $change); + } else { + AccessList::member_add(local_channel(), $group['gname'], $change); + } + } + } + + killme(); + } } diff --git a/Zotlabs/Module/Content_filter.php b/Zotlabs/Module/Content_filter.php index c6d1afc40..a6a3e6915 100644 --- a/Zotlabs/Module/Content_filter.php +++ b/Zotlabs/Module/Content_filter.php @@ -6,69 +6,67 @@ use Zotlabs\Lib\Apps; use Zotlabs\Lib\Libsync; use Zotlabs\Web\Controller; -class Content_filter extends Controller { +class Content_filter extends Controller +{ - function post() { + public function post() + { - if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Content Filter'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Content Filter'))) { return; } - if($_POST['content_filter-submit']) { + if ($_POST['content_filter-submit']) { + $incl = ((x($_POST['message_filter_incl'])) ? htmlspecialchars_decode(trim($_POST['message_filter_incl']), ENT_QUOTES) : ''); + $excl = ((x($_POST['message_filter_excl'])) ? htmlspecialchars_decode(trim($_POST['message_filter_excl']), ENT_QUOTES) : ''); - $incl = ((x($_POST['message_filter_incl'])) ? htmlspecialchars_decode(trim($_POST['message_filter_incl']),ENT_QUOTES) : ''); - $excl = ((x($_POST['message_filter_excl'])) ? htmlspecialchars_decode(trim($_POST['message_filter_excl']),ENT_QUOTES) : ''); - - set_pconfig(local_channel(),'system','message_filter_incl',$incl); - set_pconfig(local_channel(),'system','message_filter_excl',$excl); + set_pconfig(local_channel(), 'system', 'message_filter_incl', $incl); + set_pconfig(local_channel(), 'system', 'message_filter_excl', $excl); - info( t('Content Filter settings updated.') . EOL); + info(t('Content Filter settings updated.') . EOL); + } - } - - Libsync::build_sync_packet(); - - } + Libsync::build_sync_packet(); + } - function get() { + public function get() + { $desc = t('This app (when installed) allows you to filter incoming content from all sources or from specific connections. The filtering may be based on words, tags, regular expressions, or language'); $text = '' . $desc . ''; - if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Content Filter'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Content Filter'))) { return $text; } - $text .= EOL . t('The settings on this page apply to all incoming content. To edit the settings for individual connetions, see the similar settings on the Connection Edit page for that connection.') . EOL . EOL; + $text .= EOL . t('The settings on this page apply to all incoming content. To edit the settings for individual connetions, see the similar settings on the Connection Edit page for that connection.') . EOL . EOL; - $setting_fields = $text; + $setting_fields = $text; - $setting_fields .= replace_macros(get_markup_template('field_textarea.tpl'), array( - '$field' => [ - 'message_filter_incl', - t('Only import posts with this text'), - get_pconfig(local_channel(),'system','message_filter_incl',''), - t('words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts') - ] - )); - $setting_fields .= replace_macros(get_markup_template('field_textarea.tpl'), array( - '$field' => [ - 'message_filter_excl', - t('Do not import posts with this text'), - get_pconfig(local_channel(),'system','message_filter_excl',''), - t('words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts') - ] - )); + $setting_fields .= replace_macros(get_markup_template('field_textarea.tpl'), array( + '$field' => [ + 'message_filter_incl', + t('Only import posts with this text'), + get_pconfig(local_channel(), 'system', 'message_filter_incl', ''), + t('words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts') + ] + )); + $setting_fields .= replace_macros(get_markup_template('field_textarea.tpl'), array( + '$field' => [ + 'message_filter_excl', + t('Do not import posts with this text'), + get_pconfig(local_channel(), 'system', 'message_filter_excl', ''), + t('words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts') + ] + )); - $s .= replace_macros(get_markup_template('generic_app_settings.tpl'), array( - '$addon' => array('content_filter', '' . t('Content Filter Settings'), '', t('Submit')), - '$content' => $setting_fields - )); + $s .= replace_macros(get_markup_template('generic_app_settings.tpl'), array( + '$addon' => array('content_filter', '' . t('Content Filter Settings'), '', t('Submit')), + '$content' => $setting_fields + )); - return $s; - } - - -} \ No newline at end of file + return $s; + } +} diff --git a/Zotlabs/Module/Conversation.php b/Zotlabs/Module/Conversation.php index d685bba4b..03f664a0d 100644 --- a/Zotlabs/Module/Conversation.php +++ b/Zotlabs/Module/Conversation.php @@ -1,4 +1,5 @@ 0 order by imgscale asc LIMIT 1", + dbesc($image_id), + intval(local_channel()) + ); + + if ($r) { + $max_thumb = intval(get_config('system', 'max_thumbnail', 1600)); + $iscaled = false; + if (intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) { + $imagick_path = get_config('system', 'imagick_convert_path'); + if ($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) { + $fname = dbunescbin($r[0]['content']); + $tmp_name = $fname . '-001'; + $newsize = photo_calculate_scale(array_merge(getimagesize($fname), ['max' => $max_thumb])); + $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); + // logger('imagick thumbnail command: ' . $cmd); + for ($x = 0; $x < 4; $x++) { + exec($cmd); + if (file_exists($tmp_name)) { + break; + } + } + if (file_exists($tmp_name)) { + $base_image = $r[0]; + $gis = getimagesize($tmp_name); + logger('gis: ' . print_r($gis, true)); + $base_image['width'] = $gis[0]; + $base_image['height'] = $gis[1]; + $base_image['content'] = @file_get_contents($tmp_name); + $iscaled = true; + @unlink($tmp_name); + } + } + } + if (!$iscaled) { + $base_image = $r[0]; + $base_image['content'] = (($base_image['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); + } + + $im = photo_factory($base_image['content'], $base_image['mimetype']); + if ($im && $im->is_valid()) { + // We are scaling and cropping the relative pixel locations to the original photo instead of the + // scaled photo we operated on. + + // First load the scaled photo to check its size. (Should probably pass this in the post form and save + // a query.) + + $g = q( + "select width, height from photo where resource_id = '%s' and uid = %d and imgscale = 3", + dbesc($image_id), + intval(local_channel()) + ); - $srcX = intval($_POST['xstart']); - $srcY = intval($_POST['ystart']); - $srcW = intval($_POST['xfinal']) - $srcX; - $srcH = intval($_POST['yfinal']) - $srcY; - - $r = q("select gender from profile where uid = %d and is_default = 1 limit 1", - intval(local_channel()) - ); - if ($r) { - $profile = array_shift($r); - } - - $r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND imgscale > 0 order by imgscale asc LIMIT 1", - dbesc($image_id), - intval(local_channel()) - ); - - if ($r) { + $scaled_width = $g[0]['width']; + $scaled_height = $g[0]['height']; - $max_thumb = intval(get_config('system','max_thumbnail',1600)); - $iscaled = false; - if (intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) { - $imagick_path = get_config('system','imagick_convert_path'); - if ($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) { + if ((!$scaled_width) || (!$scaled_height)) { + logger('potential divide by zero scaling cover photo'); + return; + } - $fname = dbunescbin($r[0]['content']); - $tmp_name = $fname . '-001'; - $newsize = photo_calculate_scale(array_merge(getimagesize($fname),['max' => $max_thumb])); - $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); - // logger('imagick thumbnail command: ' . $cmd); - for ($x = 0; $x < 4; $x ++) { - exec($cmd); - if (file_exists($tmp_name)) { - break; - } - } - if (file_exists($tmp_name)) { - $base_image = $r[0]; - $gis = getimagesize($tmp_name); -logger('gis: ' . print_r($gis,true)); - $base_image['width'] = $gis[0]; - $base_image['height'] = $gis[1]; - $base_image['content'] = @file_get_contents($tmp_name); - $iscaled = true; - @unlink($tmp_name); - } - } - } - if (! $iscaled) { - $base_image = $r[0]; - $base_image['content'] = (($base_image['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); - } + // unset all other cover photos - $im = photo_factory($base_image['content'], $base_image['mimetype']); - if ($im && $im->is_valid()) { - - // We are scaling and cropping the relative pixel locations to the original photo instead of the - // scaled photo we operated on. - - // First load the scaled photo to check its size. (Should probably pass this in the post form and save - // a query.) - - $g = q("select width, height from photo where resource_id = '%s' and uid = %d and imgscale = 3", - dbesc($image_id), - intval(local_channel()) - ); - - - $scaled_width = $g[0]['width']; - $scaled_height = $g[0]['height']; - - if ((! $scaled_width) || (! $scaled_height)) { - logger('potential divide by zero scaling cover photo'); - return; - } - - // unset all other cover photos - - q("update photo set photo_usage = %d where photo_usage = %d and uid = %d", - intval(PHOTO_NORMAL), - intval(PHOTO_COVER), - intval(local_channel()) - ); - - $orig_srcx = ( $base_image['width'] / $scaled_width ) * $srcX; - $orig_srcy = ( $base_image['height'] / $scaled_height ) * $srcY; - $orig_srcw = ( $srcW / $scaled_width ) * $base_image['width']; - $orig_srch = ( $srcH / $scaled_height ) * $base_image['height']; - - $im->cropImageRect(1200,435,$orig_srcx, $orig_srcy, $orig_srcw, $orig_srch); - - $aid = get_account_id(); - - $p = [ - 'aid' => $aid, - 'uid' => local_channel(), - 'resource_id' => $base_image['resource_id'], - 'filename' => $base_image['filename'], - 'album' => t('Cover Photos'), - 'os_path' => $base_image['os_path'], - 'display_path' => $base_image['display_path'], - 'created' => $base_image['created'], - 'edited' => $base_image['edited'] - ]; - - $p['imgscale'] = 7; - $p['photo_usage'] = PHOTO_COVER; - - $r1 = $im->storeThumbnail($p, PHOTO_RES_COVER_1200); + q( + "update photo set photo_usage = %d where photo_usage = %d and uid = %d", + intval(PHOTO_NORMAL), + intval(PHOTO_COVER), + intval(local_channel()) + ); - $im->doScaleImage(850,310); - $p['imgscale'] = 8; + $orig_srcx = ($base_image['width'] / $scaled_width) * $srcX; + $orig_srcy = ($base_image['height'] / $scaled_height) * $srcY; + $orig_srcw = ($srcW / $scaled_width) * $base_image['width']; + $orig_srch = ($srcH / $scaled_height) * $base_image['height']; - $r2 = $im->storeThumbnail($p, PHOTO_RES_COVER_850); - - $im->doScaleImage(425,160); - $p['imgscale'] = 9; - - $r3 = $im->storeThumbnail($p, PHOTO_RES_COVER_425); - - if ($r1 === false || $r2 === false || $r3 === false) { - // if one failed, delete them all so we can start over. - notice( t('Image resize failed.') . EOL ); - $x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale >= 7 ", - dbesc($base_image['resource_id']), - local_channel() - ); - return; - } - - $channel = App::get_channel(); - $this->send_cover_photo_activity($channel,$base_image,$profile); - - - } - else - notice( t('Unable to process image') . EOL); - } - - goaway(z_root() . '/channel/' . $channel['channel_address']); - - } - - - $hash = photo_new_resource(); - $smallest = 0; - - $matches = []; - $partial = false; + $im->cropImageRect(1200, 435, $orig_srcx, $orig_srcy, $orig_srcw, $orig_srch); - if (array_key_exists('HTTP_CONTENT_RANGE',$_SERVER)) { - $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/',$_SERVER['HTTP_CONTENT_RANGE'],$matches); - if ($pm) { - logger('Content-Range: ' . print_r($matches,true)); - $partial = true; - } - } + $aid = get_account_id(); - if ($partial) { - $x = save_chunk($channel,$matches[1],$matches[2],$matches[3]); + $p = [ + 'aid' => $aid, + 'uid' => local_channel(), + 'resource_id' => $base_image['resource_id'], + 'filename' => $base_image['filename'], + 'album' => t('Cover Photos'), + 'os_path' => $base_image['os_path'], + 'display_path' => $base_image['display_path'], + 'created' => $base_image['created'], + 'edited' => $base_image['edited'] + ]; - if ($x['partial']) { - header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); - json_return_and_die($x); - } - else { - header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); + $p['imgscale'] = 7; + $p['photo_usage'] = PHOTO_COVER; - $_FILES['userfile'] = [ - 'name' => $x['name'], - 'type' => $x['type'], - 'tmp_name' => $x['tmp_name'], - 'error' => $x['error'], - 'size' => $x['size'] - ]; - } - } - else { - if (! array_key_exists('userfile',$_FILES)) { - $_FILES['userfile'] = [ - 'name' => $_FILES['files']['name'], - 'type' => $_FILES['files']['type'], - 'tmp_name' => $_FILES['files']['tmp_name'], - 'error' => $_FILES['files']['error'], - 'size' => $_FILES['files']['size'] - ]; - } - } + $r1 = $im->storeThumbnail($p, PHOTO_RES_COVER_1200); - $res = attach_store(App::get_channel(), get_observer_hash(), '', array('album' => t('Cover Photos'), 'hash' => $hash)); - - logger('attach_store: ' . print_r($res,true),LOGGER_DEBUG); + $im->doScaleImage(850, 310); + $p['imgscale'] = 8; - json_return_and_die([ 'message' => $hash ]); - - } - - function send_cover_photo_activity($channel,$photo,$profile) { - - $arr = []; - $arr['item_thread_top'] = 1; - $arr['item_origin'] = 1; - $arr['item_wall'] = 1; - $arr['uuid'] = new_uuid(); - $arr['mid'] = z_root() . '/item/' . $arr['uuid']; - $arr['obj_type'] = ACTIVITY_OBJ_NOTE; - $arr['verb'] = ACTIVITY_CREATE; - - if ($profile && stripos($profile['gender'],t('female')) !== false) { - $t = t('%1$s updated her %2$s'); - } - elseif ($profile && stripos($profile['gender'],t('male')) !== false) { - $t = t('%1$s updated his %2$s'); - } - else { - $t = t('%1$s updated their %2$s'); - } - - $ptext = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' . t('cover photo') . '[/zrl]'; - - $ltext = '[zrl=' . z_root() . '/profile/' . $channel['channel_address'] . ']' . '[zmg]' . z_root() . '/photo/' . $photo['resource_id'] . '-8[/zmg][/zrl]'; - - $arr['body'] = sprintf($t,$channel['channel_name'],$ptext) . "\n\n" . $ltext; + $r2 = $im->storeThumbnail($p, PHOTO_RES_COVER_850); - $arr['obj'] = [ - 'type' => ACTIVITY_OBJ_NOTE, - 'published' => datetime_convert('UTC','UTC',$photo['created'],ATOM_TIME), - 'updated' => datetime_convert('UTC','UTC',$photo['edited'],ATOM_TIME), - 'id' => $arr['mid'], - 'url' => [ 'type' => 'Link', 'mediaType' => $photo['mimetype'], 'href' => z_root() . '/photo/' . $photo['resource_id'] . '-7' ], - 'source' => [ 'content' => $arr['body'], 'mediaType' => 'text/x-multicode' ], - 'content' => bbcode($arr['body']), - 'actor' => Activity::encode_person($channel,false), - ]; + $im->doScaleImage(425, 160); + $p['imgscale'] = 9; - $acl = new AccessControl($channel); - $x = $acl->get(); - $arr['allow_cid'] = $x['allow_cid']; - - $arr['allow_gid'] = $x['allow_gid']; - $arr['deny_cid'] = $x['deny_cid']; - $arr['deny_gid'] = $x['deny_gid']; - - $arr['uid'] = $channel['channel_id']; - $arr['aid'] = $channel['channel_account_id']; - - $arr['owner_xchan'] = $channel['channel_hash']; - $arr['author_xchan'] = $channel['channel_hash']; - - post_activity_item($arr); - - - } - - - /** - * @brief Generate content of profile-photo view - * - * @return string - * - */ - - - function get() { - - if (! local_channel()) { - notice( t('Permission denied.') . EOL ); - return; - } - - $channel = App::get_channel(); - - $newuser = false; - - if (argc() == 2 && argv(1) === 'new') - $newuser = true; - - if (argv(1) === 'use') { - if (argc() < 3) { - notice( t('Permission denied.') . EOL ); - return; - }; - - // check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo'); - - $resource_id = argv(2); - - $r = q("SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' and imgscale > 0 ORDER BY imgscale ASC", - intval(local_channel()), - dbesc($resource_id) - ); - if (! $r) { - notice( t('Photo not available.') . EOL ); - return; - } - $havescale = false; - foreach ($r as $rr) { - if ($rr['imgscale'] == 7) { - $havescale = true; - } - } - - $r = q("SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", - intval($r[0]['id']), - intval(local_channel()) - - ); - if (! $r) { - notice( t('Photo not available.') . EOL ); - return; - } - - if (intval($r[0]['os_storage'])) { - $data = @file_get_contents(dbunescbin($r[0]['content'])); - } - else { - $data = dbunescbin($r[0]['content']); - } - - $ph = photo_factory($data, $r[0]['mimetype']); - $smallest = 0; - if ($ph && $ph->is_valid()) { - // go ahead as if we have just uploaded a new photo to crop - $i = q("select resource_id, imgscale from photo where resource_id = '%s' and uid = %d and imgscale = 0", - dbesc($r[0]['resource_id']), - intval(local_channel()) - ); - - if ($i) { - $hash = $i[0]['resource_id']; - foreach ($i as $ii) { - $smallest = intval($ii['imgscale']); - } - } - } - - $this->cover_photo_crop_ui_head($ph, $hash, $smallest); - } - - - if(! array_key_exists('imagecrop',App::$data)) { - - $o .= replace_macros(get_markup_template('cover_photo.tpl'), [ - '$user' => App::$channel['channel_address'], - '$info' => t('Your cover photo may be visible to anybody on the internet'), - '$existing' => get_cover_photo(local_channel(),'array',PHOTO_RES_COVER_850), - '$lbl_upfile' => t('Upload File:'), - '$lbl_profiles' => t('Select a profile:'), - '$title' => t('Change Cover Photo'), - '$submit' => t('Upload'), - '$profiles' => $profiles, - '$embedPhotos' => t('Use a photo from your albums'), - '$embedPhotosModalTitle' => t('Use a photo from your albums'), - '$embedPhotosModalCancel' => t('Cancel'), - '$embedPhotosModalOK' => t('OK'), - '$modalchooseimages' => t('Choose images to embed'), - '$modalchoosealbum' => t('Choose an album'), - '$modaldiffalbum' => t('Choose a different album'), - '$modalerrorlist' => t('Error getting album list'), - '$modalerrorlink' => t('Error getting photo link'), - '$modalerroralbum' => t('Error getting album'), - '$form_security_token' => get_form_security_token("cover_photo"), - '$select' => t('Select previously uploaded photo'), + $r3 = $im->storeThumbnail($p, PHOTO_RES_COVER_425); - ]); - - call_hooks('cover_photo_content_end', $o); - - return $o; - } - else { - $filename = App::$data['imagecrop'] . '-3'; - $resolution = 3; + if ($r1 === false || $r2 === false || $r3 === false) { + // if one failed, delete them all so we can start over. + notice(t('Image resize failed.') . EOL); + $x = q( + "delete from photo where resource_id = '%s' and uid = %d and imgscale >= 7 ", + dbesc($base_image['resource_id']), + local_channel() + ); + return; + } - $o .= replace_macros(get_markup_template('cropcover.tpl'), [ - '$filename' => $filename, - '$profile' => intval($_REQUEST['profile']), - '$resource' => \App::$data['imagecrop'] . '-3', - '$image_url' => z_root() . '/photo/' . $filename, - '$title' => t('Crop Image'), - '$desc' => t('Please adjust the image cropping for optimum viewing.'), - '$form_security_token' => get_form_security_token("cover_photo"), - '$done' => t('Done Editing') - ]); - return $o; - } - } - - /* @brief Generate the UI for photo-cropping - * - * @param $a Current application - * @param $ph Photo-Factory - * @return void - * - */ - - function cover_photo_crop_ui_head($ph, $hash, $smallest){ - - $max_length = get_config('system','max_image_length', MAX_IMAGE_LENGTH); - if ($max_length > 0) { - $ph->scaleImage($max_length); - } - - $width = $ph->getWidth(); - $height = $ph->getHeight(); - - if ($width < 300 || $height < 300) { - $ph->scaleImageUp(240); - $width = $ph->getWidth(); - $height = $ph->getHeight(); - } - - - App::$data['imagecrop'] = $hash; - App::$data['imagecrop_resolution'] = $smallest; - App::$page['htmlhead'] .= replace_macros(get_markup_template('crophead.tpl'), []); - return; - } - - + $channel = App::get_channel(); + $this->send_cover_photo_activity($channel, $base_image, $profile); + } else { + notice(t('Unable to process image') . EOL); + } + } + + goaway(z_root() . '/channel/' . $channel['channel_address']); + } + + + $hash = photo_new_resource(); + $smallest = 0; + + $matches = []; + $partial = false; + + if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) { + $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches); + if ($pm) { + logger('Content-Range: ' . print_r($matches, true)); + $partial = true; + } + } + + if ($partial) { + $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]); + + if ($x['partial']) { + header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); + json_return_and_die($x); + } else { + header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); + + $_FILES['userfile'] = [ + 'name' => $x['name'], + 'type' => $x['type'], + 'tmp_name' => $x['tmp_name'], + 'error' => $x['error'], + 'size' => $x['size'] + ]; + } + } else { + if (!array_key_exists('userfile', $_FILES)) { + $_FILES['userfile'] = [ + 'name' => $_FILES['files']['name'], + 'type' => $_FILES['files']['type'], + 'tmp_name' => $_FILES['files']['tmp_name'], + 'error' => $_FILES['files']['error'], + 'size' => $_FILES['files']['size'] + ]; + } + } + + $res = attach_store(App::get_channel(), get_observer_hash(), '', array('album' => t('Cover Photos'), 'hash' => $hash)); + + logger('attach_store: ' . print_r($res, true), LOGGER_DEBUG); + + json_return_and_die(['message' => $hash]); + } + + public function send_cover_photo_activity($channel, $photo, $profile) + { + + $arr = []; + $arr['item_thread_top'] = 1; + $arr['item_origin'] = 1; + $arr['item_wall'] = 1; + $arr['uuid'] = new_uuid(); + $arr['mid'] = z_root() . '/item/' . $arr['uuid']; + $arr['obj_type'] = ACTIVITY_OBJ_NOTE; + $arr['verb'] = ACTIVITY_CREATE; + + if ($profile && stripos($profile['gender'], t('female')) !== false) { + $t = t('%1$s updated her %2$s'); + } elseif ($profile && stripos($profile['gender'], t('male')) !== false) { + $t = t('%1$s updated his %2$s'); + } else { + $t = t('%1$s updated their %2$s'); + } + + $ptext = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' . t('cover photo') . '[/zrl]'; + + $ltext = '[zrl=' . z_root() . '/profile/' . $channel['channel_address'] . ']' . '[zmg]' . z_root() . '/photo/' . $photo['resource_id'] . '-8[/zmg][/zrl]'; + + $arr['body'] = sprintf($t, $channel['channel_name'], $ptext) . "\n\n" . $ltext; + + $arr['obj'] = [ + 'type' => ACTIVITY_OBJ_NOTE, + 'published' => datetime_convert('UTC', 'UTC', $photo['created'], ATOM_TIME), + 'updated' => datetime_convert('UTC', 'UTC', $photo['edited'], ATOM_TIME), + 'id' => $arr['mid'], + 'url' => ['type' => 'Link', 'mediaType' => $photo['mimetype'], 'href' => z_root() . '/photo/' . $photo['resource_id'] . '-7'], + 'source' => ['content' => $arr['body'], 'mediaType' => 'text/x-multicode'], + 'content' => bbcode($arr['body']), + 'actor' => Activity::encode_person($channel, false), + ]; + + $acl = new AccessControl($channel); + $x = $acl->get(); + $arr['allow_cid'] = $x['allow_cid']; + + $arr['allow_gid'] = $x['allow_gid']; + $arr['deny_cid'] = $x['deny_cid']; + $arr['deny_gid'] = $x['deny_gid']; + + $arr['uid'] = $channel['channel_id']; + $arr['aid'] = $channel['channel_account_id']; + + $arr['owner_xchan'] = $channel['channel_hash']; + $arr['author_xchan'] = $channel['channel_hash']; + + post_activity_item($arr); + } + + + /** + * @brief Generate content of profile-photo view + * + * @return string + * + */ + + + public function get() + { + + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } + + $channel = App::get_channel(); + + $newuser = false; + + if (argc() == 2 && argv(1) === 'new') { + $newuser = true; + } + + if (argv(1) === 'use') { + if (argc() < 3) { + notice(t('Permission denied.') . EOL); + return; + } + + // check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo'); + + $resource_id = argv(2); + + $r = q( + "SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' and imgscale > 0 ORDER BY imgscale ASC", + intval(local_channel()), + dbesc($resource_id) + ); + if (!$r) { + notice(t('Photo not available.') . EOL); + return; + } + $havescale = false; + foreach ($r as $rr) { + if ($rr['imgscale'] == 7) { + $havescale = true; + } + } + + $r = q( + "SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", + intval($r[0]['id']), + intval(local_channel()) + ); + if (!$r) { + notice(t('Photo not available.') . EOL); + return; + } + + if (intval($r[0]['os_storage'])) { + $data = @file_get_contents(dbunescbin($r[0]['content'])); + } else { + $data = dbunescbin($r[0]['content']); + } + + $ph = photo_factory($data, $r[0]['mimetype']); + $smallest = 0; + if ($ph && $ph->is_valid()) { + // go ahead as if we have just uploaded a new photo to crop + $i = q( + "select resource_id, imgscale from photo where resource_id = '%s' and uid = %d and imgscale = 0", + dbesc($r[0]['resource_id']), + intval(local_channel()) + ); + + if ($i) { + $hash = $i[0]['resource_id']; + foreach ($i as $ii) { + $smallest = intval($ii['imgscale']); + } + } + } + + $this->cover_photo_crop_ui_head($ph, $hash, $smallest); + } + + + if (!array_key_exists('imagecrop', App::$data)) { + $o .= replace_macros(get_markup_template('cover_photo.tpl'), [ + '$user' => App::$channel['channel_address'], + '$info' => t('Your cover photo may be visible to anybody on the internet'), + '$existing' => get_cover_photo(local_channel(), 'array', PHOTO_RES_COVER_850), + '$lbl_upfile' => t('Upload File:'), + '$lbl_profiles' => t('Select a profile:'), + '$title' => t('Change Cover Photo'), + '$submit' => t('Upload'), + '$profiles' => $profiles, + '$embedPhotos' => t('Use a photo from your albums'), + '$embedPhotosModalTitle' => t('Use a photo from your albums'), + '$embedPhotosModalCancel' => t('Cancel'), + '$embedPhotosModalOK' => t('OK'), + '$modalchooseimages' => t('Choose images to embed'), + '$modalchoosealbum' => t('Choose an album'), + '$modaldiffalbum' => t('Choose a different album'), + '$modalerrorlist' => t('Error getting album list'), + '$modalerrorlink' => t('Error getting photo link'), + '$modalerroralbum' => t('Error getting album'), + '$form_security_token' => get_form_security_token("cover_photo"), + '$select' => t('Select previously uploaded photo'), + + ]); + + call_hooks('cover_photo_content_end', $o); + + return $o; + } else { + $filename = App::$data['imagecrop'] . '-3'; + $resolution = 3; + + $o .= replace_macros(get_markup_template('cropcover.tpl'), [ + '$filename' => $filename, + '$profile' => intval($_REQUEST['profile']), + '$resource' => App::$data['imagecrop'] . '-3', + '$image_url' => z_root() . '/photo/' . $filename, + '$title' => t('Crop Image'), + '$desc' => t('Please adjust the image cropping for optimum viewing.'), + '$form_security_token' => get_form_security_token("cover_photo"), + '$done' => t('Done Editing') + ]); + return $o; + } + } + + /* @brief Generate the UI for photo-cropping + * + * @param $a Current application + * @param $ph Photo-Factory + * @return void + * + */ + + public function cover_photo_crop_ui_head($ph, $hash, $smallest) + { + + $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH); + if ($max_length > 0) { + $ph->scaleImage($max_length); + } + + $width = $ph->getWidth(); + $height = $ph->getHeight(); + + if ($width < 300 || $height < 300) { + $ph->scaleImageUp(240); + $width = $ph->getWidth(); + $height = $ph->getHeight(); + } + + + App::$data['imagecrop'] = $hash; + App::$data['imagecrop_resolution'] = $smallest; + App::$page['htmlhead'] .= replace_macros(get_markup_template('crophead.tpl'), []); + return; + } } diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php index 4e2fea562..d98b4680c 100644 --- a/Zotlabs/Module/Dav.php +++ b/Zotlabs/Module/Dav.php @@ -1,4 +1,5 @@ $c, 'account' => $a[0]]; + $channel_login = $c['channel_id']; + } + } + } + if (!$record) { + continue; + } - $sigblock = HTTPSig::parse_sigheader($_SERVER[$head]); - if ($sigblock) { - $keyId = str_replace('acct:','',$sigblock['keyId']); - if ($keyId) { - $r = q("select * from hubloc where ( hubloc_addr = '%s' OR hubloc_id_url = '%s' OR hubloc_hash = '%s') limit 1", - dbesc($keyId), - dbesc($keyId), - dbesc($keyId) - ); - if ($r) { - $c = channelx_by_hash($r[0]['hubloc_hash']); - if ($c) { - $a = q("select * from account where account_id = %d limit 1", - intval($c['channel_account_id']) - ); - if ($a) { - $record = [ 'channel' => $c, 'account' => $a[0] ]; - $channel_login = $c['channel_id']; - } - } - } - if (! $record) { - continue; - } + if ($record) { + $verified = HTTPSig::verify('', $record['channel']['channel_pubkey']); + if (!($verified && $verified['header_signed'] && $verified['header_valid'])) { + $record = null; + } + if ($record['account']) { + authenticate_success($record['account']); + if ($channel_login) { + change_channel($channel_login); + } + } + break; + } + } + } + } + } - if ($record) { - $verified = HTTPSig::verify('',$record['channel']['channel_pubkey']); - if (! ($verified && $verified['header_signed'] && $verified['header_valid'])) { - $record = null; - } - if ($record['account']) { - authenticate_success($record['account']); - if ($channel_login) { - change_channel($channel_login); - } - } - break; - } - } - } - } - } + if (!is_dir('store')) { + os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false); + } - if (! is_dir('store')) - os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false); - - if (argc() > 1) - Libprofile::load(argv(1),0); + if (argc() > 1) { + Libprofile::load(argv(1), 0); + } - $auth = new \Zotlabs\Storage\BasicAuth(); -// $auth->observer = get_observer_hash(); + $auth = new BasicAuth(); +// $auth->observer = get_observer_hash(); - $auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . ' ' . 'WebDAV'); + $auth->setRealm(ucfirst(System::get_platform_name()) . ' ' . 'WebDAV'); - $rootDirectory = new \Zotlabs\Storage\Directory('/', $auth); + $rootDirectory = new \Zotlabs\Storage\Directory('/', $auth); - // A SabreDAV server-object - $server = new SDAV\Server($rootDirectory); + // A SabreDAV server-object + $server = new SDAV\Server($rootDirectory); - $authPlugin = new \Sabre\DAV\Auth\Plugin($auth); - $server->addPlugin($authPlugin); + $authPlugin = new Plugin($auth); + $server->addPlugin($authPlugin); - // prevent overwriting changes each other with a lock backend - $lockBackend = new SDAV\Locks\Backend\File('cache/locks'); - $lockPlugin = new SDAV\Locks\Plugin($lockBackend); + // prevent overwriting changes each other with a lock backend + $lockBackend = new SDAV\Locks\Backend\File('cache/locks'); + $lockPlugin = new SDAV\Locks\Plugin($lockBackend); - $server->addPlugin($lockPlugin); + $server->addPlugin($lockPlugin); - // provide a directory view for the cloud in Hubzilla - $browser = new \Zotlabs\Storage\Browser($auth); - $auth->setBrowserPlugin($browser); + // provide a directory view for the cloud in Hubzilla + $browser = new Browser($auth); + $auth->setBrowserPlugin($browser); - // Experimental QuotaPlugin - // $server->addPlugin(new \Zotlabs\Storage\QuotaPlugin($auth)); + // Experimental QuotaPlugin + // $server->addPlugin(new \Zotlabs\Storage\QuotaPlugin($auth)); - // All we need to do now, is to fire up the server - $server->exec(); - - killme(); - } + // All we need to do now, is to fire up the server + $server->exec(); + killme(); + } } diff --git a/Zotlabs/Module/Defperms.php b/Zotlabs/Module/Defperms.php index 9255bbb6a..ec714b10e 100644 --- a/Zotlabs/Module/Defperms.php +++ b/Zotlabs/Module/Defperms.php @@ -1,4 +1,5 @@ $desc) { - if (array_key_exists('perms_' . $perm, $_POST)) { - if ($p) { - $p .= ','; - } - $p .= $perm; - } - } - set_abconfig($channel['channel_id'],$orig_record[0]['abook_xchan'],'system','my_perms',$p); - if ($autoperms) { - set_pconfig($channel['channel_id'],'system','autoperms',$p); - } - } - - notice( t('Settings updated.') . EOL); + if (!local_channel()) { + return; + } - - // Refresh the structure in memory with the new data - - $r = q("SELECT abook.*, xchan.* + $contact_id = intval(argv(1)); + if (!$contact_id) { + return; + } + + $channel = App::get_channel(); + + $orig_record = q( + "SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1", + intval($contact_id), + intval(local_channel()) + ); + + if (!$orig_record) { + notice(t('Could not access contact record.') . EOL); + goaway(z_root() . '/connections'); + } + + + if (intval($orig_record[0]['abook_self'])) { + $autoperms = intval($_POST['autoperms']); + $is_self = true; + } else { + $autoperms = null; + $is_self = false; + } + + $all_perms = Permissions::Perms(); + + $p = EMPTY_STR; + + if ($all_perms) { + foreach ($all_perms as $perm => $desc) { + if (array_key_exists('perms_' . $perm, $_POST)) { + if ($p) { + $p .= ','; + } + $p .= $perm; + } + } + set_abconfig($channel['channel_id'], $orig_record[0]['abook_xchan'], 'system', 'my_perms', $p); + if ($autoperms) { + set_pconfig($channel['channel_id'], 'system', 'autoperms', $p); + } + } + + notice(t('Settings updated.') . EOL); + + + // Refresh the structure in memory with the new data + + $r = q( + "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", - intval(local_channel()), - intval($contact_id) - ); - if ($r) { - App::$poi = $r[0]; - } - - $this->defperms_clone($a); - - goaway(z_root() . '/defperms'); - - return; - - } - - /* @brief Clone connection - * - * - */ - - function defperms_clone(&$a) { - - if (! App::$poi) { - return; - } - - $channel = App::get_channel(); - - $r = q("SELECT abook.*, xchan.* + intval(local_channel()), + intval($contact_id) + ); + if ($r) { + App::$poi = $r[0]; + } + + $this->defperms_clone($a); + + goaway(z_root() . '/defperms'); + + return; + } + + /* @brief Clone connection + * + * + */ + + public function defperms_clone(&$a) + { + + if (!App::$poi) { + return; + } + + $channel = App::get_channel(); + + $r = q( + "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", - intval(local_channel()), - intval(App::$poi['abook_id']) - ); - if ($r) { - App::$poi = array_shift($r); - } - - $clone = App::$poi; - - unset($clone['abook_id']); - unset($clone['abook_account']); - unset($clone['abook_channel']); - - $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); - if ($abconfig) { - $clone['abconfig'] = $abconfig; - } - Libsync::build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone))); - } - - /* @brief Generate content of connection default permissions page - * - * - */ - - function get() { - - $sort_type = 0; - $o = ''; - - if (! local_channel()) { - notice( t('Permission denied.') . EOL); - return login(); - } + intval(local_channel()), + intval(App::$poi['abook_id']) + ); + if ($r) { + App::$poi = array_shift($r); + } - $role = get_pconfig(local_channel(),'system','permissions_role'); - if ($role) { - notice( t('Permission denied.') . EOL); - return; - } + $clone = App::$poi; - $section = ((array_key_exists('section',$_REQUEST)) ? $_REQUEST['section'] : ''); - $channel = App::get_channel(); - - $yes_no = [ t('No'),t('Yes') ]; - - $connect_perms = Permissions::connect_perms(local_channel()); + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); - $o .= "\n"; - - if (App::$poi) { - - $sections = []; + foreach ($connect_perms['perms'] as $p => $v) { + if ($v) { + $o .= "\$('#me_id_perms_" . $p . "').prop('checked', true); \n"; + } + } + $o .= " }\n\n"; - $self = false; - - $tpl = get_markup_template('defperms.tpl'); - - $perms = []; - $channel = App::get_channel(); + if (App::$poi) { + $sections = []; - $contact = App::$poi; - - $global_perms = Permissions::Perms(); + $self = false; - $hidden_perms = []; - - foreach ($global_perms as $k => $v) { - $thisperm = get_abconfig(local_channel(),$contact['abook_xchan'],'my_perms',$k); - - $checkinherited = PermissionLimits::Get(local_channel(),$k); + $tpl = get_markup_template('defperms.tpl'); - $inherited = (($checkinherited & PERMS_SPECIFIC) ? false : true); + $perms = []; + $channel = App::get_channel(); - $perms[] = [ 'perms_' . $k, $v, intval($thisperm), '', $yes_no, (($inherited) ? ' disabled="disabled" ' : '') ]; - if ($inherited) { - $hidden_perms[] = [ 'perms_' . $k, intval($thisperm) ]; - } - } - - $pcat = new Permcat(local_channel()); - $pcatlist = $pcat->listing(); - $permcats = []; - if ($pcatlist) { - foreach ($pcatlist as $pc) { - $permcats[$pc['name']] = $pc['localname']; - } - } + $contact = App::$poi; - $o .= replace_macros($tpl, [ - '$header' => t('Connection Default Permissions'), - '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('If enabled, connection requests will be approved without your interaction'), $yes_no), - '$permcat' => [ 'permcat', t('Permission role'), '', '' . t('Loading') . '...',$permcats ], - '$permcat_new' => t('Add permission role'), - '$permcat_enable' => feature_enabled(local_channel(),'permcats'), - '$section' => $section, - '$sections' => $sections, - '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), - '$autoapprove' => t('Automatic approval settings'), - '$unapproved' => $unapproved, - '$inherited' => t('inherited'), - '$submit' => t('Submit'), - '$me' => t('My Settings'), - '$perms' => $perms, - '$hidden_perms' => $hidden_perms, - '$permlbl' => t('Individual Permissions'), - '$permnote_self' => t('Some individual permissions may have been preset or locked based on your channel type and privacy settings.'), - '$contact_id' => $contact['abook_id'], - '$name' => $contact['xchan_name'], - ]); - - $arr = array('contact' => $contact,'output' => $o); - - call_hooks('contact_edit', $arr); - - return $arr['output']; - - } - } + $global_perms = Permissions::Perms(); + + $hidden_perms = []; + + foreach ($global_perms as $k => $v) { + $thisperm = get_abconfig(local_channel(), $contact['abook_xchan'], 'my_perms', $k); + + $checkinherited = PermissionLimits::Get(local_channel(), $k); + + $inherited = (($checkinherited & PERMS_SPECIFIC) ? false : true); + + $perms[] = ['perms_' . $k, $v, intval($thisperm), '', $yes_no, (($inherited) ? ' disabled="disabled" ' : '')]; + if ($inherited) { + $hidden_perms[] = ['perms_' . $k, intval($thisperm)]; + } + } + + $pcat = new Permcat(local_channel()); + $pcatlist = $pcat->listing(); + $permcats = []; + if ($pcatlist) { + foreach ($pcatlist as $pc) { + $permcats[$pc['name']] = $pc['localname']; + } + } + + $o .= replace_macros($tpl, [ + '$header' => t('Connection Default Permissions'), + '$autoperms' => array('autoperms', t('Apply these permissions automatically'), ((get_pconfig(local_channel(), 'system', 'autoperms')) ? 1 : 0), t('If enabled, connection requests will be approved without your interaction'), $yes_no), + '$permcat' => ['permcat', t('Permission role'), '', '' . t('Loading') . '...', $permcats], + '$permcat_new' => t('Add permission role'), + '$permcat_enable' => feature_enabled(local_channel(), 'permcats'), + '$section' => $section, + '$sections' => $sections, + '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), + '$autoapprove' => t('Automatic approval settings'), + '$unapproved' => $unapproved, + '$inherited' => t('inherited'), + '$submit' => t('Submit'), + '$me' => t('My Settings'), + '$perms' => $perms, + '$hidden_perms' => $hidden_perms, + '$permlbl' => t('Individual Permissions'), + '$permnote_self' => t('Some individual permissions may have been preset or locked based on your channel type and privacy settings.'), + '$contact_id' => $contact['abook_id'], + '$name' => $contact['xchan_name'], + ]); + + $arr = array('contact' => $contact, 'output' => $o); + + call_hooks('contact_edit', $arr); + + return $arr['output']; + } + } } diff --git a/Zotlabs/Module/Dircensor.php b/Zotlabs/Module/Dircensor.php index 0dab52cb6..a4348b862 100644 --- a/Zotlabs/Module/Dircensor.php +++ b/Zotlabs/Module/Dircensor.php @@ -5,48 +5,48 @@ namespace Zotlabs\Module; use App; use Zotlabs\Web\Controller; +class Dircensor extends Controller +{ -class Dircensor extends Controller { + public function get() + { + if (!is_site_admin()) { + return; + } - function get() { - if(! is_site_admin()) { - return; - } + $dirmode = intval(get_config('system', 'directory_mode')); - $dirmode = intval(get_config('system','directory_mode')); + if (!($dirmode == DIRECTORY_MODE_PRIMARY || $dirmode == DIRECTORY_MODE_STANDALONE)) { + return; + } - if (! ($dirmode == DIRECTORY_MODE_PRIMARY || $dirmode == DIRECTORY_MODE_STANDALONE)) { - return; - } + $xchan = argv(1); + if (!$xchan) { + return; + } - $xchan = argv(1); - if(! $xchan) { - return; - } + $r = q( + "select * from xchan where xchan_hash = '%s'", + dbesc($xchan) + ); - $r = q("select * from xchan where xchan_hash = '%s'", - dbesc($xchan) - ); + if (!$r) { + return; + } - if(! $r) { - return; - } + $val = (($r[0]['xchan_censored']) ? 0 : 1); - $val = (($r[0]['xchan_censored']) ? 0 : 1); + q( + "update xchan set xchan_censored = $val where xchan_hash = '%s'", + dbesc($xchan) + ); - q("update xchan set xchan_censored = $val where xchan_hash = '%s'", - dbesc($xchan) - ); + if ($val) { + info(t('Entry censored') . EOL); + } else { + info(t('Entry uncensored') . EOL); + } - if( $val) { - info( t('Entry censored') . EOL); - } - else { - info( t('Entry uncensored') . EOL); - } - - goaway(z_root() . '/directory'); - - } - -} \ No newline at end of file + goaway(z_root() . '/directory'); + } +} diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php index bfe44b2b7..ba3944bfd 100644 --- a/Zotlabs/Module/Directory.php +++ b/Zotlabs/Module/Directory.php @@ -12,536 +12,528 @@ require_once('include/socgraph.php'); require_once('include/bbcode.php'); require_once('include/html2plain.php'); -define( 'DIRECTORY_PAGESIZE', 60); +define('DIRECTORY_PAGESIZE', 60); -class Directory extends Controller { +class Directory extends Controller +{ - function init() { - App::set_pager_itemspage(DIRECTORY_PAGESIZE); - - if (x($_GET,'ignore') && local_channel()) { - q("insert into xign ( uid, xchan ) values ( %d, '%s' ) ", - intval(local_channel()), - dbesc($_GET['ignore']) - ); - - Libsync::build_sync_packet(local_channel(), [ 'xign' => [ [ 'uid' => local_channel(), 'xchan' => $_GET['ignore'] ]]] ); - if ($_REQUEST['return']) { - goaway(z_root() . '/' . base64_decode($_REQUEST['return'])); - } - goaway(z_root() . '/directory?f=&suggest=1'); - } - - $observer = get_observer_hash(); - $global_changed = false; - $safe_changed = false; - $type_changed = false; - $active_changed = false; - - if (array_key_exists('global',$_REQUEST)) { - $globaldir = intval($_REQUEST['global']); - if (get_config('system','localdir_hide')) { - $globaldir = 1; - } - $global_changed = true; - } - if ($global_changed) { - $_SESSION['globaldir'] = $globaldir; - if ($observer) { - set_xconfig($observer,'directory','globaldir',$globaldir); - } - } - - if (array_key_exists('safe',$_REQUEST)) { - $safemode = intval($_REQUEST['safe']); - $safe_changed = true; - } - if ($safe_changed) { - $_SESSION['safemode'] = $safemode; - if ($observer) { - set_xconfig($observer,'directory','safemode',$safemode); - } - } - - if (array_key_exists('type',$_REQUEST)) { - $type = intval($_REQUEST['type']); - $type_changed = true; - } - if ($type_changed) { - $_SESSION['chantype'] = $type; - if ($observer) { - set_xconfig($observer,'directory','chantype',$type); - } - } + public function init() + { + App::set_pager_itemspage(DIRECTORY_PAGESIZE); - if (array_key_exists('active',$_REQUEST)) { - $active = intval($_REQUEST['active']); - $active_changed = true; - } - if ($active_changed) { - $_SESSION['activedir'] = $active; - if ($observer) { - set_xconfig($observer,'directory','activedir',$active); - } - } + if (x($_GET, 'ignore') && local_channel()) { + q( + "insert into xign ( uid, xchan ) values ( %d, '%s' ) ", + intval(local_channel()), + dbesc($_GET['ignore']) + ); - } - - function get() { - - if (observer_prohibited()) { - notice( t('Public access denied.') . EOL); - return; - } + Libsync::build_sync_packet(local_channel(), ['xign' => [['uid' => local_channel(), 'xchan' => $_GET['ignore']]]]); + if ($_REQUEST['return']) { + goaway(z_root() . '/' . base64_decode($_REQUEST['return'])); + } + goaway(z_root() . '/directory?f=&suggest=1'); + } - $observer = get_observer_hash(); + $observer = get_observer_hash(); + $global_changed = false; + $safe_changed = false; + $type_changed = false; + $active_changed = false; - if (get_config('system','block_public_directory',true) && (! $observer)) { - notice( t('Public access denied.') . EOL); - return login(false); - } - - $globaldir = Libzotdir::get_directory_setting($observer, 'globaldir'); + if (array_key_exists('global', $_REQUEST)) { + $globaldir = intval($_REQUEST['global']); + if (get_config('system', 'localdir_hide')) { + $globaldir = 1; + } + $global_changed = true; + } + if ($global_changed) { + $_SESSION['globaldir'] = $globaldir; + if ($observer) { + set_xconfig($observer, 'directory', 'globaldir', $globaldir); + } + } - // override your personal global search pref if we're doing a navbar search of the directory - if (intval($_REQUEST['navsearch'])) { - $globaldir = 1; - } - - $safe_mode = Libzotdir::get_directory_setting($observer, 'safemode'); - - $type = Libzotdir::get_directory_setting($observer, 'chantype'); + if (array_key_exists('safe', $_REQUEST)) { + $safemode = intval($_REQUEST['safe']); + $safe_changed = true; + } + if ($safe_changed) { + $_SESSION['safemode'] = $safemode; + if ($observer) { + set_xconfig($observer, 'directory', 'safemode', $safemode); + } + } - $active = Libzotdir::get_directory_setting($observer, 'activedir'); + if (array_key_exists('type', $_REQUEST)) { + $type = intval($_REQUEST['type']); + $type_changed = true; + } + if ($type_changed) { + $_SESSION['chantype'] = $type; + if ($observer) { + set_xconfig($observer, 'directory', 'chantype', $type); + } + } - $o = ''; - nav_set_selected('Directory'); - - if (x($_POST,'search')) { - $search = notags(trim($_POST['search'])); - } - else { - $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); - } - - if (strpos($search,'=')) { - $advanced = $search; - } - - $keywords = (($_GET['keywords']) ? $_GET['keywords'] : ''); - - // Suggest channels if no search terms or keywords are given - $suggest = (local_channel() && x($_REQUEST,'suggest')) ? $_REQUEST['suggest'] : ''; - - if ($suggest) { + if (array_key_exists('active', $_REQUEST)) { + $active = intval($_REQUEST['active']); + $active_changed = true; + } + if ($active_changed) { + $_SESSION['activedir'] = $active; + if ($observer) { + set_xconfig($observer, 'directory', 'activedir', $active); + } + } + } - // the directory options have no effect in suggestion mode - - $globaldir = 1; - $safe_mode = 1; - $active = 1; - $type = 0; + public function get() + { - // only return DIRECTORY_PAGESIZE suggestions as the suggestion sorting - // only works if the suggestion query and the directory query have the - // same number of results + if (observer_prohibited()) { + notice(t('Public access denied.') . EOL); + return; + } - App::set_pager_itemspage(60); - $r = suggestion_query(local_channel(),get_observer_hash(),App::$pager['start'],DIRECTORY_PAGESIZE); + $observer = get_observer_hash(); - if (! $r) { - if ($_REQUEST['aj']) { - echo ''; - killme(); - } + if (get_config('system', 'block_public_directory', true) && (!$observer)) { + notice(t('Public access denied.') . EOL); + return login(false); + } - notice( t('No default suggestions were found.') . EOL); - return; - } - - // Remember in which order the suggestions were - $addresses = []; - $common = []; - $index = 0; - foreach ($r as $rr) { - $common[$rr['xchan_hash']] = ((intval($rr['total']) > 0) ? intval($rr['total']) - 1 : 0); - $addresses[$rr['xchan_hash']] = $index++; - } - - // Build query to get info about suggested people - $advanced = ''; - foreach (array_keys($addresses) as $address) { - $advanced .= "xhash=\"$address\" "; - } - // Remove last space in the advanced query - $advanced = rtrim($advanced); - - } - - $tpl = get_markup_template('directory_header.tpl'); - - $dirmode = intval(get_config('system','directory_mode')); + $globaldir = Libzotdir::get_directory_setting($observer, 'globaldir'); - $directory_admin = false; + // override your personal global search pref if we're doing a navbar search of the directory + if (intval($_REQUEST['navsearch'])) { + $globaldir = 1; + } - $url = z_root() . '/dirsearch'; - if (is_sys_channel(local_channel())) { - $directory_admin = true; - } - - $contacts = []; - - if (local_channel()) { - $x = q("select abook_xchan from abook where abook_channel = %d", - intval(local_channel()) - ); - if ($x) { - foreach ($x as $xx) { - $contacts[] = $xx['abook_xchan']; - } - } - } - - if ($url) { - - $numtags = get_config('system','directorytags'); - - $kw = ((intval($numtags) > 0) ? intval($numtags) : 50); - - if (get_config('system','disable_directory_keywords')) { - $kw = 0; - } - - $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); - - if ($token) { - $query .= '&t=' . $token; - } - - if (! $globaldir) { - $query .= '&hub=' . App::get_hostname(); - } - if ($search) { - $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); - } - if (strpos($search,'@')) { - $query .= '&address=' . urlencode($search); - } - if (strpos($search,'http') === 0) { - $query .= '&url=' . urlencode($search); - } - if ($keywords) { - $query .= '&keywords=' . urlencode($keywords); - } - if ($advanced) { - $query .= '&query=' . urlencode($advanced); - } - if (! is_null($type)) { - $query .= '&type=' . intval($type); - } - $directory_sort_order = get_config('system','directory_sort_order'); - if (! $directory_sort_order) { - $directory_sort_order = 'date'; - } - - $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : $directory_sort_order); - - if ($sort_order) { - $query .= '&order=' . urlencode($sort_order); - } - - if (App::$pager['page'] != 1) { - $query .= '&p=' . App::$pager['page']; - } + $safe_mode = Libzotdir::get_directory_setting($observer, 'safemode'); - if (isset($active)) { - $query .= '&active=' . intval($active); - } + $type = Libzotdir::get_directory_setting($observer, 'chantype'); + + $active = Libzotdir::get_directory_setting($observer, 'activedir'); + + $o = ''; + nav_set_selected('Directory'); + + if (x($_POST, 'search')) { + $search = notags(trim($_POST['search'])); + } else { + $search = ((x($_GET, 'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); + } + + if (strpos($search, '=')) { + $advanced = $search; + } + + $keywords = (($_GET['keywords']) ? $_GET['keywords'] : ''); + + // Suggest channels if no search terms or keywords are given + $suggest = (local_channel() && x($_REQUEST, 'suggest')) ? $_REQUEST['suggest'] : ''; + + if ($suggest) { + // the directory options have no effect in suggestion mode + + $globaldir = 1; + $safe_mode = 1; + $active = 1; + $type = 0; + + // only return DIRECTORY_PAGESIZE suggestions as the suggestion sorting + // only works if the suggestion query and the directory query have the + // same number of results + + App::set_pager_itemspage(60); + $r = suggestion_query(local_channel(), get_observer_hash(), App::$pager['start'], DIRECTORY_PAGESIZE); + + if (!$r) { + if ($_REQUEST['aj']) { + echo ''; + killme(); + } + + notice(t('No default suggestions were found.') . EOL); + return; + } + + // Remember in which order the suggestions were + $addresses = []; + $common = []; + $index = 0; + foreach ($r as $rr) { + $common[$rr['xchan_hash']] = ((intval($rr['total']) > 0) ? intval($rr['total']) - 1 : 0); + $addresses[$rr['xchan_hash']] = $index++; + } + + // Build query to get info about suggested people + $advanced = ''; + foreach (array_keys($addresses) as $address) { + $advanced .= "xhash=\"$address\" "; + } + // Remove last space in the advanced query + $advanced = rtrim($advanced); + } + + $tpl = get_markup_template('directory_header.tpl'); + + $dirmode = intval(get_config('system', 'directory_mode')); + + $directory_admin = false; + + $url = z_root() . '/dirsearch'; + if (is_sys_channel(local_channel())) { + $directory_admin = true; + } + + $contacts = []; + + if (local_channel()) { + $x = q( + "select abook_xchan from abook where abook_channel = %d", + intval(local_channel()) + ); + if ($x) { + foreach ($x as $xx) { + $contacts[] = $xx['abook_xchan']; + } + } + } + + if ($url) { + $numtags = get_config('system', 'directorytags'); + + $kw = ((intval($numtags) > 0) ? intval($numtags) : 50); + + if (get_config('system', 'disable_directory_keywords')) { + $kw = 0; + } + + $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); + + if ($token) { + $query .= '&t=' . $token; + } + + if (!$globaldir) { + $query .= '&hub=' . App::get_hostname(); + } + if ($search) { + $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); + } + if (strpos($search, '@')) { + $query .= '&address=' . urlencode($search); + } + if (strpos($search, 'http') === 0) { + $query .= '&url=' . urlencode($search); + } + if ($keywords) { + $query .= '&keywords=' . urlencode($keywords); + } + if ($advanced) { + $query .= '&query=' . urlencode($advanced); + } + if (!is_null($type)) { + $query .= '&type=' . intval($type); + } + $directory_sort_order = get_config('system', 'directory_sort_order'); + if (!$directory_sort_order) { + $directory_sort_order = 'date'; + } + + $sort_order = ((x($_REQUEST, 'order')) ? $_REQUEST['order'] : $directory_sort_order); + + if ($sort_order) { + $query .= '&order=' . urlencode($sort_order); + } + + if (App::$pager['page'] != 1) { + $query .= '&p=' . App::$pager['page']; + } + + if (isset($active)) { + $query .= '&active=' . intval($active); + } - // logger('mod_directory: query: ' . $query); - - $x = z_fetch_url($query); - // logger('directory: return from upstream: ' . print_r($x,true), LOGGER_DATA); - - if ($x['success']) { - $t = 0; - $j = json_decode($x['body'],true); - if ($j) { - - if ($j['results']) { + // logger('mod_directory: query: ' . $query); - $results = $j['results']; - if ($suggest) { - // change order to "number of common friends descending" - $results = self::reorder_results($results,$addresses); - } + $x = z_fetch_url($query); + // logger('directory: return from upstream: ' . print_r($x,true), LOGGER_DATA); - $entries = []; - - $photo = 'thumb'; - - foreach ($results as $rr) { - - $profile_link = chanlink_url($rr['url']); - - $pdesc = (($rr['description']) ? $rr['description'] . '
' : ''); - $connect_link = ((local_channel()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); - - // Checking status is disabled ATM until someone checks the performance impact more carefully - //$online = remote_online_status($rr['address']); - $online = ''; - - if (in_array($rr['hash'],$contacts)) { - $connect_link = ''; - } - - $location = ''; - if (strlen($rr['locale'])) { - $location .= $rr['locale']; - } - if (strlen($rr['region'])) { - if (strlen($rr['locale'])) { - $location .= ', '; - } - $location .= $rr['region']; - } - if (strlen($rr['country'])) { - if (strlen($location)) { - $location .= ', '; - } - $location .= $rr['country']; - } - - $age = ''; - if (strlen($rr['birthday'])) { - if (($years = age($rr['birthday'],'UTC','')) > 0) { - $age = $years; - } - } - - $page_type = ''; - - $total_ratings = ''; - - $profile = $rr; - - $gender = ((x($profile,'gender') == 1) ? t('Gender: ') . $profile['gender']: False); - $marital = ((x($profile,'marital') == 1) ? t('Status: ') . $profile['marital']: False); - $homepage = ((x($profile,'homepage') == 1) ? t('Homepage: ') : False); - $homepageurl = ((x($profile,'homepage') == 1) ? html2plain($profile['homepage']) : ''); - $hometown = ((x($profile,'hometown') == 1) ? html2plain($profile['hometown']) : False); - $about = ((x($profile,'about') == 1) ? zidify_links(bbcode($profile['about'])) : False); - - $keywords = ((x($profile,'keywords')) ? $profile['keywords'] : ''); - - $out = ''; - - if ($keywords) { - $keywords = str_replace(',',' ', $keywords); - $keywords = str_replace(' ',' ', $keywords); - $karr = explode(' ', $keywords); - - if ($karr) { - if (local_channel()) { - $pk = q("select keywords from profile where uid = %d and is_default = 1 limit 1", - intval(local_channel()) - ); - if ($pk) { - $keywords = str_replace(',',' ', $pk[0]['keywords']); - $keywords = str_replace(' ',' ', $keywords); - $marr = explode(' ', $keywords); - } - } - foreach ($karr as $k) { - if (strlen($out)) { - $out .= ', '; - } - if ($marr && in_arrayi($k,$marr)) { - $out .= '' . $k . ''; - } - else { - $out .= '' . $k . ''; - } - } - } - } - - $entry = [ - 'id' => ++ $t, - 'profile_link' => $profile_link, - 'type' => $rr['type'], - 'photo' => $rr['photo'], - 'hash' => $rr['hash'], - 'alttext' => $rr['name'] . ((local_channel() || remote_channel()) ? ' ' . $rr['address'] : ''), - 'name' => $rr['name'], - 'age' => $age, - 'age_label' => t('Age:'), - 'profile' => $profile, - 'address' => $rr['address'], - 'nickname' => substr($rr['address'],0,strpos($rr['address'],'@')), - 'location' => $location, - 'location_label' => t('Location:'), - 'gender' => $gender, - 'total_ratings' => $total_ratings, - 'viewrate' => true, - 'canrate' => (($rating_enabled && local_channel()) ? true : false), - // 'network' => network_to_name($rr['network']), - // 'network_label' => t('Network:'), - 'pdesc' => $pdesc, - 'pdesc_label' => t('Description:'), - 'censor' => (($directory_admin) ? 'dircensor/' . $rr['hash'] : ''), - 'censor_label' => (($rr['censored']) ? t('Uncensor') : t('Censor')), - 'marital' => $marital, - 'homepage' => $homepage, - 'homepageurl' => (($safe_mode) ? $homepageurl : linkify($homepageurl)), - 'hometown' => $hometown, - 'hometown_label' => t('Hometown:'), - 'about' => $about, - 'about_label' => t('About:'), - 'conn_label' => t('Connect'), - 'forum_label' => t('Group'), - 'collections_label' => t('Collection'), - 'connect' => $connect_link, - 'online' => $online, - 'kw' => (($out) ? t('Keywords: ') : ''), - 'keywords' => $out, - 'ignlink' => $suggest ? z_root() . '/directory?ignore=' . $rr['hash'] : '', - 'ignore_label' => t('Don\'t suggest'), - 'common_friends' => (($common[$rr['hash']]) ? intval($common[$rr['hash']]) : ''), - 'common_label' => t('Suggestion ranking:'), - 'common_count' => intval($common[$rr['hash']]), - 'safe' => $safe_mode - ]; + if ($x['success']) { + $t = 0; + $j = json_decode($x['body'], true); + if ($j) { + if ($j['results']) { + $results = $j['results']; + if ($suggest) { + // change order to "number of common friends descending" + $results = self::reorder_results($results, $addresses); + } + + $entries = []; + + $photo = 'thumb'; + + foreach ($results as $rr) { + $profile_link = chanlink_url($rr['url']); + + $pdesc = (($rr['description']) ? $rr['description'] . '
' : ''); + $connect_link = ((local_channel()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); + + // Checking status is disabled ATM until someone checks the performance impact more carefully + //$online = remote_online_status($rr['address']); + $online = ''; + + if (in_array($rr['hash'], $contacts)) { + $connect_link = ''; + } + + $location = ''; + if (strlen($rr['locale'])) { + $location .= $rr['locale']; + } + if (strlen($rr['region'])) { + if (strlen($rr['locale'])) { + $location .= ', '; + } + $location .= $rr['region']; + } + if (strlen($rr['country'])) { + if (strlen($location)) { + $location .= ', '; + } + $location .= $rr['country']; + } + + $age = ''; + if (strlen($rr['birthday'])) { + if (($years = age($rr['birthday'], 'UTC', '')) > 0) { + $age = $years; + } + } + + $page_type = ''; + + $total_ratings = ''; + + $profile = $rr; + + $gender = ((x($profile, 'gender') == 1) ? t('Gender: ') . $profile['gender'] : false); + $marital = ((x($profile, 'marital') == 1) ? t('Status: ') . $profile['marital'] : false); + $homepage = ((x($profile, 'homepage') == 1) ? t('Homepage: ') : false); + $homepageurl = ((x($profile, 'homepage') == 1) ? html2plain($profile['homepage']) : ''); + $hometown = ((x($profile, 'hometown') == 1) ? html2plain($profile['hometown']) : false); + $about = ((x($profile, 'about') == 1) ? zidify_links(bbcode($profile['about'])) : false); + + $keywords = ((x($profile, 'keywords')) ? $profile['keywords'] : ''); + + $out = ''; + + if ($keywords) { + $keywords = str_replace(',', ' ', $keywords); + $keywords = str_replace(' ', ' ', $keywords); + $karr = explode(' ', $keywords); + + if ($karr) { + if (local_channel()) { + $pk = q( + "select keywords from profile where uid = %d and is_default = 1 limit 1", + intval(local_channel()) + ); + if ($pk) { + $keywords = str_replace(',', ' ', $pk[0]['keywords']); + $keywords = str_replace(' ', ' ', $keywords); + $marr = explode(' ', $keywords); + } + } + foreach ($karr as $k) { + if (strlen($out)) { + $out .= ', '; + } + if ($marr && in_arrayi($k, $marr)) { + $out .= '' . $k . ''; + } else { + $out .= '' . $k . ''; + } + } + } + } + + $entry = [ + 'id' => ++$t, + 'profile_link' => $profile_link, + 'type' => $rr['type'], + 'photo' => $rr['photo'], + 'hash' => $rr['hash'], + 'alttext' => $rr['name'] . ((local_channel() || remote_channel()) ? ' ' . $rr['address'] : ''), + 'name' => $rr['name'], + 'age' => $age, + 'age_label' => t('Age:'), + 'profile' => $profile, + 'address' => $rr['address'], + 'nickname' => substr($rr['address'], 0, strpos($rr['address'], '@')), + 'location' => $location, + 'location_label' => t('Location:'), + 'gender' => $gender, + 'total_ratings' => $total_ratings, + 'viewrate' => true, + 'canrate' => (($rating_enabled && local_channel()) ? true : false), + // 'network' => network_to_name($rr['network']), + // 'network_label' => t('Network:'), + 'pdesc' => $pdesc, + 'pdesc_label' => t('Description:'), + 'censor' => (($directory_admin) ? 'dircensor/' . $rr['hash'] : ''), + 'censor_label' => (($rr['censored']) ? t('Uncensor') : t('Censor')), + 'marital' => $marital, + 'homepage' => $homepage, + 'homepageurl' => (($safe_mode) ? $homepageurl : linkify($homepageurl)), + 'hometown' => $hometown, + 'hometown_label' => t('Hometown:'), + 'about' => $about, + 'about_label' => t('About:'), + 'conn_label' => t('Connect'), + 'forum_label' => t('Group'), + 'collections_label' => t('Collection'), + 'connect' => $connect_link, + 'online' => $online, + 'kw' => (($out) ? t('Keywords: ') : ''), + 'keywords' => $out, + 'ignlink' => $suggest ? z_root() . '/directory?ignore=' . $rr['hash'] : '', + 'ignore_label' => t('Don\'t suggest'), + 'common_friends' => (($common[$rr['hash']]) ? intval($common[$rr['hash']]) : ''), + 'common_label' => t('Suggestion ranking:'), + 'common_count' => intval($common[$rr['hash']]), + 'safe' => $safe_mode + ]; - $blocked = LibBlock::fetch($channel['channel_id'],BLOCKTYPE_SERVER); + $blocked = LibBlock::fetch($channel['channel_id'], BLOCKTYPE_SERVER); - $found_block = false; - if ($blocked) { - foreach ($blocked as $b) { - if (strpos($rr['site_url'],$b['block_entity']) !== false) { - $found_block = true; - break; - } - } - if ($found_block) { - continue; - } - } + $found_block = false; + if ($blocked) { + foreach ($blocked as $b) { + if (strpos($rr['site_url'], $b['block_entity']) !== false) { + $found_block = true; + break; + } + } + if ($found_block) { + continue; + } + } - if (LibBlock::fetch_by_entity(local_channel(), $entry['hash'])) { - continue; - } + if (LibBlock::fetch_by_entity(local_channel(), $entry['hash'])) { + continue; + } - $arr = array('contact' => $rr, 'entry' => $entry); - - call_hooks('directory_item', $arr); - - unset($profile); - unset($location); - - if (! $arr['entry']) { - continue; - } - - if ($sort_order == '' && $suggest) { - $entries[$addresses[$rr['address']]] = $arr['entry']; // Use the same indexes as originally to get the best suggestion first - } - else { - $entries[] = $arr['entry']; - } - } - - ksort($entries); // Sort array by key so that foreach-constructs work as expected - - if ($j['keywords']) { - App::$data['directory_keywords'] = $j['keywords']; - } - - // logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA); - - - if ($_REQUEST['aj']) { - if ($entries) { - $o = replace_macros(get_markup_template('directajax.tpl'), [ '$entries' => $entries ] ); - } - else { - $o = ''; - } - echo $o; - killme(); - } - else { - $maxheight = 94; - - $dirtitle = (($globaldir) ? t('Directory') : t('Local Directory')); - - $o .= ""; - $o .= replace_macros($tpl, [ - '$search' => $search, - '$desc' => t('Find'), - '$finddsc' => t('Finding:'), - '$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'), - '$entries' => $entries, - '$dirlbl' => $suggest ? t('Channel Suggestions') : $dirtitle, - '$submit' => t('Find'), - '$next' => alt_pager($j['records'], t('next page'), t('previous page')), - '$sort' => t('Sort options'), - '$normal' => t('Alphabetic'), - '$reverse' => t('Reverse Alphabetic'), - '$date' => t('Newest to Oldest'), - '$reversedate' => t('Oldest to Newest'), - '$suggest' => $suggest ? '&suggest=1' : '' - ]); - } - } - else { - if ($_REQUEST['aj']) { - $o = ''; - echo $o; - killme(); - } - if ($search && App::$pager['page'] == 1 && $j['records'] == 0) { - if (strpos($search,'@')) { - goaway(z_root() . '/chanview/?f=&address=' . $search); - } - elseif(strpos($search,'http') === 0) { - goaway(z_root() . '/chanview/?f=&url=' . $search); - } - else { - $r = q("select xchan_hash from xchan where xchan_name = '%s' limit 1", - dbesc($search) - ); - if ($r) { - goaway(z_root() . '/chanview/?f=&hash=' . urlencode($r[0]['xchan_hash'])); - } - } - } - info( t("No entries (some entries may be hidden).") . EOL); - } - } - } - } - return $o; - } + $arr = array('contact' => $rr, 'entry' => $entry); + + call_hooks('directory_item', $arr); + + unset($profile); + unset($location); + + if (!$arr['entry']) { + continue; + } + + if ($sort_order == '' && $suggest) { + $entries[$addresses[$rr['address']]] = $arr['entry']; // Use the same indexes as originally to get the best suggestion first + } else { + $entries[] = $arr['entry']; + } + } + + ksort($entries); // Sort array by key so that foreach-constructs work as expected + + if ($j['keywords']) { + App::$data['directory_keywords'] = $j['keywords']; + } + + // logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA); - static public function reorder_results($results,$suggests) { - if (! $suggests) { - return $results; - } + if ($_REQUEST['aj']) { + if ($entries) { + $o = replace_macros(get_markup_template('directajax.tpl'), ['$entries' => $entries]); + } else { + $o = ''; + } + echo $o; + killme(); + } else { + $maxheight = 94; - $out = []; - foreach ($suggests as $k => $v) { - foreach ($results as $rv) { - if ($k == $rv['hash']) { - $out[intval($v)] = $rv; - break; - } - } - } - return $out; - } - + $dirtitle = (($globaldir) ? t('Directory') : t('Local Directory')); + + $o .= ""; + $o .= replace_macros($tpl, [ + '$search' => $search, + '$desc' => t('Find'), + '$finddsc' => t('Finding:'), + '$safetxt' => htmlspecialchars($search, ENT_QUOTES, 'UTF-8'), + '$entries' => $entries, + '$dirlbl' => $suggest ? t('Channel Suggestions') : $dirtitle, + '$submit' => t('Find'), + '$next' => alt_pager($j['records'], t('next page'), t('previous page')), + '$sort' => t('Sort options'), + '$normal' => t('Alphabetic'), + '$reverse' => t('Reverse Alphabetic'), + '$date' => t('Newest to Oldest'), + '$reversedate' => t('Oldest to Newest'), + '$suggest' => $suggest ? '&suggest=1' : '' + ]); + } + } else { + if ($_REQUEST['aj']) { + $o = ''; + echo $o; + killme(); + } + if ($search && App::$pager['page'] == 1 && $j['records'] == 0) { + if (strpos($search, '@')) { + goaway(z_root() . '/chanview/?f=&address=' . $search); + } elseif (strpos($search, 'http') === 0) { + goaway(z_root() . '/chanview/?f=&url=' . $search); + } else { + $r = q( + "select xchan_hash from xchan where xchan_name = '%s' limit 1", + dbesc($search) + ); + if ($r) { + goaway(z_root() . '/chanview/?f=&hash=' . urlencode($r[0]['xchan_hash'])); + } + } + } + info(t("No entries (some entries may be hidden).") . EOL); + } + } + } + } + return $o; + } + + + public static function reorder_results($results, $suggests) + { + if (!$suggests) { + return $results; + } + + $out = []; + foreach ($suggests as $k => $v) { + foreach ($results as $rv) { + if ($k == $rv['hash']) { + $out[intval($v)] = $rv; + break; + } + } + } + return $out; + } } diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php index c6368dfc5..754b004ba 100644 --- a/Zotlabs/Module/Dirsearch.php +++ b/Zotlabs/Module/Dirsearch.php @@ -7,455 +7,460 @@ use Zotlabs\Web\Controller; // This is the primary endpoint for communicating with Zot directory services. -class Dirsearch extends Controller { +class Dirsearch extends Controller +{ - function init() { - App::set_pager_itemspage(60); - } - - function get() { - - $ret = [ 'success' => false ]; - - // logger('request: ' . print_r($_REQUEST,true)); - + public function init() + { + App::set_pager_itemspage(60); + } - if (argc() > 1 && argv(1) === 'sites') { - $ret = $this->list_public_sites(); - json_return_and_die($ret); - } + public function get() + { - $dirmode = intval(get_config('system','directory_mode')); + $ret = ['success' => false]; + + // logger('request: ' . print_r($_REQUEST,true)); - $network = EMPTY_STR; + if (argc() > 1 && argv(1) === 'sites') { + $ret = $this->list_public_sites(); + json_return_and_die($ret); + } - $sql_extra = ''; - - $tables = [ 'name', 'address', 'xhash', 'locale', 'region', 'postcode', - 'country', 'gender', 'marital', 'sexual', 'keywords' ]; - - // parse advanced query if present - - if ($_REQUEST['query']) { - $advanced = $this->dir_parse_query($_REQUEST['query']); - if ($advanced) { - foreach ($advanced as $adv) { - if (in_array($adv['field'],$tables)) { - if ($adv['field'] === 'name') - $sql_extra .= $this->dir_query_build($adv['logic'],'xchan_name',$adv['value']); - elseif ($adv['field'] === 'address') - $sql_extra .= $this->dir_query_build($adv['logic'],'xchan_addr',$adv['value']); - elseif ($adv['field'] === 'xhash') - $sql_extra .= $this->dir_query_build($adv['logic'],'xchan_hash',$adv['value']); - else - $sql_extra .= $this->dir_query_build($adv['logic'],'xprof_' . $adv['field'],$adv['value']); - } - } - } - } - - $hash = ((x($_REQUEST['hash'])) ? $_REQUEST['hash'] : ''); - $name = ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''); - $url = ((x($_REQUEST,'url')) ? $_REQUEST['url'] : ''); - $hub = ((x($_REQUEST,'hub')) ? $_REQUEST['hub'] : ''); - $address = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : ''); - $locale = ((x($_REQUEST,'locale')) ? $_REQUEST['locale'] : ''); - $region = ((x($_REQUEST,'region')) ? $_REQUEST['region'] : ''); - $postcode = ((x($_REQUEST,'postcode')) ? $_REQUEST['postcode'] : ''); - $country = ((x($_REQUEST,'country')) ? $_REQUEST['country'] : ''); - $gender = ((x($_REQUEST,'gender')) ? $_REQUEST['gender'] : ''); - $marital = ((x($_REQUEST,'marital')) ? $_REQUEST['marital'] : ''); - $sexual = ((x($_REQUEST,'sexual')) ? $_REQUEST['sexual'] : ''); - $keywords = ((x($_REQUEST,'keywords')) ? $_REQUEST['keywords'] : ''); - $agege = ((x($_REQUEST,'agege')) ? intval($_REQUEST['agege']) : 0 ); - $agele = ((x($_REQUEST,'agele')) ? intval($_REQUEST['agele']) : 0 ); - $kw = ((x($_REQUEST,'kw')) ? intval($_REQUEST['kw']) : 0 ); - $active = ((x($_REQUEST,'active')) ? intval($_REQUEST['active']) : 0 ); - $type = ((array_key_exists('type',$_REQUEST)) ? intval($_REQUEST['type']) : 0); - - // allow a site to disable the directory's keyword list - if (get_config('system','disable_directory_keywords')) - $kw = 0; - - // by default use a safe search - $safe = ((x($_REQUEST,'safe'))); - if ($safe === false) { - $safe = 1; - } - - // Directory mirrors will request sync packets, which are lists - // of records that have changed since the sync datetime. - - if (array_key_exists('sync',$_REQUEST)) { - if ($_REQUEST['sync']) - $sync = datetime_convert('UTC','UTC',$_REQUEST['sync']); - else - $sync = datetime_convert('UTC','UTC','2010-01-01 01:01:00'); - } - else - $sync = false; - - if (($dirmode == DIRECTORY_MODE_STANDALONE) && (! $hub)) { - $hub = App::get_hostname(); - } - - if ($hub) { - $hub_query = " and xchan_hash in (select hubloc_hash from hubloc where hubloc_host = '" . protect_sprintf(dbesc($hub)) . "') "; - } - else { - $hub_query = ''; - } - - if ($url) { - $r = q("select xchan_name from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_url = '%s' or hubloc_id_url = '%s'", - dbesc($url), - dbesc($url) - ); - if ($r && $r[0]['xchan_name']) { - $name = $r[0]['xchan_name']; - } - } - - // The order identifier is validated further below - - $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : ''); + $dirmode = intval(get_config('system', 'directory_mode')); - // parse and assemble the query for advanced searches - - $joiner = ' OR '; + $network = EMPTY_STR; - if($_REQUEST['and']) - $joiner = ' AND '; - - if ($name) { - $sql_extra .= $this->dir_query_build($joiner,'xchan_name',$name); - } - if ($address) { - $sql_extra .= $this->dir_query_build($joiner,'xchan_addr',$address); - } - if ($hash) { - $sql_extra .= $this->dir_query_build($joiner,'xchan_hash',$hash); - } - if ($locale) { - $sql_extra .= $this->dir_query_build($joiner,'xprof_locale',$locale); - } - if ($region) { - $sql_extra .= $this->dir_query_build($joiner,'xprof_region',$region); - } - if ($postcode) { - $sql_extra .= $this->dir_query_build($joiner,'xprof_postcode',$postcode); - } - if ($country) { - $sql_extra .= $this->dir_query_build($joiner,'xprof_country',$country); - } - if ($gender) { - $sql_extra .= $this->dir_query_build($joiner,'xprof_gender',$gender); - } - if ($marital) { - $sql_extra .= $this->dir_query_build($joiner,'xprof_marital',$marital); - } - if ($sexual) { - $sql_extra .= $this->dir_query_build($joiner,'xprof_sexual',$sexual); - } - if ($keywords) { - $sql_extra .= $this->dir_query_build($joiner,'xprof_keywords',$keywords); - } - - // we only support an age range currently. You must set both agege - // (greater than or equal) and agele (less than or equal) - - if($agele && $agege) { - $sql_extra .= " $joiner ( xprof_age <= " . intval($agele) . " "; - $sql_extra .= " AND xprof_age >= " . intval($agege) . ") "; - } - - - $perpage = (($_REQUEST['n']) ? $_REQUEST['n'] : 60); - $page = (($_REQUEST['p']) ? intval($_REQUEST['p'] - 1) : 0); - $startrec = (($page+1) * $perpage) - $perpage; - $limit = (($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 0); - $return_total = ((x($_REQUEST,'return_total')) ? intval($_REQUEST['return_total']) : 0); - - // mtime is not currently working - - $mtime = ((x($_REQUEST,'mtime')) ? datetime_convert('UTC','UTC',$_REQUEST['mtime']) : ''); - - // merge them into xprof - - $ret['success'] = true; - - // If &limit=n, return at most n entries - // If &return_total=1, we count matching entries and return that as 'total_items' for use in pagination. - // By default we return one page (default 60 items maximum) and do not count total entries - - $logic = ((strlen($sql_extra)) ? 'false' : 'true'); - - if ($hash) { - $logic = 'true'; - } - - if ($dirmode == DIRECTORY_MODE_STANDALONE) { - $sql_extra .= " and xchan_addr like '%%" . App::get_hostname() . "' "; - } - - $safesql = (($safe > 0) ? " and xchan_censored = 0 and xchan_selfcensored = 0 " : ''); - if ($safe < 0) { - $safesql = " and ( xchan_censored = 1 OR xchan_selfcensored = 1 ) "; - } - - if ($type) { - $safesql .= " and xchan_type = " . intval($type); - } + $sql_extra = ''; - $activesql = EMPTY_STR; - - if ($active) { - $activesql = "and xchan_updated > '" . datetime_convert(date_default_timezone_get(),'UTC','now - 60 days') . "' "; - } + $tables = ['name', 'address', 'xhash', 'locale', 'region', 'postcode', + 'country', 'gender', 'marital', 'sexual', 'keywords']; - if ($limit) { - $qlimit = " LIMIT $limit "; - } - else { - $qlimit = " LIMIT " . intval($perpage) . " OFFSET " . intval($startrec); - if ($return_total) { - $r = q("SELECT COUNT(xchan_hash) AS total FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra $network and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 $safesql $activesql "); - if ($r) { - $ret['total_items'] = $r[0]['total']; - } - } - } - - if ($sort_order == 'normal') { - $order = " order by xchan_name asc "; - - // Start the alphabetic search at 'A' - // This will make a handful of channels whose names begin with - // punctuation un-searchable in this mode - - $safesql .= " and ascii(substring(xchan_name FROM 1 FOR 1)) > 64 "; - } - elseif ($sort_order == 'reverse') - $order = " order by xchan_name desc "; - elseif ($sort_order == 'reversedate') - $order = " order by xchan_name_date asc "; - else - $order = " order by xchan_name_date desc "; - - - // normal directory query + // parse advanced query if present - $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash + if ($_REQUEST['query']) { + $advanced = $this->dir_parse_query($_REQUEST['query']); + if ($advanced) { + foreach ($advanced as $adv) { + if (in_array($adv['field'], $tables)) { + if ($adv['field'] === 'name') { + $sql_extra .= $this->dir_query_build($adv['logic'], 'xchan_name', $adv['value']); + } elseif ($adv['field'] === 'address') { + $sql_extra .= $this->dir_query_build($adv['logic'], 'xchan_addr', $adv['value']); + } elseif ($adv['field'] === 'xhash') { + $sql_extra .= $this->dir_query_build($adv['logic'], 'xchan_hash', $adv['value']); + } else { + $sql_extra .= $this->dir_query_build($adv['logic'], 'xprof_' . $adv['field'], $adv['value']); + } + } + } + } + } + + $hash = ((x($_REQUEST['hash'])) ? $_REQUEST['hash'] : ''); + $name = ((x($_REQUEST, 'name')) ? $_REQUEST['name'] : ''); + $url = ((x($_REQUEST, 'url')) ? $_REQUEST['url'] : ''); + $hub = ((x($_REQUEST, 'hub')) ? $_REQUEST['hub'] : ''); + $address = ((x($_REQUEST, 'address')) ? $_REQUEST['address'] : ''); + $locale = ((x($_REQUEST, 'locale')) ? $_REQUEST['locale'] : ''); + $region = ((x($_REQUEST, 'region')) ? $_REQUEST['region'] : ''); + $postcode = ((x($_REQUEST, 'postcode')) ? $_REQUEST['postcode'] : ''); + $country = ((x($_REQUEST, 'country')) ? $_REQUEST['country'] : ''); + $gender = ((x($_REQUEST, 'gender')) ? $_REQUEST['gender'] : ''); + $marital = ((x($_REQUEST, 'marital')) ? $_REQUEST['marital'] : ''); + $sexual = ((x($_REQUEST, 'sexual')) ? $_REQUEST['sexual'] : ''); + $keywords = ((x($_REQUEST, 'keywords')) ? $_REQUEST['keywords'] : ''); + $agege = ((x($_REQUEST, 'agege')) ? intval($_REQUEST['agege']) : 0); + $agele = ((x($_REQUEST, 'agele')) ? intval($_REQUEST['agele']) : 0); + $kw = ((x($_REQUEST, 'kw')) ? intval($_REQUEST['kw']) : 0); + $active = ((x($_REQUEST, 'active')) ? intval($_REQUEST['active']) : 0); + $type = ((array_key_exists('type', $_REQUEST)) ? intval($_REQUEST['type']) : 0); + + // allow a site to disable the directory's keyword list + if (get_config('system', 'disable_directory_keywords')) { + $kw = 0; + } + + // by default use a safe search + $safe = ((x($_REQUEST, 'safe'))); + if ($safe === false) { + $safe = 1; + } + + // Directory mirrors will request sync packets, which are lists + // of records that have changed since the sync datetime. + + if (array_key_exists('sync', $_REQUEST)) { + if ($_REQUEST['sync']) { + $sync = datetime_convert('UTC', 'UTC', $_REQUEST['sync']); + } else { + $sync = datetime_convert('UTC', 'UTC', '2010-01-01 01:01:00'); + } + } else { + $sync = false; + } + + if (($dirmode == DIRECTORY_MODE_STANDALONE) && (!$hub)) { + $hub = App::get_hostname(); + } + + if ($hub) { + $hub_query = " and xchan_hash in (select hubloc_hash from hubloc where hubloc_host = '" . protect_sprintf(dbesc($hub)) . "') "; + } else { + $hub_query = ''; + } + + if ($url) { + $r = q( + "select xchan_name from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_url = '%s' or hubloc_id_url = '%s'", + dbesc($url), + dbesc($url) + ); + if ($r && $r[0]['xchan_name']) { + $name = $r[0]['xchan_name']; + } + } + + // The order identifier is validated further below + + $sort_order = ((x($_REQUEST, 'order')) ? $_REQUEST['order'] : ''); + + + // parse and assemble the query for advanced searches + + $joiner = ' OR '; + + if ($_REQUEST['and']) { + $joiner = ' AND '; + } + + if ($name) { + $sql_extra .= $this->dir_query_build($joiner, 'xchan_name', $name); + } + if ($address) { + $sql_extra .= $this->dir_query_build($joiner, 'xchan_addr', $address); + } + if ($hash) { + $sql_extra .= $this->dir_query_build($joiner, 'xchan_hash', $hash); + } + if ($locale) { + $sql_extra .= $this->dir_query_build($joiner, 'xprof_locale', $locale); + } + if ($region) { + $sql_extra .= $this->dir_query_build($joiner, 'xprof_region', $region); + } + if ($postcode) { + $sql_extra .= $this->dir_query_build($joiner, 'xprof_postcode', $postcode); + } + if ($country) { + $sql_extra .= $this->dir_query_build($joiner, 'xprof_country', $country); + } + if ($gender) { + $sql_extra .= $this->dir_query_build($joiner, 'xprof_gender', $gender); + } + if ($marital) { + $sql_extra .= $this->dir_query_build($joiner, 'xprof_marital', $marital); + } + if ($sexual) { + $sql_extra .= $this->dir_query_build($joiner, 'xprof_sexual', $sexual); + } + if ($keywords) { + $sql_extra .= $this->dir_query_build($joiner, 'xprof_keywords', $keywords); + } + + // we only support an age range currently. You must set both agege + // (greater than or equal) and agele (less than or equal) + + if ($agele && $agege) { + $sql_extra .= " $joiner ( xprof_age <= " . intval($agele) . " "; + $sql_extra .= " AND xprof_age >= " . intval($agege) . ") "; + } + + + $perpage = (($_REQUEST['n']) ? $_REQUEST['n'] : 60); + $page = (($_REQUEST['p']) ? intval($_REQUEST['p'] - 1) : 0); + $startrec = (($page + 1) * $perpage) - $perpage; + $limit = (($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 0); + $return_total = ((x($_REQUEST, 'return_total')) ? intval($_REQUEST['return_total']) : 0); + + // mtime is not currently working + + $mtime = ((x($_REQUEST, 'mtime')) ? datetime_convert('UTC', 'UTC', $_REQUEST['mtime']) : ''); + + // merge them into xprof + + $ret['success'] = true; + + // If &limit=n, return at most n entries + // If &return_total=1, we count matching entries and return that as 'total_items' for use in pagination. + // By default we return one page (default 60 items maximum) and do not count total entries + + $logic = ((strlen($sql_extra)) ? 'false' : 'true'); + + if ($hash) { + $logic = 'true'; + } + + if ($dirmode == DIRECTORY_MODE_STANDALONE) { + $sql_extra .= " and xchan_addr like '%%" . App::get_hostname() . "' "; + } + + $safesql = (($safe > 0) ? " and xchan_censored = 0 and xchan_selfcensored = 0 " : ''); + if ($safe < 0) { + $safesql = " and ( xchan_censored = 1 OR xchan_selfcensored = 1 ) "; + } + + if ($type) { + $safesql .= " and xchan_type = " . intval($type); + } + + $activesql = EMPTY_STR; + + if ($active) { + $activesql = "and xchan_updated > '" . datetime_convert(date_default_timezone_get(), 'UTC', 'now - 60 days') . "' "; + } + + if ($limit) { + $qlimit = " LIMIT $limit "; + } else { + $qlimit = " LIMIT " . intval($perpage) . " OFFSET " . intval($startrec); + if ($return_total) { + $r = q("SELECT COUNT(xchan_hash) AS total FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra $network and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 $safesql $activesql "); + if ($r) { + $ret['total_items'] = $r[0]['total']; + } + } + } + + if ($sort_order == 'normal') { + $order = " order by xchan_name asc "; + + // Start the alphabetic search at 'A' + // This will make a handful of channels whose names begin with + // punctuation un-searchable in this mode + + $safesql .= " and ascii(substring(xchan_name FROM 1 FOR 1)) > 64 "; + } elseif ($sort_order == 'reverse') { + $order = " order by xchan_name desc "; + } elseif ($sort_order == 'reversedate') { + $order = " order by xchan_name_date asc "; + } else { + $order = " order by xchan_name_date desc "; + } + + + // normal directory query + + $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where ( $logic $sql_extra ) $hub_query $network and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 - $safesql $activesql $order $qlimit " - ); + $safesql $activesql $order $qlimit "); - $ret['page'] = $page + 1; - $ret['records'] = count($r); - - if ($r) { - - $entries = []; - $dups = []; - $isdup = EMPTY_STR; + $ret['page'] = $page + 1; + $ret['records'] = count($r); - // Collect activitypub identities and query which also have zot6 identities. - // Do this once per page fetch rather than once per entry. + if ($r) { + $entries = []; + $dups = []; + $isdup = EMPTY_STR; - foreach ($r as $rv) { - if ($rv['xchan_network'] === 'activitypub') { - if ($isdup) { - $isdup .= ','; - } - $isdup .= "'" . dbesc($rv['xchan_url']) . "'"; - } - if ($isdup) { - $isdup = protect_sprintf($isdup); + // Collect activitypub identities and query which also have zot6 identities. + // Do this once per page fetch rather than once per entry. + + foreach ($r as $rv) { + if ($rv['xchan_network'] === 'activitypub') { + if ($isdup) { + $isdup .= ','; + } + $isdup .= "'" . dbesc($rv['xchan_url']) . "'"; + } + if ($isdup) { + $isdup = protect_sprintf($isdup); $z = q("select xchan_url, xchan_hash from xchan where xchan_url in ( $isdup ) and xchan_network in ('nomad','zot6')"); - if ($z) { - foreach($z as $zv) { - $dups[$zv['xchan_url']] = $zv['xchan_hash']; - } - } - } - } - - foreach ($r as $rr) { + if ($z) { + foreach ($z as $zv) { + $dups[$zv['xchan_url']] = $zv['xchan_hash']; + } + } + } + } - // If it's an activitypub record and the channel also has a zot6 address, don't return it. - - if (array_key_exists($rr['xchan_url'],$dups)) { - continue; - } + foreach ($r as $rr) { + // If it's an activitypub record and the channel also has a zot6 address, don't return it. - if (! check_siteallowed($rr['xchan_url'])) { - continue; - } + if (array_key_exists($rr['xchan_url'], $dups)) { + continue; + } - if (! check_channelallowed($rr['xchan_hash'])) { - continue; - } + if (!check_siteallowed($rr['xchan_url'])) { + continue; + } + + if (!check_channelallowed($rr['xchan_hash'])) { + continue; + } - $entry = []; - - $entry['name'] = $rr['xchan_name']; - $entry['hash'] = $rr['xchan_hash']; - $entry['censored'] = $rr['xchan_censored']; - $entry['selfcensored'] = $rr['xchan_selfcensored']; - $entry['type'] = $rr['xchan_type']; - $entry['url'] = $rr['xchan_url']; - $entry['photo_l'] = $rr['xchan_photo_l']; - $entry['photo'] = $rr['xchan_photo_m']; - $entry['address'] = $rr['xchan_addr']; - $entry['network'] = $rr['xchan_network']; - $entry['description'] = $rr['xprof_desc']; - $entry['locale'] = $rr['xprof_locale']; - $entry['region'] = $rr['xprof_region']; - $entry['postcode'] = $rr['xprof_postcode']; - $entry['country'] = $rr['xprof_country']; - $entry['birthday'] = $rr['xprof_dob']; - $entry['age'] = $rr['xprof_age']; - $entry['gender'] = $rr['xprof_gender']; - $entry['marital'] = $rr['xprof_marital']; - $entry['sexual'] = $rr['xprof_sexual']; - $entry['about'] = $rr['xprof_about']; - $entry['homepage'] = $rr['xprof_homepage']; - $entry['hometown'] = $rr['xprof_hometown']; - $entry['keywords'] = $rr['xprof_keywords']; - - $entries[] = $entry; - - } - - $ret['results'] = $entries; - if ($kw) { - $k = dir_tagadelic($kw, $hub, $type,$safesql); - if ($k) { - $ret['keywords'] = []; - foreach ($k as $kv) { - $ret['keywords'][] = [ 'term' => $kv[0], 'weight' => $kv[1], 'normalise' => $kv[2] ]; - } - } - } - } - json_return_and_die($ret); - } - - function dir_query_build($joiner,$field,$s) { - $ret = ''; - if (trim($s)) - $ret .= dbesc($joiner) . " " . dbesc($field) . " like '" . protect_sprintf( '%' . dbesc($s) . '%' ) . "' "; - return $ret; - } - - function dir_flag_build($joiner,$field,$bit,$s) { - return dbesc($joiner) . " ( " . dbesc($field) . " & " . intval($bit) . " ) " . ((intval($s)) ? '>' : '=' ) . " 0 "; - } - - - function dir_parse_query($s) { - - $ret = []; - $curr = []; - $all = explode(' ',$s); - $quoted_string = false; - - if ($all) { - foreach ($all as $q) { - if ($quoted_string === false) { - if ($q === 'and') { - $curr['logic'] = 'and'; - continue; - } - if ($q === 'or') { - $curr['logic'] = 'or'; - continue; - } - if ($q === 'not') { - $curr['logic'] .= ' not'; - continue; - } - if (strpos($q,'=')) { - if (! isset($curr['logic'])) - $curr['logic'] = 'or'; - $curr['field'] = trim(substr($q,0,strpos($q,'='))); - $curr['value'] = trim(substr($q,strpos($q,'=')+1)); - if ($curr['value'][0] == '"' && $curr['value'][strlen($curr['value'])-1] != '"') { - $quoted_string = true; - $curr['value'] = substr($curr['value'],1); - continue; - } - elseif ($curr['value'][0] == '"' && $curr['value'][strlen($curr['value'])-1] == '"') { - $curr['value'] = substr($curr['value'],1,strlen($curr['value'])-2); - $ret[] = $curr; - $curr = []; - continue; - } - else { - $ret[] = $curr; - $curr = []; - continue; - } - } - } - else { - if ($q[strlen($q)-1] == '"') { - $curr['value'] .= ' ' . str_replace('"','',trim($q)); - $ret[] = $curr; - $curr = []; - $quoted_string = false; - } - else - $curr['value'] .= ' ' . trim($q); - } - } - } - logger('dir_parse_query:' . print_r($ret,true),LOGGER_DATA); - return $ret; - } - - - function list_public_sites() { - - $rand = db_getfunc('rand'); - $realm = get_directory_realm(); + $entry = []; - $r = q("select * from site where site_type = %d and site_dead = 0", - intval(SITE_TYPE_ZOT) - ); - - $ret = array('success' => false); - - if ($r) { - $ret['success'] = true; - $ret['sites'] = []; - - foreach ($r as $rr) { - - if ($rr['site_access'] == ACCESS_FREE) - $access = 'free'; - elseif ($rr['site_access'] == ACCESS_PAID) - $access = 'paid'; - elseif ($rr['site_access'] == ACCESS_TIERED) - $access = 'tiered'; - else - $access = 'private'; - - if ($rr['site_register'] == REGISTER_OPEN) - $register = 'open'; - elseif ($rr['site_register'] == REGISTER_APPROVE) - $register = 'approve'; - else - $register = 'closed'; - - $ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project'], 'version' => $rr['site_version']); + $entry['name'] = $rr['xchan_name']; + $entry['hash'] = $rr['xchan_hash']; + $entry['censored'] = $rr['xchan_censored']; + $entry['selfcensored'] = $rr['xchan_selfcensored']; + $entry['type'] = $rr['xchan_type']; + $entry['url'] = $rr['xchan_url']; + $entry['photo_l'] = $rr['xchan_photo_l']; + $entry['photo'] = $rr['xchan_photo_m']; + $entry['address'] = $rr['xchan_addr']; + $entry['network'] = $rr['xchan_network']; + $entry['description'] = $rr['xprof_desc']; + $entry['locale'] = $rr['xprof_locale']; + $entry['region'] = $rr['xprof_region']; + $entry['postcode'] = $rr['xprof_postcode']; + $entry['country'] = $rr['xprof_country']; + $entry['birthday'] = $rr['xprof_dob']; + $entry['age'] = $rr['xprof_age']; + $entry['gender'] = $rr['xprof_gender']; + $entry['marital'] = $rr['xprof_marital']; + $entry['sexual'] = $rr['xprof_sexual']; + $entry['about'] = $rr['xprof_about']; + $entry['homepage'] = $rr['xprof_homepage']; + $entry['hometown'] = $rr['xprof_hometown']; + $entry['keywords'] = $rr['xprof_keywords']; - } - } - return $ret; - } + $entries[] = $entry; + } + $ret['results'] = $entries; + if ($kw) { + $k = dir_tagadelic($kw, $hub, $type, $safesql); + if ($k) { + $ret['keywords'] = []; + foreach ($k as $kv) { + $ret['keywords'][] = ['term' => $kv[0], 'weight' => $kv[1], 'normalise' => $kv[2]]; + } + } + } + } + json_return_and_die($ret); + } + + public function dir_query_build($joiner, $field, $s) + { + $ret = ''; + if (trim($s)) { + $ret .= dbesc($joiner) . " " . dbesc($field) . " like '" . protect_sprintf('%' . dbesc($s) . '%') . "' "; + } + return $ret; + } + + public function dir_flag_build($joiner, $field, $bit, $s) + { + return dbesc($joiner) . " ( " . dbesc($field) . " & " . intval($bit) . " ) " . ((intval($s)) ? '>' : '=') . " 0 "; + } + + + public function dir_parse_query($s) + { + + $ret = []; + $curr = []; + $all = explode(' ', $s); + $quoted_string = false; + + if ($all) { + foreach ($all as $q) { + if ($quoted_string === false) { + if ($q === 'and') { + $curr['logic'] = 'and'; + continue; + } + if ($q === 'or') { + $curr['logic'] = 'or'; + continue; + } + if ($q === 'not') { + $curr['logic'] .= ' not'; + continue; + } + if (strpos($q, '=')) { + if (!isset($curr['logic'])) { + $curr['logic'] = 'or'; + } + $curr['field'] = trim(substr($q, 0, strpos($q, '='))); + $curr['value'] = trim(substr($q, strpos($q, '=') + 1)); + if ($curr['value'][0] == '"' && $curr['value'][strlen($curr['value']) - 1] != '"') { + $quoted_string = true; + $curr['value'] = substr($curr['value'], 1); + continue; + } elseif ($curr['value'][0] == '"' && $curr['value'][strlen($curr['value']) - 1] == '"') { + $curr['value'] = substr($curr['value'], 1, strlen($curr['value']) - 2); + $ret[] = $curr; + $curr = []; + continue; + } else { + $ret[] = $curr; + $curr = []; + continue; + } + } + } else { + if ($q[strlen($q) - 1] == '"') { + $curr['value'] .= ' ' . str_replace('"', '', trim($q)); + $ret[] = $curr; + $curr = []; + $quoted_string = false; + } else { + $curr['value'] .= ' ' . trim($q); + } + } + } + } + logger('dir_parse_query:' . print_r($ret, true), LOGGER_DATA); + return $ret; + } + + + public function list_public_sites() + { + + $rand = db_getfunc('rand'); + $realm = get_directory_realm(); + + $r = q( + "select * from site where site_type = %d and site_dead = 0", + intval(SITE_TYPE_ZOT) + ); + + $ret = array('success' => false); + + if ($r) { + $ret['success'] = true; + $ret['sites'] = []; + + foreach ($r as $rr) { + if ($rr['site_access'] == ACCESS_FREE) { + $access = 'free'; + } elseif ($rr['site_access'] == ACCESS_PAID) { + $access = 'paid'; + } elseif ($rr['site_access'] == ACCESS_TIERED) { + $access = 'tiered'; + } else { + $access = 'private'; + } + + if ($rr['site_register'] == REGISTER_OPEN) { + $register = 'open'; + } elseif ($rr['site_register'] == REGISTER_APPROVE) { + $register = 'approve'; + } else { + $register = 'closed'; + } + + $ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project'], 'version' => $rr['site_version']); + } + } + return $ret; + } } diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 11fbc4511..a18712805 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -2,8 +2,8 @@ namespace Zotlabs\Module; - use App; +use Zotlabs\Lib\PermissionDescription; use Zotlabs\Lib\System; use Zotlabs\Lib\PConfig; use Zotlabs\Web\Controller; @@ -14,510 +14,505 @@ require_once('include/conversation.php'); require_once('include/acl_selectors.php'); -class Display extends Controller { +class Display extends Controller +{ - // State passed in from the Update module. - - public $profile_uid = 0; - public $loading = 0; - public $updating = 0; + // State passed in from the Update module. + + public $profile_uid = 0; + public $loading = 0; + public $updating = 0; - function get() { + public function get() + { - $noscript_content = (get_config('system', 'noscript_content', '1') && (! $this->updating)); + $noscript_content = (get_config('system', 'noscript_content', '1') && (!$this->updating)); - $module_format = 'html'; + $module_format = 'html'; - if(argc() > 1) { - $module_format = substr(argv(1),strrpos(argv(1),'.') + 1); - if(! in_array($module_format,['atom','zot','json'])) - $module_format = 'html'; - } + if (argc() > 1) { + $module_format = substr(argv(1), strrpos(argv(1), '.') + 1); + if (!in_array($module_format, ['atom', 'zot', 'json'])) { + $module_format = 'html'; + } + } - if($this->loading) - $_SESSION['loadtime_display'] = datetime_convert(); - - if(observer_prohibited()) { - notice( t('Public access denied.') . EOL); - return; - } - - if(argc() > 1) { - $item_hash = argv(1); - if($module_format !== 'html') { - $item_hash = substr($item_hash,0,strrpos($item_hash,'.')); - } - } - - if($_REQUEST['mid']) - $item_hash = $_REQUEST['mid']; + if ($this->loading) { + $_SESSION['loadtime_display'] = datetime_convert(); + } - if(! $item_hash) { - App::$error = 404; - notice( t('Item not found.') . EOL); - return; - } - - $observer_is_owner = false; - $updateable = false; + if (observer_prohibited()) { + notice(t('Public access denied.') . EOL); + return; + } - if(local_channel() && (! $this->updating)) { - - $channel = \App::get_channel(); + if (argc() > 1) { + $item_hash = argv(1); + if ($module_format !== 'html') { + $item_hash = substr($item_hash, 0, strrpos($item_hash, '.')); + } + } - $channel_acl = array( - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'] - ); + if ($_REQUEST['mid']) { + $item_hash = $_REQUEST['mid']; + } - $x = array( - 'is_owner' => true, - 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), - 'default_location' => $channel['channel_location'], - 'nickname' => $channel['channel_address'], - 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), - 'permissions' => $channel_acl, - 'bang' => '', - 'visitor' => true, - 'profile_uid' => local_channel(), - 'return_path' => 'channel/' . $channel['channel_address'], - 'expanded' => true, - 'editor_autocomplete' => true, - 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true, - 'jotnets' => true, - 'reset' => t('Reset form') - ); - - $o = ''; - $o .= status_editor($x); - $o .= ''; - } - - // This page can be viewed by anybody so the query could be complicated - // First we'll see if there is a copy of the item which is owned by us - if we're logged in locally. - // If that fails (or we aren't logged in locally), - // query an item in which the observer (if logged in remotely) has cid or gid rights - // and if that fails, look for a copy of the post that has no privacy restrictions. - // If we find the post, but we don't find a copy that we're allowed to look at, this fact needs to be reported. - - // find a copy of the item somewhere - - $target_item = null; + if (!$item_hash) { + App::$error = 404; + notice(t('Item not found.') . EOL); + return; + } - $item_hash = unpack_link_id($item_hash); + $observer_is_owner = false; + $updateable = false; - $r = q("select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, author_xchan, item_blocked from item where mid like '%s' limit 1", - dbesc($item_hash . '%') - ); - - if($r) { - $target_item = $r[0]; - } + if (local_channel() && (!$this->updating)) { + $channel = App::get_channel(); - $x = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($target_item['author_xchan']) - ); - if($x) { + $channel_acl = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); + + $x = array( + 'is_owner' => true, + 'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''), + 'default_location' => $channel['channel_location'], + 'nickname' => $channel['channel_address'], + 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'acl' => populate_acl($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), + 'permissions' => $channel_acl, + 'bang' => '', + 'visitor' => true, + 'profile_uid' => local_channel(), + 'return_path' => 'channel/' . $channel['channel_address'], + 'expanded' => true, + 'editor_autocomplete' => true, + 'bbco_autocomplete' => 'bbcode', + 'bbcode' => true, + 'jotnets' => true, + 'reset' => t('Reset form') + ); + + $o = ''; + $o .= status_editor($x); + $o .= ''; + } + + // This page can be viewed by anybody so the query could be complicated + // First we'll see if there is a copy of the item which is owned by us - if we're logged in locally. + // If that fails (or we aren't logged in locally), + // query an item in which the observer (if logged in remotely) has cid or gid rights + // and if that fails, look for a copy of the post that has no privacy restrictions. + // If we find the post, but we don't find a copy that we're allowed to look at, this fact needs to be reported. + + // find a copy of the item somewhere + + $target_item = null; + + $item_hash = unpack_link_id($item_hash); + + $r = q( + "select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, author_xchan, item_blocked from item where mid like '%s' limit 1", + dbesc($item_hash . '%') + ); + + if ($r) { + $target_item = $r[0]; + } + + $x = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($target_item['author_xchan']) + ); + if ($x) { // not yet ready for prime time -// \App::$poi = $x[0]; - } +// \App::$poi = $x[0]; + } - // if the item is to be moderated redirect to /moderate - if($target_item['item_blocked'] == ITEM_MODERATED) { - goaway(z_root() . '/moderate/' . $target_item['id']); - } - - $r = null; - - if($target_item['item_type'] == ITEM_TYPE_WEBPAGE) { - $x = q("select * from channel where channel_id = %d limit 1", - intval($target_item['uid']) - ); - $y = q("select * from iconfig left join item on iconfig.iid = item.id + // if the item is to be moderated redirect to /moderate + if ($target_item['item_blocked'] == ITEM_MODERATED) { + goaway(z_root() . '/moderate/' . $target_item['id']); + } + + $r = null; + + if ($target_item['item_type'] == ITEM_TYPE_WEBPAGE) { + $x = q( + "select * from channel where channel_id = %d limit 1", + intval($target_item['uid']) + ); + $y = q( + "select * from iconfig left join item on iconfig.iid = item.id where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item.id = %d limit 1", - intval($target_item['uid']), - intval($target_item['parent']) - ); - if($x && $y) { - goaway(z_root() . '/page/' . $x[0]['channel_address'] . '/' . $y[0]['v']); - } - else { - notice( t('Page not found.') . EOL); - return ''; - } - } - if($target_item['item_type'] == ITEM_TYPE_ARTICLE) { - $x = q("select * from channel where channel_id = %d limit 1", - intval($target_item['uid']) - ); - $y = q("select * from iconfig left join item on iconfig.iid = item.id + intval($target_item['uid']), + intval($target_item['parent']) + ); + if ($x && $y) { + goaway(z_root() . '/page/' . $x[0]['channel_address'] . '/' . $y[0]['v']); + } else { + notice(t('Page not found.') . EOL); + return ''; + } + } + if ($target_item['item_type'] == ITEM_TYPE_ARTICLE) { + $x = q( + "select * from channel where channel_id = %d limit 1", + intval($target_item['uid']) + ); + $y = q( + "select * from iconfig left join item on iconfig.iid = item.id where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and item.id = %d limit 1", - intval($target_item['uid']), - intval($target_item['parent']) - ); - if($x && $y) { - goaway(z_root() . '/articles/' . $x[0]['channel_address'] . '/' . $y[0]['v']); - } - else { - notice( t('Page not found.') . EOL); - return ''; - } - } - if($target_item['item_type'] == ITEM_TYPE_CARD) { - $x = q("select * from channel where channel_id = %d limit 1", - intval($target_item['uid']) - ); - $y = q("select * from iconfig left join item on iconfig.iid = item.id + intval($target_item['uid']), + intval($target_item['parent']) + ); + if ($x && $y) { + goaway(z_root() . '/articles/' . $x[0]['channel_address'] . '/' . $y[0]['v']); + } else { + notice(t('Page not found.') . EOL); + return ''; + } + } + if ($target_item['item_type'] == ITEM_TYPE_CARD) { + $x = q( + "select * from channel where channel_id = %d limit 1", + intval($target_item['uid']) + ); + $y = q( + "select * from iconfig left join item on iconfig.iid = item.id where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'CARD' and item.id = %d limit 1", - intval($target_item['uid']), - intval($target_item['parent']) - ); - if($x && $y) { - goaway(z_root() . '/cards/' . $x[0]['channel_address'] . '/' . $y[0]['v']); - } - else { - notice( t('Page not found.') . EOL); - return ''; - } - } - if ($target_item['item_type'] == ITEM_TYPE_CUSTOM) { - call_hooks('item_custom_display',$target_item); - notice( t('Page not found.') . EOL); - return ''; - } + intval($target_item['uid']), + intval($target_item['parent']) + ); + if ($x && $y) { + goaway(z_root() . '/cards/' . $x[0]['channel_address'] . '/' . $y[0]['v']); + } else { + notice(t('Page not found.') . EOL); + return ''; + } + } + if ($target_item['item_type'] == ITEM_TYPE_CUSTOM) { + call_hooks('item_custom_display', $target_item); + notice(t('Page not found.') . EOL); + return ''; + } - - - $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); - - - $simple_update = (($this->updating) ? " AND item_unseen = 1 " : ''); - - if($this->updating && $_SESSION['loadtime_display']) - $simple_update = " AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime_display']) . "' "; - if($this->loading) - $simple_update = ''; - - if($static && $simple_update) - $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; - - if((! $this->updating) && (! $this->loading)) { - $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1); + $static = ((array_key_exists('static', $_REQUEST)) ? intval($_REQUEST['static']) : 0); - // if the target item is not a post (eg a like) we want to address its thread parent - $mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']); + $simple_update = (($this->updating) ? " AND item_unseen = 1 " : ''); - // if we received a decoded hash originally we must encode it again before handing to javascript + if ($this->updating && $_SESSION['loadtime_display']) { + $simple_update = " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_display']) . "' "; + } + if ($this->loading) { + $simple_update = ''; + } - $mid = gen_link_id($mid); + if ($static && $simple_update) { + $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; + } - $o .= '' . "\r\n"; - $o .= "\r\n"; - - App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( - '$baseurl' => z_root(), - '$pgtype' => 'display', - '$uid' => '0', - '$gid' => '0', - '$cid' => '0', - '$cmin' => '(-1)', - '$cmax' => '(-1)', - '$star' => '0', - '$liked' => '0', - '$conv' => '0', - '$spam' => '0', - '$fh' => '0', - '$dm' => '0', - '$nouveau' => '0', - '$wall' => '0', - '$draft' => '0', - '$static' => $static, - '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1), - '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), - '$search' => '', - '$xchan' => '', - '$order' => '', - '$file' => '', - '$cats' => '', - '$tags' => '', - '$dend' => '', - '$dbegin' => '', - '$verb' => '', - '$net' => '', - '$mid' => (($mid) ? urlencode($mid) : '') - )); + if ((!$this->updating) && (!$this->loading)) { + $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1); - head_add_link([ - 'rel' => 'alternate', - 'type' => 'application/json+oembed', - 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string), - 'title' => 'oembed' - ]); + // if the target item is not a post (eg a like) we want to address its thread parent - } + $mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']); - $observer_hash = get_observer_hash(); - $item_normal = item_normal(); - $item_normal_update = item_normal_update(); + // if we received a decoded hash originally we must encode it again before handing to javascript - $sql_extra = ((local_channel()) ? EMPTY_STR : item_permissions_sql(0, $observer_hash)); + $mid = gen_link_id($mid); - if($noscript_content || $this->loading) { + $o .= '' . "\r\n"; + $o .= "\r\n"; - $r = null; + App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"), array( + '$baseurl' => z_root(), + '$pgtype' => 'display', + '$uid' => '0', + '$gid' => '0', + '$cid' => '0', + '$cmin' => '(-1)', + '$cmax' => '(-1)', + '$star' => '0', + '$liked' => '0', + '$conv' => '0', + '$spam' => '0', + '$fh' => '0', + '$dm' => '0', + '$nouveau' => '0', + '$wall' => '0', + '$draft' => '0', + '$static' => $static, + '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1), + '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0), + '$search' => '', + '$xchan' => '', + '$order' => '', + '$file' => '', + '$cats' => '', + '$tags' => '', + '$dend' => '', + '$dbegin' => '', + '$verb' => '', + '$net' => '', + '$mid' => (($mid) ? urlencode($mid) : '') + )); - require_once('include/channel.php'); - $sys = get_sys_channel(); - $sysid = $sys['channel_id']; + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string), + 'title' => 'oembed' + ]); + } - if(local_channel()) { - $r = q("SELECT item.id as item_id from item WHERE uid = %d and mid = '%s' $item_normal limit 1", - intval(local_channel()), - dbesc($target_item['parent_mid']) - ); - if($r) { - $updateable = true; - } - } + $observer_hash = get_observer_hash(); + $item_normal = item_normal(); + $item_normal_update = item_normal_update(); - if (! (is_array($r) && count($r))) { - $r = q("SELECT item.id as item_id from item WHERE mid = '%s' $sql_extra $item_normal limit 1", - dbesc($target_item['parent_mid']) - ); - } - } - elseif ($this->updating && !$this->loading) { - $r = null; + $sql_extra = ((local_channel()) ? EMPTY_STR : item_permissions_sql(0, $observer_hash)); - require_once('include/channel.php'); - $sys = get_sys_channel(); - $sysid = $sys['channel_id']; + if ($noscript_content || $this->loading) { + $r = null; - if (local_channel()) { - $r = q("SELECT item.parent AS item_id from item WHERE uid = %d and parent_mid = '%s' $item_normal_update $simple_update limit 1", - intval(local_channel()), - dbesc($target_item['parent_mid']) - ); - if($r) { - $updateable = true; - } - } + require_once('include/channel.php'); + $sys = get_sys_channel(); + $sysid = $sys['channel_id']; - if(! $r) { - $r = q("SELECT item.parent AS item_id from item WHERE parent_mid = '%s' $sql_extra $item_normal_update $simple_update limit 1", - dbesc($target_item['parent_mid']) - ); - } - } - - else { - $r = []; - } + if (local_channel()) { + $r = q( + "SELECT item.id as item_id from item WHERE uid = %d and mid = '%s' $item_normal limit 1", + intval(local_channel()), + dbesc($target_item['parent_mid']) + ); + if ($r) { + $updateable = true; + } + } - if($r) { - $parents_str = ids_to_querystr($r,'item_id'); - if($parents_str) { - $items = q("SELECT item.*, item.id AS item_id + if (!(is_array($r) && count($r))) { + $r = q( + "SELECT item.id as item_id from item WHERE mid = '%s' $sql_extra $item_normal limit 1", + dbesc($target_item['parent_mid']) + ); + } + } elseif ($this->updating && !$this->loading) { + $r = null; + + require_once('include/channel.php'); + $sys = get_sys_channel(); + $sysid = $sys['channel_id']; + + if (local_channel()) { + $r = q( + "SELECT item.parent AS item_id from item WHERE uid = %d and parent_mid = '%s' $item_normal_update $simple_update limit 1", + intval(local_channel()), + dbesc($target_item['parent_mid']) + ); + if ($r) { + $updateable = true; + } + } + + if (!$r) { + $r = q( + "SELECT item.parent AS item_id from item WHERE parent_mid = '%s' $sql_extra $item_normal_update $simple_update limit 1", + dbesc($target_item['parent_mid']) + ); + } + } else { + $r = []; + } + + if ($r) { + $parents_str = ids_to_querystr($r, 'item_id'); + if ($parents_str) { + $items = q( + "SELECT item.*, item.id AS item_id FROM item WHERE parent in ( %s ) $item_normal $sql_extra ", - dbesc($parents_str) - ); - xchan_query($items); - $items = fetch_post_tags($items,true); - $items = conv_sort($items,'created'); - } - } - else { - $items = []; - } + dbesc($parents_str) + ); + xchan_query($items); + $items = fetch_post_tags($items, true); + $items = conv_sort($items, 'created'); + } + } else { + $items = []; + } - // see if the top-level post owner chose to block search engines - - if ($items && get_pconfig($items[0]['uid'],'system','noindex')) { - App::$meta->set('robots', 'noindex, noarchive'); - } + // see if the top-level post owner chose to block search engines - foreach ($items as $item) { - if ($item['mid'] === $item_hash) { + if ($items && get_pconfig($items[0]['uid'], 'system', 'noindex')) { + App::$meta->set('robots', 'noindex, noarchive'); + } + + foreach ($items as $item) { + if ($item['mid'] === $item_hash) { + if (preg_match("/\[[zi]mg(.*?)\]([^\[]+)/is", $items[0]['body'], $matches)) { + $ogimage = $matches[2]; + // Will we use og:image:type someday? We keep this just in case + // $ogimagetype = guess_image_type($ogimage); + } + + // some work on post content to generate a description + // almost fully based on work done on Hubzilla by Max Kostikov + $ogdesc = $item['body']; + + $ogdesc = bbcode($ogdesc, ['export' => true]); + $ogdesc = trim(html2plain($ogdesc, 0, true)); + $ogdesc = html_entity_decode($ogdesc, ENT_QUOTES, 'UTF-8'); + + // remove all URLs + $ogdesc = preg_replace("/https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@]+/", "", $ogdesc); + + // shorten description + $ogdesc = substr($ogdesc, 0, 300); + $ogdesc = str_replace("\n", " ", $ogdesc); + while (strpos($ogdesc, " ") !== false) { + $ogdesc = str_replace(" ", " ", $ogdesc); + } + $ogdesc = (strlen($ogdesc) < 298 ? $ogdesc : rtrim(substr($ogdesc, 0, strrpos($ogdesc, " ")), "?.,:;!-") . "..."); + + $ogsite = (System::get_site_name()) ? escape_tags(System::get_site_name()) : System::get_platform_name(); + + // we can now start loading content + if ($item['mid'] == $item['parent_mid']) { + App::$meta->set('og:title', ($items[0]['title'] + ? sprintf(t('"%1$s", shared by %2$s with %3$s'), $items[0]['title'], $item['author']['xchan_name'], $ogsite) + : sprintf(t('%1$s shared this post with %2$s'), $item['author']['xchan_name'], $ogsite))); + App::$meta->set('og:image', (isset($ogimage) ? $ogimage : System::get_site_icon())); + App::$meta->set('og:type', 'article'); + App::$meta->set('og:url:secure_url', $item['llink']); + App::$meta->set('og:description', ($ogdesc ? $ogdesc : sprintf(t('Not much to read, click to see the post.')))); + } else { + if (($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) { + App::$meta->set('og:title', ($items[0]['title'] + ? sprintf(t('%1$s shared a reaction to "%2$s"'), $item['author']['xchan_name'], $items[0]['title']) + : sprintf(t('%s shared a reaction to this post/conversation'), $item['author']['xchan_name']))); + App::$meta->set('og:image', (isset($ogimage) ? $ogimage : System::get_site_icon())); + App::$meta->set('og:type', 'article'); + App::$meta->set('og:url:secure_url', $item['llink']); + App::$meta->set('og:description', $ogdesc); + } else { + App::$meta->set('og:title', ($items[0]['title'] + ? sprintf(t('%1$s commented "%2$s"'), $item['author']['xchan_name'], $items[0]['title']) + : sprintf(t('%s shared a comment of this post/conversation'), $item['author']['xchan_name']))); + App::$meta->set('og:image', (isset($ogimage) ? $ogimage : System::get_site_icon())); + App::$meta->set('og:type', 'article'); + App::$meta->set('og:url:secure_url', $item['llink']); + App::$meta->set('og:description', sprintf(t('%1$s wrote this: "%2$s"'), $item['author']['xchan_name'], $ogdesc)); + } + } + } + } + + if (local_channel() && $items) { + $ids = ids_to_array($items, 'item_id'); + $seen = PConfig::Get(local_channel(), 'system', 'seen_items'); + if (!$seen) { + $seen = []; + } + $seen = array_unique(array_merge($ids, $seen)); + PConfig::Set(local_channel(), 'system', 'seen_items', $seen); + } + + switch ($module_format) { + case 'html': + if ($this->updating) { + $o .= conversation($items, 'display', $this->updating, 'client'); + } else { + $o .= ''; + + App::$page['title'] = (($items[0]['title']) ? $items[0]['title'] . " - " . App::$page['title'] : App::$page['title']); + + $o .= conversation($items, 'display', $this->updating, 'client'); + } + + break; + + case 'atom': + $atom = replace_macros(get_markup_template('atom_feed.tpl'), array( + '$version' => xmlify(System::get_project_version()), + '$generator' => xmlify(System::get_platform_name()), + '$generator_uri' => 'https://hubzilla.org', + '$feed_id' => xmlify(App::$cmd), + '$feed_title' => xmlify(t('Article')), + '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now', ATOM_TIME)), + '$author' => '', + '$owner' => '', + '$profile_page' => xmlify(z_root() . '/display/' . $target_item['mid']), + )); + + $x = ['xml' => $atom, 'channel' => $channel, 'observer_hash' => $observer_hash, 'params' => $params]; + call_hooks('atom_feed_top', $x); + + $atom = $x['xml']; + + // a much simpler interface + call_hooks('atom_feed', $atom); - if(preg_match("/\[[zi]mg(.*?)\]([^\[]+)/is", $items[0]['body'], $matches)) { - $ogimage = $matches[2]; - // Will we use og:image:type someday? We keep this just in case - // $ogimagetype = guess_image_type($ogimage); - } + if ($items) { + $type = 'html'; + foreach ($items as $item) { + if ($item['item_private']) { + continue; + } + $atom .= atom_entry($item, $type, null, '', true, '', false); + } + } - // some work on post content to generate a description - // almost fully based on work done on Hubzilla by Max Kostikov - $ogdesc = $item['body']; + call_hooks('atom_feed_end', $atom); - $ogdesc = bbcode($ogdesc, [ 'export' => true ]); - $ogdesc = trim(html2plain($ogdesc, 0, true)); - $ogdesc = html_entity_decode($ogdesc, ENT_QUOTES, 'UTF-8'); + $atom .= '' . "\r\n"; - // remove all URLs - $ogdesc = preg_replace("/https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@]+/", "", $ogdesc); + header('Content-type: application/atom+xml'); + echo $atom; + killme(); + } - // shorten description - $ogdesc = substr($ogdesc, 0, 300); - $ogdesc = str_replace("\n", " ", $ogdesc); - while (strpos($ogdesc, " ") !== false) - $ogdesc = str_replace(" ", " ", $ogdesc); - $ogdesc = (strlen($ogdesc) < 298 ? $ogdesc : rtrim(substr($ogdesc, 0, strrpos($ogdesc, " ")), "?.,:;!-") . "..."); + if ($updateable) { + $x = q( + "UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d and parent = %d ", + intval(local_channel()), + intval($r[0]['item_id']) + ); + } - $ogsite = (System::get_site_name()) ? escape_tags(System::get_site_name()) : System::get_platform_name(); + $o .= ''; - // we can now start loading content - if ($item['mid'] == $item['parent_mid']) { - App::$meta->set('og:title', ($items[0]['title'] - ? sprintf( t('"%1$s", shared by %2$s with %3$s'),$items[0]['title'],$item['author']['xchan_name'],$ogsite) - : sprintf( t('%1$s shared this post with %2$s'),$item['author']['xchan_name'],$ogsite))); - App::$meta->set('og:image', (isset($ogimage) ? $ogimage : System::get_site_icon())); - App::$meta->set('og:type', 'article'); - App::$meta->set('og:url:secure_url', $item['llink']); - App::$meta->set('og:description', ($ogdesc ? $ogdesc : sprintf( t('Not much to read, click to see the post.')))); - } - else { - if (($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) { - App::$meta->set('og:title', ($items[0]['title'] - ? sprintf( t('%1$s shared a reaction to "%2$s"'),$item['author']['xchan_name'],$items[0]['title']) - : sprintf( t('%s shared a reaction to this post/conversation'),$item['author']['xchan_name']))); - App::$meta->set('og:image', (isset($ogimage) ? $ogimage : System::get_site_icon())); - App::$meta->set('og:type', 'article'); - App::$meta->set('og:url:secure_url', $item['llink']); - App::$meta->set('og:description', $ogdesc); - } - else { - App::$meta->set('og:title', ($items[0]['title'] - ? sprintf( t('%1$s commented "%2$s"'),$item['author']['xchan_name'],$items[0]['title']) - : sprintf( t('%s shared a comment of this post/conversation'),$item['author']['xchan_name']))); - App::$meta->set('og:image', (isset($ogimage) ? $ogimage : System::get_site_icon())); - App::$meta->set('og:type', 'article'); - App::$meta->set('og:url:secure_url', $item['llink']); - App::$meta->set('og:description', sprintf( t('%1$s wrote this: "%2$s"'),$item['author']['xchan_name'],$ogdesc)); - } - } - } - } + if ((($this->updating && $this->loading) || $noscript_content) && (!$items)) { + $r = q( + "SELECT id, item_deleted FROM item WHERE mid = '%s' LIMIT 1", + dbesc($item_hash) + ); - if (local_channel() && $items) { - $ids = ids_to_array($items,'item_id'); - $seen = PConfig::Get(local_channel(),'system','seen_items'); - if (! $seen) { - $seen = []; - } - $seen = array_unique(array_merge($ids,$seen)); - PConfig::Set(local_channel(),'system','seen_items',$seen); - } - - switch($module_format) { - - case 'html': - - if ($this->updating) { - $o .= conversation($items, 'display', $this->updating, 'client'); - } - else { - $o .= ''; - - App::$page['title'] = (($items[0]['title']) ? $items[0]['title'] . " - " . App::$page['title'] : App::$page['title']); - - $o .= conversation($items, 'display', $this->updating, 'client'); - } - - break; - - case 'atom': - - $atom = replace_macros(get_markup_template('atom_feed.tpl'), array( - '$version' => xmlify(System::get_project_version()), - '$generator' => xmlify(System::get_platform_name()), - '$generator_uri' => 'https://hubzilla.org', - '$feed_id' => xmlify(App::$cmd), - '$feed_title' => xmlify(t('Article')), - '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now', ATOM_TIME)), - '$author' => '', - '$owner' => '', - '$profile_page' => xmlify(z_root() . '/display/' . $target_item['mid']), - )); - - $x = [ 'xml' => $atom, 'channel' => $channel, 'observer_hash' => $observer_hash, 'params' => $params ]; - call_hooks('atom_feed_top',$x); - - $atom = $x['xml']; - - // a much simpler interface - call_hooks('atom_feed', $atom); - - - if($items) { - $type = 'html'; - foreach($items as $item) { - if($item['item_private']) - continue; - $atom .= atom_entry($item, $type, null, '', true, '', false); - } - } - - call_hooks('atom_feed_end', $atom); - - $atom .= '' . "\r\n"; - - header('Content-type: application/atom+xml'); - echo $atom; - killme(); - - } - - if($updateable) { - $x = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d and parent = %d ", - intval(local_channel()), - intval($r[0]['item_id']) - ); - - - } - - $o .= ''; - - if((($this->updating && $this->loading) || $noscript_content) && (! $items)) { - - $r = q("SELECT id, item_deleted FROM item WHERE mid = '%s' LIMIT 1", - dbesc($item_hash) - ); - - if($r) { - if(intval($r[0]['item_deleted'])) { - notice( t('Item has been removed.') . EOL ); - } - else { - notice( t('Permission denied.') . EOL ); - } - } - else { - notice( t('Item not found.') . EOL ); - } - - } - - return $o; - - } + if ($r) { + if (intval($r[0]['item_deleted'])) { + notice(t('Item has been removed.') . EOL); + } else { + notice(t('Permission denied.') . EOL); + } + } else { + notice(t('Item not found.') . EOL); + } + } + return $o; + } } diff --git a/Zotlabs/Module/Drafts.php b/Zotlabs/Module/Drafts.php index 0d7431452..722a1139e 100644 --- a/Zotlabs/Module/Drafts.php +++ b/Zotlabs/Module/Drafts.php @@ -6,24 +6,26 @@ use Zotlabs\Lib\Apps; use Zotlabs\Lib\Libsync; use Zotlabs\Web\Controller; -class Drafts extends Controller { +class Drafts extends Controller +{ - function init() { - if (local_channel() && Apps::system_app_installed(local_channel(),'Drafts')) { - goaway(z_root() . '/stream/?draft=1'); + public function init() + { + if (local_channel() && Apps::system_app_installed(local_channel(), 'Drafts')) { + goaway(z_root() . '/stream/?draft=1'); } - } + } - function get() { + public function get() + { $desc = t('This app allows you to save posts you are writing and finish them later prior to sharing/publishing.'); $text = '' . $desc . ''; - if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Drafts'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Drafts'))) { return $text; } - - } + } } diff --git a/Zotlabs/Module/Dreport.php b/Zotlabs/Module/Dreport.php index 0498f14e7..ebe25016e 100644 --- a/Zotlabs/Module/Dreport.php +++ b/Zotlabs/Module/Dreport.php @@ -1,195 +1,197 @@ 2) { - $cmd = argv(1); - $mid = argv(2); - } - elseif (argc() > 1) { - $cmd = EMPTY_STR; - $mid = argv(1); - } + if (!local_channel()) { + notice(t('Permission denied') . EOL); + return; + } - $message_id = unpack_link_id($mid); + $table = 'item'; - if (! $message_id) { - notice( t('Invalid message') . EOL); - return; - } - - if($cmd === 'push') { - $i = q("select id from item where mid = '%s' and uid = %d and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ", - dbesc($message_id), - intval($channel['channel_id']), - dbesc($channel['channel_hash']), - dbesc($channel['channel_hash']) - ); - if ($i) { - Run::Summon([ 'Notifier', 'edit_post', $i[0]['id'] ]); - } - sleep(3); - goaway(z_root() . '/dreport/' . urlencode($mid)); - } + $channel = App::get_channel(); - if ($cmd === 'log') { - $host = escape_tags($_REQUEST['host']); - $r = q("select * from dreport where dreport_xchan = '%s' and dreport_mid = '%s' and dreport_recip = '%s'", - dbesc($channel['channel_hash']), - dbesc($message_id), - dbesc($host) - ); - if ($r) { - $output = '' . t('Delivery Log') . '
'; - $output .= EOL . $r[0]['dreport_log']; - return $output; - } - else { - notice( t('Item not found') . EOL); - return; - } - } - - switch ($table) { - case 'item': - $i = q("select id from item where mid = '%s' and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ", - dbesc($message_id), - dbesc($channel['channel_hash']), - dbesc($channel['channel_hash']) - ); - break; - default: - break; - } - - if(! $i) { - notice( t('Permission denied') . EOL); - return; - } - - $r = q("select * from dreport where dreport_xchan = '%s' and dreport_mid = '%s'", - dbesc($channel['channel_hash']), - dbesc($message_id) - ); - - if (! $r) { - notice( t('no results') . EOL); - } - - for($x = 0; $x < count($r); $x++ ) { - - // This has two purposes: 1. make the delivery report strings translateable, and - // 2. assign an ordering to item delivery results so we can group them and provide - // a readable report with more interesting events listed toward the top and lesser - // interesting items towards the bottom - - switch($r[$x]['dreport_result']) { - case 'channel sync processed': - $r[$x]['gravity'] = 0; - $r[$x]['dreport_result'] = t('channel sync processed'); - break; - case 'queued': - $r[$x]['gravity'] = 2; - $r[$x]['dreport_result'] = '' . t('queued') . ''; - break; - case 'site dead': - $r[$x]['gravity'] = 3; - $r[$x]['dreport_result'] = t('site dead'); - break; - case 'site deferred': - $r[$x]['gravity'] = 3; - $r[$x]['dreport_result'] = t('site might be dead - deferred'); - break; - case 'posted': - $r[$x]['gravity'] = 3; - $r[$x]['dreport_result'] = t('posted'); - break; - case 'accepted for delivery': - $r[$x]['gravity'] = 4; - $r[$x]['dreport_result'] = t('accepted for delivery'); - break; - case 'updated': - $r[$x]['gravity'] = 5; - $r[$x]['dreport_result'] = t('updated'); - case 'update ignored': - $r[$x]['gravity'] = 6; - $r[$x]['dreport_result'] = t('update ignored'); - break; - case 'permission denied': - $r[$x]['dreport_result'] = t('permission denied'); - $r[$x]['gravity'] = 6; - break; - case 'recipient not found': - $r[$x]['dreport_result'] = t('recipient not found'); - break; - case 'mail recalled': - $r[$x]['dreport_result'] = t('mail recalled'); - break; - case 'duplicate mail received': - $r[$x]['dreport_result'] = t('duplicate mail received'); - break; - case 'mail delivered': - $r[$x]['dreport_result'] = t('mail delivered'); - break; - default: - if (strpos($r[$x]['dreport_result'],'delivery rejected') === 0) { - $r[$x]['dreport_result'] = t('delivery rejected') . ' ' . substr($r[$x]['dreport_result'],17); - } - $r[$x]['gravity'] = 1; - break; - } - } - - usort($r,'self::dreport_gravity_sort'); + if (argc() > 2) { + $cmd = argv(1); + $mid = argv(2); + } elseif (argc() > 1) { + $cmd = EMPTY_STR; + $mid = argv(1); + } - $entries = []; - foreach($r as $rr) { - $entries[] = [ - 'name' => escape_tags($rr['dreport_name'] ?: $rr['dreport_recip']), - 'result' => $rr['dreport_result'], - 'time' => escape_tags(datetime_convert('UTC',date_default_timezone_get(),$rr['dreport_time'])) - ]; - } + $message_id = unpack_link_id($mid); - $output = replace_macros(get_markup_template('dreport.tpl'), array( - '$title' => sprintf( t('Delivery report for %1$s'),basename($message_id)) . '...', - '$table' => $table, - '$mid' => urlencode($mid), - '$options' => t('Options'), - '$push' => t('Redeliver'), - '$entries' => $entries - )); - - - return $output; - - - - } - - private static function dreport_gravity_sort($a,$b) { - if($a['gravity'] == $b['gravity']) { - if($a['dreport_name'] === $b['dreport_name']) - return strcmp($a['dreport_time'],$b['dreport_time']); - return strcmp($a['dreport_name'],$b['dreport_name']); - } - return (($a['gravity'] > $b['gravity']) ? 1 : (-1)); - } - + if (!$message_id) { + notice(t('Invalid message') . EOL); + return; + } + + if ($cmd === 'push') { + $i = q( + "select id from item where mid = '%s' and uid = %d and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ", + dbesc($message_id), + intval($channel['channel_id']), + dbesc($channel['channel_hash']), + dbesc($channel['channel_hash']) + ); + if ($i) { + Run::Summon(['Notifier', 'edit_post', $i[0]['id']]); + } + sleep(3); + goaway(z_root() . '/dreport/' . urlencode($mid)); + } + + if ($cmd === 'log') { + $host = escape_tags($_REQUEST['host']); + $r = q( + "select * from dreport where dreport_xchan = '%s' and dreport_mid = '%s' and dreport_recip = '%s'", + dbesc($channel['channel_hash']), + dbesc($message_id), + dbesc($host) + ); + if ($r) { + $output = '' . t('Delivery Log') . '
'; + $output .= EOL . $r[0]['dreport_log']; + return $output; + } else { + notice(t('Item not found') . EOL); + return; + } + } + + switch ($table) { + case 'item': + $i = q( + "select id from item where mid = '%s' and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ", + dbesc($message_id), + dbesc($channel['channel_hash']), + dbesc($channel['channel_hash']) + ); + break; + default: + break; + } + + if (!$i) { + notice(t('Permission denied') . EOL); + return; + } + + $r = q( + "select * from dreport where dreport_xchan = '%s' and dreport_mid = '%s'", + dbesc($channel['channel_hash']), + dbesc($message_id) + ); + + if (!$r) { + notice(t('no results') . EOL); + } + + for ($x = 0; $x < count($r); $x++) { + // This has two purposes: 1. make the delivery report strings translateable, and + // 2. assign an ordering to item delivery results so we can group them and provide + // a readable report with more interesting events listed toward the top and lesser + // interesting items towards the bottom + + switch ($r[$x]['dreport_result']) { + case 'channel sync processed': + $r[$x]['gravity'] = 0; + $r[$x]['dreport_result'] = t('channel sync processed'); + break; + case 'queued': + $r[$x]['gravity'] = 2; + $r[$x]['dreport_result'] = '' . t('queued') . ''; + break; + case 'site dead': + $r[$x]['gravity'] = 3; + $r[$x]['dreport_result'] = t('site dead'); + break; + case 'site deferred': + $r[$x]['gravity'] = 3; + $r[$x]['dreport_result'] = t('site might be dead - deferred'); + break; + case 'posted': + $r[$x]['gravity'] = 3; + $r[$x]['dreport_result'] = t('posted'); + break; + case 'accepted for delivery': + $r[$x]['gravity'] = 4; + $r[$x]['dreport_result'] = t('accepted for delivery'); + break; + case 'updated': + $r[$x]['gravity'] = 5; + $r[$x]['dreport_result'] = t('updated'); + case 'update ignored': + $r[$x]['gravity'] = 6; + $r[$x]['dreport_result'] = t('update ignored'); + break; + case 'permission denied': + $r[$x]['dreport_result'] = t('permission denied'); + $r[$x]['gravity'] = 6; + break; + case 'recipient not found': + $r[$x]['dreport_result'] = t('recipient not found'); + break; + case 'mail recalled': + $r[$x]['dreport_result'] = t('mail recalled'); + break; + case 'duplicate mail received': + $r[$x]['dreport_result'] = t('duplicate mail received'); + break; + case 'mail delivered': + $r[$x]['dreport_result'] = t('mail delivered'); + break; + default: + if (strpos($r[$x]['dreport_result'], 'delivery rejected') === 0) { + $r[$x]['dreport_result'] = t('delivery rejected') . ' ' . substr($r[$x]['dreport_result'], 17); + } + $r[$x]['gravity'] = 1; + break; + } + } + + usort($r, 'self::dreport_gravity_sort'); + + $entries = []; + foreach ($r as $rr) { + $entries[] = [ + 'name' => escape_tags($rr['dreport_name'] ?: $rr['dreport_recip']), + 'result' => $rr['dreport_result'], + 'time' => escape_tags(datetime_convert('UTC', date_default_timezone_get(), $rr['dreport_time'])) + ]; + } + + $output = replace_macros(get_markup_template('dreport.tpl'), array( + '$title' => sprintf(t('Delivery report for %1$s'), basename($message_id)) . '...', + '$table' => $table, + '$mid' => urlencode($mid), + '$options' => t('Options'), + '$push' => t('Redeliver'), + '$entries' => $entries + )); + + + return $output; + } + + private static function dreport_gravity_sort($a, $b) + { + if ($a['gravity'] == $b['gravity']) { + if ($a['dreport_name'] === $b['dreport_name']) { + return strcmp($a['dreport_time'], $b['dreport_time']); + } + return strcmp($a['dreport_name'], $b['dreport_name']); + } + return (($a['gravity'] > $b['gravity']) ? 1 : (-1)); + } } diff --git a/Zotlabs/Module/Editblock.php b/Zotlabs/Module/Editblock.php index 204d8f81f..91fd97675 100644 --- a/Zotlabs/Module/Editblock.php +++ b/Zotlabs/Module/Editblock.php @@ -1,115 +1,124 @@ 1 && argv(1) === 'sys' && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - \App::$is_sys = true; - } - } + if (argc() > 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + App::$is_sys = true; + } + } - if(argc() > 1) - $which = argv(1); - else - return; + if (argc() > 1) { + $which = argv(1); + } else { + return; + } - Libprofile::load($which); + Libprofile::load($which); + } - } + public function get() + { - function get() { + if (!App::$profile) { + notice(t('Requested profile is not available.') . EOL); + App::$error = 404; + return; + } - if(! \App::$profile) { - notice( t('Requested profile is not available.') . EOL ); - \App::$error = 404; - return; - } + $which = argv(1); - $which = argv(1); + $uid = local_channel(); + $owner = 0; + $channel = null; + $observer = App::get_observer(); - $uid = local_channel(); - $owner = 0; - $channel = null; - $observer = \App::get_observer(); + $channel = App::get_channel(); - $channel = \App::get_channel(); + if (App::$is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } + } - if(\App::$is_sys && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - $uid = $owner = intval($sys['channel_id']); - $channel = $sys; - $observer = $sys; - } - } + if (!$owner) { + // Figure out who the page owner is. + $r = q( + "select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if ($r) { + $owner = intval($r[0]['channel_id']); + } + } - if(! $owner) { - // Figure out who the page owner is. - $r = q("select channel_id from channel where channel_address = '%s'", - dbesc($which) - ); - if($r) { - $owner = intval($r[0]['channel_id']); - } - } + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + if (!perm_is_allowed($owner, $ob_hash, 'write_pages')) { + notice(t('Permission denied.') . EOL); + return; + } - if(! perm_is_allowed($owner,$ob_hash,'write_pages')) { - notice( t('Permission denied.') . EOL); - return; - } + $is_owner = (($uid && $uid == $owner) ? true : false); - $is_owner = (($uid && $uid == $owner) ? true : false); + $o = ''; - $o = ''; + // Figure out which post we're editing + $post_id = ((argc() > 2) ? intval(argv(2)) : 0); - // Figure out which post we're editing - $post_id = ((argc() > 2) ? intval(argv(2)) : 0); + if (!($post_id && $owner)) { + notice(t('Item not found') . EOL); + return; + } - if(! ($post_id && $owner)) { - notice( t('Item not found') . EOL); - return; - } + $itm = q( + "SELECT * FROM item WHERE id = %d and uid = %s LIMIT 1", + intval($post_id), + intval($owner) + ); + if ($itm) { + $item_id = q( + "select * from iconfig where cat = 'system' and k = 'BUILDBLOCK' and iid = %d limit 1", + intval($itm[0]['id']) + ); + if ($item_id) { + $block_title = $item_id[0]['v']; + } + } else { + notice(t('Item not found') . EOL); + return; + } - $itm = q("SELECT * FROM item WHERE id = %d and uid = %s LIMIT 1", - intval($post_id), - intval($owner) - ); - if($itm) { - $item_id = q("select * from iconfig where cat = 'system' and k = 'BUILDBLOCK' and iid = %d limit 1", - intval($itm[0]['id']) - ); - if($item_id) - $block_title = $item_id[0]['v']; - } - else { - notice( t('Item not found') . EOL); - return; - } + $mimetype = $itm[0]['mimetype']; - $mimetype = $itm[0]['mimetype']; - - $content = $itm[0]['body']; - if($itm[0]['mimetype'] === 'text/markdown') - $content = \Zotlabs\Lib\MarkdownSoap::unescape($itm[0]['body']); + $content = $itm[0]['body']; + if ($itm[0]['mimetype'] === 'text/markdown') { + $content = MarkdownSoap::unescape($itm[0]['body']); + } - $rp = 'blocks/' . $channel['channel_address']; + $rp = 'blocks/' . $channel['channel_address']; - $x = array( + $x = array( 'nickname' => $channel['channel_address'], 'bbco_autocomplete'=> ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) ? 'bbcode' : 'comanche-block'), 'return_path' => $rp, @@ -134,20 +143,18 @@ class Editblock extends Controller { 'pagetitle' => $block_title, 'profile_uid' => (intval($channel['channel_id'])), 'bbcode' => ((in_array($mimetype, [ 'text/bbcode' , 'text/x-multicode' ])) ? true : false) - ); + ); - $editor = status_editor($x); + $editor = status_editor($x); - $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit Block'), - '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), - '$id' => $itm[0]['id'], - '$cancel' => t('Cancel'), - '$editor' => $editor - )); - - return $o; - - } + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit Block'), + '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), + '$id' => $itm[0]['id'], + '$cancel' => t('Cancel'), + '$editor' => $editor + )); + return $o; + } } diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php index 8d907d168..5eca164da 100644 --- a/Zotlabs/Module/Editlayout.php +++ b/Zotlabs/Module/Editlayout.php @@ -1,4 +1,5 @@ 1 && argv(1) === 'sys' && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - \App::$is_sys = true; - } - } + if (argc() > 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + App::$is_sys = true; + } + } - if(argc() > 1) - $which = argv(1); - else - return; + if (argc() > 1) { + $which = argv(1); + } else { + return; + } - Libprofile::load($which); + Libprofile::load($which); + } - } + public function get() + { - function get() { + if (!App::$profile) { + notice(t('Requested profile is not available.') . EOL); + App::$error = 404; + return; + } - if(! \App::$profile) { - notice( t('Requested profile is not available.') . EOL ); - \App::$error = 404; - return; - } + $which = argv(1); - $which = argv(1); + $uid = local_channel(); + $owner = 0; + $channel = null; + $observer = App::get_observer(); - $uid = local_channel(); - $owner = 0; - $channel = null; - $observer = \App::get_observer(); + $channel = App::get_channel(); - $channel = \App::get_channel(); + if (App::$is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } + } - if(\App::$is_sys && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - $uid = $owner = intval($sys['channel_id']); - $channel = $sys; - $observer = $sys; - } - } + if (!$owner) { + // Figure out who the page owner is. + $r = q( + "select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if ($r) { + $owner = intval($r[0]['channel_id']); + } + } - if(! $owner) { - // Figure out who the page owner is. - $r = q("select channel_id from channel where channel_address = '%s'", - dbesc($which) - ); - if($r) { - $owner = intval($r[0]['channel_id']); - } - } + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + if (!perm_is_allowed($owner, $ob_hash, 'write_pages')) { + notice(t('Permission denied.') . EOL); + return; + } - if(! perm_is_allowed($owner,$ob_hash,'write_pages')) { - notice( t('Permission denied.') . EOL); - return; - } + $is_owner = (($uid && $uid == $owner) ? true : false); - $is_owner = (($uid && $uid == $owner) ? true : false); + $o = ''; - $o = ''; + // Figure out which post we're editing + $post_id = ((argc() > 2) ? intval(argv(2)) : 0); - // Figure out which post we're editing - $post_id = ((argc() > 2) ? intval(argv(2)) : 0); + if (!$post_id) { + notice(t('Item not found') . EOL); + return; + } - if(! $post_id) { - notice( t('Item not found') . EOL); - return; - } + // Now we've got a post and an owner, let's find out if we're allowed to edit it - // Now we've got a post and an owner, let's find out if we're allowed to edit it + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + $perms = get_all_perms($owner, $ob_hash); - $perms = get_all_perms($owner,$ob_hash); + if (!$perms['write_pages']) { + notice(t('Permission denied.') . EOL); + return; + } - if(! $perms['write_pages']) { - notice( t('Permission denied.') . EOL); - return; - } + $itm = q( + "SELECT * FROM item WHERE id = %d and uid = %s LIMIT 1", + intval($post_id), + intval($owner) + ); - $itm = q("SELECT * FROM item WHERE id = %d and uid = %s LIMIT 1", - intval($post_id), - intval($owner) - ); - - $item_id = q("select * from iconfig where cat = 'system' and k = 'PDL' and iid = %d limit 1", - intval($itm[0]['id']) - ); - if($item_id) - $layout_title = $item_id[0]['v']; + $item_id = q( + "select * from iconfig where cat = 'system' and k = 'PDL' and iid = %d limit 1", + intval($itm[0]['id']) + ); + if ($item_id) { + $layout_title = $item_id[0]['v']; + } - $rp = 'layouts/' . $which; + $rp = 'layouts/' . $which; - $x = array( - 'webpage' => ITEM_TYPE_PDL, - 'nickname' => $channel['channel_address'], - 'editor_autocomplete'=> true, - 'bbco_autocomplete'=> 'comanche', - 'return_path' => $rp, - 'button' => t('Edit'), - 'hide_voting' => true, - 'hide_future' => true, - 'hide_expire' => true, - 'hide_location' => true, - 'hide_weblink' => true, - 'hide_attach' => true, - 'hide_preview' => true, - 'disable_comments' => true, - 'ptyp' => $itm[0]['obj_type'], - 'body' => undo_post_tagging($itm[0]['body']), - 'post_id' => $post_id, - 'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), - 'pagetitle' => $layout_title, - 'ptlabel' => t('Layout Name'), - 'placeholdertitle' => t('Layout Description (Optional)'), - 'showacl' => false, - 'profile_uid' => intval($owner), - ); + $x = array( + 'webpage' => ITEM_TYPE_PDL, + 'nickname' => $channel['channel_address'], + 'editor_autocomplete' => true, + 'bbco_autocomplete' => 'comanche', + 'return_path' => $rp, + 'button' => t('Edit'), + 'hide_voting' => true, + 'hide_future' => true, + 'hide_expire' => true, + 'hide_location' => true, + 'hide_weblink' => true, + 'hide_attach' => true, + 'hide_preview' => true, + 'disable_comments' => true, + 'ptyp' => $itm[0]['obj_type'], + 'body' => undo_post_tagging($itm[0]['body']), + 'post_id' => $post_id, + 'title' => htmlspecialchars($itm[0]['title'], ENT_COMPAT, 'UTF-8'), + 'pagetitle' => $layout_title, + 'ptlabel' => t('Layout Name'), + 'placeholdertitle' => t('Layout Description (Optional)'), + 'showacl' => false, + 'profile_uid' => intval($owner), + ); - $editor = status_editor($x); + $editor = status_editor($x); - $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit Layout'), - '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), - '$id' => $itm[0]['id'], - '$cancel' => t('Cancel'), - '$editor' => $editor - )); - - return $o; - - } + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit Layout'), + '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), + '$id' => $itm[0]['id'], + '$cancel' => t('Cancel'), + '$editor' => $editor + )); + return $o; + } } diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php index 6e9754689..f8eacf6f7 100644 --- a/Zotlabs/Module/Editpost.php +++ b/Zotlabs/Module/Editpost.php @@ -1,4 +1,5 @@ 1) ? intval(argv(1)) : 0); + $post_id = ((argc() > 1) ? intval(argv(1)) : 0); - if (! $post_id) { - notice( t('Item not found') . EOL); - return; - } + if (!$post_id) { + notice(t('Item not found') . EOL); + return; + } - $item = q("SELECT * FROM item WHERE id = %d AND ( owner_xchan = '%s' OR author_xchan = '%s' ) LIMIT 1", - intval($post_id), - dbesc(get_observer_hash()), - dbesc(get_observer_hash()) - ); + $item = q( + "SELECT * FROM item WHERE id = %d AND ( owner_xchan = '%s' OR author_xchan = '%s' ) LIMIT 1", + intval($post_id), + dbesc(get_observer_hash()), + dbesc(get_observer_hash()) + ); - // don't allow web editing of potentially binary content (item_obscured = 1) + // don't allow web editing of potentially binary content (item_obscured = 1) - if ((! $item) || intval($item[0]['item_obscured'])) { - notice( t('Item is not editable') . EOL); - return; - } + if ((!$item) || intval($item[0]['item_obscured'])) { + notice(t('Item is not editable') . EOL); + return; + } - $item = array_shift($item); + $item = array_shift($item); - $owner_uid = intval($item['uid']); - $owner = channelx_by_n($owner_uid); + $owner_uid = intval($item['uid']); + $owner = channelx_by_n($owner_uid); - if ($item['resource_type'] === 'photo' && $item['resource_id'] && $owner) { - goaway(z_root() . '/photos/' . $owner['channel_address'] . '/image/' . $item['resource_id'] . '?expandform=1'); - } + if ($item['resource_type'] === 'photo' && $item['resource_id'] && $owner) { + goaway(z_root() . '/photos/' . $owner['channel_address'] . '/image/' . $item['resource_id'] . '?expandform=1'); + } - if ($item['resource_type'] === 'event' && $item['resource_id']) { - goaway(z_root() . '/events/' . $item['resource_id'] . '?expandform=1'); - } + if ($item['resource_type'] === 'event' && $item['resource_id']) { + goaway(z_root() . '/events/' . $item['resource_id'] . '?expandform=1'); + } - $channel = App::get_channel(); + $channel = App::get_channel(); - $category = ''; - $collections = []; - $catsenabled = ((Apps::system_app_installed($owner_uid,'Categories')) ? 'categories' : ''); + $category = ''; + $collections = []; + $catsenabled = ((Apps::system_app_installed($owner_uid, 'Categories')) ? 'categories' : ''); - // we have a single item, but fetch_post_tags expects an array. Convert it before and after. + // we have a single item, but fetch_post_tags expects an array. Convert it before and after. - $item = array_shift(fetch_post_tags([$item])); + $item = array_shift(fetch_post_tags([$item])); - if ($catsenabled) { - $cats = get_terms_oftype($item['term'], TERM_CATEGORY); + if ($catsenabled) { + $cats = get_terms_oftype($item['term'], TERM_CATEGORY); - if ($cats) { - foreach ($cats as $cat) { - if (strlen($category)) { - $category .= ', '; - } - $category .= $cat['term']; - } - } - } + if ($cats) { + foreach ($cats as $cat) { + if (strlen($category)) { + $category .= ', '; + } + $category .= $cat['term']; + } + } + } - $clcts = get_terms_oftype($item['term'], TERM_PCATEGORY); - if ($clcts) { - foreach ($clcts as $clct) { - $collections[] = $clct['term']; - } - } + $clcts = get_terms_oftype($item['term'], TERM_PCATEGORY); + if ($clcts) { + foreach ($clcts as $clct) { + $collections[] = $clct['term']; + } + } - if ($item['attach']) { - $j = json_decode($item['attach'],true); - if ($j) { - foreach ($j as $jj) { - $item['body'] .= "\n" . '[attachment]' . basename($jj['href']) . ',' . $jj['revision'] . '[/attachment]' . "\n"; - } - } - } + if ($item['attach']) { + $j = json_decode($item['attach'], true); + if ($j) { + foreach ($j as $jj) { + $item['body'] .= "\n" . '[attachment]' . basename($jj['href']) . ',' . $jj['revision'] . '[/attachment]' . "\n"; + } + } + } - if (intval($item['item_unpublished'])) { - // clear the old creation date if editing a saved draft. These will always show as just created. - unset($item['created']); - } + if (intval($item['item_unpublished'])) { + // clear the old creation date if editing a saved draft. These will always show as just created. + unset($item['created']); + } - if ($item['summary']) { - $item['body'] = '[summary]' . $item['summary'] . '[/summary]' . "\n\n" . $item['body']; - } + if ($item['summary']) { + $item['body'] = '[summary]' . $item['summary'] . '[/summary]' . "\n\n" . $item['body']; + } - $x = [ - 'nickname' => $channel['channel_address'], - 'item' => $item, - 'editor_autocomplete'=> true, - 'bbco_autocomplete'=> 'bbcode', - 'return_path' => $_SESSION['return_url'], - 'button' => t('Submit'), - 'hide_voting' => true, - 'hide_future' => true, - 'hide_location' => true, - 'is_draft' => ((intval($item['item_unpublished'])) ? true : false), - 'parent' => (($item['mid'] === $item['parent_mid']) ? 0 : $item['parent']), - 'mimetype' => $item['mimetype'], - 'ptyp' => $item['obj_type'], - 'body' => htmlspecialchars_decode(undo_post_tagging($item['body']),ENT_COMPAT), - 'post_id' => $post_id, - 'defloc' => $channel['channel_location'], - 'visitor' => true, - 'title' => htmlspecialchars_decode($item['title'],ENT_COMPAT), - 'category' => $category, - 'showacl' => ((intval($item['item_unpublished'])) ? true : false), - 'lockstate' => (($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl($item, true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), - 'bang' => EMPTY_STR, - 'permissions' => $item, - 'profile_uid' => $owner_uid, - 'catsenabled' => $catsenabled, - 'collections' => $collections, - 'jotnets' => true, - 'hide_expire' => true, - 'bbcode' => true - ]; + $x = [ + 'nickname' => $channel['channel_address'], + 'item' => $item, + 'editor_autocomplete' => true, + 'bbco_autocomplete' => 'bbcode', + 'return_path' => $_SESSION['return_url'], + 'button' => t('Submit'), + 'hide_voting' => true, + 'hide_future' => true, + 'hide_location' => true, + 'is_draft' => ((intval($item['item_unpublished'])) ? true : false), + 'parent' => (($item['mid'] === $item['parent_mid']) ? 0 : $item['parent']), + 'mimetype' => $item['mimetype'], + 'ptyp' => $item['obj_type'], + 'body' => htmlspecialchars_decode(undo_post_tagging($item['body']), ENT_COMPAT), + 'post_id' => $post_id, + 'defloc' => $channel['channel_location'], + 'visitor' => true, + 'title' => htmlspecialchars_decode($item['title'], ENT_COMPAT), + 'category' => $category, + 'showacl' => ((intval($item['item_unpublished'])) ? true : false), + 'lockstate' => (($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) ? 'lock' : 'unlock'), + 'acl' => populate_acl($item, true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), + 'bang' => EMPTY_STR, + 'permissions' => $item, + 'profile_uid' => $owner_uid, + 'catsenabled' => $catsenabled, + 'collections' => $collections, + 'jotnets' => true, + 'hide_expire' => true, + 'bbcode' => true + ]; - $editor = status_editor($x); + $editor = status_editor($x); - $output .= replace_macros(get_markup_template('edpost_head.tpl'), - [ '$title' => t('Edit post'), '$cancel' => t('Cancel'), '$editor' => $editor ] ); - - return $output; - - } + $output .= replace_macros( + get_markup_template('edpost_head.tpl'), + ['$title' => t('Edit post'), '$cancel' => t('Cancel'), '$editor' => $editor] + ); + return $output; + } } diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php index 2ac90718a..39d6fbd3d 100644 --- a/Zotlabs/Module/Editwebpage.php +++ b/Zotlabs/Module/Editwebpage.php @@ -1,7 +1,10 @@ 1 && argv(1) === 'sys' && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - \App::$is_sys = true; - } - } + if (argc() > 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + App::$is_sys = true; + } + } - if(argc() > 1) - $which = argv(1); - else - return; + if (argc() > 1) { + $which = argv(1); + } else { + return; + } - Libprofile::load($which); + Libprofile::load($which); + } - } + public function get() + { - function get() { + if (!App::$profile) { + notice(t('Requested profile is not available.') . EOL); + App::$error = 404; + return; + } - if(! \App::$profile) { - notice( t('Requested profile is not available.') . EOL ); - \App::$error = 404; - return; - } + $which = argv(1); - $which = argv(1); + $uid = local_channel(); + $owner = 0; + $channel = null; + $observer = App::get_observer(); - $uid = local_channel(); - $owner = 0; - $channel = null; - $observer = \App::get_observer(); + $channel = App::get_channel(); - $channel = \App::get_channel(); + if (App::$is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } + } - if(\App::$is_sys && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - $uid = $owner = intval($sys['channel_id']); - $channel = $sys; - $observer = $sys; - } - } + if (!$owner) { + // Figure out who the page owner is. + $r = q( + "select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if ($r) { + $owner = intval($r[0]['channel_id']); + } + } - if(! $owner) { - // Figure out who the page owner is. - $r = q("select channel_id from channel where channel_address = '%s'", - dbesc($which) - ); - if($r) { - $owner = intval($r[0]['channel_id']); - } - } + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + if (!perm_is_allowed($owner, $ob_hash, 'write_pages')) { + notice(t('Permission denied.') . EOL); + return; + } - if(! perm_is_allowed($owner,$ob_hash,'write_pages')) { - notice( t('Permission denied.') . EOL); - return; - } + $is_owner = (($uid && $uid == $owner) ? true : false); - $is_owner = (($uid && $uid == $owner) ? true : false); + $o = ''; - $o = ''; + // Figure out which post we're editing + $post_id = ((argc() > 2) ? intval(argv(2)) : 0); - // Figure out which post we're editing - $post_id = ((argc() > 2) ? intval(argv(2)) : 0); - - if(! $post_id) { - notice( t('Item not found') . EOL); - return; - } + if (!$post_id) { + notice(t('Item not found') . EOL); + return; + } - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - $perms = get_all_perms($owner,$ob_hash); + $perms = get_all_perms($owner, $ob_hash); - if(! $perms['write_pages']) { - notice( t('Permission denied.') . EOL); - return; - } + if (!$perms['write_pages']) { + notice(t('Permission denied.') . EOL); + return; + } - // We've already figured out which item we want and whose copy we need, - // so we don't need anything fancy here + // We've already figured out which item we want and whose copy we need, + // so we don't need anything fancy here - $sql_extra = item_permissions_sql($owner); + $sql_extra = item_permissions_sql($owner); - $itm = q("SELECT * FROM item WHERE id = %d and uid = %s $sql_extra LIMIT 1", - intval($post_id), - intval($owner) - ); + $itm = q( + "SELECT * FROM item WHERE id = %d and uid = %s $sql_extra LIMIT 1", + intval($post_id), + intval($owner) + ); - // don't allow web editing of potentially binary content (item_obscured = 1) - // @FIXME how do we do it instead? + // don't allow web editing of potentially binary content (item_obscured = 1) + // @FIXME how do we do it instead? - if((! $itm) || intval($itm[0]['item_obscured'])) { - notice( t('Permission denied.') . EOL); - return; - } + if ((!$itm) || intval($itm[0]['item_obscured'])) { + notice(t('Permission denied.') . EOL); + return; + } - $item_id = q("select * from iconfig where cat = 'system' and k = 'WEBPAGE' and iid = %d limit 1", - intval($itm[0]['id']) - ); - if($item_id) - $page_title = urldecode($item_id[0]['v']); + $item_id = q( + "select * from iconfig where cat = 'system' and k = 'WEBPAGE' and iid = %d limit 1", + intval($itm[0]['id']) + ); + if ($item_id) { + $page_title = urldecode($item_id[0]['v']); + } - $mimetype = $itm[0]['mimetype']; + $mimetype = $itm[0]['mimetype']; - if($mimetype === 'application/x-php') { - if((! $uid) || ($uid != $itm[0]['uid'])) { - notice( t('Permission denied.') . EOL); - return; - } - } - - $layout = $itm[0]['layout_mid']; + if ($mimetype === 'application/x-php') { + if ((!$uid) || ($uid != $itm[0]['uid'])) { + notice(t('Permission denied.') . EOL); + return; + } + } - $content = $itm[0]['body']; - if($itm[0]['mimetype'] === 'text/markdown') - $content = \Zotlabs\Lib\MarkdownSoap::unescape($itm[0]['body']); - - $rp = 'webpages/' . $which; + $layout = $itm[0]['layout_mid']; - $x = array( - 'nickname' => $channel['channel_address'], - 'bbco_autocomplete'=> ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) ? 'bbcode' : ''), - 'return_path' => $rp, - 'webpage' => ITEM_TYPE_WEBPAGE, - 'ptlabel' => t('Page link'), - 'pagetitle' => $page_title, - 'writefiles' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false), - 'button' => t('Edit'), - 'weblink' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) ? t('Insert web link') : false), - 'hide_location' => true, - 'hide_voting' => true, - 'ptyp' => $itm[0]['type'], - 'body' => undo_post_tagging($content), - 'post_id' => $post_id, - 'visitor' => ($is_owner) ? true : false, - 'acl' => populate_acl($itm[0],false,\Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')), - 'permissions' => $itm[0], - 'showacl' => ($is_owner) ? true : false, - 'mimetype' => $mimetype, - 'mimeselect' => true, - 'layout' => $layout, - 'layoutselect' => true, - 'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), - 'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'), - 'profile_uid' => (intval($owner)), - 'bbcode' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) ? true : false) - ); + $content = $itm[0]['body']; + if ($itm[0]['mimetype'] === 'text/markdown') { + $content = MarkdownSoap::unescape($itm[0]['body']); + } - $editor = status_editor($x); + $rp = 'webpages/' . $which; - $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit Webpage'), - '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), - '$editor' => $editor, - '$cancel' => t('Cancel'), - '$id' => $itm[0]['id'] - )); + $x = array( + 'nickname' => $channel['channel_address'], + 'bbco_autocomplete' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode'])) ? 'bbcode' : ''), + 'return_path' => $rp, + 'webpage' => ITEM_TYPE_WEBPAGE, + 'ptlabel' => t('Page link'), + 'pagetitle' => $page_title, + 'writefiles' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode'])) ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false), + 'button' => t('Edit'), + 'weblink' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode'])) ? t('Insert web link') : false), + 'hide_location' => true, + 'hide_voting' => true, + 'ptyp' => $itm[0]['type'], + 'body' => undo_post_tagging($content), + 'post_id' => $post_id, + 'visitor' => ($is_owner) ? true : false, + 'acl' => populate_acl($itm[0], false, PermissionDescription::fromGlobalPermission('view_pages')), + 'permissions' => $itm[0], + 'showacl' => ($is_owner) ? true : false, + 'mimetype' => $mimetype, + 'mimeselect' => true, + 'layout' => $layout, + 'layoutselect' => true, + 'title' => htmlspecialchars($itm[0]['title'], ENT_COMPAT, 'UTF-8'), + 'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'), + 'profile_uid' => (intval($owner)), + 'bbcode' => ((in_array($mimetype, ['text/bbcode', 'text/x-multicode'])) ? true : false) + ); - return $o; + $editor = status_editor($x); - } + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit Webpage'), + '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), + '$editor' => $editor, + '$cancel' => t('Cancel'), + '$id' => $itm[0]['id'] + )); + return $o; + } } diff --git a/Zotlabs/Module/Email_resend.php b/Zotlabs/Module/Email_resend.php index f8a336be0..2a5e199fd 100644 --- a/Zotlabs/Module/Email_resend.php +++ b/Zotlabs/Module/Email_resend.php @@ -2,45 +2,43 @@ namespace Zotlabs\Module; +use Zotlabs\Web\Controller; -class Email_resend extends \Zotlabs\Web\Controller { +class Email_resend extends Controller +{ - function post() { + public function post() + { - if($_POST['token']) { - if(! account_approve(trim($_POST['token']))) { - notice(t('Token verification failed.')); - } - } - - } + if ($_POST['token']) { + if (!account_approve(trim($_POST['token']))) { + notice(t('Token verification failed.')); + } + } + } - function get() { + public function get() + { - if(argc() > 1) { - $result = false; - $email = hex2bin(argv(1)); + if (argc() > 1) { + $result = false; + $email = hex2bin(argv(1)); - if($email) { - $result = verify_email_address( [ 'resend' => true, 'email' => $email ] ); - } + if ($email) { + $result = verify_email_address(['resend' => true, 'email' => $email]); + } - if($result) { - notice(t('Email verification resent')); - } - else { - notice(t('Unable to resend email verification message.')); - } + if ($result) { + notice(t('Email verification resent')); + } else { + notice(t('Unable to resend email verification message.')); + } - goaway(z_root() . '/email_validation/' . bin2hex($email)); - - } - - // @todo - one can provide a form here to resend the mail - // after directing to here if a succesful login was attempted from an unverified address. - - - } + goaway(z_root() . '/email_validation/' . bin2hex($email)); + } + // @todo - one can provide a form here to resend the mail + // after directing to here if a succesful login was attempted from an unverified address. + } } diff --git a/Zotlabs/Module/Email_validation.php b/Zotlabs/Module/Email_validation.php index c1ba9a01a..90f68cbca 100644 --- a/Zotlabs/Module/Email_validation.php +++ b/Zotlabs/Module/Email_validation.php @@ -2,47 +2,49 @@ namespace Zotlabs\Module; +use Zotlabs\Web\Controller; -class Email_validation extends \Zotlabs\Web\Controller { +class Email_validation extends Controller +{ - function post() { + public function post() + { - $success = false; - if($_POST['token']) { - // This will redirect internally on success unless the channel is auto_created - if(account_approve(trim(basename($_POST['token'])))) { - $success = true; - if(get_config('system','auto_channel_create')) { - $next_page = get_config('system', 'workflow_channel_next', 'profiles'); - } - if($next_page) { - goaway(z_root() . '/' . $next_page); - } - } - } - if(! $success) { - notice( t('Token verification failed.') . EOL); - } - } + $success = false; + if ($_POST['token']) { + // This will redirect internally on success unless the channel is auto_created + if (account_approve(trim(basename($_POST['token'])))) { + $success = true; + if (get_config('system', 'auto_channel_create')) { + $next_page = get_config('system', 'workflow_channel_next', 'profiles'); + } + if ($next_page) { + goaway(z_root() . '/' . $next_page); + } + } + } + if (!$success) { + notice(t('Token verification failed.') . EOL); + } + } - function get() { + public function get() + { - if(argc() > 1) { - $email = hex2bin(argv(1)); - } + if (argc() > 1) { + $email = hex2bin(argv(1)); + } - $o = replace_macros(get_markup_template('email_validation.tpl'), [ - '$title' => t('Email Verification Required'), - '$desc' => sprintf( t('A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message.'),$email), - '$resend' => t('Resend Email'), - '$email' => bin2hex($email), - '$submit' => t('Submit'), - '$token' => [ 'token', t('Validation token'),'','' ], - ]); - - return $o; + $o = replace_macros(get_markup_template('email_validation.tpl'), [ + '$title' => t('Email Verification Required'), + '$desc' => sprintf(t('A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message.'), $email), + '$resend' => t('Resend Email'), + '$email' => bin2hex($email), + '$submit' => t('Submit'), + '$token' => ['token', t('Validation token'), '', ''], + ]); - } - -} \ No newline at end of file + return $o; + } +} diff --git a/Zotlabs/Module/Embed.php b/Zotlabs/Module/Embed.php index d470719a0..1cd6e296b 100644 --- a/Zotlabs/Module/Embed.php +++ b/Zotlabs/Module/Embed.php @@ -9,14 +9,16 @@ namespace Zotlabs\Module; use Zotlabs\Web\Controller; -class Embed extends Controller { +class Embed extends Controller +{ - function init() { - $post_id = ((argc() > 1) ? intval(argv(1)) : 0); - - if ($post_id && local_channel()) { - echo '[share=' . $post_id . '][/share]'; - } - killme(); - } + public function init() + { + $post_id = ((argc() > 1) ? intval(argv(1)) : 0); + + if ($post_id && local_channel()) { + echo '[share=' . $post_id . '][/share]'; + } + killme(); + } } diff --git a/Zotlabs/Module/Embedphotos.php b/Zotlabs/Module/Embedphotos.php index cd4db4aa9..1a26532d9 100644 --- a/Zotlabs/Module/Embedphotos.php +++ b/Zotlabs/Module/Embedphotos.php @@ -8,240 +8,237 @@ use Zotlabs\Web\Controller; require_once('include/attach.php'); require_once('include/photos.php'); -class Embedphotos extends Controller { +class Embedphotos extends Controller +{ - /** - * - * This is the POST destination for the embedphotos button - * - */ - function post() { - - // The admin tools for setting a site logo and cover photo set the channel_id explicitly - // to the 'sys' channel and use stored resources for that channel. - // Legacy behaviour uses the local logged in channel. - - if (argc() > 2 && is_site_admin() && intval(argv(2))) { - $channel_id = argv(2); - } - else { - $channel_id = local_channel(); - } - if (argc() > 1 && argv(1) === 'album') { - // API: /embedphotos/album - $name = (x($_POST,'name') ? $_POST['name'] : null ); - if (! $name) { - json_return_and_die(array('errormsg' => 'Error retrieving album', 'status' => false)); - } - $album = $this->embedphotos_widget_album(array('channel_id' => $channel_id, 'album' => $name)); - json_return_and_die(array('status' => true, 'content' => $album)); - } - if (argc() > 1 && argv(1) === 'albumlist') { - // API: /embedphotos/albumlist - $album_list = $this->embedphotos_album_list($channel_id); - json_return_and_die(array('status' => true, 'albumlist' => $album_list)); - } - if (argc() > 1 && argv(1) === 'photolink') { - // API: /embedphotos/photolink - $href = (x($_POST,'href') ? $_POST['href'] : null ); - if (! $href) { - json_return_and_die(array('errormsg' => 'Error retrieving link ' . $href, 'status' => false)); - } - $resource_id = array_pop(explode("/", $href)); + /** + * + * This is the POST destination for the embedphotos button + * + */ + public function post() + { - $x = self::photolink($resource_id, $channel_id); - if ($x) { - json_return_and_die(array('status' => true, 'photolink' => $x, 'resource_id' => $resource_id)); - } - json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false)); + // The admin tools for setting a site logo and cover photo set the channel_id explicitly + // to the 'sys' channel and use stored resources for that channel. + // Legacy behaviour uses the local logged in channel. - } - } + if (argc() > 2 && is_site_admin() && intval(argv(2))) { + $channel_id = argv(2); + } else { + $channel_id = local_channel(); + } + if (argc() > 1 && argv(1) === 'album') { + // API: /embedphotos/album + $name = (x($_POST, 'name') ? $_POST['name'] : null); + if (!$name) { + json_return_and_die(array('errormsg' => 'Error retrieving album', 'status' => false)); + } + $album = $this->embedphotos_widget_album(array('channel_id' => $channel_id, 'album' => $name)); + json_return_and_die(array('status' => true, 'content' => $album)); + } + if (argc() > 1 && argv(1) === 'albumlist') { + // API: /embedphotos/albumlist + $album_list = $this->embedphotos_album_list($channel_id); + json_return_and_die(array('status' => true, 'albumlist' => $album_list)); + } + if (argc() > 1 && argv(1) === 'photolink') { + // API: /embedphotos/photolink + $href = (x($_POST, 'href') ? $_POST['href'] : null); + if (!$href) { + json_return_and_die(array('errormsg' => 'Error retrieving link ' . $href, 'status' => false)); + } + $resource_id = array_pop(explode("/", $href)); + + $x = self::photolink($resource_id, $channel_id); + if ($x) { + json_return_and_die(array('status' => true, 'photolink' => $x, 'resource_id' => $resource_id)); + } + json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false)); + } + } - protected static function photolink($resource, $channel_id = 0) { - if (intval($channel_id)) { - $channel = channelx_by_n($channel_id); - } - else { - $channel = App::get_channel(); - } - - $output = EMPTY_STR; - if ($channel) { - $resolution = ((feature_enabled($channel['channel_id'],'large_photos')) ? 1 : 2); - $r = q("select mimetype, height, width, title from photo where resource_id = '%s' and $resolution = %d and uid = %d limit 1", - dbesc($resource), - intval($resolution), - intval($channel['channel_id']) - ); - if (! $r) { - return $output; - } - - if ($r[0]['mimetype'] === 'image/jpeg') { - $ext = '.jpg'; - } - elseif ($r[0]['mimetype'] === 'image/png') { - $ext = '.png'; - } - elseif ($r[0]['mimetype'] === 'image/gif') { - $ext = '.gif'; - } - else { - $ext = EMPTY_STR; - } + protected static function photolink($resource, $channel_id = 0) + { + if (intval($channel_id)) { + $channel = channelx_by_n($channel_id); + } else { + $channel = App::get_channel(); + } - $alt = $r[0]['title']; - if (! $alt) { - $a = q("select filename from attach where hash = '%s' and uid = %d limit 1", - dbesc($resource), - intval($channel['channel_id']) - ); - if ($a) { - $alt = $a[0]['filename']; - } - else { - $alt = t('Image/photo'); - } - } - $alt = ' alt="' . $alt . '"'; + $output = EMPTY_STR; + if ($channel) { + $resolution = ((feature_enabled($channel['channel_id'], 'large_photos')) ? 1 : 2); + $r = q( + "select mimetype, height, width, title from photo where resource_id = '%s' and $resolution = %d and uid = %d limit 1", + dbesc($resource), + intval($resolution), + intval($channel['channel_id']) + ); + if (!$r) { + return $output; + } - $output = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $resource . ']' - . '[zmg width="' . $r[0]['width'] . '" height="' . $r[0]['height'] . '"' . $alt . ']' - . z_root() . '/photo/' . $resource . '-' . $resolution . $ext . '[/zmg][/zrl]'; + if ($r[0]['mimetype'] === 'image/jpeg') { + $ext = '.jpg'; + } elseif ($r[0]['mimetype'] === 'image/png') { + $ext = '.png'; + } elseif ($r[0]['mimetype'] === 'image/gif') { + $ext = '.gif'; + } else { + $ext = EMPTY_STR; + } - return $output; - } - } + $alt = $r[0]['title']; + if (!$alt) { + $a = q( + "select filename from attach where hash = '%s' and uid = %d limit 1", + dbesc($resource), + intval($channel['channel_id']) + ); + if ($a) { + $alt = $a[0]['filename']; + } else { + $alt = t('Image/photo'); + } + } + $alt = ' alt="' . $alt . '"'; + + $output = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $resource . ']' + . '[zmg width="' . $r[0]['width'] . '" height="' . $r[0]['height'] . '"' . $alt . ']' + . z_root() . '/photo/' . $resource . '-' . $resolution . $ext . '[/zmg][/zrl]'; + + return $output; + } + } + /** + * Copied from include/widgets.php::widget_album() with a modification to get the profile_uid from + * the input array as in widget_item() + * + * @param array $args + * @return string with HTML + */ + public function embedphotos_widget_album($args) + { + $channel_id = 0; + if (array_key_exists('channel_id', $args)) { + $channel_id = $args['channel_id']; + $channel = channelx_by_n($channel_id); + } - /** - * Copied from include/widgets.php::widget_album() with a modification to get the profile_uid from - * the input array as in widget_item() - * - * @param array $args - * @return string with HTML - */ + if (!$channel_id) { + return ''; + } - function embedphotos_widget_album($args) { + $owner_uid = $channel_id; + require_once('include/security.php'); + $sql_extra = permissions_sql($channel_id); - $channel_id = 0; - if (array_key_exists('channel_id', $args)) { - $channel_id = $args['channel_id']; - $channel = channelx_by_n($channel_id); - } - - if (! $channel_id) { - return ''; - } + if (!perm_is_allowed($channel_id, get_observer_hash(), 'view_storage')) { + return ''; + } - $owner_uid = $channel_id; - require_once('include/security.php'); - $sql_extra = permissions_sql($channel_id); + if ($args['album']) { + $album = (($args['album'] === '/') ? '' : $args['album']); + } - if (! perm_is_allowed($channel_id,get_observer_hash(),'view_storage')) - return ''; + if ($args['title']) { + $title = $args['title']; + } - if ($args['album']) { - $album = (($args['album'] === '/') ? '' : $args['album']); - } - - if ($args['title']) { - $title = $args['title']; - } + /** + * This may return incorrect permissions if you have multiple directories of the same name. + * It is a limitation of the photo table using a name for a photo album instead of a folder hash + */ + if ($album) { + $x = q( + "select hash from attach where filename = '%s' and uid = %d limit 1", + dbesc($album), + intval($owner_uid) + ); + if ($x) { + $y = attach_can_view_folder($owner_uid, get_observer_hash(), $x[0]['hash']); + if (!$y) { + return ''; + } + } + } - /** - * This may return incorrect permissions if you have multiple directories of the same name. - * It is a limitation of the photo table using a name for a photo album instead of a folder hash - */ - if ($album) { - $x = q("select hash from attach where filename = '%s' and uid = %d limit 1", - dbesc($album), - intval($owner_uid) - ); - if ($x) { - $y = attach_can_view_folder($owner_uid,get_observer_hash(),$x[0]['hash']); - if (! $y) { - return ''; - } - } - } + $order = 'DESC'; - $order = 'DESC'; - - $r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN + $r = q( + "SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN (SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 AND photo_usage IN ( %d, %d ) $sql_extra GROUP BY resource_id) ph ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale) ORDER BY created $order", - intval($owner_uid), - dbesc($album), - intval(PHOTO_NORMAL), - intval(PHOTO_PROFILE) - ); + intval($owner_uid), + dbesc($album), + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE) + ); - $photos = []; - if ($r) { - $twist = 'rotright'; - foreach ($r as $rr) { - if ($twist == 'rotright') { - $twist = 'rotleft'; - } - else { - $twist = 'rotright'; - } + $photos = []; + if ($r) { + $twist = 'rotright'; + foreach ($r as $rr) { + if ($twist == 'rotright') { + $twist = 'rotleft'; + } else { + $twist = 'rotright'; + } - $ext = $phototypes[$rr['mimetype']]; + $ext = $phototypes[$rr['mimetype']]; - $imgalt_e = $rr['filename']; - $desc_e = $rr['description']; + $imgalt_e = $rr['filename']; + $desc_e = $rr['description']; - $imagelink = (z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $rr['resource_id'] - . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '')); + $imagelink = (z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $rr['resource_id'] + . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '')); - $photos[] = [ - 'id' => $rr['id'], - 'twist' => ' ' . $twist . rand(2,4), - 'link' => $imagelink, - 'title' => t('View Photo'), - 'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext, - 'alt' => $imgalt_e, - 'desc' => $desc_e, - 'ext' => $ext, - 'hash' => $rr['resource_id'], - 'unknown' => t('Unknown') - ]; - } - } + $photos[] = [ + 'id' => $rr['id'], + 'twist' => ' ' . $twist . rand(2, 4), + 'link' => $imagelink, + 'title' => t('View Photo'), + 'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' . $ext, + 'alt' => $imgalt_e, + 'desc' => $desc_e, + 'ext' => $ext, + 'hash' => $rr['resource_id'], + 'unknown' => t('Unknown') + ]; + } + } - $o .= replace_macros(get_markup_template('photo_album.tpl'), [ - '$photos' => $photos, - '$album' => (($title) ? $title : $album), - '$album_id' => rand(), - '$album_edit' => array(t('Edit Album'), $album_edit), - '$can_post' => false, - '$upload' => [ t('Upload'), z_root() . '/photos/' . $channel['channel_address'] . '/upload/' . bin2hex($album) ], - '$order' => false, - '$upload_form' => $upload_form, - '$no_fullscreen_btn' => true - ]); + $o .= replace_macros(get_markup_template('photo_album.tpl'), [ + '$photos' => $photos, + '$album' => (($title) ? $title : $album), + '$album_id' => rand(), + '$album_edit' => array(t('Edit Album'), $album_edit), + '$can_post' => false, + '$upload' => [t('Upload'), z_root() . '/photos/' . $channel['channel_address'] . '/upload/' . bin2hex($album)], + '$order' => false, + '$upload_form' => $upload_form, + '$no_fullscreen_btn' => true + ]); - return $o; - } - - function embedphotos_album_list($channel_id) { - $channel = channelx_by_n($channel_id); - $p = photos_albums_list($channel,App::get_observer()); - if ($p['success']) { - return $p['albums']; - } - else { - return null; - } - } + return $o; + } + public function embedphotos_album_list($channel_id) + { + $channel = channelx_by_n($channel_id); + $p = photos_albums_list($channel, App::get_observer()); + if ($p['success']) { + return $p['albums']; + } else { + return null; + } + } } diff --git a/Zotlabs/Module/Event.php b/Zotlabs/Module/Event.php index 9b9769cdf..abfec6fc7 100644 --- a/Zotlabs/Module/Event.php +++ b/Zotlabs/Module/Event.php @@ -1,4 +1,5 @@ MAX_EVENT_REPEAT_COUNT) { - $count = MAX_EVENT_REPEAT_COUNT; - } + $start_text = escape_tags($_REQUEST['start_text']); + $finish_text = escape_tags($_REQUEST['finish_text']); - require_once('include/text.php'); - linkify_tags($desc, local_channel()); - linkify_tags($location, local_channel()); - - //$action = ($event_hash == '') ? 'new' : "event/" . $event_hash; - - //@fixme: this url gives a wsod if there is a linebreak detected in one of the variables ($desc or $location) - //$onerror_url = z_root() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish&type=$type"; - $onerror_url = z_root() . "/events"; - - if(strcmp($finish,$start) < 0 && !$nofinish) { - notice( t('Event can not end before it has started.') . EOL); - if(intval($_REQUEST['preview'])) { - echo( t('Unable to generate preview.')); - killme(); - } - goaway($onerror_url); - } - - if((! $summary) || (! $start)) { - notice( t('Event title and start time are required.') . EOL); - if(intval($_REQUEST['preview'])) { - echo( t('Unable to generate preview.')); - killme(); - } - goaway($onerror_url); - } - - // $share = ((intval($_POST['distr'])) ? intval($_POST['distr']) : 0); + $adjust = intval($_POST['adjust']); + $nofinish = intval($_POST['nofinish']); - $share = 1; + $timezone = ((x($_POST, 'timezone_select')) ? notags(trim($_POST['timezone_select'])) : ''); - - $acl = new AccessControl(false); - - if($event_id) { - $x = q("select * from event where id = %d and uid = %d limit 1", - intval($event_id), - intval(local_channel()) - ); - if(! $x) { - notice( t('Event not found.') . EOL); - if(intval($_REQUEST['preview'])) { - echo( t('Unable to generate preview.')); - killme(); - } - return; - } - - $acl->set($x[0]); - - $created = $x[0]['created']; - $edited = datetime_convert(); - - if($x[0]['allow_cid'] === '<' . $channel['channel_hash'] . '>' - && $x[0]['allow_gid'] === '' && $x[0]['deny_cid'] === '' && $x[0]['deny_gid'] === '') { - $share = false; - } - else { - $share = true; - } - } - else { - $created = $edited = datetime_convert(); - if($share) { - $acl->set_from_array($_POST); - } - else { - $acl->set(array('allow_cid' => '<' . $channel['channel_hash'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '')); - } - } - - $post_tags = []; + $tz = (($timezone) ? $timezone : date_default_timezone_get()); - $ac = $acl->get(); - - if(strlen($categories)) { - $cats = explode(',',$categories); - foreach($cats as $cat) { - $post_tags[] = array( - 'uid' => $profile_uid, - 'ttype' => TERM_CATEGORY, - 'otype' => TERM_OBJ_POST, - 'term' => trim($cat), - 'url' => $channel['xchan_url'] . '?f=&cat=' . urlencode(trim($cat)) - ); - } - } - - $datarray = []; - $datarray['dtstart'] = $start; - $datarray['dtend'] = $finish; - $datarray['summary'] = $summary; - $datarray['description'] = $desc; - $datarray['location'] = $location; - $datarray['etype'] = $type; - $datarray['adjust'] = $adjust; - $datarray['nofinish'] = $nofinish; - $datarray['uid'] = local_channel(); - $datarray['account'] = get_account_id(); - $datarray['event_xchan'] = $channel['channel_hash']; - $datarray['allow_cid'] = $ac['allow_cid']; - $datarray['allow_gid'] = $ac['allow_gid']; - $datarray['deny_cid'] = $ac['deny_cid']; - $datarray['deny_gid'] = $ac['deny_gid']; - $datarray['private'] = (($acl->is_private()) ? 1 : 0); - $datarray['id'] = $event_id; - $datarray['created'] = $created; - $datarray['edited'] = $edited; - - if(intval($_REQUEST['preview'])) { - $html = format_event_html($datarray); - echo $html; - killme(); - } - - $event = event_store_event($datarray); - - if($post_tags) - $datarray['term'] = $post_tags; - - $item_id = event_store_item($datarray,$event); - - if($item_id) { - $r = q("select * from item where id = %d", - intval($item_id) - ); - if($r) { - xchan_query($r); - $sync_item = fetch_post_tags($r); - $z = q("select * from event where event_hash = '%s' and uid = %d limit 1", - dbesc($r[0]['resource_id']), - intval($channel['channel_id']) - ); - if($z) { - Libsync::build_sync_packet($channel['channel_id'], [ 'event_item' => [ encode_item($sync_item[0],true)],'event' => $z ]); - } - } - } - - if($share) - Run::Summon( [ 'Notifier', 'event', $item_id ] ); - - } - - - - function get() { - - if(argc() > 2 && argv(1) == 'ical') { - $event_id = argv(2); - - require_once('include/security.php'); - $sql_extra = permissions_sql(local_channel()); - - $r = q("select * from event where event_hash = '%s' $sql_extra limit 1", - dbesc($event_id) - ); - if($r) { - header('Content-type: text/calendar'); - header('Content-Disposition: attachment; filename="' . t('event') . '-' . $event_id . '.ics"' ); - echo ical_wrapper($r); - killme(); - } - else { - notice( t('Event not found.') . EOL ); - return; - } - } - - if(! local_channel()) { - notice( t('Permission denied.') . EOL); - return; - } - - $channel = App::get_channel(); + $categories = escape_tags(trim($_POST['category'])); - nav_set_selected('Events'); - - if((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) { - $r = q("update event set dismissed = 1 where id = %d and uid = %d", - intval(argv(2)), - intval(local_channel()) - ); - } - - if((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) { - $r = q("update event set dismissed = 0 where id = %d and uid = %d", - intval(argv(2)), - intval(local_channel()) - ); - } - - $first_day = intval(get_pconfig(local_channel(),'system','cal_first_day',0)); - - $htpl = get_markup_template('event_head.tpl'); - App::$page['htmlhead'] .= replace_macros($htpl,array( - '$baseurl' => z_root(), - '$module_url' => '/events', - '$modparams' => 1, - '$lang' => \App::$language, - '$first_day' => $first_day - )); - - $o = ''; - - $mode = 'view'; - $y = 0; - $m = 0; - $ignored = ((x($_REQUEST,'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : ''); - - - // logger('args: ' . print_r(App::$argv,true)); - - - - if(argc() > 1) { - if(argc() > 2 && argv(1) === 'add') { - $mode = 'add'; - $item_id = intval(argv(2)); - } - if(argc() > 2 && argv(1) === 'drop') { - $mode = 'drop'; - $event_id = argv(2); - } - if(argc() > 2 && intval(argv(1)) && intval(argv(2))) { - $mode = 'view'; - $y = intval(argv(1)); - $m = intval(argv(2)); - } - if(argc() <= 2) { - $mode = 'view'; - $event_id = argv(1); - } - } - - if($mode === 'add') { - event_addtocal($item_id,local_channel()); - killme(); - } - - if($mode == 'view') { - - /* edit/create form */ - if($event_id) { - $r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1", - dbesc($event_id), - intval(local_channel()) - ); - if(count($r)) - $orig_event = $r[0]; - } - - $channel = \App::get_channel(); - - // Passed parameters overrides anything found in the DB - if(!x($orig_event)) - $orig_event = []; - - // In case of an error the browser is redirected back here, with these parameters filled in with the previous values - /* - if(x($_REQUEST,'nofinish')) $orig_event['nofinish'] = $_REQUEST['nofinish']; - if(x($_REQUEST,'adjust')) $orig_event['adjust'] = $_REQUEST['adjust']; - if(x($_REQUEST,'summary')) $orig_event['summary'] = $_REQUEST['summary']; - if(x($_REQUEST,'description')) $orig_event['description'] = $_REQUEST['description']; - if(x($_REQUEST,'location')) $orig_event['location'] = $_REQUEST['location']; - if(x($_REQUEST,'start')) $orig_event['dtstart'] = $_REQUEST['start']; - if(x($_REQUEST,'finish')) $orig_event['dtend'] = $_REQUEST['finish']; - if(x($_REQUEST,'type')) $orig_event['etype'] = $_REQUEST['type']; - */ - - $n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : ''); - $a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : ''); - $t_orig = ((x($orig_event)) ? $orig_event['summary'] : ''); - $d_orig = ((x($orig_event)) ? $orig_event['description'] : ''); - $l_orig = ((x($orig_event)) ? $orig_event['location'] : ''); - $eid = ((x($orig_event)) ? $orig_event['id'] : 0); - $event_xchan = ((x($orig_event)) ? $orig_event['event_xchan'] : $channel['channel_hash']); - $mid = ((x($orig_event)) ? $orig_event['mid'] : ''); - - if(! x($orig_event)) { - $sh_checked = ''; - $a_checked = ' checked="checked" '; - } - else { - $sh_checked = ((($orig_event['allow_cid'] === '<' . $channel['channel_hash'] . '>' || (! $orig_event['allow_cid'])) && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ' ); - } + // only allow editing your own events. - if($orig_event['event_xchan']) - $sh_checked .= ' disabled="disabled" '; - - $sdt = ((x($orig_event)) ? $orig_event['dtstart'] : 'now'); - - $fdt = ((x($orig_event)) ? $orig_event['dtend'] : '+1 hour'); - - $tz = date_default_timezone_get(); - if(x($orig_event)) - $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC'); - - $syear = datetime_convert('UTC', $tz, $sdt, 'Y'); - $smonth = datetime_convert('UTC', $tz, $sdt, 'm'); - $sday = datetime_convert('UTC', $tz, $sdt, 'd'); - $shour = datetime_convert('UTC', $tz, $sdt, 'H'); - $sminute = datetime_convert('UTC', $tz, $sdt, 'i'); - - $stext = datetime_convert('UTC',$tz,$sdt); - $stext = substr($stext,0,14) . "00:00"; - - $fyear = datetime_convert('UTC', $tz, $fdt, 'Y'); - $fmonth = datetime_convert('UTC', $tz, $fdt, 'm'); - $fday = datetime_convert('UTC', $tz, $fdt, 'd'); - $fhour = datetime_convert('UTC', $tz, $fdt, 'H'); - $fminute = datetime_convert('UTC', $tz, $fdt, 'i'); - - $ftext = datetime_convert('UTC',$tz,$fdt); - $ftext = substr($ftext,0,14) . "00:00"; - - $type = ((x($orig_event)) ? $orig_event['etype'] : 'event'); - - $f = get_config('system','event_input_format'); - if(! $f) - $f = 'ymd'; - - $catsenabled = Apps::system_app_installed(local_channel(),'Categories'); - - $category = ''; - - if($catsenabled && x($orig_event)){ - $itm = q("select * from item where resource_type = 'event' and resource_id = '%s' and uid = %d limit 1", - dbesc($orig_event['event_hash']), - intval(local_channel()) - ); - $itm = fetch_post_tags($itm); - if($itm) { - $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY); - foreach ($cats as $cat) { - if(strlen($category)) - $category .= ', '; - $category .= $cat['term']; - } - } - } - - require_once('include/acl_selectors.php'); - - $acl = new AccessControl($channel); - $perm_defaults = $acl->get(); + if (($xchan) && ($xchan !== get_observer_hash())) { + return; + } - $permissions = ((x($orig_event)) ? $orig_event : $perm_defaults); + if ($start_text) { + $start = $start_text; + } else { + $start = sprintf('%d-%d-%d %d:%d:0', $startyear, $startmonth, $startday, $starthour, $startminute); + } - $freq_options = [ - 'DAILY' => t('day(s)'), - 'WEEKLY' => t('week(s)'), - 'MONTHLY' => t('month(s)'), - 'YEARLY' => t('year(s)') - ]; - - $tpl = get_markup_template('event_form.tpl'); - - $form = replace_macros($tpl,array( - '$post' => z_root() . '/events', - '$eid' => $eid, - '$type' => $type, - '$xchan' => $event_xchan, - '$mid' => $mid, - '$event_hash' => $event_id, - '$summary' => array('summary', (($event_id) ? t('Edit event title') : t('Event title')), $t_orig, t('Required'), '*'), - '$catsenabled' => $catsenabled, - '$placeholdercategory' => t('Categories (comma-separated list)'), - '$c_text' => (($event_id) ? t('Edit Category') : t('Category')), - '$category' => $category, - '$required' => '*', - '$s_dsel' => datetimesel($f,new \DateTime(),\DateTime::createFromFormat('Y',$syear+5),\DateTime::createFromFormat('Y-m-d H:i',"$syear-$smonth-$sday $shour:$sminute"), (($event_id) ? t('Edit start date and time') : t('Start date and time')), 'start_text',true,true,'','',true,$first_day), - '$n_text' => t('Finish date and time are not known or not relevant'), - '$n_checked' => $n_checked, - '$f_dsel' => datetimesel($f,new \DateTime(),\DateTime::createFromFormat('Y',$fyear+5),\DateTime::createFromFormat('Y-m-d H:i',"$fyear-$fmonth-$fday $fhour:$fminute"), (($event_id) ? t('Edit finish date and time') : t('Finish date and time')),'finish_text',true,true,'start_text','',false,$first_day), - '$nofinish' => array('nofinish', t('Finish date and time are not known or not relevant'), $n_checked, '', array(t('No'),t('Yes')), 'onclick="enableDisableFinishDate();"'), - '$adjust' => array('adjust', t('Adjust for viewer timezone'), $a_checked, t('Important for events that happen in a particular place. Not practical for global holidays.'), array(t('No'),t('Yes'))), - '$a_text' => t('Adjust for viewer timezone'), - '$d_text' => (($event_id) ? t('Edit Description') : t('Description')), - '$d_orig' => $d_orig, - '$l_text' => (($event_id) ? t('Edit Location') : t('Location')), - '$l_orig' => $l_orig, - '$t_orig' => $t_orig, - '$preview' => t('Preview'), - '$perms_label' => t('Permission settings'), - // populating the acl dialog was a permission description from view_stream because Cal.php, which - // displays events, says "since we don't currently have an event permission - use the stream permission" - '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'))), + if ($finish_text) { + $finish = $finish_text; + } else { + $finish = sprintf('%d-%d-%d %d:%d:0', $finishyear, $finishmonth, $finishday, $finishhour, $finishminute); + } - '$allow_cid' => acl2json($permissions['allow_cid']), - '$allow_gid' => acl2json($permissions['allow_gid']), - '$deny_cid' => acl2json($permissions['deny_cid']), - '$deny_gid' => acl2json($permissions['deny_gid']), - '$tz_choose' => feature_enabled(local_channel(),'event_tz_select'), - '$timezone' => array('timezone_select' , t('Timezone:'), date_default_timezone_get(), '', get_timezones()), + if ($nofinish) { + $finish = NULL_DATE; + } - '$lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'), - '$submit' => t('Submit'), - '$advanced' => t('Advanced Options'), + if ($adjust) { + $start = datetime_convert($tz, 'UTC', $start); + if (!$nofinish) { + $finish = datetime_convert($tz, 'UTC', $finish); + } + } else { + $start = datetime_convert('UTC', 'UTC', $start); + if (!$nofinish) { + $finish = datetime_convert('UTC', 'UTC', $finish); + } + } - '$repeat' => [ 'repeat' , t('Event repeat'), false, '', [ t('No'), t('Yes') ] ], - '$freq' => [ 'freq' , t('Repeat frequency') , '', '', $freq_options ], - '$interval' => [ 'interval', t('Repeat every'), 1 , '' ], - '$count' => [ 'count', t('Number of total repeats'), 10, '' ], - '$until' => '', - '$byday' => '', - - )); - /* end edit/create form */ - - $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); - $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); - if(! $y) - $y = intval($thisyear); - if(! $m) - $m = intval($thismonth); - - $export = false; - if(argc() === 4 && argv(3) === 'export') - $export = true; - - // Put some limits on dates. The PHP date functions don't seem to do so well before 1900. - // An upper limit was chosen to keep search engines from exploring links millions of years in the future. - - if($y < 1901) - $y = 1900; - if($y > 2099) - $y = 2100; - - $nextyear = $y; - $nextmonth = $m + 1; - if($nextmonth > 12) { - $nextmonth = 1; - $nextyear ++; - } - - $prevyear = $y; - if($m > 1) - $prevmonth = $m - 1; - else { - $prevmonth = 12; - $prevyear --; - } - - $dim = get_dim($y,$m); - $start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0); - $finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59); - - - if (argv(1) === 'json'){ - if (x($_GET,'start')) $start = $_GET['start']; - if (x($_GET,'end')) $finish = $_GET['end']; - } - - $start = datetime_convert('UTC','UTC',$start); - $finish = datetime_convert('UTC','UTC',$finish); - - $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start); - $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish); - - if (x($_GET,'id')){ - $r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan + // Don't allow the event to finish before it begins. + // It won't hurt anything, but somebody will file a bug report + // and we'll waste a bunch of time responding to it. Time that + // could've been spent doing something else. + + + $summary = escape_tags(trim($_POST['summary'])); + $desc = escape_tags(trim($_POST['desc'])); + $location = escape_tags(trim($_POST['location'])); + $type = escape_tags(trim($_POST['type'])); + + $repeat = ((array_key_exists('repeat', $_REQUEST) && intval($_REQUEST['repeat'])) ? 1 : 0); + $freq = ((array_key_exists('freq', $_REQUEST) && $_REQUEST['freq']) ? escape_tags(trim($_REQUEST['freq'])) : EMPTY_STR); + $interval = ((array_key_exists('interval', $_REQUEST) && intval($_REQUEST['interval'])) ? 1 : 0); + $count = ((array_key_exists('count', $_REQUEST) && intval($_REQUEST['count'])) ? intval($_REQUEST['count']) : 0); + $until = ((array_key_exists('until', $_REQUEST) && $_REQUEST['until']) ? datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['until']) : NULL_DATE); + $byday = []; + + if ((!$freq) || (!in_array($freq, ['DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY']))) { + $repeat = 0; + } + if ($count < 0) { + $count = 0; + } + if ($count > MAX_EVENT_REPEAT_COUNT) { + $count = MAX_EVENT_REPEAT_COUNT; + } + + require_once('include/text.php'); + linkify_tags($desc, local_channel()); + linkify_tags($location, local_channel()); + + //$action = ($event_hash == '') ? 'new' : "event/" . $event_hash; + + //@fixme: this url gives a wsod if there is a linebreak detected in one of the variables ($desc or $location) + //$onerror_url = z_root() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish&type=$type"; + $onerror_url = z_root() . "/events"; + + if (strcmp($finish, $start) < 0 && !$nofinish) { + notice(t('Event can not end before it has started.') . EOL); + if (intval($_REQUEST['preview'])) { + echo(t('Unable to generate preview.')); + killme(); + } + goaway($onerror_url); + } + + if ((!$summary) || (!$start)) { + notice(t('Event title and start time are required.') . EOL); + if (intval($_REQUEST['preview'])) { + echo(t('Unable to generate preview.')); + killme(); + } + goaway($onerror_url); + } + + // $share = ((intval($_POST['distr'])) ? intval($_POST['distr']) : 0); + + $share = 1; + + + $acl = new AccessControl(false); + + if ($event_id) { + $x = q( + "select * from event where id = %d and uid = %d limit 1", + intval($event_id), + intval(local_channel()) + ); + if (!$x) { + notice(t('Event not found.') . EOL); + if (intval($_REQUEST['preview'])) { + echo(t('Unable to generate preview.')); + killme(); + } + return; + } + + $acl->set($x[0]); + + $created = $x[0]['created']; + $edited = datetime_convert(); + + if ( + $x[0]['allow_cid'] === '<' . $channel['channel_hash'] . '>' + && $x[0]['allow_gid'] === '' && $x[0]['deny_cid'] === '' && $x[0]['deny_gid'] === '' + ) { + $share = false; + } else { + $share = true; + } + } else { + $created = $edited = datetime_convert(); + if ($share) { + $acl->set_from_array($_POST); + } else { + $acl->set(array('allow_cid' => '<' . $channel['channel_hash'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '')); + } + } + + $post_tags = []; + + $ac = $acl->get(); + + if (strlen($categories)) { + $cats = explode(',', $categories); + foreach ($cats as $cat) { + $post_tags[] = array( + 'uid' => $profile_uid, + 'ttype' => TERM_CATEGORY, + 'otype' => TERM_OBJ_POST, + 'term' => trim($cat), + 'url' => $channel['xchan_url'] . '?f=&cat=' . urlencode(trim($cat)) + ); + } + } + + $datarray = []; + $datarray['dtstart'] = $start; + $datarray['dtend'] = $finish; + $datarray['summary'] = $summary; + $datarray['description'] = $desc; + $datarray['location'] = $location; + $datarray['etype'] = $type; + $datarray['adjust'] = $adjust; + $datarray['nofinish'] = $nofinish; + $datarray['uid'] = local_channel(); + $datarray['account'] = get_account_id(); + $datarray['event_xchan'] = $channel['channel_hash']; + $datarray['allow_cid'] = $ac['allow_cid']; + $datarray['allow_gid'] = $ac['allow_gid']; + $datarray['deny_cid'] = $ac['deny_cid']; + $datarray['deny_gid'] = $ac['deny_gid']; + $datarray['private'] = (($acl->is_private()) ? 1 : 0); + $datarray['id'] = $event_id; + $datarray['created'] = $created; + $datarray['edited'] = $edited; + + if (intval($_REQUEST['preview'])) { + $html = format_event_html($datarray); + echo $html; + killme(); + } + + $event = event_store_event($datarray); + + if ($post_tags) { + $datarray['term'] = $post_tags; + } + + $item_id = event_store_item($datarray, $event); + + if ($item_id) { + $r = q( + "select * from item where id = %d", + intval($item_id) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + $z = q( + "select * from event where event_hash = '%s' and uid = %d limit 1", + dbesc($r[0]['resource_id']), + intval($channel['channel_id']) + ); + if ($z) { + Libsync::build_sync_packet($channel['channel_id'], ['event_item' => [encode_item($sync_item[0], true)], 'event' => $z]); + } + } + } + + if ($share) { + Run::Summon(['Notifier', 'event', $item_id]); + } + } + + + public function get() + { + + if (argc() > 2 && argv(1) == 'ical') { + $event_id = argv(2); + + require_once('include/security.php'); + $sql_extra = permissions_sql(local_channel()); + + $r = q( + "select * from event where event_hash = '%s' $sql_extra limit 1", + dbesc($event_id) + ); + if ($r) { + header('Content-type: text/calendar'); + header('Content-Disposition: attachment; filename="' . t('event') . '-' . $event_id . '.ics"'); + echo ical_wrapper($r); + killme(); + } else { + notice(t('Event not found.') . EOL); + return; + } + } + + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } + + $channel = App::get_channel(); + + nav_set_selected('Events'); + + if ((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) { + $r = q( + "update event set dismissed = 1 where id = %d and uid = %d", + intval(argv(2)), + intval(local_channel()) + ); + } + + if ((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) { + $r = q( + "update event set dismissed = 0 where id = %d and uid = %d", + intval(argv(2)), + intval(local_channel()) + ); + } + + $first_day = intval(get_pconfig(local_channel(), 'system', 'cal_first_day', 0)); + + $htpl = get_markup_template('event_head.tpl'); + App::$page['htmlhead'] .= replace_macros($htpl, array( + '$baseurl' => z_root(), + '$module_url' => '/events', + '$modparams' => 1, + '$lang' => App::$language, + '$first_day' => $first_day + )); + + $o = ''; + + $mode = 'view'; + $y = 0; + $m = 0; + $ignored = ((x($_REQUEST, 'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : ''); + + + // logger('args: ' . print_r(App::$argv,true)); + + + if (argc() > 1) { + if (argc() > 2 && argv(1) === 'add') { + $mode = 'add'; + $item_id = intval(argv(2)); + } + if (argc() > 2 && argv(1) === 'drop') { + $mode = 'drop'; + $event_id = argv(2); + } + if (argc() > 2 && intval(argv(1)) && intval(argv(2))) { + $mode = 'view'; + $y = intval(argv(1)); + $m = intval(argv(2)); + } + if (argc() <= 2) { + $mode = 'view'; + $event_id = argv(1); + } + } + + if ($mode === 'add') { + event_addtocal($item_id, local_channel()); + killme(); + } + + if ($mode == 'view') { + /* edit/create form */ + if ($event_id) { + $r = q( + "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1", + dbesc($event_id), + intval(local_channel()) + ); + if (count($r)) { + $orig_event = $r[0]; + } + } + + $channel = App::get_channel(); + + // Passed parameters overrides anything found in the DB + if (!x($orig_event)) { + $orig_event = []; + } + + // In case of an error the browser is redirected back here, with these parameters filled in with the previous values + /* + if(x($_REQUEST,'nofinish')) $orig_event['nofinish'] = $_REQUEST['nofinish']; + if(x($_REQUEST,'adjust')) $orig_event['adjust'] = $_REQUEST['adjust']; + if(x($_REQUEST,'summary')) $orig_event['summary'] = $_REQUEST['summary']; + if(x($_REQUEST,'description')) $orig_event['description'] = $_REQUEST['description']; + if(x($_REQUEST,'location')) $orig_event['location'] = $_REQUEST['location']; + if(x($_REQUEST,'start')) $orig_event['dtstart'] = $_REQUEST['start']; + if(x($_REQUEST,'finish')) $orig_event['dtend'] = $_REQUEST['finish']; + if(x($_REQUEST,'type')) $orig_event['etype'] = $_REQUEST['type']; + */ + + $n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : ''); + $a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : ''); + $t_orig = ((x($orig_event)) ? $orig_event['summary'] : ''); + $d_orig = ((x($orig_event)) ? $orig_event['description'] : ''); + $l_orig = ((x($orig_event)) ? $orig_event['location'] : ''); + $eid = ((x($orig_event)) ? $orig_event['id'] : 0); + $event_xchan = ((x($orig_event)) ? $orig_event['event_xchan'] : $channel['channel_hash']); + $mid = ((x($orig_event)) ? $orig_event['mid'] : ''); + + if (!x($orig_event)) { + $sh_checked = ''; + $a_checked = ' checked="checked" '; + } else { + $sh_checked = ((($orig_event['allow_cid'] === '<' . $channel['channel_hash'] . '>' || (!$orig_event['allow_cid'])) && (!$orig_event['allow_gid']) && (!$orig_event['deny_cid']) && (!$orig_event['deny_gid'])) ? '' : ' checked="checked" '); + } + + if ($orig_event['event_xchan']) { + $sh_checked .= ' disabled="disabled" '; + } + + $sdt = ((x($orig_event)) ? $orig_event['dtstart'] : 'now'); + + $fdt = ((x($orig_event)) ? $orig_event['dtend'] : '+1 hour'); + + $tz = date_default_timezone_get(); + if (x($orig_event)) { + $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC'); + } + + $syear = datetime_convert('UTC', $tz, $sdt, 'Y'); + $smonth = datetime_convert('UTC', $tz, $sdt, 'm'); + $sday = datetime_convert('UTC', $tz, $sdt, 'd'); + $shour = datetime_convert('UTC', $tz, $sdt, 'H'); + $sminute = datetime_convert('UTC', $tz, $sdt, 'i'); + + $stext = datetime_convert('UTC', $tz, $sdt); + $stext = substr($stext, 0, 14) . "00:00"; + + $fyear = datetime_convert('UTC', $tz, $fdt, 'Y'); + $fmonth = datetime_convert('UTC', $tz, $fdt, 'm'); + $fday = datetime_convert('UTC', $tz, $fdt, 'd'); + $fhour = datetime_convert('UTC', $tz, $fdt, 'H'); + $fminute = datetime_convert('UTC', $tz, $fdt, 'i'); + + $ftext = datetime_convert('UTC', $tz, $fdt); + $ftext = substr($ftext, 0, 14) . "00:00"; + + $type = ((x($orig_event)) ? $orig_event['etype'] : 'event'); + + $f = get_config('system', 'event_input_format'); + if (!$f) { + $f = 'ymd'; + } + + $catsenabled = Apps::system_app_installed(local_channel(), 'Categories'); + + $category = ''; + + if ($catsenabled && x($orig_event)) { + $itm = q( + "select * from item where resource_type = 'event' and resource_id = '%s' and uid = %d limit 1", + dbesc($orig_event['event_hash']), + intval(local_channel()) + ); + $itm = fetch_post_tags($itm); + if ($itm) { + $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY); + foreach ($cats as $cat) { + if (strlen($category)) { + $category .= ', '; + } + $category .= $cat['term']; + } + } + } + + require_once('include/acl_selectors.php'); + + $acl = new AccessControl($channel); + $perm_defaults = $acl->get(); + + $permissions = ((x($orig_event)) ? $orig_event : $perm_defaults); + + $freq_options = [ + 'DAILY' => t('day(s)'), + 'WEEKLY' => t('week(s)'), + 'MONTHLY' => t('month(s)'), + 'YEARLY' => t('year(s)') + ]; + + + $tpl = get_markup_template('event_form.tpl'); + + $form = replace_macros($tpl, array( + '$post' => z_root() . '/events', + '$eid' => $eid, + '$type' => $type, + '$xchan' => $event_xchan, + '$mid' => $mid, + '$event_hash' => $event_id, + '$summary' => array('summary', (($event_id) ? t('Edit event title') : t('Event title')), $t_orig, t('Required'), '*'), + '$catsenabled' => $catsenabled, + '$placeholdercategory' => t('Categories (comma-separated list)'), + '$c_text' => (($event_id) ? t('Edit Category') : t('Category')), + '$category' => $category, + '$required' => '*', + '$s_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $syear + 5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), (($event_id) ? t('Edit start date and time') : t('Start date and time')), 'start_text', true, true, '', '', true, $first_day), + '$n_text' => t('Finish date and time are not known or not relevant'), + '$n_checked' => $n_checked, + '$f_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $fyear + 5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), (($event_id) ? t('Edit finish date and time') : t('Finish date and time')), 'finish_text', true, true, 'start_text', '', false, $first_day), + '$nofinish' => array('nofinish', t('Finish date and time are not known or not relevant'), $n_checked, '', array(t('No'), t('Yes')), 'onclick="enableDisableFinishDate();"'), + '$adjust' => array('adjust', t('Adjust for viewer timezone'), $a_checked, t('Important for events that happen in a particular place. Not practical for global holidays.'), array(t('No'), t('Yes'))), + '$a_text' => t('Adjust for viewer timezone'), + '$d_text' => (($event_id) ? t('Edit Description') : t('Description')), + '$d_orig' => $d_orig, + '$l_text' => (($event_id) ? t('Edit Location') : t('Location')), + '$l_orig' => $l_orig, + '$t_orig' => $t_orig, + '$preview' => t('Preview'), + '$perms_label' => t('Permission settings'), + // populating the acl dialog was a permission description from view_stream because Cal.php, which + // displays events, says "since we don't currently have an event permission - use the stream permission" + '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, PermissionDescription::fromGlobalPermission('view_stream'))), + + '$allow_cid' => acl2json($permissions['allow_cid']), + '$allow_gid' => acl2json($permissions['allow_gid']), + '$deny_cid' => acl2json($permissions['deny_cid']), + '$deny_gid' => acl2json($permissions['deny_gid']), + '$tz_choose' => feature_enabled(local_channel(), 'event_tz_select'), + '$timezone' => array('timezone_select', t('Timezone:'), date_default_timezone_get(), '', get_timezones()), + + '$lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'), + + '$submit' => t('Submit'), + '$advanced' => t('Advanced Options'), + + '$repeat' => ['repeat', t('Event repeat'), false, '', [t('No'), t('Yes')]], + '$freq' => ['freq', t('Repeat frequency'), '', '', $freq_options], + '$interval' => ['interval', t('Repeat every'), 1, ''], + '$count' => ['count', t('Number of total repeats'), 10, ''], + '$until' => '', + '$byday' => '', + + )); + /* end edit/create form */ + + $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y'); + $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm'); + if (!$y) { + $y = intval($thisyear); + } + if (!$m) { + $m = intval($thismonth); + } + + $export = false; + if (argc() === 4 && argv(3) === 'export') { + $export = true; + } + + // Put some limits on dates. The PHP date functions don't seem to do so well before 1900. + // An upper limit was chosen to keep search engines from exploring links millions of years in the future. + + if ($y < 1901) { + $y = 1900; + } + if ($y > 2099) { + $y = 2100; + } + + $nextyear = $y; + $nextmonth = $m + 1; + if ($nextmonth > 12) { + $nextmonth = 1; + $nextyear++; + } + + $prevyear = $y; + if ($m > 1) { + $prevmonth = $m - 1; + } else { + $prevmonth = 12; + $prevyear--; + } + + $dim = get_dim($y, $m); + $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0); + $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59); + + + if (argv(1) === 'json') { + if (x($_GET, 'start')) { + $start = $_GET['start']; + } + if (x($_GET, 'end')) { + $finish = $_GET['end']; + } + } + + $start = datetime_convert('UTC', 'UTC', $start); + $finish = datetime_convert('UTC', 'UTC', $finish); + + $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start); + $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish); + + if (x($_GET, 'id')) { + $r = q( + "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d limit 1", - intval(local_channel()), - intval($_GET['id']) - ); - } elseif($export) { - $r = q("SELECT * from event where uid = %d + intval(local_channel()), + intval($_GET['id']) + ); + } elseif ($export) { + $r = q( + "SELECT * from event where uid = %d AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) OR ( adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ", - intval(local_channel()), - dbesc($start), - dbesc($finish), - dbesc($adjust_start), - dbesc($adjust_finish) - ); - } - else { - // fixed an issue with "nofinish" events not showing up in the calendar. - // There's still an issue if the finish date crosses the end of month. - // Noting this for now - it will need to be fixed here and in Friendica. - // Ultimately the finish date shouldn't be involved in the query. + intval(local_channel()), + dbesc($start), + dbesc($finish), + dbesc($adjust_start), + dbesc($adjust_finish) + ); + } else { + // fixed an issue with "nofinish" events not showing up in the calendar. + // There's still an issue if the finish date crosses the end of month. + // Noting this for now - it will need to be fixed here and in Friendica. + // Ultimately the finish date shouldn't be involved in the query. - $r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan + $r = q( + "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan from event left join item on event_hash = resource_id where resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) OR ( adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ", - intval(local_channel()), - dbesc($start), - dbesc($finish), - dbesc($adjust_start), - dbesc($adjust_finish) - ); - } - - $links = []; - - if($r && ! $export) { - xchan_query($r); - $r = fetch_post_tags($r,true); - - $r = sort_by_date($r); - } - - if($r) { - foreach($r as $rr) { - $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j')); - if(! x($links,$j)) - $links[$j] = z_root() . '/' . \App::$cmd . '#link-' . $j; - } - } - - $events=[]; - - $last_date = ''; - $fmt = t('l, F j'); - - if($r) { - - foreach($r as $rr) { - - $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j')); - $d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], $fmt) : datetime_convert('UTC','UTC',$rr['dtstart'],$fmt)); - $d = day_translate($d); - - $start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'c') : datetime_convert('UTC','UTC',$rr['dtstart'],'c')); - if ($rr['nofinish']){ - $end = null; - } else { - $end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtend'], 'c') : datetime_convert('UTC','UTC',$rr['dtend'],'c')); + intval(local_channel()), + dbesc($start), + dbesc($finish), + dbesc($adjust_start), + dbesc($adjust_finish) + ); + } - // give a fake end to birthdays so they get crammed into a - // single day on the calendar + $links = []; - if($rr['etype'] === 'birthday') - $end = null; - } - - - $is_first = ($d !== $last_date); - - $last_date = $d; - - $edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'','') : false); - - $drop = array(z_root().'/events/drop/'.$rr['event_hash'],t('Delete event'),'',''); - - $title = strip_tags(html_entity_decode(zidify_links(bbcode($rr['summary'])),ENT_QUOTES,'UTF-8')); - if(! $title) { - list($title, $_trash) = explode("' . $desc . ''; - if (! ( local_channel() && Apps::system_app_installed(local_channel(),'Expire Posts'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Expire Posts'))) { return $text; } - $setting_fields .= replace_macros(get_markup_template('field_input.tpl'), [ - '$field' => array('selfexpiredays', t('Expire and delete all my posts after this many days'), intval(get_pconfig(local_channel(),'system','selfexpiredays',0)), t('Leave at 0 if you wish to manually control expiration of specific posts.')) - ]); - - return replace_macros(get_markup_template('generic_app_settings.tpl'), [ - '$addon' => array('expire', t('Automatic Expiration Settings'), '', t('Submit')), - '$content' => $setting_fields - ]); - - } - + $setting_fields .= replace_macros(get_markup_template('field_input.tpl'), [ + '$field' => array('selfexpiredays', t('Expire and delete all my posts after this many days'), intval(get_pconfig(local_channel(), 'system', 'selfexpiredays', 0)), t('Leave at 0 if you wish to manually control expiration of specific posts.')) + ]); + return replace_macros(get_markup_template('generic_app_settings.tpl'), [ + '$addon' => array('expire', t('Automatic Expiration Settings'), '', t('Submit')), + '$content' => $setting_fields + ]); + } } diff --git a/Zotlabs/Module/Fastping.php b/Zotlabs/Module/Fastping.php index 5eea05c56..63fc2e739 100644 --- a/Zotlabs/Module/Fastping.php +++ b/Zotlabs/Module/Fastping.php @@ -15,59 +15,58 @@ require_once('include/bbcode.php'); * Called from the client at regular intervals to check for updates from the server * */ +class Fastping extends Controller +{ -class Fastping extends Controller { + /** + * @brief do several updates when pinged. + * + * This function does several tasks. Whenever called it checks for new messages, + * introductions, notifications, etc. and returns a json with the results. + * + * @result JSON + */ - /** - * @brief do several updates when pinged. - * - * This function does several tasks. Whenever called it checks for new messages, - * introductions, notifications, etc. and returns a json with the results. - * - * @result JSON - */ + public function init() + { - function init() { + $result['notice'] = []; + $result['info'] = []; - $result['notice'] = []; - $result['info'] = []; + $vnotify = (-1); - $vnotify = (-1); + $result['invalid'] = ((isset($_GET['uid']) && intval($_GET['uid'])) && (intval($_GET['uid']) != local_channel()) ? 1 : 0); - $result['invalid'] = ((isset($_GET['uid']) && intval($_GET['uid'])) && (intval($_GET['uid']) != local_channel()) ? 1 : 0); + if (local_channel()) { + $vnotify = get_pconfig(local_channel(), 'system', 'vnotify', (-1)); + } - if (local_channel()) { - $vnotify = get_pconfig(local_channel(),'system','vnotify',(-1)); - } + /** + * Send all system messages (alerts) to the browser. + * Some are marked as informational and some represent + * errors or serious notifications. These typically + * will popup on the current page (no matter what page it is) + */ - /** - * Send all system messages (alerts) to the browser. - * Some are marked as informational and some represent - * errors or serious notifications. These typically - * will popup on the current page (no matter what page it is) - */ - - if (x($_SESSION, 'sysmsg')) { - foreach ($_SESSION['sysmsg'] as $m) { - $result['notice'][] = array('message' => $m); - } - unset($_SESSION['sysmsg']); - } - if (x($_SESSION, 'sysmsg_info')) { - foreach ($_SESSION['sysmsg_info'] as $m) { - $result['info'][] = array('message' => $m); - } - unset($_SESSION['sysmsg_info']); - } - if (! ($vnotify & VNOTIFY_INFO)) { - $result['info'] = []; - } - if (! ($vnotify & VNOTIFY_ALERT)) { - $result['notice'] = []; - } - - json_return_and_die($result); - - } + if (x($_SESSION, 'sysmsg')) { + foreach ($_SESSION['sysmsg'] as $m) { + $result['notice'][] = array('message' => $m); + } + unset($_SESSION['sysmsg']); + } + if (x($_SESSION, 'sysmsg_info')) { + foreach ($_SESSION['sysmsg_info'] as $m) { + $result['info'][] = array('message' => $m); + } + unset($_SESSION['sysmsg_info']); + } + if (!($vnotify & VNOTIFY_INFO)) { + $result['info'] = []; + } + if (!($vnotify & VNOTIFY_ALERT)) { + $result['notice'] = []; + } + json_return_and_die($result); + } } diff --git a/Zotlabs/Module/Fbrowser.php b/Zotlabs/Module/Fbrowser.php index 75afd705d..396e63fce 100644 --- a/Zotlabs/Module/Fbrowser.php +++ b/Zotlabs/Module/Fbrowser.php @@ -1,133 +1,142 @@ + * @package Friendica\modules + * @subpackage FileBrowser + * @author Fabio Comuni"; var_dump(\App::$argv); killme(); - - switch(\App::$argv[1]){ - case "image": - $path = array( array(z_root()."/fbrowser/image/", t("Photos"))); - $albums = false; - $sql_extra = ""; - $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10"; - - if (\App::$argc==2){ - $albums = q("SELECT distinct(album) AS album FROM photo WHERE uid = %d ", - intval(local_channel()) - ); - // anon functions only from 5.3.0... meglio tardi che mai.. - $albums = array_map( "self::folder1" , $albums); - - } - - $album = ""; - if (\App::$argc==3){ - $album = hex2bin(\App::$argv[2]); - $sql_extra = sprintf("AND album = '%s' ",dbesc($album)); - $sql_extra2 = ""; - $path[]=array(z_root() . "/fbrowser/image/" . \App::$argv[2] . "/", $album); - } - - $r = q("SELECT resource_id, id, filename, type, min(imgscale) AS hiq,max(imgscale) AS loq, description + public function get() + { + + if (!local_channel()) { + killme(); + } + + if (App::$argc == 1) { + killme(); + } + + //echo ""; var_dump(\App::$argv); killme(); + + switch (App::$argv[1]) { + case "image": + $path = array(array(z_root() . "/fbrowser/image/", t("Photos"))); + $albums = false; + $sql_extra = ""; + $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10"; + + if (App::$argc == 2) { + $albums = q( + "SELECT distinct(album) AS album FROM photo WHERE uid = %d ", + intval(local_channel()) + ); + // anon functions only from 5.3.0... meglio tardi che mai.. + $albums = array_map("self::folder1", $albums); + } + + $album = ""; + if (App::$argc == 3) { + $album = hex2bin(App::$argv[2]); + $sql_extra = sprintf("AND album = '%s' ", dbesc($album)); + $sql_extra2 = ""; + $path[] = array(z_root() . "/fbrowser/image/" . App::$argv[2] . "/", $album); + } + + $r = q( + "SELECT resource_id, id, filename, type, min(imgscale) AS hiq,max(imgscale) AS loq, description FROM photo WHERE uid = %d $sql_extra GROUP BY resource_id $sql_extra2", - intval(local_channel()) - ); - - $files = array_map("self::files1", $r); - - $tpl = get_markup_template("filebrowser.tpl"); - echo replace_macros($tpl, array( - '$type' => 'image', - '$baseurl' => z_root(), - '$path' => $path, - '$folders' => $albums, - '$files' =>$files, - '$cancel' => t('Cancel'), - )); - - - break; - case "file": - if (\App::$argc==2){ - $files = q("SELECT id, filename, filetype FROM attach WHERE uid = %d ", - intval(local_channel()) - ); - - $files = array_map("self::files2", $files); - //echo ""; var_dump($files); killme(); - - - $tpl = get_markup_template("filebrowser.tpl"); - echo replace_macros($tpl, array( - '$type' => 'file', - '$baseurl' => z_root(), - '$path' => array( array(z_root()."/fbrowser/image/", t("Files")) ), - '$folders' => false, - '$files' =>$files, - '$cancel' => t('Cancel'), - )); - - } - - break; - } - - - killme(); - - } + intval(local_channel()) + ); - private static function folder1($el){ - return array(bin2hex($el['album']),$el['album']); - } + $files = array_map("self::files1", $r); + + $tpl = get_markup_template("filebrowser.tpl"); + echo replace_macros($tpl, array( + '$type' => 'image', + '$baseurl' => z_root(), + '$path' => $path, + '$folders' => $albums, + '$files' => $files, + '$cancel' => t('Cancel'), + )); - private static function files1($rr){ + break; + case "file": + if (App::$argc == 2) { + $files = q( + "SELECT id, filename, filetype FROM attach WHERE uid = %d ", + intval(local_channel()) + ); - $ph = photo_factory(''); - $types = $ph->supportedTypes(); - $ext = $types[$rr['type']]; - - $filename_e = $rr['filename']; - - return array( - z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['hiq'] . '.' .$ext, - $filename_e, - z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['loq'] . '.'. $ext - ); - } + $files = array_map("self::files2", $files); + //echo ""; var_dump($files); killme(); - private static function files2($rr){ - list($m1,$m2) = explode("/",$rr['filetype']); - $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip"); - - if(\App::get_template_engine() === 'internal') { - $filename_e = template_escape($rr['filename']); - } - else { - $filename_e = $rr['filename']; - } - - return array( z_root() . '/attach/' . $rr['id'], $filename_e, z_root() . '/images/icons/16/' . $filetype . '.png'); - } - + $tpl = get_markup_template("filebrowser.tpl"); + echo replace_macros($tpl, array( + '$type' => 'file', + '$baseurl' => z_root(), + '$path' => array(array(z_root() . "/fbrowser/image/", t("Files"))), + '$folders' => false, + '$files' => $files, + '$cancel' => t('Cancel'), + )); + } + + break; + } + + + killme(); + } + + private static function folder1($el) + { + return array(bin2hex($el['album']), $el['album']); + } + + + private static function files1($rr) + { + + $ph = photo_factory(''); + $types = $ph->supportedTypes(); + $ext = $types[$rr['type']]; + + $filename_e = $rr['filename']; + + return array( + z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['hiq'] . '.' . $ext, + $filename_e, + z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['loq'] . '.' . $ext + ); + } + + private static function files2($rr) + { + list($m1, $m2) = explode("/", $rr['filetype']); + $filetype = ((file_exists("images/icons/$m1.png")) ? $m1 : "zip"); + + if (App::get_template_engine() === 'internal') { + $filename_e = template_escape($rr['filename']); + } else { + $filename_e = $rr['filename']; + } + + return array(z_root() . '/attach/' . $rr['id'], $filename_e, z_root() . '/images/icons/16/' . $filetype . '.png'); + } } diff --git a/Zotlabs/Module/Fedi_id.php b/Zotlabs/Module/Fedi_id.php index d3ee3ff96..cb4328070 100644 --- a/Zotlabs/Module/Fedi_id.php +++ b/Zotlabs/Module/Fedi_id.php @@ -4,50 +4,53 @@ namespace Zotlabs\Module; use Zotlabs\Web\Controller; +class Fedi_id extends Controller +{ -class Fedi_id extends Controller { + public function post() + { + $channel = channelx_by_n(argv(1)); + if (!$channel) { + return; + } + if ($_REQUEST['address']) { + $x = discover_by_webbie(trim($_REQUEST['address'])); + if ($x) { + $ab = q( + "select * from abook where abook_xchan = '%s' and abook_channel = %d", + dbesc($x), + intval($channel['channel_id']) + ); + if ($ab) { + notice(t('You are already connected with this channel.')); + goaway(channel_url($channel)); + } + $r = q( + "select * from xchan where xchan_hash = '%s'", + dbesc($x) + ); + if ($r && $r[0]['xchan_follow']) { + goaway(sprintf($r[0]['xchan_follow'], urlencode(channel_reddress($channel)))); + } + } - function post() { - $channel = channelx_by_n(argv(1)); - if (! $channel) { - return; - } - if ($_REQUEST['address']) { - $x = discover_by_webbie(trim($_REQUEST['address'])); - if ($x) { - $ab = q("select * from abook where abook_xchan = '%s' and abook_channel = %d", - dbesc($x), - intval($channel['channel_id']) - ); - if ($ab) { - notice( t('You are already connected with this channel.') ); - goaway(channel_url($channel)); - } - $r = q("select * from xchan where xchan_hash = '%s'", - dbesc($x) - ); - if ($r && $r[0]['xchan_follow']) { - goaway(sprintf($r[0]['xchan_follow'],urlencode(channel_reddress($channel)))); - } - } + notice(t('Unknown or unreachable identifier')); + return; + } + } - notice( t('Unknown or unreachable identifier') ); - return; - } - } + public function get() + { - function get() { - - return replace_macros(get_markup_template('fedi_id.tpl'), - [ - '$title' => t('Home instance'), - '$address' => [ 'address', t('Enter your channel address or fediverse ID (e.g. channel@example.com)'), '', t('If you do not have a fediverse ID, please use your browser \'back\' button to return to the previous page') ], - '$action' => 'fedi_id/' . argv(1), - '$method' => 'post', - '$submit' => t('Connect') - ] - ); - - } - -} \ No newline at end of file + return replace_macros( + get_markup_template('fedi_id.tpl'), + [ + '$title' => t('Home instance'), + '$address' => ['address', t('Enter your channel address or fediverse ID (e.g. channel@example.com)'), '', t('If you do not have a fediverse ID, please use your browser \'back\' button to return to the previous page')], + '$action' => 'fedi_id/' . argv(1), + '$method' => 'post', + '$submit' => t('Connect') + ] + ); + } +} diff --git a/Zotlabs/Module/Feed.php b/Zotlabs/Module/Feed.php index ace1109a8..69347ba69 100644 --- a/Zotlabs/Module/Feed.php +++ b/Zotlabs/Module/Feed.php @@ -1,49 +1,49 @@ 1) { + $params['begin'] = ((x($_REQUEST, 'date_begin')) ? $_REQUEST['date_begin'] : NULL_DATE); + $params['end'] = ((x($_REQUEST, 'date_end')) ? $_REQUEST['date_end'] : ''); + $params['type'] = ((stristr(argv(0), 'json')) ? 'json' : 'xml'); + $params['pages'] = ((x($_REQUEST, 'pages')) ? intval($_REQUEST['pages']) : 0); + $params['top'] = ((x($_REQUEST, 'top')) ? intval($_REQUEST['top']) : 0); + $params['start'] = ((x($_REQUEST, 'start')) ? intval($_REQUEST['start']) : 0); + $params['records'] = ((x($_REQUEST, 'records')) ? intval($_REQUEST['records']) : 40); + $params['direction'] = ((x($_REQUEST, 'direction')) ? dbesc($_REQUEST['direction']) : 'desc'); + $params['cat'] = ((x($_REQUEST, 'cat')) ? escape_tags($_REQUEST['cat']) : ''); + $params['compat'] = ((x($_REQUEST, 'compat')) ? intval($_REQUEST['compat']) : 0); - if (observer_prohibited(true)) { - killme(); - } + if (!in_array($params['direction'], ['asc', 'desc'])) { + $params['direction'] = 'desc'; + } - $channel = channelx_by_nick(argv(1)); - if (! $channel) { - killme(); - } - - logger('public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']); - - echo get_public_feed($channel,$params); - - killme(); - } - - } - + if (argc() > 1) { + if (observer_prohibited(true)) { + killme(); + } + + $channel = channelx_by_nick(argv(1)); + if (!$channel) { + killme(); + } + + logger('public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']); + + echo get_public_feed($channel, $params); + + killme(); + } + } } diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php index 7e38397c2..7e10c9c52 100644 --- a/Zotlabs/Module/File_upload.php +++ b/Zotlabs/Module/File_upload.php @@ -1,110 +1,106 @@ array($sync))); - } - goaway(z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']); + if ($channel['channel_id'] != local_channel()) { + $_REQUEST['contact_allow'] = expand_acl($channel['channel_allow_cid']); + $_REQUEST['group_allow'] = expand_acl($channel['channel_allow_gid']); + $_REQUEST['contact_deny'] = expand_acl($channel['channel_deny_cid']); + $_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']); + } - } - } - else { + $_REQUEST['allow_cid'] = perms2str($_REQUEST['contact_allow']); + $_REQUEST['allow_gid'] = perms2str($_REQUEST['group_allow']); + $_REQUEST['deny_cid'] = perms2str($_REQUEST['contact_deny']); + $_REQUEST['deny_gid'] = perms2str($_REQUEST['group_deny']); - $matches = []; - $partial = false; + if ($_REQUEST['filename']) { + $r = attach_mkdir($channel, get_observer_hash(), $_REQUEST); + if ($r['success']) { + $hash = $r['data']['hash']; + + $sync = attach_export_data($channel, $hash); + if ($sync) { + Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync))); + } + goaway(z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']); + } + } else { + $matches = []; + $partial = false; + if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) { + $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches); + if ($pm) { + logger('Content-Range: ' . print_r($matches, true)); + $partial = true; + } + } - if(array_key_exists('HTTP_CONTENT_RANGE',$_SERVER)) { - $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/',$_SERVER['HTTP_CONTENT_RANGE'],$matches); - if($pm) { - logger('Content-Range: ' . print_r($matches,true)); - $partial = true; - } - } + if ($partial) { + $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]); - if($partial) { - $x = save_chunk($channel,$matches[1],$matches[2],$matches[3]); + if ($x['partial']) { + header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); + json_return_and_die($x); + } else { + header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); - if($x['partial']) { - header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); - json_return_and_die($x); - } - else { - header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); + $_FILES['userfile'] = [ + 'name' => $x['name'], + 'type' => $x['type'], + 'tmp_name' => $x['tmp_name'], + 'error' => $x['error'], + 'size' => $x['size'] + ]; + } + } else { + if (!array_key_exists('userfile', $_FILES)) { + $_FILES['userfile'] = [ + 'name' => $_FILES['files']['name'], + 'type' => $_FILES['files']['type'], + 'tmp_name' => $_FILES['files']['tmp_name'], + 'error' => $_FILES['files']['error'], + 'size' => $_FILES['files']['size'] + ]; + } + } - $_FILES['userfile'] = [ - 'name' => $x['name'], - 'type' => $x['type'], - 'tmp_name' => $x['tmp_name'], - 'error' => $x['error'], - 'size' => $x['size'] - ]; - } - } - else { - if(! array_key_exists('userfile',$_FILES)) { - $_FILES['userfile'] = [ - 'name' => $_FILES['files']['name'], - 'type' => $_FILES['files']['type'], - 'tmp_name' => $_FILES['files']['tmp_name'], - 'error' => $_FILES['files']['error'], - 'size' => $_FILES['files']['size'] - ]; - } - } - - $r = attach_store($channel, get_observer_hash(), '', $_REQUEST); - if($r['success']) { - $sync = attach_export_data($channel,$r['data']['hash']); - if($sync) - Libsync::build_sync_packet($channel['channel_id'],array('file' => array($sync))); - - } - } - goaway(z_root() . '/' . $_REQUEST['return_url']); - - } - + $r = attach_store($channel, get_observer_hash(), '', $_REQUEST); + if ($r['success']) { + $sync = attach_export_data($channel, $r['data']['hash']); + if ($sync) { + Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync))); + } + } + } + goaway(z_root() . '/' . $_REQUEST['return_url']); + } } diff --git a/Zotlabs/Module/Filer.php b/Zotlabs/Module/Filer.php index f73981b6b..6596dcd8a 100644 --- a/Zotlabs/Module/Filer.php +++ b/Zotlabs/Module/Filer.php @@ -1,61 +1,69 @@ 1) ? intval(\App::$argv[1]) : 0); - - logger('filer: tag ' . $term . ' item ' . $item_id); - - if($item_id && strlen($term)){ - // file item - store_item_tag(local_channel(),$item_id,TERM_OBJ_POST,TERM_FILE,$term,''); - - // protect the entire conversation from periodic expiration - - $r = q("select parent from item where id = %d and uid = %d limit 1", - intval($item_id), - intval(local_channel()) - ); - if($r) { - $x = q("update item set item_retained = 1 where id = %d and uid = %d", - intval($r[0]['parent']), - intval(local_channel()) - ); - } - } - else { - $filetags = []; - $r = q("select distinct(term) from term where uid = %d and ttype = %d order by term asc", - intval(local_channel()), - intval(TERM_FILE) - ); - if(count($r)) { - foreach($r as $rr) - $filetags[] = $rr['term']; - } - $tpl = get_markup_template("filer_dialog.tpl"); - $o = replace_macros($tpl, array( - '$field' => array('term', t('Enter a folder name'), '', '', $filetags, 'placeholder="' . t('or select an existing folder (doubleclick)') . '"'), - '$submit' => t('Save'), - '$title' => t('Save to Folder'), - '$cancel' => t('Cancel') - )); - - echo $o; - } - killme(); - } - + public function get() + { + + if (!local_channel()) { + killme(); + } + + $term = unxmlify(trim($_GET['term'])); + $item_id = ((App::$argc > 1) ? intval(App::$argv[1]) : 0); + + logger('filer: tag ' . $term . ' item ' . $item_id); + + if ($item_id && strlen($term)) { + // file item + store_item_tag(local_channel(), $item_id, TERM_OBJ_POST, TERM_FILE, $term, ''); + + // protect the entire conversation from periodic expiration + + $r = q( + "select parent from item where id = %d and uid = %d limit 1", + intval($item_id), + intval(local_channel()) + ); + if ($r) { + $x = q( + "update item set item_retained = 1 where id = %d and uid = %d", + intval($r[0]['parent']), + intval(local_channel()) + ); + } + } else { + $filetags = []; + $r = q( + "select distinct(term) from term where uid = %d and ttype = %d order by term asc", + intval(local_channel()), + intval(TERM_FILE) + ); + if (count($r)) { + foreach ($r as $rr) { + $filetags[] = $rr['term']; + } + } + $tpl = get_markup_template("filer_dialog.tpl"); + $o = replace_macros($tpl, array( + '$field' => array('term', t('Enter a folder name'), '', '', $filetags, 'placeholder="' . t('or select an existing folder (doubleclick)') . '"'), + '$submit' => t('Save'), + '$title' => t('Save to Folder'), + '$cancel' => t('Cancel') + )); + + echo $o; + } + killme(); + } } diff --git a/Zotlabs/Module/Filerm.php b/Zotlabs/Module/Filerm.php index cbf6a118d..5d2178cff 100644 --- a/Zotlabs/Module/Filerm.php +++ b/Zotlabs/Module/Filerm.php @@ -1,39 +1,46 @@ 1) ? intval(\App::$argv[1]) : 0); - - logger('filerm: tag ' . $term . ' item ' . $item_id); - - if($item_id && strlen($term)) { - $r = q("delete from term where uid = %d and ttype = %d and oid = %d and term = '%s'", - intval(local_channel()), - intval(($category) ? TERM_CATEGORY : TERM_FILE), - intval($item_id), - dbesc($term) - ); - } - - if(x($_SESSION,'return_url')) - goaway(z_root() . '/' . $_SESSION['return_url']); - - killme(); - } - + public function get() + { + + if (!local_channel()) { + killme(); + } + + $term = trim($_GET['term']); + $cat = trim($_GET['cat']); + + $category = (($cat) ? true : false); + if ($category) { + $term = $cat; + } + + $item_id = ((App::$argc > 1) ? intval(App::$argv[1]) : 0); + + logger('filerm: tag ' . $term . ' item ' . $item_id); + + if ($item_id && strlen($term)) { + $r = q( + "delete from term where uid = %d and ttype = %d and oid = %d and term = '%s'", + intval(local_channel()), + intval(($category) ? TERM_CATEGORY : TERM_FILE), + intval($item_id), + dbesc($term) + ); + } + + if (x($_SESSION, 'return_url')) { + goaway(z_root() . '/' . $_SESSION['return_url']); + } + + killme(); + } } diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php index 6539add67..2acef08c3 100644 --- a/Zotlabs/Module/Filestorage.php +++ b/Zotlabs/Module/Filestorage.php @@ -1,6 +1,6 @@ set_from_array($_POST); - $x = $acl->get(); + if ($m) { + // we should always have $newdir, but only call attach_move() + // if it is being changed *or* a new filename is set, and + // account for the fact $newdir can legally be an empty sring + // to indicate the cloud root directory - $url = get_cloud_url($channel_id, $channel['channel_address'], $resource); + if ($newdir !== false && $newdir !== $m[0]['folder']) { + $changed = true; + } + if ($newname) { + $changed = true; + } + if ($changed) { + attach_move($channel_id, $resource, $newdir, $newname); + } + } + } - // get the object before permissions change so we can catch eventual former allowed members - $object = get_file_activity_object($channel_id, $resource, $url); + $acl = new AccessControl($channel); + $acl->set_from_array($_POST); + $x = $acl->get(); - attach_change_permissions($channel_id, $resource, $x['allow_cid'], $x['allow_gid'], $x['deny_cid'], $x['deny_gid'], $recurse, true); + $url = get_cloud_url($channel_id, $channel['channel_address'], $resource); - $sync = attach_export_data($channel,$resource,false); - if ($sync) { - Libsync::build_sync_packet($channel_id,array('file' => array($sync))); - } + // get the object before permissions change so we can catch eventual former allowed members + $object = get_file_activity_object($channel_id, $resource, $url); -// file_activity($channel_id, $object, $x['allow_cid'], $x['allow_gid'], $x['deny_cid'], $x['deny_gid'], 'post', $notify); + attach_change_permissions($channel_id, $resource, $x['allow_cid'], $x['allow_gid'], $x['deny_cid'], $x['deny_gid'], $recurse, true); - goaway(dirname($url)); - } + $sync = attach_export_data($channel, $resource, false); + if ($sync) { + Libsync::build_sync_packet($channel_id, array('file' => array($sync))); + } - function get() { +// file_activity($channel_id, $object, $x['allow_cid'], $x['allow_gid'], $x['deny_cid'], $x['deny_gid'], 'post', $notify); - if (argc() > 1) { - $channel = channelx_by_nick(argv(1)); - } - if (! $channel) { - notice( t('Channel unavailable.') . EOL); - App::$error = 404; - return; - } + goaway(dirname($url)); + } - $owner = intval($channel['channel_id']); - $observer = App::get_observer(); - - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + public function get() + { - $perms = get_all_perms($owner, $ob_hash); + if (argc() > 1) { + $channel = channelx_by_nick(argv(1)); + } + if (!$channel) { + notice(t('Channel unavailable.') . EOL); + App::$error = 404; + return; + } - if (! ($perms['view_storage'] || is_site_admin())){ - notice( t('Permission denied.') . EOL); - return; - } + $owner = intval($channel['channel_id']); + $observer = App::get_observer(); + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner, $ob_hash); + + if (!($perms['view_storage'] || is_site_admin())) { + notice(t('Permission denied.') . EOL); + return; + } - if (argc() > 3 && argv(3) === 'delete') { + if (argc() > 3 && argv(3) === 'delete') { + if (argc() > 4 && argv(4) === 'json') { + $json_return = true; + } - if (argc() > 4 && argv(4) === 'json') { - $json_return = true; - } + $admin_delete = false; - $admin_delete = false; + if (!$perms['write_storage']) { + if (is_site_admin()) { + $admin_delete = true; + } else { + notice(t('Permission denied.') . EOL); + if ($json_return) { + json_return_and_die(['success' => false]); + } + return; + } + } - if (! $perms['write_storage']) { - if (is_site_admin()) { - $admin_delete = true; - } - else { - notice( t('Permission denied.') . EOL); - if ($json_return) { - json_return_and_die([ 'success' => false ]); - } - return; - } - } + $file = intval(argv(2)); + $r = q( + "SELECT hash, creator FROM attach WHERE id = %d AND uid = %d LIMIT 1", + dbesc($file), + intval($owner) + ); + if (!$r) { + notice(t('File not found.') . EOL); - $file = intval(argv(2)); - $r = q("SELECT hash, creator FROM attach WHERE id = %d AND uid = %d LIMIT 1", - dbesc($file), - intval($owner) - ); - if (! $r) { - notice( t('File not found.') . EOL); + if ($json_return) { + json_return_and_die(['success' => false]); + } - if ($json_return) { - json_return_and_die([ 'success' => false ]); - } + goaway(z_root() . '/cloud/' . $which); + } - goaway(z_root() . '/cloud/' . $which); - } + $f = array_shift($r); - $f = array_shift($r); + if (intval(local_channel()) !== $owner) { + if ($f['creator'] && $f['creator'] !== $ob_hash) { + notice(t('Permission denied.') . EOL); - if (intval(local_channel()) !== $owner) { - if ($f['creator'] && $f['creator'] !== $ob_hash) { - notice( t('Permission denied.') . EOL); + if ($json_return) { + json_return_and_die(['success' => false]); + } + goaway(z_root() . '/cloud/' . $which); + } + } - if ($json_return) { - json_return_and_die([ 'success' => false ]); - } - goaway(z_root() . '/cloud/' . $which); - } - } + $url = get_cloud_url($channel['channel_id'], $channel['channel_address'], $f['hash']); - $url = get_cloud_url($channel['channel_id'], $channel['channel_address'], $f['hash']); + attach_delete($owner, $f['hash']); - attach_delete($owner, $f['hash']); + if (!$admin_delete) { + $sync = attach_export_data($channel, $f['hash'], true); + if ($sync) { + Libsync::build_sync_packet($channel['channel_id'], ['file' => [$sync]]); + } + } - if (! $admin_delete) { - $sync = attach_export_data($channel, $f['hash'], true); - if ($sync) { - Libsync::build_sync_packet($channel['channel_id'], [ 'file' => [ $sync ] ]); - } - } + if ($json_return) { + json_return_and_die(['success' => true]); + } - if ($json_return) { - json_return_and_die([ 'success' => true ]); - } - - goaway(dirname($url)); - } + goaway(dirname($url)); + } - // Since we have ACL'd files in the wild, but don't have ACL here yet, we - // need to return for anyone other than the owner, despite the perms check for now. + // Since we have ACL'd files in the wild, but don't have ACL here yet, we + // need to return for anyone other than the owner, despite the perms check for now. - $is_owner = (((local_channel()) && ($owner == local_channel())) ? true : false); - if (! ($is_owner || is_site_admin())) { - notice( t('Permission denied.') . EOL ); - return; - } + $is_owner = (((local_channel()) && ($owner == local_channel())) ? true : false); + if (!($is_owner || is_site_admin())) { + notice(t('Permission denied.') . EOL); + return; + } - if (argc() > 3 && argv(3) === 'edit') { - require_once('include/acl_selectors.php'); - if (! $perms['write_storage']) { - notice( t('Permission denied.') . EOL); - return; - } - - $file = intval(argv(2)); + if (argc() > 3 && argv(3) === 'edit') { + require_once('include/acl_selectors.php'); + if (!$perms['write_storage']) { + notice(t('Permission denied.') . EOL); + return; + } - $r = q("select id, uid, folder, filename, revision, flags, is_dir, os_storage, hash, allow_cid, allow_gid, deny_cid, deny_gid from attach where id = %d and uid = %d limit 1", - intval($file), - intval($owner) - ); + $file = intval(argv(2)); - $f = array_shift($r); - - $channel = App::get_channel(); + $r = q( + "select id, uid, folder, filename, revision, flags, is_dir, os_storage, hash, allow_cid, allow_gid, deny_cid, deny_gid from attach where id = %d and uid = %d limit 1", + intval($file), + intval($owner) + ); - $cloudpath = get_cloudpath($f); + $f = array_shift($r); - $aclselect_e = populate_acl($f, false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')); - $is_a_dir = (intval($f['is_dir']) ? true : false); + $channel = App::get_channel(); - $lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock'); + $cloudpath = get_cloudpath($f); - // Encode path that is used for link so it's a valid URL - // Keep slashes as slashes, otherwise mod_rewrite doesn't work correctly - $encoded_path = str_replace('%2F', '/', rawurlencode($cloudpath)); - $folder_list = attach_folder_select_list($channel['channel_id']); + $aclselect_e = populate_acl($f, false, PermissionDescription::fromGlobalPermission('view_storage')); + $is_a_dir = (intval($f['is_dir']) ? true : false); - $o = replace_macros(get_markup_template('attach_edit.tpl'), [ - '$header' => t('Edit file permissions'), - '$file' => $f, - '$cloudpath' => z_root() . '/' . $encoded_path, - '$uid' => $channel['channel_id'], - '$channelnick' => $channel['channel_address'], - '$permissions' => t('Permissions'), - '$aclselect' => $aclselect_e, - '$allow_cid' => acl2json($f['allow_cid']), - '$allow_gid' => acl2json($f['allow_gid']), - '$deny_cid' => acl2json($f['deny_cid']), - '$deny_gid' => acl2json($f['deny_gid']), - '$lockstate' => $lockstate, - '$newname' => [ 'newname', t('Change filename to') , '', t('Leave blank to keep the existing filename') ], - '$newdir' => [ 'newdir', t('Move to directory'), $f['folder'], '', $folder_list ], - '$permset' => t('Set/edit permissions'), - '$recurse' => [ 'recurse', t('Include all files and sub folders'), 0, '', [ t('No'), t('Yes') ] ], - '$backlink' => t('Return to file list'), - '$isadir' => $is_a_dir, - '$cpdesc' => t('Copy/paste this code to attach file to a post'), - '$cpldesc' => t('Copy/paste this URL to link file from a web page'), - '$submit' => t('Submit'), - '$attach_btn_title' => t('Share this file'), - '$link_btn_title' => t('Show URL to this file'), - '$notify' => [ 'notify_edit', t('Show in your contacts shared folder'), 0, '', [ t('No'), t('Yes') ] ], - ]); + $lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock'); - echo $o; - killme(); - } - goaway(z_root() . '/cloud/' . $which); - } + // Encode path that is used for link so it's a valid URL + // Keep slashes as slashes, otherwise mod_rewrite doesn't work correctly + $encoded_path = str_replace('%2F', '/', rawurlencode($cloudpath)); + $folder_list = attach_folder_select_list($channel['channel_id']); + + $o = replace_macros(get_markup_template('attach_edit.tpl'), [ + '$header' => t('Edit file permissions'), + '$file' => $f, + '$cloudpath' => z_root() . '/' . $encoded_path, + '$uid' => $channel['channel_id'], + '$channelnick' => $channel['channel_address'], + '$permissions' => t('Permissions'), + '$aclselect' => $aclselect_e, + '$allow_cid' => acl2json($f['allow_cid']), + '$allow_gid' => acl2json($f['allow_gid']), + '$deny_cid' => acl2json($f['deny_cid']), + '$deny_gid' => acl2json($f['deny_gid']), + '$lockstate' => $lockstate, + '$newname' => ['newname', t('Change filename to'), '', t('Leave blank to keep the existing filename')], + '$newdir' => ['newdir', t('Move to directory'), $f['folder'], '', $folder_list], + '$permset' => t('Set/edit permissions'), + '$recurse' => ['recurse', t('Include all files and sub folders'), 0, '', [t('No'), t('Yes')]], + '$backlink' => t('Return to file list'), + '$isadir' => $is_a_dir, + '$cpdesc' => t('Copy/paste this code to attach file to a post'), + '$cpldesc' => t('Copy/paste this URL to link file from a web page'), + '$submit' => t('Submit'), + '$attach_btn_title' => t('Share this file'), + '$link_btn_title' => t('Show URL to this file'), + '$notify' => ['notify_edit', t('Show in your contacts shared folder'), 0, '', [t('No'), t('Yes')]], + ]); + + echo $o; + killme(); + } + goaway(z_root() . '/cloud/' . $which); + } } diff --git a/Zotlabs/Module/Finger.php b/Zotlabs/Module/Finger.php index b16ce7d88..bdfeff2cb 100644 --- a/Zotlabs/Module/Finger.php +++ b/Zotlabs/Module/Finger.php @@ -12,25 +12,25 @@ namespace Zotlabs\Module; use Zotlabs\Web\Controller; use Zotlabs\Lib\Webfinger; -class Finger extends Controller { +class Finger extends Controller +{ - function get() { + public function get() + { - $o = replace_macros(get_markup_template('finger.tpl'), [ - '$page_title' => t('Webfinger Diagnostic'), - '$resource' => [ 'resource', t('Lookup address or URL') , $_GET['resource'], EMPTY_STR ], - '$submit' => t('Submit') - ]); - - if($_GET['resource']) { + $o = replace_macros(get_markup_template('finger.tpl'), [ + '$page_title' => t('Webfinger Diagnostic'), + '$resource' => ['resource', t('Lookup address or URL'), $_GET['resource'], EMPTY_STR], + '$submit' => t('Submit') + ]); - $resource = trim(escape_tags($_GET['resource'])); + if ($_GET['resource']) { + $resource = trim(escape_tags($_GET['resource'])); - $result = Webfinger::exec($resource); - - $o .= '' . str_replace("\n",''; - } - return $o; - } - + $result = Webfinger::exec($resource); + + $o .= '
',print_array($result)) . '' . str_replace("\n", ''; + } + return $o; + } } diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php index c667eca82..a97d50b92 100644 --- a/Zotlabs/Module/Follow.php +++ b/Zotlabs/Module/Follow.php @@ -1,4 +1,5 @@ = 2) { - $abook_id = intval(argv(1)); - if(! $abook_id) - return; - - $r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d", - intval($abook_id) - ); - if (! $r) { - return; - } - - $chan = channelx_by_n($r[0]['abook_channel']); - - if (! $chan) { - http_status_exit(404, 'Not found'); - } - - $actor = Activity::encode_person($chan,true,true); - if (! $actor) { - http_status_exit(404, 'Not found'); - } - - // Pleroma requires a unique follow id for every follow and follow response - // instead of our method of re-using the abook_id. This causes issues if they unfollow - // and re-follow so md5 their follow id and slap it on the end so they don't simply discard our - // subsequent accept/reject actions. - - $orig_follow = get_abconfig($chan['channel_id'],$r[0]['xchan_hash'],'activitypub','their_follow_id'); - $orig_follow_type = get_abconfig($chan['channel_id'],$r[0]['xchan_hash'],'activitypub','their_follow_type'); - - as_return_and_die([ - 'id' => z_root() . '/follow/' . $r[0]['abook_id'] . (($orig_follow) ? '/' . md5($orig_follow) : EMPTY_STR), - 'type' => (($orig_follow_type) ? $orig_follow_type : 'Follow'), - 'actor' => $actor, - 'object' => $r[0]['xchan_url'] - ], $chan); - - } + public function init() + { + if (ActivityStreams::is_as_request() && argc() >= 2) { + $abook_id = intval(argv(1)); + if (!$abook_id) { + return; + } - $uid = local_channel(); + $r = q( + "select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d", + intval($abook_id) + ); + if (!$r) { + return; + } - if (! $uid) { - return; - } + $chan = channelx_by_n($r[0]['abook_channel']); - $url = notags(trim(punify($_REQUEST['url']))); - $return_url = $_SESSION['return_url']; - $confirm = intval($_REQUEST['confirm']); - $interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1); - $channel = App::get_channel(); + if (!$chan) { + http_status_exit(404, 'Not found'); + } - if ((strpos($url,'http') === 0) || strpos($url,'bear:') === 0 || strpos($url,'x-zot:') === 0) { - $n = Activity::fetch($url); - if ($n && isset($n['type']) && ! ActivityStreams::is_an_actor($n['type'])) { - // set client flag to convert objects to implied activities - $a = new ActivityStreams($n,null,true); - if ($a->type === 'Announce' && is_array($a->obj) - && array_key_exists('object',$a->obj) && array_key_exists('actor',$a->obj)) { - // This is a relayed/forwarded Activity (as opposed to a shared/boosted object) - // Reparse the encapsulated Activity and use that instead - logger('relayed activity',LOGGER_DEBUG); - $a = new ActivityStreams($a->obj,null,true); - } + $actor = Activity::encode_person($chan, true, true); + if (!$actor) { + http_status_exit(404, 'Not found'); + } - if ($a->is_valid()) { + // Pleroma requires a unique follow id for every follow and follow response + // instead of our method of re-using the abook_id. This causes issues if they unfollow + // and re-follow so md5 their follow id and slap it on the end so they don't simply discard our + // subsequent accept/reject actions. - if (is_array($a->actor) && array_key_exists('id',$a->actor)) { - Activity::actor_store($a->actor['id'],$a->actor); - } + $orig_follow = get_abconfig($chan['channel_id'], $r[0]['xchan_hash'], 'activitypub', 'their_follow_id'); + $orig_follow_type = get_abconfig($chan['channel_id'], $r[0]['xchan_hash'], 'activitypub', 'their_follow_type'); - // ActivityPub sourced items are cacheable - $item = Activity::decode_note($a,true); - - if ($item) { - Activity::store($channel,get_observer_hash(),$a,$item,true); - - $r = q("select * from item where mid = '%s' and uid = %d", - dbesc($item['mid']), - intval($uid) - ); - if ($r) { - if ($interactive) { - goaway(z_root() . '/display/' . gen_link_id($item['mid'])); - } - else { - $result['success'] = true; - json_return_and_die($result); - } - } - } - } - } - } + as_return_and_die([ + 'id' => z_root() . '/follow/' . $r[0]['abook_id'] . (($orig_follow) ? '/' . md5($orig_follow) : EMPTY_STR), + 'type' => (($orig_follow_type) ? $orig_follow_type : 'Follow'), + 'actor' => $actor, + 'object' => $r[0]['xchan_url'] + ], $chan); + } - - $result = Connect::connect($channel,$url); - - if ($result['success'] == false) { - - if ($result['message']) { - notice($result['message']); - } - if ($interactive) { - goaway($return_url); - } - else { - json_return_and_die($result); - } - } - - info( t('Connection added.') . EOL); - - $clone = []; - foreach ($result['abook'] as $k => $v) { - if (strpos($k,'abook_') === 0) { - $clone[$k] = $v; - } - } - unset($clone['abook_id']); - unset($clone['abook_account']); - unset($clone['abook_channel']); - - $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); - if ($abconfig) { - $clone['abconfig'] = $abconfig; - } - Libsync::build_sync_packet(0, [ 'abook' => [ $clone ] ], true); - - $can_view_stream = their_perms_contains($channel['channel_id'],$clone['abook_xchan'],'view_stream'); - - // If we can view their stream, pull in some posts - - if (($can_view_stream) || ($result['abook']['xchan_network'] === 'rss')) { - Run::Summon([ 'Onepoll', $result['abook']['abook_id'] ]); - } - - if ($interactive) { - goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?follow=1'); - } - else { - json_return_and_die([ 'success' => true ]); - } - - } - - function get() { - if (! local_channel()) { - return login(); - } - } + + $uid = local_channel(); + + if (!$uid) { + return; + } + + $url = notags(trim(punify($_REQUEST['url']))); + $return_url = $_SESSION['return_url']; + $confirm = intval($_REQUEST['confirm']); + $interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1); + $channel = App::get_channel(); + + if ((strpos($url, 'http') === 0) || strpos($url, 'bear:') === 0 || strpos($url, 'x-zot:') === 0) { + $n = Activity::fetch($url); + if ($n && isset($n['type']) && !ActivityStreams::is_an_actor($n['type'])) { + // set client flag to convert objects to implied activities + $a = new ActivityStreams($n, null, true); + if ( + $a->type === 'Announce' && is_array($a->obj) + && array_key_exists('object', $a->obj) && array_key_exists('actor', $a->obj) + ) { + // This is a relayed/forwarded Activity (as opposed to a shared/boosted object) + // Reparse the encapsulated Activity and use that instead + logger('relayed activity', LOGGER_DEBUG); + $a = new ActivityStreams($a->obj, null, true); + } + + if ($a->is_valid()) { + if (is_array($a->actor) && array_key_exists('id', $a->actor)) { + Activity::actor_store($a->actor['id'], $a->actor); + } + + // ActivityPub sourced items are cacheable + $item = Activity::decode_note($a, true); + + if ($item) { + Activity::store($channel, get_observer_hash(), $a, $item, true); + + $r = q( + "select * from item where mid = '%s' and uid = %d", + dbesc($item['mid']), + intval($uid) + ); + if ($r) { + if ($interactive) { + goaway(z_root() . '/display/' . gen_link_id($item['mid'])); + } else { + $result['success'] = true; + json_return_and_die($result); + } + } + } + } + } + } + + + $result = Connect::connect($channel, $url); + + if ($result['success'] == false) { + if ($result['message']) { + notice($result['message']); + } + if ($interactive) { + goaway($return_url); + } else { + json_return_and_die($result); + } + } + + info(t('Connection added.') . EOL); + + $clone = []; + foreach ($result['abook'] as $k => $v) { + if (strpos($k, 'abook_') === 0) { + $clone[$k] = $v; + } + } + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); + + $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']); + if ($abconfig) { + $clone['abconfig'] = $abconfig; + } + Libsync::build_sync_packet(0, ['abook' => [$clone]], true); + + $can_view_stream = their_perms_contains($channel['channel_id'], $clone['abook_xchan'], 'view_stream'); + + // If we can view their stream, pull in some posts + + if (($can_view_stream) || ($result['abook']['xchan_network'] === 'rss')) { + Run::Summon(['Onepoll', $result['abook']['abook_id']]); + } + + if ($interactive) { + goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?follow=1'); + } else { + json_return_and_die(['success' => true]); + } + } + + public function get() + { + if (!local_channel()) { + return login(); + } + } } diff --git a/Zotlabs/Module/Followers.php b/Zotlabs/Module/Followers.php index e24d73558..19485452d 100644 --- a/Zotlabs/Module/Followers.php +++ b/Zotlabs/Module/Followers.php @@ -10,69 +10,70 @@ use Zotlabs\Web\HTTPSig; use Zotlabs\Web\Controller; use Zotlabs\Lib\Libprofile; -class Followers extends Controller { +class Followers extends Controller +{ - function init() { + public function init() + { - if (observer_prohibited(true)) { - http_status_exit(403, 'Forbidden'); - } + if (observer_prohibited(true)) { + http_status_exit(403, 'Forbidden'); + } - if (argc() < 2) { - http_status_exit(404, 'Not found'); - } + if (argc() < 2) { + http_status_exit(404, 'Not found'); + } - $channel = channelx_by_nick(argv(1)); - if (! $channel) { - http_status_exit(404, 'Not found'); - } + $channel = channelx_by_nick(argv(1)); + if (!$channel) { + http_status_exit(404, 'Not found'); + } -// if (intval($channel['channel_system'])) { -// http_status_exit(403,'Permission denied'); -// } +// if (intval($channel['channel_system'])) { +// http_status_exit(403,'Permission denied'); +// } - Libprofile::load(argv(1)); + Libprofile::load(argv(1)); - $observer_hash = get_observer_hash(); + $observer_hash = get_observer_hash(); - if (((! (is_array(App::$profile) && count(App::$profile))) || (App::$profile['hide_friends']))) { - http_status_exit(403, 'Forbidden'); - } + if (((!(is_array(App::$profile) && count(App::$profile))) || (App::$profile['hide_friends']))) { + http_status_exit(403, 'Forbidden'); + } - if (! perm_is_allowed($channel['channel_id'],$observer_hash,'view_contacts')) { - http_status_exit(403, 'Forbidden'); - } + if (!perm_is_allowed($channel['channel_id'], $observer_hash, 'view_contacts')) { + http_status_exit(403, 'Forbidden'); + } - $t = q("select count(xchan_hash) as total from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'their_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0 ", - intval($channel['channel_id']), - intval($channel['channel_id']), - dbesc($channel['channel_hash']) - ); - if ($t) { - App::set_pager_total($t[0]['total']); - App::set_pager_itemspage(100); - } + $t = q( + "select count(xchan_hash) as total from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'their_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0 ", + intval($channel['channel_id']), + intval($channel['channel_id']), + dbesc($channel['channel_hash']) + ); + if ($t) { + App::set_pager_total($t[0]['total']); + App::set_pager_itemspage(100); + } - if(App::$pager['unset'] && intval($t[0]['total']) > 100) { - $ret = Activity::paged_collection_init($t[0]['total'],App::$query_string); - } - else { - $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); + if (App::$pager['unset'] && intval($t[0]['total']) > 100) { + $ret = Activity::paged_collection_init($t[0]['total'], App::$query_string); + } else { + $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); - $r = q("select * from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'their_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0 $pager_sql", - intval($channel['channel_id']), - intval($channel['channel_id']), - dbesc($channel['channel_hash']) - ); + $r = q( + "select * from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'their_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0 $pager_sql", + intval($channel['channel_id']), + intval($channel['channel_id']), + dbesc($channel['channel_hash']) + ); - $ret = Activity::encode_follow_collection($r, App::$query_string, 'OrderedCollection', $t[0]['total']); - } - - if (ActivityStreams::is_as_request()) { - as_return_and_die($ret,$channel); - } - - } + $ret = Activity::encode_follow_collection($r, App::$query_string, 'OrderedCollection', $t[0]['total']); + } + if (ActivityStreams::is_as_request()) { + as_return_and_die($ret, $channel); + } + } } diff --git a/Zotlabs/Module/Following.php b/Zotlabs/Module/Following.php index 1ecd3ceb9..ec6171add 100644 --- a/Zotlabs/Module/Following.php +++ b/Zotlabs/Module/Following.php @@ -1,4 +1,5 @@ 100) { - $ret = Activity::paged_collection_init($t[0]['total'],App::$query_string); - } - else { - $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); + if (App::$pager['unset'] && $t[0]['total'] > 100) { + $ret = Activity::paged_collection_init($t[0]['total'], App::$query_string); + } else { + $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); - $r = q("select * from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'my_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0 $pager_sql", - intval($channel['channel_id']), - intval($channel['channel_id']), - dbesc($channel['channel_hash']) - ); + $r = q( + "select * from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'my_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0 $pager_sql", + intval($channel['channel_id']), + intval($channel['channel_id']), + dbesc($channel['channel_hash']) + ); - $ret = Activity::encode_follow_collection($r, App::$query_string, 'OrderedCollection', $t[0]['total']); - } - - if (ActivityStreams::is_as_request()) { - as_return_and_die($ret,$channel); - } - } + $ret = Activity::encode_follow_collection($r, App::$query_string, 'OrderedCollection', $t[0]['total']); + } + if (ActivityStreams::is_as_request()) { + as_return_and_die($ret, $channel); + } + } } diff --git a/Zotlabs/Module/Future.php b/Zotlabs/Module/Future.php index 215e5434d..1cf4b28bf 100644 --- a/Zotlabs/Module/Future.php +++ b/Zotlabs/Module/Future.php @@ -6,16 +6,16 @@ use Zotlabs\Lib\Apps; use Zotlabs\Lib\Libsync; use Zotlabs\Web\Controller; -class Future extends Controller { +class Future extends Controller +{ - function get() { + public function get() + { $desc = t('This app allows you to set an optional publish date/time for posts, which may be in the future. This must be at least ten minutes into the future to initiate delayed publishing. The posts will be published automatically after that time has passed. Once installed, a new button will appear in the post editor to set the date/time.'); $text = '
', print_array($result)) . '' . $desc . ''; - return $text; - - } - + return $text; + } } diff --git a/Zotlabs/Module/Getfile.php b/Zotlabs/Module/Getfile.php index e1541bff7..a2cd7c40f 100644 --- a/Zotlabs/Module/Getfile.php +++ b/Zotlabs/Module/Getfile.php @@ -1,4 +1,5 @@ 1) { + $verify_hash = argv(1); + if ($verify_hash !== $resource) { + logger('resource mismatch'); + killme(); + } + } - if(argc() > 1) { - $verify_hash = argv(1); - if($verify_hash !== $resource) { - logger('resource mismatch'); - killme(); - } - } + if (!$hash) { + logger('no sender hash'); + killme(); + } - if(! $hash) { - logger('no sender hash'); - killme(); - } + foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $head) { + if (array_key_exists($head, $_SERVER) && substr(trim($_SERVER[$head]), 0, 9) === 'Signature') { + if ($head !== 'HTTP_AUTHORIZATION') { + $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head]; + continue; + } - foreach([ 'REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION' ] as $head) { - if(array_key_exists($head,$_SERVER) && substr(trim($_SERVER[$head]),0,9) === 'Signature') { - if($head !== 'HTTP_AUTHORIZATION') { - $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head]; - continue; - } + $verified = HTTPSig::verify(''); + if ($verified && $verified['header_signed'] && $verified['header_valid']) { + $r = q( + "select hubloc_hash from hubloc where hubloc_id_url = '%s' or hubloc_addr = '%s' limit 1", + dbesc($verified['signer']), + dbesc(str_replace('acct:', '', $verified['signer'])) + ); + if ($r && $r[0]['hubloc_hash'] === $hash) { + $header_verified = true; + } + } + } + } - $verified = HTTPSig::verify(''); - if($verified && $verified['header_signed'] && $verified['header_valid']) { - $r = q("select hubloc_hash from hubloc where hubloc_id_url = '%s' or hubloc_addr = '%s' limit 1", - dbesc($verified['signer']), - dbesc(str_replace('acct:','',$verified['signer'])) - ); - if($r && $r[0]['hubloc_hash'] === $hash) { - $header_verified = true; - } - } - } - } + if (!$header_verified) { + http_status_exit(403, 'Permission denied'); + } - if(! $header_verified) { - http_status_exit(403,'Permission denied'); - } + $channel = channelx_by_hash($hash); - $channel = channelx_by_hash($hash); + if (!$channel) { + logger('error: missing info'); + killme(); + } - if(! $channel) { - logger('error: missing info'); - killme(); - } - - if($resolution > 0) { - $r = q("select * from photo where resource_id = '%s' and uid = %d and imgscale = %d limit 1", - dbesc($resource), - intval($channel['channel_id']), - intval($resolution) - ); - if($r) { - header('Content-type: ' . $r[0]['mimetype']); + if ($resolution > 0) { + $r = q( + "select * from photo where resource_id = '%s' and uid = %d and imgscale = %d limit 1", + dbesc($resource), + intval($channel['channel_id']), + intval($resolution) + ); + if ($r) { + header('Content-type: ' . $r[0]['mimetype']); - if(intval($r[0]['os_storage'])) { - $fname = dbunescbin($r[0]['content']); - if(strpos($fname,'store') !== false) - $istream = fopen($fname,'rb'); - else - $istream = fopen('store/' . $channel['channel_address'] . '/' . $fname,'rb'); - $ostream = fopen('php://output','wb'); - if($istream && $ostream) { - pipe_streams($istream,$ostream); - fclose($istream); - fclose($ostream); - } - } - else { - echo dbunescbin($r[0]['content']); - } - } - killme(); - } + if (intval($r[0]['os_storage'])) { + $fname = dbunescbin($r[0]['content']); + if (strpos($fname, 'store') !== false) { + $istream = fopen($fname, 'rb'); + } else { + $istream = fopen('store/' . $channel['channel_address'] . '/' . $fname, 'rb'); + } + $ostream = fopen('php://output', 'wb'); + if ($istream && $ostream) { + pipe_streams($istream, $ostream); + fclose($istream); + fclose($ostream); + } + } else { + echo dbunescbin($r[0]['content']); + } + } + killme(); + } - $r = attach_by_hash($resource,$channel['channel_hash'],$revision); - - if(! $r['success']) { - logger('attach_by_hash failed: ' . $r['message']); - notice( $r['message'] . EOL); - return; - } - - header('Content-type: ' . $r['data']['filetype']); - header('Content-Disposition: attachment; filename="' . $r['data']['filename'] . '"'); - if(intval($r['data']['os_storage'])) { - $fname = dbunescbin($r['data']['content']); - if(strpos($fname,'store') !== false) - $istream = fopen($fname,'rb'); - else - $istream = fopen('store/' . $channel['channel_address'] . '/' . $fname,'rb'); - $ostream = fopen('php://output','wb'); - if($istream && $ostream) { - pipe_streams($istream,$ostream); - fclose($istream); - fclose($ostream); - } - } - else { - echo dbunescbin($r['data']['content']); - } - killme(); - } + $r = attach_by_hash($resource, $channel['channel_hash'], $revision); + + if (!$r['success']) { + logger('attach_by_hash failed: ' . $r['message']); + notice($r['message'] . EOL); + return; + } + + header('Content-type: ' . $r['data']['filetype']); + header('Content-Disposition: attachment; filename="' . $r['data']['filename'] . '"'); + if (intval($r['data']['os_storage'])) { + $fname = dbunescbin($r['data']['content']); + if (strpos($fname, 'store') !== false) { + $istream = fopen($fname, 'rb'); + } else { + $istream = fopen('store/' . $channel['channel_address'] . '/' . $fname, 'rb'); + } + $ostream = fopen('php://output', 'wb'); + if ($istream && $ostream) { + pipe_streams($istream, $ostream); + fclose($istream); + fclose($ostream); + } + } else { + echo dbunescbin($r['data']['content']); + } + killme(); + } } diff --git a/Zotlabs/Module/Hashtags.php b/Zotlabs/Module/Hashtags.php index f31e86ab7..9b8ee35f4 100644 --- a/Zotlabs/Module/Hashtags.php +++ b/Zotlabs/Module/Hashtags.php @@ -9,25 +9,29 @@ namespace Zotlabs\Module; use Zotlabs\Web\Controller; -class Hashtags extends Controller { +class Hashtags extends Controller +{ - function init() { - $result = []; + public function init() + { + $result = []; - $t = escape_tags($_REQUEST['t']); - if(! $t) - json_return_and_die($result); + $t = escape_tags($_REQUEST['t']); + if (!$t) { + json_return_and_die($result); + } - $r = q("select distinct(term) from term where term like '%s' and ttype = %d order by term", - dbesc($t . '%'), - intval(TERM_HASHTAG) - ); - if($r) { - foreach($r as $rv) { - $result[] = [ 'text' => $rv['term'] ]; - } - } + $r = q( + "select distinct(term) from term where term like '%s' and ttype = %d order by term", + dbesc($t . '%'), + intval(TERM_HASHTAG) + ); + if ($r) { + foreach ($r as $rv) { + $result[] = ['text' => $rv['term']]; + } + } - json_return_and_die($result); - } -} \ No newline at end of file + json_return_and_die($result); + } +} diff --git a/Zotlabs/Module/Hcard.php b/Zotlabs/Module/Hcard.php index a2ffc15b4..14f078021 100644 --- a/Zotlabs/Module/Hcard.php +++ b/Zotlabs/Module/Hcard.php @@ -1,76 +1,77 @@ 1) - $which = argv(1); - else { - notice( t('Requested profile is not available.') . EOL ); - \App::$error = 404; - return; - } - - logger('hcard_request: ' . $which, LOGGER_DEBUG); + public function init() + { - $profile = ''; - $channel = \App::get_channel(); - - if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) { - $which = $channel['channel_address']; - $profile = argv(1); - $r = q("select profile_guid from profile where id = %d and uid = %d limit 1", - intval($profile), - intval(local_channel()) - ); - if(! $r) - $profile = ''; - $profile = $r[0]['profile_guid']; - } - - head_add_link( [ - 'rel' => 'alternate', - 'type' => 'application/atom+xml', - 'title' => t('Posts and comments'), - 'href' => z_root() . '/feed/' . $which - ]); + if (argc() > 1) { + $which = argv(1); + } else { + notice(t('Requested profile is not available.') . EOL); + App::$error = 404; + return; + } - head_add_link( [ - 'rel' => 'alternate', - 'type' => 'application/atom+xml', - 'title' => t('Only posts'), - 'href' => z_root() . '/feed/' . $which . '?f=&top=1' - ]); + logger('hcard_request: ' . $which, LOGGER_DEBUG); - - if(! $profile) { - $x = q("select channel_id as profile_uid from channel where channel_address = '%s' limit 1", - dbesc(argv(1)) - ); - if($x) { - \App::$profile = $x[0]; - } - } - - Libprofile::load($which,$profile); - - - } - - - function get() { + $profile = ''; + $channel = App::get_channel(); - $x = new \Zotlabs\Widget\Profile(); - return $x->widget([]); - - } - - - + if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) { + $which = $channel['channel_address']; + $profile = argv(1); + $r = q( + "select profile_guid from profile where id = %d and uid = %d limit 1", + intval($profile), + intval(local_channel()) + ); + if (!$r) { + $profile = ''; + } + $profile = $r[0]['profile_guid']; + } + + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/atom+xml', + 'title' => t('Posts and comments'), + 'href' => z_root() . '/feed/' . $which + ]); + + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/atom+xml', + 'title' => t('Only posts'), + 'href' => z_root() . '/feed/' . $which . '?f=&top=1' + ]); + + + if (!$profile) { + $x = q( + "select channel_id as profile_uid from channel where channel_address = '%s' limit 1", + dbesc(argv(1)) + ); + if ($x) { + App::$profile = $x[0]; + } + } + + Libprofile::load($which, $profile); + } + + + public function get() + { + + $x = new \Zotlabs\Widget\Profile(); + return $x->widget([]); + } } diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php index 27c0c928f..151d70c64 100644 --- a/Zotlabs/Module/Help.php +++ b/Zotlabs/Module/Help.php @@ -1,4 +1,5 @@ '; - $o .= ''; - $o .= ''; - $o .= '' . t('Documentation Search') . ' - ' . htmlspecialchars($_REQUEST['search']) . '
'; - $o .= ''; + if ($_REQUEST['search']) { + $o .= ''; + $o .= ''; + } - return $o; - } - - - if(argc() > 2 && argv(argc()-2) === 'assets') { - $path = ''; - for($x = 1; $x < argc(); $x ++) { - if(strlen($path)) - $path .= '/'; - $path .= argv($x); - } - $realpath = 'doc/' . $path; - //Set the content-type header as appropriate - $imageInfo = getimagesize($realpath); - switch ($imageInfo[2]) { - case IMAGETYPE_JPEG: - header("Content-Type: image/jpeg"); - break; - case IMAGETYPE_GIF: - header("Content-Type: image/gif"); - break; - case IMAGETYPE_PNG: - header("Content-Type: image/png"); - break; - default: - break; - } - header("Content-Length: " . filesize($realpath)); - - // dump the picture and stop the script - readfile($realpath); - killme(); - } - - if (argc() === 1) { - $files = self::listdir('doc'); - - if ($files) { - foreach ($files as $file) { - if ((! strpos($file,'/site/')) && file_exists(str_replace('doc/','doc/site/',$file))) { - continue; - } - if (strpos($file,'README')) { - continue; - } - if (preg_match('/\/(..|..\-..)\//',$file,$matches)) { - $language = $matches[1]; - } - else { - $language = t('Unknown language'); - } - if ($language === substr(App::$language,0,2)) { - $language = ''; - } - - $link = str_replace( [ 'doc/', '.mc' ], [ 'help/', '' ], $file); - if (strpos($link,'/global/') !== false || strpos($link,'/media/') !== false) { - continue; - } - $content .= '' . (($language) ? " [$language]" : '') . EOL; - } - } - } - else { - $content = get_help_content(); - } - - - return replace_macros(get_markup_template('help.tpl'), array( - '$title' => t('$Projectname Documentation'), - '$tocHeading' => t('Contents'), - '$content' => $content, - '$heading' => $heading, - '$language' => $language - )); - } - - static function listdir($path) { - $results = []; - $handle = opendir($path); - if (! $handle) { - return $results; - } - while (false !== ($file = readdir($handle))) { - if ($file === '.' || $file === '..') { - continue; - } - if (is_dir($path . '/' . $file)) { - $results = array_merge($results, self::listdir($path . '/' . $file)); - } - else { - $results[] = $path . '/' . $file; - } - } - closedir($handle); - return $results; - } + return $o; + } + if (argc() > 2 && argv(argc() - 2) === 'assets') { + $path = ''; + for ($x = 1; $x < argc(); $x++) { + if (strlen($path)) { + $path .= '/'; + } + $path .= argv($x); + } + $realpath = 'doc/' . $path; + //Set the content-type header as appropriate + $imageInfo = getimagesize($realpath); + switch ($imageInfo[2]) { + case IMAGETYPE_JPEG: + header("Content-Type: image/jpeg"); + break; + case IMAGETYPE_GIF: + header("Content-Type: image/gif"); + break; + case IMAGETYPE_PNG: + header("Content-Type: image/png"); + break; + default: + break; + } + header("Content-Length: " . filesize($realpath)); + + // dump the picture and stop the script + readfile($realpath); + killme(); + } + + if (argc() === 1) { + $files = self::listdir('doc'); + + if ($files) { + foreach ($files as $file) { + if ((!strpos($file, '/site/')) && file_exists(str_replace('doc/', 'doc/site/', $file))) { + continue; + } + if (strpos($file, 'README')) { + continue; + } + if (preg_match('/\/(..|..\-..)\//', $file, $matches)) { + $language = $matches[1]; + } else { + $language = t('Unknown language'); + } + if ($language === substr(App::$language, 0, 2)) { + $language = ''; + } + + $link = str_replace(['doc/', '.mc'], ['help/', ''], $file); + if (strpos($link, '/global/') !== false || strpos($link, '/media/') !== false) { + continue; + } + $content .= '' . (($language) ? " [$language]" : '') . EOL; + } + } + } else { + $content = get_help_content(); + } + + + return replace_macros(get_markup_template('help.tpl'), array( + '$title' => t('$Projectname Documentation'), + '$tocHeading' => t('Contents'), + '$content' => $content, + '$heading' => $heading, + '$language' => $language + )); + } + + public static function listdir($path) + { + $results = []; + $handle = opendir($path); + if (!$handle) { + return $results; + } + while (false !== ($file = readdir($handle))) { + if ($file === '.' || $file === '..') { + continue; + } + if (is_dir($path . '/' . $file)) { + $results = array_merge($results, self::listdir($path . '/' . $file)); + } else { + $results[] = $path . '/' . $file; + } + } + closedir($handle); + return $results; + } } diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php index dd78352b5..e41ff8311 100644 --- a/Zotlabs/Module/Home.php +++ b/Zotlabs/Module/Home.php @@ -1,4 +1,5 @@ [ - ACTIVITYSTREAMS_JSONLD_REV, - 'https://w3id.org/security/v1', - Activity::ap_schema() - ]], Activity::encode_site() ); + if (ActivityStreams::is_as_request()) { + $x = array_merge(['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + Activity::ap_schema() + ]], Activity::encode_site()); - $headers = []; - $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' ; - $x['signature'] = LDSignatures::sign($x,[ 'channel_address' => z_root(), 'channel_prvkey' => get_config('system','prvkey') ]); - $ret = json_encode($x, JSON_UNESCAPED_SLASHES); - logger('data: ' . jindent($ret), LOGGER_DATA); - $headers['Date'] = datetime_convert('UTC','UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T'); - $headers['Digest'] = HTTPSig::generate_digest_header($ret); - $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; + $headers = []; + $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'; + $x['signature'] = LDSignatures::sign($x, ['channel_address' => z_root(), 'channel_prvkey' => get_config('system', 'prvkey')]); + $ret = json_encode($x, JSON_UNESCAPED_SLASHES); + logger('data: ' . jindent($ret), LOGGER_DATA); + $headers['Date'] = datetime_convert('UTC', 'UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T'); + $headers['Digest'] = HTTPSig::generate_digest_header($ret); + $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; - $h = HTTPSig::create_sig($headers,get_config('system','prvkey'),z_root()); - HTTPSig::set_headers($h); + $h = HTTPSig::create_sig($headers, get_config('system', 'prvkey'), z_root()); + HTTPSig::set_headers($h); - echo $ret; - killme(); - } + echo $ret; + killme(); + } - if (Libzot::is_zot_request()) { + if (Libzot::is_zot_request()) { + $channel = get_sys_channel(); + $sigdata = HTTPSig::verify(file_get_contents('php://input'), EMPTY_STR, 'zot6'); - $channel = get_sys_channel(); - $sigdata = HTTPSig::verify(file_get_contents('php://input'), EMPTY_STR, 'zot6'); + if ($sigdata && $sigdata['signer'] && $sigdata['header_valid']) { + $data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash'], 'target_url' => $sigdata['signer']])); + $s = q( + "select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network in ('zot6','nomad') limit 1", + dbesc($sigdata['signer']) + ); - if($sigdata && $sigdata['signer'] && $sigdata['header_valid']) { - $data = json_encode(Libzot::zotinfo([ 'guid_hash' => $channel['channel_hash'], 'target_url' => $sigdata['signer'] ])); - $s = q("select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network in ('nomad','zot6') limit 1", - dbesc($sigdata['signer']) - ); + if ($s && $s[0]['hubloc_sitekey'] && $s[0]['site_crypto']) { + $data = json_encode(Crypto::encapsulate($data, $s[0]['hubloc_sitekey'], Libzot::best_algorithm($s[0]['site_crypto']))); + } + } else { + $data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash']])); + } - if($s && $s[0]['hubloc_sitekey'] && $s[0]['site_crypto']) { - $data = json_encode(Crypto::encapsulate($data,$s[0]['hubloc_sitekey'],Libzot::best_algorithm($s[0]['site_crypto']))); - } - } - else { - $data = json_encode(Libzot::zotinfo([ 'guid_hash' => $channel['channel_hash'] ])); - } - - $headers = [ - 'Content-Type' => 'application/x-nomad+json', - 'Digest' => HTTPSig::generate_digest_header($data), - '(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'] - ]; - $h = HTTPSig::create_sig($headers,get_config('system','prvkey'),z_root()); - HTTPSig::set_headers($h); - echo $data; - killme(); - } + $headers = [ + 'Content-Type' => 'application/x-nomad+json', + 'Digest' => HTTPSig::generate_digest_header($data), + '(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'] + ]; + $h = HTTPSig::create_sig($headers, get_config('system', 'prvkey'), z_root()); + HTTPSig::set_headers($h); + echo $data; + killme(); + } - $splash = ((argc() > 1 && argv(1) === 'splash') ? true : false); - - $channel = App::get_channel(); - if (local_channel() && $channel && $channel['xchan_url'] && ! $splash) { - $dest = $channel['channel_startpage']; - if (! $dest) { - $dest = get_pconfig(local_channel(),'system','startpage'); - } - if (! $dest) { - $dest = get_config('system','startpage'); - } - if (! $dest) { - $dest = z_root() . '/stream'; - } - goaway($dest); - } + $splash = ((argc() > 1 && argv(1) === 'splash') ? true : false); - if (remote_channel() && (! $splash) && $_SESSION['atoken']) { - $r = q("select * from atoken where atoken_id = %d", - intval($_SESSION['atoken']) - ); - if ($r) { - $x = channelx_by_n($r[0]['atoken_uid']); - if ($x) { - goaway(z_root() . '/channel/' . $x['channel_address']); - } - } - } + $channel = App::get_channel(); + if (local_channel() && $channel && $channel['xchan_url'] && !$splash) { + $dest = $channel['channel_startpage']; + if (!$dest) { + $dest = get_pconfig(local_channel(), 'system', 'startpage'); + } + if (!$dest) { + $dest = get_config('system', 'startpage'); + } + if (!$dest) { + $dest = z_root() . '/stream'; + } + goaway($dest); + } - - if (get_account_id() && ! $splash) { - goaway(z_root() . '/new_channel'); - } - - } - - - function get() { - - $o = EMPTY_STR; - - if (x($_SESSION,'theme')) { - unset($_SESSION['theme']); - } - if (x($_SESSION,'mobile_theme')) { - unset($_SESSION['mobile_theme']); - } - - $splash = ((argc() > 1 && argv(1) === 'splash') ? true : false); - - call_hooks('home_content',$o); - if ($o) { - return $o; - } - - $frontpage = get_config('system','frontpage'); - if ($frontpage) { - if (strpos($frontpage,'include:') !== false) { - $file = trim(str_replace('include:' , '', $frontpage)); - if (file_exists($file)) { - App::$page['template'] = 'full'; - App::$page['title'] = t('$Projectname'); - $o .= file_get_contents($file); - return $o; - } - } - if (strpos($frontpage,'http') !== 0) { - $frontpage = z_root() . '/' . $frontpage; - } - if (intval(get_config('system','mirror_frontpage'))) { - $o = ''; + $o .= ''; - } + $o .= ''; + $o .= ''; + $o .= '' . t('Documentation Search') . ' - ' . htmlspecialchars($_REQUEST['search']) . '
'; + $o .= ''; - $r = search_doc_files($_REQUEST['search']); - if($r) { - $o .= ''; - $o .= '- ';
- foreach($r as $rr) {
- $dirname = dirname($rr['v']);
- $fname = basename($rr['v']);
- $fname = substr($fname, 0, strrpos($fname, '.'));
- $path = trim(substr($dirname, 4), '/');
+ $r = search_doc_files($_REQUEST['search']);
+ if ($r) {
+ $o .= '
- ' . ucwords(str_replace('_',' ',notags($fname))) . '
' - . '' . 'help/' . (($path) ? $path . '/' : '') . $fname . '
' - . '...' . str_replace('$Projectname', System::get_platform_name(), $rr['text']) . '... ';
- }
- $o .= '
- ';
+ foreach ($r as $rr) {
+ $dirname = dirname($rr['v']);
+ $fname = basename($rr['v']);
+ $fname = substr($fname, 0, strrpos($fname, '.'));
+ $path = trim(substr($dirname, 4), '/');
- $o .= '
- ' . ucwords(str_replace('_', ' ', notags($fname))) . '
'; + } + $o .= ''; + $o .= '
' + . '' . 'help/' . (($path) ? $path . '/' : '') . $fname . '
' + . '...' . str_replace('$Projectname', System::get_platform_name(), $rr['text']) . '...' . t('$Projectname') . ' '; - echo $o; - killme(); - } - goaway($frontpage); - } - - - $sitename = get_config('system','sitename'); - if ($sitename) { - $o .= '' . sprintf( t('Welcome to %s') ,$sitename) . '
'; - } - - $loginbox = get_config('system','login_on_homepage'); - if (intval($loginbox) || $loginbox === false) { - $o .= login(true); - } - - return $o; - } + if (remote_channel() && (!$splash) && $_SESSION['atoken']) { + $r = q( + "select * from atoken where atoken_id = %d", + intval($_SESSION['atoken']) + ); + if ($r) { + $x = channelx_by_n($r[0]['atoken_uid']); + if ($x) { + goaway(z_root() . '/channel/' . $x['channel_address']); + } + } + } + + + if (get_account_id() && !$splash) { + goaway(z_root() . '/new_channel'); + } + } + + + public function get() + { + + $o = EMPTY_STR; + + if (x($_SESSION, 'theme')) { + unset($_SESSION['theme']); + } + if (x($_SESSION, 'mobile_theme')) { + unset($_SESSION['mobile_theme']); + } + + $splash = ((argc() > 1 && argv(1) === 'splash') ? true : false); + + call_hooks('home_content', $o); + if ($o) { + return $o; + } + + $frontpage = get_config('system', 'frontpage'); + if ($frontpage) { + if (strpos($frontpage, 'include:') !== false) { + $file = trim(str_replace('include:', '', $frontpage)); + if (file_exists($file)) { + App::$page['template'] = 'full'; + App::$page['title'] = t('$Projectname'); + $o .= file_get_contents($file); + return $o; + } + } + if (strpos($frontpage, 'http') !== 0) { + $frontpage = z_root() . '/' . $frontpage; + } + if (intval(get_config('system', 'mirror_frontpage'))) { + $o = '' . t('$Projectname') . ' '; + echo $o; + killme(); + } + goaway($frontpage); + } + + + $sitename = get_config('system', 'sitename'); + if ($sitename) { + $o .= '' . sprintf(t('Welcome to %s'), $sitename) . '
'; + } + + $loginbox = get_config('system', 'login_on_homepage'); + if (intval($loginbox) || $loginbox === false) { + $o .= login(true); + } + + return $o; + } } diff --git a/Zotlabs/Module/Hostxrd.php b/Zotlabs/Module/Hostxrd.php index c1d5cf0e9..2aa569c64 100644 --- a/Zotlabs/Module/Hostxrd.php +++ b/Zotlabs/Module/Hostxrd.php @@ -1,25 +1,29 @@ \App::get_hostname(), - '$zroot' => z_root() - )); - $arr = array('xrd' => $x); - call_hooks('hostxrd',$arr); - - echo $arr['xrd']; - killme(); - } - + public function init() + { + session_write_close(); + header('Access-Control-Allow-Origin: *'); + header("Content-type: application/xrd+xml"); + logger('hostxrd', LOGGER_DEBUG); + + $tpl = get_markup_template('xrd_host.tpl'); + $x = replace_macros(get_markup_template('xrd_host.tpl'), array( + '$zhost' => App::get_hostname(), + '$zroot' => z_root() + )); + $arr = array('xrd' => $x); + call_hooks('hostxrd', $arr); + + echo $arr['xrd']; + killme(); + } } diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index b6fd52f4c..0e715a93f 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -1,4 +1,5 @@ loading) { + $_SESSION['loadtime_hq'] = datetime_convert(); + } - if($this->loading) - $_SESSION['loadtime_hq'] = datetime_convert(); - - if(argc() > 1 && argv(1) !== 'load') { - $item_hash = argv(1); - } - - if($_REQUEST['mid']) - $item_hash = $_REQUEST['mid']; + if (argc() > 1 && argv(1) !== 'load') { + $item_hash = argv(1); + } - $item_normal = item_normal(); - $item_normal_update = item_normal_update(); + if ($_REQUEST['mid']) { + $item_hash = $_REQUEST['mid']; + } - if(! $item_hash) { - $r = q("SELECT mid FROM item + $item_normal = item_normal(); + $item_normal_update = item_normal_update(); + + if (!$item_hash) { + $r = q( + "SELECT mid FROM item WHERE uid = %d $item_normal AND mid = parent_mid ORDER BY created DESC LIMIT 1", - intval(local_channel()) - ); + intval(local_channel()) + ); - if($r[0]['mid']) { - $item_hash = gen_link_id($r[0]['mid']); - } - } + if ($r[0]['mid']) { + $item_hash = gen_link_id($r[0]['mid']); + } + } - if($item_hash) { + if ($item_hash) { + $item_hash = unpack_link_id($item_hash); - $item_hash = unpack_link_id($item_hash); + $target_item = null; - $target_item = null; + $r = q( + "select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, item_blocked from item where mid like '%s' limit 1", + dbesc($item_hash . '%') + ); - $r = q("select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, item_blocked from item where mid like '%s' limit 1", - dbesc($item_hash . '%') - ); - - if($r) { - $target_item = $r[0]; - } + if ($r) { + $target_item = $r[0]; + } - //if the item is to be moderated redirect to /moderate - if($target_item['item_blocked'] == ITEM_MODERATED) { - goaway(z_root() . '/moderate/' . $target_item['id']); - } - - $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); + //if the item is to be moderated redirect to /moderate + if ($target_item['item_blocked'] == ITEM_MODERATED) { + goaway(z_root() . '/moderate/' . $target_item['id']); + } - $simple_update = (($this->updating) ? " AND item_unseen = 1 " : ''); - - if($this->updating && $_SESSION['loadtime_hq']) - $simple_update = " AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime_hq']) . "' "; - - if($static && $simple_update) - $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; + $static = ((array_key_exists('static', $_REQUEST)) ? intval($_REQUEST['static']) : 0); - $sys = get_sys_channel(); - $sql_extra = item_permissions_sql($sys['channel_id']); + $simple_update = (($this->updating) ? " AND item_unseen = 1 " : ''); - $sys_item = false; + if ($this->updating && $_SESSION['loadtime_hq']) { + $simple_update = " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_hq']) . "' "; + } - } - - if(! $this->updating) { - $channel = App::get_channel(); + if ($static && $simple_update) { + $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; + } - $channel_acl = [ - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'] - ]; + $sys = get_sys_channel(); + $sql_extra = item_permissions_sql($sys['channel_id']); - $x = [ - 'is_owner' => true, - 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), - 'default_location' => $channel['channel_location'], - 'nickname' => $channel['channel_address'], - 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl($channel_acl,true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), - 'permissions' => $channel_acl, - 'bang' => '', - 'visitor' => true, - 'profile_uid' => local_channel(), - 'return_path' => 'hq', - 'expanded' => true, - 'editor_autocomplete' => true, - 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true, - 'jotnets' => true, - 'reset' => t('Reset form') - ]; + $sys_item = false; + } - $o = replace_macros(get_markup_template("hq.tpl"), - [ - '$no_messages' => (($target_item) ? false : true), - '$no_messages_label' => [ t('Welcome to $Projectname!'), t('You have got no unseen posts...') ], - '$editor' => status_editor($x) - ] - ); + if (!$this->updating) { + $channel = App::get_channel(); - } + $channel_acl = [ + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ]; - if(! $this->updating && ! $this->loading) { + $x = [ + 'is_owner' => true, + 'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''), + 'default_location' => $channel['channel_location'], + 'nickname' => $channel['channel_address'], + 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'acl' => populate_acl($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), + 'permissions' => $channel_acl, + 'bang' => '', + 'visitor' => true, + 'profile_uid' => local_channel(), + 'return_path' => 'hq', + 'expanded' => true, + 'editor_autocomplete' => true, + 'bbco_autocomplete' => 'bbcode', + 'bbcode' => true, + 'jotnets' => true, + 'reset' => t('Reset form') + ]; - nav_set_selected('HQ'); + $o = replace_macros( + get_markup_template("hq.tpl"), + [ + '$no_messages' => (($target_item) ? false : true), + '$no_messages_label' => [t('Welcome to $Projectname!'), t('You have got no unseen posts...')], + '$editor' => status_editor($x) + ] + ); + } - $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1); + if (!$this->updating && !$this->loading) { + nav_set_selected('HQ'); - if($target_item) { - // if the target item is not a post (eg a like) we want to address its thread parent - $mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']); + $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1); - // if we got a decoded hash we must encode it again before handing to javascript - $mid = gen_link_id($mid); - } - else { - $mid = ''; - } + if ($target_item) { + // if the target item is not a post (eg a like) we want to address its thread parent + $mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']); - $o .= '' . "\r\n"; - $o .= "\r\n"; - - App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),[ - '$baseurl' => z_root(), - '$pgtype' => 'hq', - '$uid' => local_channel(), - '$gid' => '0', - '$cid' => '0', - '$cmin' => '0', - '$cmax' => '99', - '$star' => '0', - '$liked' => '0', - '$conv' => '0', - '$spam' => '0', - '$fh' => '0', - '$dm' => '0', - '$nouveau' => '0', - '$wall' => '0', - '$draft' => '0', - '$static' => $static, - '$page' => 1, - '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), - '$search' => '', - '$xchan' => '', - '$order' => '', - '$file' => '', - '$cats' => '', - '$tags' => '', - '$dend' => '', - '$dbegin' => '', - '$verb' => '', - '$net' => '', - '$mid' => (($mid) ? urlencode($mid) : '') - ]); - } + // if we got a decoded hash we must encode it again before handing to javascript + $mid = gen_link_id($mid); + } else { + $mid = ''; + } - $updateable = false; + $o .= '' . "\r\n"; + $o .= "\r\n"; - if($this->loading && $target_item) { - $r = null; + App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"), [ + '$baseurl' => z_root(), + '$pgtype' => 'hq', + '$uid' => local_channel(), + '$gid' => '0', + '$cid' => '0', + '$cmin' => '0', + '$cmax' => '99', + '$star' => '0', + '$liked' => '0', + '$conv' => '0', + '$spam' => '0', + '$fh' => '0', + '$dm' => '0', + '$nouveau' => '0', + '$wall' => '0', + '$draft' => '0', + '$static' => $static, + '$page' => 1, + '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0), + '$search' => '', + '$xchan' => '', + '$order' => '', + '$file' => '', + '$cats' => '', + '$tags' => '', + '$dend' => '', + '$dbegin' => '', + '$verb' => '', + '$net' => '', + '$mid' => (($mid) ? urlencode($mid) : '') + ]); + } - $r = q("SELECT item.id AS item_id FROM item + $updateable = false; + + if ($this->loading && $target_item) { + $r = null; + + $r = q( + "SELECT item.id AS item_id FROM item WHERE uid = %d AND mid = '%s' $item_normal LIMIT 1", - intval(local_channel()), - dbesc($target_item['parent_mid']) - ); + intval(local_channel()), + dbesc($target_item['parent_mid']) + ); - if($r) { - $updateable = true; - } + if ($r) { + $updateable = true; + } - if(!$r) { - $sys_item = true; + if (!$r) { + $sys_item = true; - $r = q("SELECT item.id AS item_id FROM item + $r = q( + "SELECT item.id AS item_id FROM item LEFT JOIN abook ON item.author_xchan = abook.abook_xchan WHERE mid = '%s' AND item.uid = %d $item_normal AND (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra LIMIT 1", - dbesc($target_item['parent_mid']), - intval($sys['channel_id']) - ); - } - } - elseif($this->updating && $target_item) { - $r = null; + dbesc($target_item['parent_mid']), + intval($sys['channel_id']) + ); + } + } elseif ($this->updating && $target_item) { + $r = null; - $r = q("SELECT item.parent AS item_id FROM item + $r = q( + "SELECT item.parent AS item_id FROM item WHERE uid = %d AND parent_mid = '%s' $item_normal_update $simple_update LIMIT 1", - intval(local_channel()), - dbesc($target_item['parent_mid']) - ); + intval(local_channel()), + dbesc($target_item['parent_mid']) + ); - if($r) { - $updateable = true; - } + if ($r) { + $updateable = true; + } - if(!$r) { - $sys_item = true; + if (!$r) { + $sys_item = true; - $r = q("SELECT item.parent AS item_id FROM item + $r = q( + "SELECT item.parent AS item_id FROM item LEFT JOIN abook ON item.author_xchan = abook.abook_xchan WHERE mid = '%s' AND item.uid = %d $item_normal_update $simple_update AND (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra LIMIT 1", - dbesc($target_item['parent_mid']), - intval($sys['channel_id']) - ); - } + dbesc($target_item['parent_mid']), + intval($sys['channel_id']) + ); + } - $_SESSION['loadtime_hq'] = datetime_convert(); - } - else { - $r = []; - } - - if($r) { - $items = q("SELECT item.*, item.id AS item_id + $_SESSION['loadtime_hq'] = datetime_convert(); + } else { + $r = []; + } + + if ($r) { + $items = q( + "SELECT item.*, item.id AS item_id FROM item WHERE parent = '%s' $item_normal ", - dbesc($r[0]['item_id']) - ); - - xchan_query($items,true,(($sys_item) ? local_channel() : 0)); - $items = fetch_post_tags($items,true); - $items = conv_sort($items,'created'); - } - else { - $items = []; - } + dbesc($r[0]['item_id']) + ); - $o .= conversation($items, 'hq', $this->updating, 'client'); + xchan_query($items, true, (($sys_item) ? local_channel() : 0)); + $items = fetch_post_tags($items, true); + $items = conv_sort($items, 'created'); + } else { + $items = []; + } - if($updateable) { - $x = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d AND parent = %d ", - intval(local_channel()), - intval($r[0]['item_id']) - ); - } + $o .= conversation($items, 'hq', $this->updating, 'client'); - $o .= ''; + if ($updateable) { + $x = q( + "UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d AND parent = %d ", + intval(local_channel()), + intval($r[0]['item_id']) + ); + } - return $o; - - } + $o .= ''; + return $o; + } } diff --git a/Zotlabs/Module/Id.php b/Zotlabs/Module/Id.php index 1bac99eeb..41e2ada25 100644 --- a/Zotlabs/Module/Id.php +++ b/Zotlabs/Module/Id.php @@ -7,8 +7,8 @@ namespace Zotlabs\Module; * Controller for responding to x-zot: protocol requests * x-zot:_jkfRG85nJ-714zn-LW_VbTFW8jSjGAhAydOcJzHxqHkvEHWG2E0RbA_pbch-h4R63RG1YJZifaNzgccoLa3MQ/453c1678-1a79-4af7-ab65-6b012f6cab77 - * - */ + * + */ use Zotlabs\Lib\Libsync; use Zotlabs\Lib\Activity; @@ -27,94 +27,92 @@ require_once('include/bbcode.php'); require_once('include/security.php'); -class Id extends Controller { +class Id extends Controller +{ - function init() { + public function init() + { - if (Libzot::is_zot_request()) { + if (Libzot::is_zot_request()) { + $conversation = false; - $conversation = false; + $request_portable_id = argv(1); + if (argc() > 2) { + $item_id = argv(2); + } - $request_portable_id = argv(1); - if(argc() > 2) { - $item_id = argv(2); - } + $portable_id = EMPTY_STR; - $portable_id = EMPTY_STR; + $sigdata = HTTPSig::verify(EMPTY_STR); + if ($sigdata['portable_id'] && $sigdata['header_valid']) { + $portable_id = $sigdata['portable_id']; + } - $sigdata = HTTPSig::verify(EMPTY_STR); - if ($sigdata['portable_id'] && $sigdata['header_valid']) { - $portable_id = $sigdata['portable_id']; - } + $chan = channelx_by_hash($request_portable_id); - $chan = channelx_by_hash($request_portable_id); - - if ($chan) { - $channel_id = $chan['channel_id']; - if (! $item_id) { - $handler = new Channel(); - App::$argc = 2; - App::$argv[0] = 'channel'; - App::$argv[1] = $chan['channel_address']; - $handler->init(); - } - } - else { - http_status_exit(404, 'Not found'); - } + if ($chan) { + $channel_id = $chan['channel_id']; + if (!$item_id) { + $handler = new Channel(); + App::$argc = 2; + App::$argv[0] = 'channel'; + App::$argv[1] = $chan['channel_address']; + $handler->init(); + } + } else { + http_status_exit(404, 'Not found'); + } - $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 "; + $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 "; - $sql_extra = item_permissions_sql(0); + $sql_extra = item_permissions_sql(0); - $r = q("select * from item where uuid = '%s' $item_normal $sql_extra and uid = %d limit 1", - dbesc($item_id), - intval($channel_id) - ); - if(! $r) { + $r = q( + "select * from item where uuid = '%s' $item_normal $sql_extra and uid = %d limit 1", + dbesc($item_id), + intval($channel_id) + ); + if (!$r) { + $r = q( + "select * from item where uuid = '%s' $item_normal and uid = %d limit 1", + dbesc($item_id), + intval($channel_id) + ); + if ($r) { + http_status_exit(403, 'Forbidden'); + } + http_status_exit(404, 'Not found'); + } - $r = q("select * from item where uuid = '%s' $item_normal and uid = %d limit 1", - dbesc($item_id), - intval($channel_id) - ); - if($r) { - http_status_exit(403, 'Forbidden'); - } - http_status_exit(404, 'Not found'); - } + if (!perm_is_allowed($chan['channel_id'], get_observer_hash(), 'view_stream')) { + http_status_exit(403, 'Forbidden'); + } - if(! perm_is_allowed($chan['channel_id'],get_observer_hash(),'view_stream')) - http_status_exit(403, 'Forbidden'); + xchan_query($r, true); + $items = fetch_post_tags($r, true); - xchan_query($r,true); - $items = fetch_post_tags($r,true); + $i = Activity::encode_item($items[0], (get_config('system', 'activitypub', ACTIVITYPUB_ENABLED) ? true : false)); - $i = Activity::encode_item($items[0],( get_config('system','activitypub', ACTIVITYPUB_ENABLED) ? true : false )); + if (!$i) { + http_status_exit(404, 'Not found'); + } - if(! $i) - http_status_exit(404, 'Not found'); - - $x = array_merge(['@context' => [ - ACTIVITYSTREAMS_JSONLD_REV, - 'https://w3id.org/security/v1', - Activity::ap_schema() - ]], $i); - - $headers = []; - $headers['Content-Type'] = 'application/x-nomad+json' ; - $ret = json_encode($x, JSON_UNESCAPED_SLASHES); - $headers['Digest'] = HTTPSig::generate_digest_header($ret); - $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; - $h = HTTPSig::create_sig($headers,$chan['channel_prvkey'],channel_url($chan)); - HTTPSig::set_headers($h); - echo $ret; - killme(); - - } - - } + $x = array_merge(['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + Activity::ap_schema() + ]], $i); + $headers = []; + $headers['Content-Type'] = 'application/x-nomad+json'; + $ret = json_encode($x, JSON_UNESCAPED_SLASHES); + $headers['Digest'] = HTTPSig::generate_digest_header($ret); + $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; + $h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], channel_url($chan)); + HTTPSig::set_headers($h); + echo $ret; + killme(); + } + } } - - diff --git a/Zotlabs/Module/Impel.php b/Zotlabs/Module/Impel.php index 48d7b49e9..d82417dd0 100644 --- a/Zotlabs/Module/Impel.php +++ b/Zotlabs/Module/Impel.php @@ -1,197 +1,215 @@ false); - - if(! local_channel()) - json_return_and_die($ret); - - logger('impel: ' . print_r($_REQUEST,true), LOGGER_DATA); - - $elm = $_REQUEST['element']; - $x = base64url_decode($elm); - if(! $x) - json_return_and_die($ret); - - $j = json_decode($x,true); - if(! $j) - json_return_and_die($ret); - - // logger('element: ' . print_r($j,true)); + public function init() + { - $channel = \App::get_channel(); - - $arr = []; - $is_menu = false; - - // a portable menu has its links rewritten with the local baseurl - $portable_menu = false; - - switch($j['type']) { - case 'webpage': - $arr['item_type'] = ITEM_TYPE_WEBPAGE; - $namespace = 'WEBPAGE'; - $installed_type = t('webpage'); - break; - case 'block': - $arr['item_type'] = ITEM_TYPE_BLOCK; - $namespace = 'BUILDBLOCK'; - $installed_type = t('block'); - break; - case 'layout': - $arr['item_type'] = ITEM_TYPE_PDL; - $namespace = 'PDL'; - $installed_type = t('layout'); - break; - case 'portable-menu': - $portable_menu = true; - // fall through - case 'menu': - $is_menu = true; - $installed_type = t('menu'); - break; - default: - logger('mod_impel: unrecognised element type' . print_r($j,true)); - break; - } - - if($is_menu) { - $m = []; - $m['menu_channel_id'] = local_channel(); - $m['menu_name'] = $j['pagetitle']; - $m['menu_desc'] = $j['desc']; - if($j['created']) - $m['menu_created'] = datetime_convert($j['created']); - if($j['edited']) - $m['menu_edited'] = datetime_convert($j['edited']); - - $m['menu_flags'] = 0; - if($j['flags']) { - if(in_array('bookmark',$j['flags'])) - $m['menu_flags'] |= MENU_BOOKMARK; - if(in_array('system',$j['flags'])) - $m['menu_flags'] |= MENU_SYSTEM; - - } - - $menu_id = menu_create($m); - - if($menu_id) { - if(is_array($j['items'])) { - foreach($j['items'] as $it) { - $mitem = []; - - $mitem['mitem_link'] = str_replace('[channelurl]',z_root() . '/channel/' . $channel['channel_address'],$it['link']); - $mitem['mitem_link'] = str_replace('[pageurl]',z_root() . '/page/' . $channel['channel_address'],$it['link']); - $mitem['mitem_link'] = str_replace('[cloudurl]',z_root() . '/cloud/' . $channel['channel_address'],$it['link']); - $mitem['mitem_link'] = str_replace('[baseurl]',z_root(),$it['link']); + $ret = array('success' => false); - $mitem['mitem_desc'] = escape_tags($it['desc']); - $mitem['mitem_order'] = intval($it['order']); - if(is_array($it['flags'])) { - $mitem['mitem_flags'] = 0; - if(in_array('zid',$it['flags'])) - $mitem['mitem_flags'] |= MENU_ITEM_ZID; - if(in_array('new-window',$it['flags'])) - $mitem['mitem_flags'] |= MENU_ITEM_NEWWIN; - if(in_array('chatroom',$it['flags'])) - $mitem['mitem_flags'] |= MENU_ITEM_CHATROOM; - } - menu_add_item($menu_id,local_channel(),$mitem); - } - if($j['edited']) { - $x = q("update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", - dbesc(datetime_convert('UTC','UTC',$j['edited'])), - intval($menu_id), - intval(local_channel()) - ); - } - } - $ret['success'] = true; - } - $x = $ret; - } - else { - $arr['uid'] = local_channel(); - $arr['aid'] = $channel['channel_account_id']; - $arr['title'] = $j['title']; - $arr['body'] = $j['body']; - $arr['term'] = $j['term']; - $arr['layout_mid'] = $j['layout_mid']; - $arr['created'] = datetime_convert('UTC','UTC', $j['created']); - $arr['edited'] = datetime_convert('UTC','UTC',$j['edited']); - $arr['owner_xchan'] = get_observer_hash(); - $arr['author_xchan'] = (($j['author_xchan']) ? $j['author_xchan'] : get_observer_hash()); - $arr['mimetype'] = (($j['mimetype']) ? $j['mimetype'] : 'text/x-multicode'); - - if(! $j['mid']) { - $j['uuid'] = new_uuid(); - $j['mid'] = z_root() . '/item/' . $j['uuid']; - } - - $arr['uuid'] = $j['uuid']; - $arr['mid'] = $arr['parent_mid'] = $j['mid']; - - - if($j['pagetitle']) { - $pagetitle = strtolower(\URLify::transliterate($j['pagetitle'])); - } - - // Verify ability to use html or php!!! - - $execflag = ((intval($channel['channel_id']) == intval(local_channel()) && ($channel['channel_pageflags'] & PAGE_ALLOWCODE)) ? true : false); + if (!local_channel()) { + json_return_and_die($ret); + } - $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", - dbesc($arr['mid']), - intval(local_channel()) - ); + logger('impel: ' . print_r($_REQUEST, true), LOGGER_DATA); - \Zotlabs\Lib\IConfig::Set($arr,'system',$namespace,(($pagetitle) ? $pagetitle : substr($arr['mid'],0,16)),true); - - if($i) { - $arr['id'] = $i[0]['id']; - // don't update if it has the same timestamp as the original - if($arr['edited'] > $i[0]['edited']) - $x = item_store_update($arr,$execflag); - } - else { - if(($i) && (intval($i[0]['item_deleted']))) { - // was partially deleted already, finish it off - q("delete from item where mid = '%s' and uid = %d", - dbesc($arr['mid']), - intval(local_channel()) - ); - } - else - $x = item_store($arr,$execflag); - } - - if($x && $x['success']) { - $item_id = $x['item_id']; - } - } - - if($x['success']) { - $ret['success'] = true; - info( sprintf( t('%s element installed'), $installed_type)); - } - else { - notice( sprintf( t('%s element installation failed'), $installed_type)); - } - - //??? should perhaps return ret? + $elm = $_REQUEST['element']; + $x = base64url_decode($elm); + if (!$x) { + json_return_and_die($ret); + } - json_return_and_die(true); - - } - + $j = json_decode($x, true); + if (!$j) { + json_return_and_die($ret); + } + + // logger('element: ' . print_r($j,true)); + + $channel = App::get_channel(); + + $arr = []; + $is_menu = false; + + // a portable menu has its links rewritten with the local baseurl + $portable_menu = false; + + switch ($j['type']) { + case 'webpage': + $arr['item_type'] = ITEM_TYPE_WEBPAGE; + $namespace = 'WEBPAGE'; + $installed_type = t('webpage'); + break; + case 'block': + $arr['item_type'] = ITEM_TYPE_BLOCK; + $namespace = 'BUILDBLOCK'; + $installed_type = t('block'); + break; + case 'layout': + $arr['item_type'] = ITEM_TYPE_PDL; + $namespace = 'PDL'; + $installed_type = t('layout'); + break; + case 'portable-menu': + $portable_menu = true; + // fall through + case 'menu': + $is_menu = true; + $installed_type = t('menu'); + break; + default: + logger('mod_impel: unrecognised element type' . print_r($j, true)); + break; + } + + if ($is_menu) { + $m = []; + $m['menu_channel_id'] = local_channel(); + $m['menu_name'] = $j['pagetitle']; + $m['menu_desc'] = $j['desc']; + if ($j['created']) { + $m['menu_created'] = datetime_convert($j['created']); + } + if ($j['edited']) { + $m['menu_edited'] = datetime_convert($j['edited']); + } + + $m['menu_flags'] = 0; + if ($j['flags']) { + if (in_array('bookmark', $j['flags'])) { + $m['menu_flags'] |= MENU_BOOKMARK; + } + if (in_array('system', $j['flags'])) { + $m['menu_flags'] |= MENU_SYSTEM; + } + } + + $menu_id = menu_create($m); + + if ($menu_id) { + if (is_array($j['items'])) { + foreach ($j['items'] as $it) { + $mitem = []; + + $mitem['mitem_link'] = str_replace('[channelurl]', z_root() . '/channel/' . $channel['channel_address'], $it['link']); + $mitem['mitem_link'] = str_replace('[pageurl]', z_root() . '/page/' . $channel['channel_address'], $it['link']); + $mitem['mitem_link'] = str_replace('[cloudurl]', z_root() . '/cloud/' . $channel['channel_address'], $it['link']); + $mitem['mitem_link'] = str_replace('[baseurl]', z_root(), $it['link']); + + $mitem['mitem_desc'] = escape_tags($it['desc']); + $mitem['mitem_order'] = intval($it['order']); + if (is_array($it['flags'])) { + $mitem['mitem_flags'] = 0; + if (in_array('zid', $it['flags'])) { + $mitem['mitem_flags'] |= MENU_ITEM_ZID; + } + if (in_array('new-window', $it['flags'])) { + $mitem['mitem_flags'] |= MENU_ITEM_NEWWIN; + } + if (in_array('chatroom', $it['flags'])) { + $mitem['mitem_flags'] |= MENU_ITEM_CHATROOM; + } + } + menu_add_item($menu_id, local_channel(), $mitem); + } + if ($j['edited']) { + $x = q( + "update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", + dbesc(datetime_convert('UTC', 'UTC', $j['edited'])), + intval($menu_id), + intval(local_channel()) + ); + } + } + $ret['success'] = true; + } + $x = $ret; + } else { + $arr['uid'] = local_channel(); + $arr['aid'] = $channel['channel_account_id']; + $arr['title'] = $j['title']; + $arr['body'] = $j['body']; + $arr['term'] = $j['term']; + $arr['layout_mid'] = $j['layout_mid']; + $arr['created'] = datetime_convert('UTC', 'UTC', $j['created']); + $arr['edited'] = datetime_convert('UTC', 'UTC', $j['edited']); + $arr['owner_xchan'] = get_observer_hash(); + $arr['author_xchan'] = (($j['author_xchan']) ? $j['author_xchan'] : get_observer_hash()); + $arr['mimetype'] = (($j['mimetype']) ? $j['mimetype'] : 'text/x-multicode'); + + if (!$j['mid']) { + $j['uuid'] = new_uuid(); + $j['mid'] = z_root() . '/item/' . $j['uuid']; + } + + $arr['uuid'] = $j['uuid']; + $arr['mid'] = $arr['parent_mid'] = $j['mid']; + + + if ($j['pagetitle']) { + $pagetitle = strtolower(URLify::transliterate($j['pagetitle'])); + } + + // Verify ability to use html or php!!! + + $execflag = ((intval($channel['channel_id']) == intval(local_channel()) && ($channel['channel_pageflags'] & PAGE_ALLOWCODE)) ? true : false); + + $i = q( + "select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", + dbesc($arr['mid']), + intval(local_channel()) + ); + + IConfig::Set($arr, 'system', $namespace, (($pagetitle) ? $pagetitle : substr($arr['mid'], 0, 16)), true); + + if ($i) { + $arr['id'] = $i[0]['id']; + // don't update if it has the same timestamp as the original + if ($arr['edited'] > $i[0]['edited']) { + $x = item_store_update($arr, $execflag); + } + } else { + if (($i) && (intval($i[0]['item_deleted']))) { + // was partially deleted already, finish it off + q( + "delete from item where mid = '%s' and uid = %d", + dbesc($arr['mid']), + intval(local_channel()) + ); + } else { + $x = item_store($arr, $execflag); + } + } + + if ($x && $x['success']) { + $item_id = $x['item_id']; + } + } + + if ($x['success']) { + $ret['success'] = true; + info(sprintf(t('%s element installed'), $installed_type)); + } else { + notice(sprintf(t('%s element installation failed'), $installed_type)); + } + + //??? should perhaps return ret? + + json_return_and_die(true); + } } diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index b1c38724f..0e3dc379c 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -9,10 +9,8 @@ use Zotlabs\Web\HTTPSig; use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Connect; use Zotlabs\Daemon\Run; - use Zotlabs\Import\Friendica; - require_once('include/import.php'); require_once('include/photo_factory.php'); @@ -23,691 +21,686 @@ require_once('include/photo_factory.php'); * Import a channel, either by direct file upload or via * connection to another server. */ - -class Import extends Controller { +class Import extends Controller +{ - /** - * @brief Import channel into account. - * - * @param int $account_id - */ - function import_account($account_id) { + /** + * @brief Import channel into account. + * + * @param int $account_id + */ + public function import_account($account_id) + { - if (! $account_id) { - logger('No account ID supplied'); - return; - } + if (!$account_id) { + logger('No account ID supplied'); + return; + } - $max_friends = account_service_class_fetch($account_id,'total_channels'); - $max_feeds = account_service_class_fetch($account_id,'total_feeds'); - $data = null; - $seize = ((x($_REQUEST,'make_primary')) ? intval($_REQUEST['make_primary']) : 0); - $import_posts = ((x($_REQUEST,'import_posts')) ? intval($_REQUEST['import_posts']) : 0); - $moving = false; // intval($_REQUEST['moving']); - $src = $_FILES['filename']['tmp_name']; - $filename = basename($_FILES['filename']['name']); - $filesize = intval($_FILES['filename']['size']); - $filetype = $_FILES['filename']['type']; - $newname = trim(strtolower($_REQUEST['newname'])); + $max_friends = account_service_class_fetch($account_id, 'total_channels'); + $max_feeds = account_service_class_fetch($account_id, 'total_feeds'); + $data = null; + $seize = ((x($_REQUEST, 'make_primary')) ? intval($_REQUEST['make_primary']) : 0); + $import_posts = ((x($_REQUEST, 'import_posts')) ? intval($_REQUEST['import_posts']) : 0); + $moving = false; // intval($_REQUEST['moving']); + $src = $_FILES['filename']['tmp_name']; + $filename = basename($_FILES['filename']['name']); + $filesize = intval($_FILES['filename']['size']); + $filetype = $_FILES['filename']['type']; + $newname = trim(strtolower($_REQUEST['newname'])); - // import channel from file - if ($src) { + // import channel from file + if ($src) { + // This is OS specific and could also fail if your tmpdir isn't very + // large mostly used for Diaspora which exports gzipped files. - // This is OS specific and could also fail if your tmpdir isn't very - // large mostly used for Diaspora which exports gzipped files. + if (strpos($filename, '.gz')) { + @rename($src, $src . '.gz'); + @system('gunzip ' . escapeshellarg($src . '.gz')); + } - if (strpos($filename,'.gz')){ - @rename($src,$src . '.gz'); - @system('gunzip ' . escapeshellarg($src . '.gz')); - } + if ($filesize) { + $data = @file_get_contents($src); + } + unlink($src); + } - if ($filesize) { - $data = @file_get_contents($src); - } - unlink($src); - } + // import channel from another server + if (!$src) { + $old_address = ((x($_REQUEST, 'old_address')) ? $_REQUEST['old_address'] : ''); + if (!$old_address) { + logger('Nothing to import.'); + notice(t('Nothing to import.') . EOL); + return; + } elseif (strpos($old_address, '＠')) { + // if you copy the identity address from your profile page, make it work for convenience - WARNING: this is a utf-8 variant and NOT an ASCII ampersand. Please do not edit. + $old_address = str_replace('＠', '@', $old_address); + } - // import channel from another server - if (! $src) { - $old_address = ((x($_REQUEST,'old_address')) ? $_REQUEST['old_address'] : ''); - if (! $old_address) { - logger('Nothing to import.'); - notice( t('Nothing to import.') . EOL); - return; - } - elseif (strpos($old_address, '＠')) { - // if you copy the identity address from your profile page, make it work for convenience - WARNING: this is a utf-8 variant and NOT an ASCII ampersand. Please do not edit. - $old_address = str_replace('＠', '@', $old_address); - } + $email = ((x($_REQUEST, 'email')) ? $_REQUEST['email'] : ''); + $password = ((x($_REQUEST, 'password')) ? $_REQUEST['password'] : ''); - $email = ((x($_REQUEST,'email')) ? $_REQUEST['email'] : ''); - $password = ((x($_REQUEST,'password')) ? $_REQUEST['password'] : ''); + $channelname = substr($old_address, 0, strpos($old_address, '@')); + $servername = substr($old_address, strpos($old_address, '@') + 1); - $channelname = substr($old_address,0,strpos($old_address,'@')); - $servername = substr($old_address,strpos($old_address,'@')+1); + $api_path = probe_api_path($servername); + if (!$api_path) { + notice(t('Unable to download data from old server') . EOL); + return; + } - $api_path = probe_api_path($servername); - if (! $api_path) { - notice( t('Unable to download data from old server') . EOL); - return; - } + $api_path .= 'channel/export/basic?f=&zap_compat=1&channel=' . $channelname; + if ($import_posts) { + $api_path .= '&posts=1'; + } + $binary = false; + $redirects = 0; + $opts = ['http_auth' => $email . ':' . $password]; + $ret = z_fetch_url($api_path, $binary, $redirects, $opts); + if ($ret['success']) { + $data = $ret['body']; + } else { + notice(t('Unable to download data from old server') . EOL); + return; + } + } - $api_path .= 'channel/export/basic?f=&zap_compat=1&channel=' . $channelname; - if ($import_posts) { - $api_path .= '&posts=1'; - } - $binary = false; - $redirects = 0; - $opts = [ 'http_auth' => $email . ':' . $password ]; - $ret = z_fetch_url($api_path, $binary, $redirects, $opts); - if ($ret['success']) { - $data = $ret['body']; - } - else { - notice( t('Unable to download data from old server') . EOL); - return; - } - } + if (!$data) { + logger('Empty import file.'); + notice(t('Imported file is empty.') . EOL); + return; + } - if (! $data) { - logger('Empty import file.'); - notice( t('Imported file is empty.') . EOL); - return; - } + $data = json_decode($data, true); - $data = json_decode($data,true); - - //logger('import: data: ' . print_r($data,true)); - //print_r($data); + //logger('import: data: ' . print_r($data,true)); + //print_r($data); - // handle Friendica export - - if (array_path_exists('user/parent-uid',$data)) { + // handle Friendica export - $settings = [ 'account_id' => $account_id, 'sieze' => 1, 'newname' => $newname ]; - $f = new Friendica($data, $settings); - - return; - } + if (array_path_exists('user/parent-uid', $data)) { + $settings = ['account_id' => $account_id, 'sieze' => 1, 'newname' => $newname]; + $f = new Friendica($data, $settings); - if (! array_key_exists('compatibility',$data)) { - call_hooks('import_foreign_channel_data',$data); - if ($data['handled']) { - return; - } - } + return; + } - $codebase = 'zap'; + if (!array_key_exists('compatibility', $data)) { + call_hooks('import_foreign_channel_data', $data); + if ($data['handled']) { + return; + } + } - if ((! array_path_exists('compatibility/codebase',$data)) || $data['compatibility']['codebase'] !== $codebase) { - notice('Data export format is not compatible with this software'); - return; - } + $codebase = 'zap'; - if ($moving) { - $seize = 1; - } + if ((!array_path_exists('compatibility/codebase', $data)) || $data['compatibility']['codebase'] !== $codebase) { + notice('Data export format is not compatible with this software'); + return; + } - // import channel + if ($moving) { + $seize = 1; + } - $relocate = ((array_key_exists('relocate',$data)) ? $data['relocate'] : null); + // import channel - if (array_key_exists('channel',$data)) { + $relocate = ((array_key_exists('relocate', $data)) ? $data['relocate'] : null); - $max_identities = account_service_class_fetch($account_id,'total_identities'); + if (array_key_exists('channel', $data)) { + $max_identities = account_service_class_fetch($account_id, 'total_identities'); - if ($max_identities !== false) { - $r = q("select channel_id from channel where channel_account_id = %d and channel_removed = 0 ", - intval($account_id) - ); - if ($r && count($r) > $max_identities) { - notice( sprintf( t('Your service plan only allows %d channels.'), $max_identities) . EOL); - return; - } - } + if ($max_identities !== false) { + $r = q( + "select channel_id from channel where channel_account_id = %d and channel_removed = 0 ", + intval($account_id) + ); + if ($r && count($r) > $max_identities) { + notice(sprintf(t('Your service plan only allows %d channels.'), $max_identities) . EOL); + return; + } + } if ($newname) { - $x = false; - - if (get_config('system','unicode_usernames')) { - $x = punify(mb_strtolower($newname)); - } - - if ((! $x) || strlen($x) > 64) { - $x = strtolower(URLify::transliterate($newname)); - } - else { - $x = $newname; - } - $newname = $x; - } - - $channel = import_channel($data['channel'], $account_id, $seize, $newname); - } - else { - $moving = false; - $channel = App::get_channel(); - } - - if (! $channel) { - logger('Channel not found. ' . print_r($channel,true)); - notice( t('No channel. Import failed.') . EOL); - return; - } - - if (is_array($data['config'])) { - import_config($channel,$data['config']); - } - - logger('import step 2'); - - if (array_key_exists('channel',$data)) { - if ($data['photo']) { - import_channel_photo(base64url_decode($data['photo']['data']),$data['photo']['type'],$account_id,$channel['channel_id']); - } - - if (is_array($data['profile'])) { - import_profiles($channel,$data['profile']); - } - } - - logger('import step 3'); - - // import xchans and contact photos - // This *must* be done before importing hublocs - - if (array_key_exists('channel',$data) && $seize) { - - // replace any existing xchan we may have on this site if we're seizing control - - $r = q("delete from xchan where xchan_hash = '%s'", - dbesc($channel['channel_hash']) - ); - - $r = xchan_store_lowlevel( - [ - 'xchan_hash' => $channel['channel_hash'], - 'xchan_guid' => $channel['channel_guid'], - 'xchan_guid_sig' => $channel['channel_guid_sig'], - 'xchan_pubkey' => $channel['channel_pubkey'], - 'xchan_photo_l' => z_root() . "/photo/profile/l/" . $channel['channel_id'], - 'xchan_photo_m' => z_root() . "/photo/profile/m/" . $channel['channel_id'], - 'xchan_photo_s' => z_root() . "/photo/profile/s/" . $channel['channel_id'], - 'xchan_addr' => channel_reddress($channel), - 'xchan_url' => z_root() . '/channel/' . $channel['channel_address'], - 'xchan_connurl' => z_root() . '/poco/' . $channel['channel_address'], - 'xchan_follow' => z_root() . '/follow?f=&url=%s', - 'xchan_name' => $channel['channel_name'], - 'xchan_network' => 'nomad', - 'xchan_updated' => datetime_convert(), - 'xchan_photo_date' => datetime_convert(), - 'xchan_name_date' => datetime_convert() - ] - ); - } - - logger('import step 4'); - - // import xchans - $xchans = $data['xchan']; - if ($xchans) { - foreach ($xchans as $xchan) { - - // Provide backward compatibility for zot11 based projects - - if ($xchan['xchan_network'] === 'nomad' && version_compare(ZOT_REVISION, '10.0') <= 0) { - $xchan['xchan_network'] = 'zot6'; - } - - $hash = Libzot::make_xchan_hash($xchan['xchan_guid'],$xchan['xchan_pubkey']); - - if (in_array($xchan['xchan_network'],['nomad','zot6']) && $hash !== $xchan['xchan_hash']) { - logger('forged xchan: ' . print_r($xchan,true)); - continue; - } - - $r = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1", - dbesc($xchan['xchan_hash']) - ); - if ($r) { - continue; - } - xchan_store_lowlevel($xchan); - - - if ($xchan['xchan_hash'] === $channel['channel_hash']) { - $r = q("update xchan set xchan_updated = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s'", - dbesc(datetime_convert()), - dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']), - dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']), - dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']), - dbesc($xchan['xchan_hash']) - ); - } - else { - $photos = import_remote_xchan_photo($xchan['xchan_photo_l'],$xchan['xchan_hash']); - if ($photos) { - if ($photos[4]) { - $photodate = NULL_DATE; - } - else { - $photodate = $xchan['xchan_photo_date']; - } - - $r = q("update xchan set xchan_updated = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s' where xchan_hash = '%s'", - dbesc(datetime_convert()), - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc($photos[3]), - dbesc($photodate), - dbesc($xchan['xchan_hash']) - ); - } - } - } - - logger('import step 5'); - } - - - logger('import step 6'); - - - if (is_array($data['hubloc'])) { - import_hublocs($channel,$data['hubloc'],$seize,$moving); - } - - logger('import step 7'); - - // create new hubloc for the new channel at this site - - if (array_key_exists('channel',$data)) { - $r = hubloc_store_lowlevel( - [ - 'hubloc_guid' => $channel['channel_guid'], - 'hubloc_guid_sig' => $channel['channel_guid_sig'], - 'hubloc_id_url' => channel_url($channel), - 'hubloc_hash' => $channel['channel_hash'], - 'hubloc_addr' => channel_reddress($channel), - 'hubloc_network' => 'nomad', - 'hubloc_primary' => (($seize) ? 1 : 0), - 'hubloc_url' => z_root(), - 'hubloc_url_sig' => Libzot::sign(z_root(),$channel['channel_prvkey']), - 'hubloc_site_id' => Libzot::make_xchan_hash(z_root(),get_config('system','pubkey')), - 'hubloc_host' => App::get_hostname(), - 'hubloc_callback' => z_root() . '/zot', - 'hubloc_sitekey' => get_config('system','pubkey'), - 'hubloc_updated' => datetime_convert() - ] - ); - - // reset the original primary hubloc if it is being seized - - if ($seize) { - $r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' and hubloc_url != '%s' ", - dbesc($channel['channel_hash']), - dbesc(z_root()) - ); - } - } - - - $friends = 0; - $feeds = 0; - - // import contacts - $abooks = $data['abook']; - if ($abooks) { - foreach ($abooks as $abook) { - - $abook_copy = $abook; - - $abconfig = null; - if (array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && count($abook['abconfig'])) { - $abconfig = $abook['abconfig']; - } - - unset($abook['abook_id']); - unset($abook['abook_rating']); - unset($abook['abook_rating_text']); - unset($abook['abconfig']); - unset($abook['abook_their_perms']); - unset($abook['abook_my_perms']); - unset($abook['abook_not_here']); - - $abook['abook_account'] = $account_id; - $abook['abook_channel'] = $channel['channel_id']; - - $reconnect = false; - - if (array_key_exists('abook_instance',$abook) && $abook['abook_instance'] && strpos($abook['abook_instance'],z_root()) === false) { - $abook['abook_not_here'] = 1; - if (! ($abook['abook_pending'] || $abook['abook_blocked'])) { - $reconnect = true; - } - } - - if ($abook['abook_self']) { - $ctype = 0; - $role = get_pconfig($channel['channel_id'],'system','permissions_role'); - if (strpos($role,'collection' !== false)) { - $ctype = 2; - } - elseif (strpos($role,'group') !== false) { - $ctype = 1; - } - if ($ctype) { - q("update xchan set xchan_type = %d where xchan_hash = '%s' ", - intval($ctype), - dbesc($abook['abook_xchan']) - ); - } - } - else { - if ($max_friends !== false && $friends > $max_friends) { - continue; - } - if ($max_feeds !== false && intval($abook['abook_feed']) && ($feeds > $max_feeds)) { - continue; - } - } - - $r = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1", - dbesc($abook['abook_xchan']), - intval($channel['channel_id']) - ); - if($r) { - $columns = db_columns('abook'); - - foreach ($abook as $k => $v) { - if (! in_array($k,$columns)) { - continue; - } - $r = q("UPDATE abook SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE abook_xchan = '%s' AND abook_channel = %d", - dbesc($k), - dbesc($v), - dbesc($abook['abook_xchan']), - intval($channel['channel_id']) - ); - } - } - else { - abook_store_lowlevel($abook); - - $friends ++; - if (intval($abook['abook_feed'])) { - $feeds ++; - } - } - - if ($abconfig) { - foreach ($abconfig as $abc) { - set_abconfig($channel['channel_id'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']); - } - } - if ($reconnect) { - Connect::connect($channel,$abook['abook_xchan']); - } - } - - logger('import step 8'); - } - - // import groups - $groups = $data['group']; - if ($groups) { - $saved = []; - foreach ($groups as $group) { - $saved[$group['hash']] = [ 'old' => $group['id'] ]; - if (array_key_exists('name', $group)) { - $group['gname'] = $group['name']; - unset($group['name']); - } - unset($group['id']); - $group['uid'] = $channel['channel_id']; - - create_table_from_array('pgrp', $group); - } - $r = q("select * from pgrp where uid = %d", - intval($channel['channel_id']) - ); - if ($r) { - foreach ($r as $rr) { - $saved[$rr['hash']]['new'] = $rr['id']; - } - } - } - - // import group members - $group_members = $data['group_member']; - if ($group_members) { - foreach ($group_members as $group_member) { - unset($group_member['id']); - $group_member['uid'] = $channel['channel_id']; - foreach ($saved as $x) { - if ($x['old'] == $group_member['gid']) { - $group_member['gid'] = $x['new']; - } - } - create_table_from_array('pgrp_member', $group_member); - } - } - - logger('import step 9'); - - - if (is_array($data['atoken'])) { - import_atoken($channel,$data['atoken']); - } - if (is_array($data['xign'])) { - import_xign($channel,$data['xign']); - } - if (is_array($data['block'])) { - import_block($channel,$data['block']); - } - if (is_array($data['obj'])) { - import_objs($channel,$data['obj']); - } - if (is_array($data['likes'])) { - import_likes($channel,$data['likes']); - } - if (is_array($data['app'])) { - import_apps($channel,$data['app']); - } - if (is_array($data['sysapp'])) { - import_sysapps($channel,$data['sysapp']); - } - if (is_array($data['chatroom'])) { - import_chatrooms($channel,$data['chatroom']); - } -// if (is_array($data['conv'])) { -// import_conv($channel,$data['conv']); -// } -// if (is_array($data['mail'])) { -// import_mail($channel,$data['mail']); -// } - if (is_array($data['event'])) { - import_events($channel,$data['event']); - } - if (is_array($data['event_item'])) { - import_items($channel,$data['event_item'],false,$relocate); - } -// if (is_array($data['menu'])) { -// import_menus($channel,$data['menu']); -// } -// if (is_array($data['wiki'])) { -// import_items($channel,$data['wiki'],false,$relocate); -// } -// if (is_array($data['webpages'])) { -// import_items($channel,$data['webpages'],false,$relocate); -// } - $addon = array('channel' => $channel,'data' => $data); - call_hooks('import_channel',$addon); - - $saved_notification_flags = notifications_off($channel['channel_id']); - if ($import_posts && array_key_exists('item',$data) && $data['item']) { - import_items($channel,$data['item'],false,$relocate); - } - - if ($api_path && $import_posts) { // we are importing from a server and not a file - - $m = parse_url($api_path); - - $hz_server = $m['scheme'] . '://' . $m['host']; - - $since = datetime_convert(date_default_timezone_get(),date_default_timezone_get(),'0001-01-01 00:00'); - $until = datetime_convert(date_default_timezone_get(),date_default_timezone_get(),'now + 1 day'); - - $poll_interval = get_config('system','poll_interval',3); - $page = 0; - - while (1) { - $headers = [ - 'X-API-Token' => random_string(), - 'X-API-Request' => $hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page , - 'Host' => $m['host'], - '(request-target)' => 'get /api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page , - ]; - - $headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'], channel_url($channel),true,'sha512'); - - $x = z_fetch_url($hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page,false,$redirects,[ 'headers' => $headers ]); - - // logger('z_fetch: ' . print_r($x,true)); - - if (! $x['success']) { - logger('no API response'); - break; - } - - $j = json_decode($x['body'],true); - - if (! $j) { - break; - } - - if (! ($j['item'] || count($j['item']))) { - break; - } - - Run::Summon([ 'Content_importer', sprintf('%d',$page), $since, $until, $channel['channel_address'], urlencode($hz_server) ]); - sleep($poll_interval); - - $page ++; - continue; - } - - $headers = [ - 'X-API-Token' => random_string(), - 'X-API-Request' => $hz_server . '/api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until), - 'Host' => $m['host'], - '(request-target)' => 'get /api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until), - ]; - - $headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'], channel_url($channel),true,'sha512'); - - $x = z_fetch_url($hz_server . '/api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until),false,$redirects,[ 'headers' => $headers ]); - - if (! $x['success']) { - logger('no API response'); - return; - } + $x = false; + + if (get_config('system', 'unicode_usernames')) { + $x = punify(mb_strtolower($newname)); + } + + if ((!$x) || strlen($x) > 64) { + $x = strtolower(URLify::transliterate($newname)); + } else { + $x = $newname; + } + $newname = $x; + } + + $channel = import_channel($data['channel'], $account_id, $seize, $newname); + } else { + $moving = false; + $channel = App::get_channel(); + } + + if (!$channel) { + logger('Channel not found. ' . print_r($channel, true)); + notice(t('No channel. Import failed.') . EOL); + return; + } + + if (is_array($data['config'])) { + import_config($channel, $data['config']); + } + + logger('import step 2'); + + if (array_key_exists('channel', $data)) { + if ($data['photo']) { + import_channel_photo(base64url_decode($data['photo']['data']), $data['photo']['type'], $account_id, $channel['channel_id']); + } + + if (is_array($data['profile'])) { + import_profiles($channel, $data['profile']); + } + } + + logger('import step 3'); + + // import xchans and contact photos + // This *must* be done before importing hublocs + + if (array_key_exists('channel', $data) && $seize) { + // replace any existing xchan we may have on this site if we're seizing control + + $r = q( + "delete from xchan where xchan_hash = '%s'", + dbesc($channel['channel_hash']) + ); + + $r = xchan_store_lowlevel( + [ + 'xchan_hash' => $channel['channel_hash'], + 'xchan_guid' => $channel['channel_guid'], + 'xchan_guid_sig' => $channel['channel_guid_sig'], + 'xchan_pubkey' => $channel['channel_pubkey'], + 'xchan_photo_l' => z_root() . "/photo/profile/l/" . $channel['channel_id'], + 'xchan_photo_m' => z_root() . "/photo/profile/m/" . $channel['channel_id'], + 'xchan_photo_s' => z_root() . "/photo/profile/s/" . $channel['channel_id'], + 'xchan_addr' => channel_reddress($channel), + 'xchan_url' => z_root() . '/channel/' . $channel['channel_address'], + 'xchan_connurl' => z_root() . '/poco/' . $channel['channel_address'], + 'xchan_follow' => z_root() . '/follow?f=&url=%s', + 'xchan_name' => $channel['channel_name'], + 'xchan_network' => 'nomad', + 'xchan_updated' => datetime_convert(), + 'xchan_photo_date' => datetime_convert(), + 'xchan_name_date' => datetime_convert() + ] + ); + } + + logger('import step 4'); + + // import xchans + $xchans = $data['xchan']; + if ($xchans) { + foreach ($xchans as $xchan) { + // Provide backward compatibility for zot11 based projects + + if ($xchan['xchan_network'] === 'nomad' && version_compare(ZOT_REVISION, '10.0') <= 0) { + $xchan['xchan_network'] = 'zot6'; + } + + $hash = Libzot::make_xchan_hash($xchan['xchan_guid'], $xchan['xchan_pubkey']); + + if (in_array($xchan['xchan_network'], ['nomad', 'zot6']) && $hash !== $xchan['xchan_hash']) { + logger('forged xchan: ' . print_r($xchan, true)); + continue; + } + + $r = q( + "select xchan_hash from xchan where xchan_hash = '%s' limit 1", + dbesc($xchan['xchan_hash']) + ); + if ($r) { + continue; + } + xchan_store_lowlevel($xchan); + + + if ($xchan['xchan_hash'] === $channel['channel_hash']) { + $r = q( + "update xchan set xchan_updated = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s'", + dbesc(datetime_convert()), + dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']), + dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']), + dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']), + dbesc($xchan['xchan_hash']) + ); + } else { + $photos = import_remote_xchan_photo($xchan['xchan_photo_l'], $xchan['xchan_hash']); + if ($photos) { + if ($photos[4]) { + $photodate = NULL_DATE; + } else { + $photodate = $xchan['xchan_photo_date']; + } + + $r = q( + "update xchan set xchan_updated = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s' where xchan_hash = '%s'", + dbesc(datetime_convert()), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc($photos[3]), + dbesc($photodate), + dbesc($xchan['xchan_hash']) + ); + } + } + } + + logger('import step 5'); + } + + + logger('import step 6'); + + + if (is_array($data['hubloc'])) { + import_hublocs($channel, $data['hubloc'], $seize, $moving); + } + + logger('import step 7'); + + // create new hubloc for the new channel at this site + + if (array_key_exists('channel', $data)) { + $r = hubloc_store_lowlevel( + [ + 'hubloc_guid' => $channel['channel_guid'], + 'hubloc_guid_sig' => $channel['channel_guid_sig'], + 'hubloc_id_url' => channel_url($channel), + 'hubloc_hash' => $channel['channel_hash'], + 'hubloc_addr' => channel_reddress($channel), + 'hubloc_network' => 'nomad', + 'hubloc_primary' => (($seize) ? 1 : 0), + 'hubloc_url' => z_root(), + 'hubloc_url_sig' => Libzot::sign(z_root(), $channel['channel_prvkey']), + 'hubloc_site_id' => Libzot::make_xchan_hash(z_root(), get_config('system', 'pubkey')), + 'hubloc_host' => App::get_hostname(), + 'hubloc_callback' => z_root() . '/zot', + 'hubloc_sitekey' => get_config('system', 'pubkey'), + 'hubloc_updated' => datetime_convert() + ] + ); + + // reset the original primary hubloc if it is being seized + + if ($seize) { + $r = q( + "update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' and hubloc_url != '%s' ", + dbesc($channel['channel_hash']), + dbesc(z_root()) + ); + } + } + + + $friends = 0; + $feeds = 0; + + // import contacts + $abooks = $data['abook']; + if ($abooks) { + foreach ($abooks as $abook) { + $abook_copy = $abook; + + $abconfig = null; + if (array_key_exists('abconfig', $abook) && is_array($abook['abconfig']) && count($abook['abconfig'])) { + $abconfig = $abook['abconfig']; + } + + unset($abook['abook_id']); + unset($abook['abook_rating']); + unset($abook['abook_rating_text']); + unset($abook['abconfig']); + unset($abook['abook_their_perms']); + unset($abook['abook_my_perms']); + unset($abook['abook_not_here']); + + $abook['abook_account'] = $account_id; + $abook['abook_channel'] = $channel['channel_id']; + + $reconnect = false; + + if (array_key_exists('abook_instance', $abook) && $abook['abook_instance'] && strpos($abook['abook_instance'], z_root()) === false) { + $abook['abook_not_here'] = 1; + if (!($abook['abook_pending'] || $abook['abook_blocked'])) { + $reconnect = true; + } + } + + if ($abook['abook_self']) { + $ctype = 0; + $role = get_pconfig($channel['channel_id'], 'system', 'permissions_role'); + if (strpos($role, 'collection' !== false)) { + $ctype = 2; + } elseif (strpos($role, 'group') !== false) { + $ctype = 1; + } + if ($ctype) { + q( + "update xchan set xchan_type = %d where xchan_hash = '%s' ", + intval($ctype), + dbesc($abook['abook_xchan']) + ); + } + } else { + if ($max_friends !== false && $friends > $max_friends) { + continue; + } + if ($max_feeds !== false && intval($abook['abook_feed']) && ($feeds > $max_feeds)) { + continue; + } + } + + $r = q( + "select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($abook['abook_xchan']), + intval($channel['channel_id']) + ); + if ($r) { + $columns = db_columns('abook'); + + foreach ($abook as $k => $v) { + if (!in_array($k, $columns)) { + continue; + } + $r = q( + "UPDATE abook SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE abook_xchan = '%s' AND abook_channel = %d", + dbesc($k), + dbesc($v), + dbesc($abook['abook_xchan']), + intval($channel['channel_id']) + ); + } + } else { + abook_store_lowlevel($abook); + + $friends++; + if (intval($abook['abook_feed'])) { + $feeds++; + } + } + + if ($abconfig) { + foreach ($abconfig as $abc) { + set_abconfig($channel['channel_id'], $abc['xchan'], $abc['cat'], $abc['k'], $abc['v']); + } + } + if ($reconnect) { + Connect::connect($channel, $abook['abook_xchan']); + } + } + + logger('import step 8'); + } + + // import groups + $groups = $data['group']; + if ($groups) { + $saved = []; + foreach ($groups as $group) { + $saved[$group['hash']] = ['old' => $group['id']]; + if (array_key_exists('name', $group)) { + $group['gname'] = $group['name']; + unset($group['name']); + } + unset($group['id']); + $group['uid'] = $channel['channel_id']; + + create_table_from_array('pgrp', $group); + } + $r = q( + "select * from pgrp where uid = %d", + intval($channel['channel_id']) + ); + if ($r) { + foreach ($r as $rr) { + $saved[$rr['hash']]['new'] = $rr['id']; + } + } + } + + // import group members + $group_members = $data['group_member']; + if ($group_members) { + foreach ($group_members as $group_member) { + unset($group_member['id']); + $group_member['uid'] = $channel['channel_id']; + foreach ($saved as $x) { + if ($x['old'] == $group_member['gid']) { + $group_member['gid'] = $x['new']; + } + } + create_table_from_array('pgrp_member', $group_member); + } + } + + logger('import step 9'); + + + if (is_array($data['atoken'])) { + import_atoken($channel, $data['atoken']); + } + if (is_array($data['xign'])) { + import_xign($channel, $data['xign']); + } + if (is_array($data['block'])) { + import_block($channel, $data['block']); + } + if (is_array($data['obj'])) { + import_objs($channel, $data['obj']); + } + if (is_array($data['likes'])) { + import_likes($channel, $data['likes']); + } + if (is_array($data['app'])) { + import_apps($channel, $data['app']); + } + if (is_array($data['sysapp'])) { + import_sysapps($channel, $data['sysapp']); + } + if (is_array($data['chatroom'])) { + import_chatrooms($channel, $data['chatroom']); + } +// if (is_array($data['conv'])) { +// import_conv($channel,$data['conv']); +// } +// if (is_array($data['mail'])) { +// import_mail($channel,$data['mail']); +// } + if (is_array($data['event'])) { + import_events($channel, $data['event']); + } + if (is_array($data['event_item'])) { + import_items($channel, $data['event_item'], false, $relocate); + } +// if (is_array($data['menu'])) { +// import_menus($channel,$data['menu']); +// } +// if (is_array($data['wiki'])) { +// import_items($channel,$data['wiki'],false,$relocate); +// } +// if (is_array($data['webpages'])) { +// import_items($channel,$data['webpages'],false,$relocate); +// } + $addon = array('channel' => $channel, 'data' => $data); + call_hooks('import_channel', $addon); + + $saved_notification_flags = notifications_off($channel['channel_id']); + if ($import_posts && array_key_exists('item', $data) && $data['item']) { + import_items($channel, $data['item'], false, $relocate); + } + + if ($api_path && $import_posts) { // we are importing from a server and not a file + $m = parse_url($api_path); + + $hz_server = $m['scheme'] . '://' . $m['host']; + + $since = datetime_convert(date_default_timezone_get(), date_default_timezone_get(), '0001-01-01 00:00'); + $until = datetime_convert(date_default_timezone_get(), date_default_timezone_get(), 'now + 1 day'); + + $poll_interval = get_config('system', 'poll_interval', 3); + $page = 0; + + while (1) { + $headers = [ + 'X-API-Token' => random_string(), + 'X-API-Request' => $hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page, + 'Host' => $m['host'], + '(request-target)' => 'get /api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page, + ]; + + $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel), true, 'sha512'); + + $x = z_fetch_url($hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page, false, $redirects, ['headers' => $headers]); + + // logger('z_fetch: ' . print_r($x,true)); + + if (!$x['success']) { + logger('no API response'); + break; + } + + $j = json_decode($x['body'], true); + + if (!$j) { + break; + } + + if (!($j['item'] || count($j['item']))) { + break; + } + + Run::Summon(['Content_importer', sprintf('%d', $page), $since, $until, $channel['channel_address'], urlencode($hz_server)]); + sleep($poll_interval); + + $page++; + continue; + } + + $headers = [ + 'X-API-Token' => random_string(), + 'X-API-Request' => $hz_server . '/api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until), + 'Host' => $m['host'], + '(request-target)' => 'get /api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until), + ]; + + $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel), true, 'sha512'); + + $x = z_fetch_url($hz_server . '/api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until), false, $redirects, ['headers' => $headers]); + + if (!$x['success']) { + logger('no API response'); + return; + } + + $j = json_decode($x['body'], true); + + if (!$j) { + return; + } + + if (!$j['success']) { + return; + } - $j = json_decode($x['body'],true); + $poll_interval = get_config('system', 'poll_interval', 3); - if (! $j) { - return; - } + if (count($j['results'])) { + $todo = count($j['results']); + logger('total to process: ' . $todo, LOGGER_DEBUG); - if (! $j['success']) { - return; - } + foreach ($j['results'] as $jj) { + Run::Summon(['File_importer', $jj['hash'], $channel['channel_address'], urlencode($hz_server)]); + sleep($poll_interval); + } + } - $poll_interval = get_config('system','poll_interval',3); + notice(t('Files and Posts imported.') . EOL); + } - if(count($j['results'])) { - $todo = count($j['results']); - logger('total to process: ' . $todo,LOGGER_DEBUG); + notifications_on($channel['channel_id'], $saved_notification_flags); - foreach($j['results'] as $jj) { - Run::Summon([ 'File_importer',$jj['hash'], $channel['channel_address'], urlencode($hz_server) ]); - sleep($poll_interval); - } - } - notice(t('Files and Posts imported.') . EOL); + // send out refresh requests + // notify old server that it may no longer be primary. - } + Run::Summon(['Notifier', 'refresh_all', $channel['channel_id']]); - notifications_on($channel['channel_id'],$saved_notification_flags); + // This will indirectly perform a refresh_all *and* update the directory + Run::Summon(['Directory', $channel['channel_id']]); - // send out refresh requests - // notify old server that it may no longer be primary. + notice(t('Import completed.') . EOL); - Run::Summon( [ 'Notifier','refresh_all',$channel['channel_id'] ] ); + change_channel($channel['channel_id']); - // This will indirectly perform a refresh_all *and* update the directory + goaway(z_root() . '/stream'); + } - Run::Summon( [ 'Directory', $channel['channel_id'] ] ); + /** + * @brief Handle POST action on channel import page. + */ - notice( t('Import completed.') . EOL); + public function post() + { + $account_id = get_account_id(); + if (!$account_id) { + return; + } - change_channel($channel['channel_id']); + check_form_security_token_redirectOnErr('/import', 'channel_import'); + $this->import_account($account_id); + } - goaway(z_root() . '/stream' ); - } + /** + * @brief Generate channel import page. + * + * @return string with parsed HTML. + */ - /** - * @brief Handle POST action on channel import page. - */ + public function get() + { - function post() { - $account_id = get_account_id(); - if (! $account_id) { - return; - } + if (!get_account_id()) { + notice(t('You must be logged in to use this feature.') . EOL); + return EMPTY_STR; + } - check_form_security_token_redirectOnErr('/import', 'channel_import'); - $this->import_account($account_id); - } + return replace_macros(get_markup_template('channel_import.tpl'), [ + '$title' => t('Import Channel'), + '$desc' => t('Use this form to import an existing channel from a different server. You may retrieve the channel identity from the old server via the network or provide an export file.'), + '$label_filename' => t('File to Upload'), + '$choice' => t('Or provide the old server details'), + '$old_address' => ['old_address', t('Your old identity address (xyz@example.com)'), '', ''], + '$email' => ['email', t('Your old login email address'), '', ''], + '$password' => ['password', t('Your old login password'), '', ''], + '$import_posts' => ['import_posts', t('Import a few months of posts if possible (limited by available memory)'), false, '', [t('No'), t('Yes')]], - /** - * @brief Generate channel import page. - * - * @return string with parsed HTML. - */ + '$common' => t('For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media.'), - function get() { + '$make_primary' => ['make_primary', t('Make this hub my primary location'), false, '', [t('No'), t('Yes')]], + '$moving' => ['moving', t('Move this channel (disable all previous locations)'), false, '', [t('No'), t('Yes')]], + '$newname' => ['newname', t('Use this channel nickname instead of the one provided'), '', t('Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site.')], - if (! get_account_id()) { - notice( t('You must be logged in to use this feature.') . EOL); - return EMPTY_STR; - } - - return replace_macros(get_markup_template('channel_import.tpl'), [ - '$title' => t('Import Channel'), - '$desc' => t('Use this form to import an existing channel from a different server. You may retrieve the channel identity from the old server via the network or provide an export file.'), - '$label_filename' => t('File to Upload'), - '$choice' => t('Or provide the old server details'), - '$old_address' => [ 'old_address', t('Your old identity address (xyz@example.com)'), '', ''], - '$email' => [ 'email', t('Your old login email address'), '', '' ], - '$password' => [ 'password', t('Your old login password'), '', '' ], - '$import_posts' => [ 'import_posts', t('Import a few months of posts if possible (limited by available memory)'), false, '', [ t('No'), t('Yes') ]], - - '$common' => t('For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media.'), - - '$make_primary' => [ 'make_primary', t('Make this hub my primary location'), false, '', [ t('No'), t('Yes') ] ], - '$moving' => [ 'moving', t('Move this channel (disable all previous locations)'), false, '', [ t('No'), t('Yes') ] ], - '$newname' => [ 'newname', t('Use this channel nickname instead of the one provided'), '', t('Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site.')], - - '$pleasewait' => t('This process may take several minutes to complete and considerably longer if importing a large amount of posts and files. Please submit the form only once and leave this page open until finished.'), - - '$form_security_token' => get_form_security_token('channel_import'), - '$submit' => t('Submit') - ]); - } + '$pleasewait' => t('This process may take several minutes to complete and considerably longer if importing a large amount of posts and files. Please submit the form only once and leave this page open until finished.'), + '$form_security_token' => get_form_security_token('channel_import'), + '$submit' => t('Submit') + ]); + } } diff --git a/Zotlabs/Module/Import_items.php b/Zotlabs/Module/Import_items.php index 225e3d6c6..e489f9fe9 100644 --- a/Zotlabs/Module/Import_items.php +++ b/Zotlabs/Module/Import_items.php @@ -1,6 +1,10 @@ $email . ':' . $password); + $url = $scheme . $servername . $api_path; + $ret = z_fetch_url($url, $binary, $redirects, $opts); + if (!$ret['success']) { + $ret = z_fetch_url('http://' . $servername . $api_path, $binary, $redirects, $opts); + } + if ($ret['success']) { + $data = $ret['body']; + } else { + notice(t('Unable to download data from old server') . EOL); + } + } - $scheme = 'https://'; - $api_path = '/api/red/channel/export/items?f=&zap_compat=1&channel=' . $channelname . '&year=' . intval($year); - $binary = false; - $redirects = 0; - $opts = array('http_auth' => $email . ':' . $password); - $url = $scheme . $servername . $api_path; - $ret = z_fetch_url($url, $binary, $redirects, $opts); - if(! $ret['success']) - $ret = z_fetch_url('http://' . $servername . $api_path, $binary, $redirects, $opts); - if($ret['success']) - $data = $ret['body']; - else - notice( t('Unable to download data from old server') . EOL); - } + if (!$data) { + logger('Empty file.'); + notice(t('Imported file is empty.') . EOL); + return; + } - if(! $data) { - logger('Empty file.'); - notice( t('Imported file is empty.') . EOL); - return; - } + $data = json_decode($data, true); - $data = json_decode($data, true); + //logger('import: data: ' . print_r($data,true)); + //print_r($data); - //logger('import: data: ' . print_r($data,true)); - //print_r($data); + if (!is_array($data)) { + return; + } - if(! is_array($data)) - return; +// if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) { +// $v1 = substr($data['compatibility']['database'],-4); +// $v2 = substr(DB_UPDATE_VERSION,-4); +// if($v2 > $v1) { +// $t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 ); +// notice($t . EOL); +// } +// } -// if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) { -// $v1 = substr($data['compatibility']['database'],-4); -// $v2 = substr(DB_UPDATE_VERSION,-4); -// if($v2 > $v1) { -// $t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 ); -// notice($t . EOL); -// } -// } + $codebase = 'zap'; - $codebase = 'zap'; + if ((!array_path_exists('compatibility/codebase', $data)) || $data['compatibility']['codebase'] !== $codebase) { + notice(t('Data export format is not compatible with this software')); + return; + } - if ((! array_path_exists('compatibility/codebase',$data)) || $data['compatibility']['codebase'] !== $codebase) { - notice(t('Data export format is not compatible with this software')); - return; - } + $channel = App::get_channel(); - $channel = \App::get_channel(); + if (array_key_exists('item', $data) && $data['item']) { + import_items($channel, $data['item'], false, ((array_key_exists('relocate', $data)) ? $data['relocate'] : null)); + } - if(array_key_exists('item',$data) && $data['item']) { - import_items($channel,$data['item'],false,((array_key_exists('relocate',$data)) ? $data['relocate'] : null)); - } - - info( t('Import completed') . EOL); - } + info(t('Import completed') . EOL); + } - /** - * @brief Generate item import page. - * - * @return string with parsed HTML. - */ - function get() { + /** + * @brief Generate item import page. + * + * @return string with parsed HTML. + */ + public function get() + { - if(! local_channel()) { - notice( t('Permission denied') . EOL); - return login(); - } + if (!local_channel()) { + notice(t('Permission denied') . EOL); + return login(); + } - $o = replace_macros(get_markup_template('item_import.tpl'), array( - '$title' => t('Import Items'), - '$desc' => t('Use this form to import existing posts and content from an export file.'), - '$label_filename' => t('File to Upload'), - '$form_security_token' => get_form_security_token('import_items'), - '$submit' => t('Submit') - )); - - return $o; - } + $o = replace_macros(get_markup_template('item_import.tpl'), array( + '$title' => t('Import Items'), + '$desc' => t('Use this form to import existing posts and content from an export file.'), + '$label_filename' => t('File to Upload'), + '$form_security_token' => get_form_security_token('import_items'), + '$submit' => t('Submit') + )); + return $o; + } } diff --git a/Zotlabs/Module/Inbox.php b/Zotlabs/Module/Inbox.php index 89f08412e..3a5e70782 100644 --- a/Zotlabs/Module/Inbox.php +++ b/Zotlabs/Module/Inbox.php @@ -1,4 +1,5 @@ is_valid() && $AS->type === 'Announce' && is_array($AS->obj) - && array_key_exists('object',$AS->obj) && array_key_exists('actor',$AS->obj)) { - // This is a relayed/forwarded Activity (as opposed to a shared/boosted object) - // Reparse the encapsulated Activity and use that instead - logger('relayed activity',LOGGER_DEBUG); - $AS = new ActivityStreams($AS->obj); - } + // By convention, fediverse server-to-server communications require a valid HTTP Signature + // which includes a signed digest header. - // logger('debug: ' . $AS->debug()); + // This check may need to move elsewhere or be modified in order to fully implement ActivityPub C2S. - if (! $AS->is_valid()) { - if ($AS->deleted) { - // process mastodon user deletion activities, but only if we can validate the signature - if ($hsig['header_valid'] && $hsig['content_valid'] && $hsig['portable_id']) { - logger('removing deleted actor'); - remove_all_xchan_resources($hsig['portable_id']); - } - else { - logger('ignoring deleted actor', LOGGER_DEBUG, LOG_INFO); - } - } - return; - } - + if (!($hsig['header_signed'] && $hsig['header_valid'] && $hsig['content_signed'] && $hsig['content_valid'])) { + http_status_exit(403, 'Permission denied'); + } - if (is_array($AS->actor) && array_key_exists('id',$AS->actor)) { - Activity::actor_store($AS->actor['id'],$AS->actor); - } + $AS = new ActivityStreams($data); + if ( + $AS->is_valid() && $AS->type === 'Announce' && is_array($AS->obj) + && array_key_exists('object', $AS->obj) && array_key_exists('actor', $AS->obj) + ) { + // This is a relayed/forwarded Activity (as opposed to a shared/boosted object) + // Reparse the encapsulated Activity and use that instead + logger('relayed activity', LOGGER_DEBUG); + $AS = new ActivityStreams($AS->obj); + } - if (is_array($AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) { - Activity::actor_store($AS->obj['id'],$AS->obj); - } + // logger('debug: ' . $AS->debug()); - if (is_array($AS->obj) && is_array($AS->obj['actor']) && array_key_exists('id',$AS->obj['actor']) && $AS->obj['actor']['id'] !== $AS->actor['id']) { - Activity::actor_store($AS->obj['actor']['id'],$AS->obj['actor']); - if (! check_channelallowed($AS->obj['actor']['id'])) { - http_status_exit(403,'Permission denied'); - } - } - - // Validate that the channel that sent us this activity has authority to do so. - // Require a valid HTTPSignature with a signed Digest header. - - // Only permit relayed activities if the activity is signed with LDSigs - // AND the signature is valid AND the signer is the actor. - - if ($hsig['header_valid'] && $hsig['content_valid'] && $hsig['portable_id']) { - - // if the sender has the ability to send messages over zot/nomad, ignore messages sent via activitypub - // as observer aware features and client side markup will be unavailable - - $test = Activity::get_actor_hublocs($hsig['portable_id'],'all,not_deleted'); - if ($test) { - foreach ($test as $t) { - if ($t['hubloc_network'] === 'zot6') { - http_status_exit(409,'Conflict'); - } - } - } - - // fetch the portable_id for the actor, which may or may not be the sender - - $v = Activity::get_actor_hublocs($AS->actor['id'],'activitypub,not_deleted'); - - if ($v && $v[0]['hubloc_hash'] !== $hsig['portable_id']) { - // The sender is not actually the activity actor, so verify the LD signature. - // litepub activities (with no LD signature) will always have a matching actor and sender - - if ($AS->signer && is_array($AS->signer) && $AS->signer['id'] !== $AS->actor['id']) { - // the activity wasn't signed by the activity actor - return; - } - if (! $AS->sigok) { - // The activity signature isn't valid. - return; - } - - } - - if ($v) { - // The sender has been validated and stored - $observer_hash = $hsig['portable_id']; - } - - } - - if (! $observer_hash) { - return; - } - - // verify that this site has permitted communication with the sender. - - $m = parse_url($observer_hash); - - if ($m && $m['scheme'] && $m['host']) { - if (! check_siteallowed($m['scheme'] . '://' . $m['host'])) { - http_status_exit(403,'Permission denied'); - } - // this site obviously isn't dead because they are trying to communicate with us. - $test = q("update site set site_dead = 0 where site_dead = 1 and site_url = '%s' ", - dbesc($m['scheme'] . '://' . $m['host']) - ); - } - if (! check_channelallowed($observer_hash)) { - http_status_exit(403,'Permission denied'); - } - - // update the hubloc_connected timestamp, ignore failures - - $test = q("update hubloc set hubloc_connected = '%s' where hubloc_hash = '%s' and hubloc_network = 'activitypub'", - dbesc(datetime_convert()), - dbesc($observer_hash) - ); + if (!$AS->is_valid()) { + if ($AS->deleted) { + // process mastodon user deletion activities, but only if we can validate the signature + if ($hsig['header_valid'] && $hsig['content_valid'] && $hsig['portable_id']) { + logger('removing deleted actor'); + remove_all_xchan_resources($hsig['portable_id']); + } else { + logger('ignoring deleted actor', LOGGER_DEBUG, LOG_INFO); + } + } + return; + } - // Now figure out who the recipients are + if (is_array($AS->actor) && array_key_exists('id', $AS->actor)) { + Activity::actor_store($AS->actor['id'], $AS->actor); + } - if ($is_public) { + if (is_array($AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) { + Activity::actor_store($AS->obj['id'], $AS->obj); + } - if (in_array($AS->type, [ 'Follow', 'Join' ]) && is_array($AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) { - $channels = q("SELECT * from channel where channel_address = '%s' and channel_removed = 0 ", - dbesc(basename($AS->obj['id'])) - ); - } - else { - // deliver to anybody following $AS->actor + if (is_array($AS->obj) && is_array($AS->obj['actor']) && array_key_exists('id', $AS->obj['actor']) && $AS->obj['actor']['id'] !== $AS->actor['id']) { + Activity::actor_store($AS->obj['actor']['id'], $AS->obj['actor']); + if (!check_channelallowed($AS->obj['actor']['id'])) { + http_status_exit(403, 'Permission denied'); + } + } - $channels = q("SELECT * from channel where channel_id in ( SELECT abook_channel from abook left join xchan on abook_xchan = xchan_hash WHERE xchan_network = 'activitypub' and xchan_hash = '%s' ) and channel_removed = 0 ", - dbesc($observer_hash) - ); - if (! $channels) { - $channels = []; - } + // Validate that the channel that sent us this activity has authority to do so. + // Require a valid HTTPSignature with a signed Digest header. - $parent = $AS->parent_id; - if ($parent) { - // this is a comment - deliver to everybody who owns the parent - $owners = q("SELECT * from channel where channel_id in ( SELECT uid from item where mid = '%s' ) ", - dbesc($parent) - ); - if ($owners) { - $channels = array_merge($channels,$owners); - } - } - } + // Only permit relayed activities if the activity is signed with LDSigs + // AND the signature is valid AND the signer is the actor. - if ($channels === false) { - $channels = []; - } + if ($hsig['header_valid'] && $hsig['content_valid'] && $hsig['portable_id']) { + // if the sender has the ability to send messages over zot/nomad, ignore messages sent via activitypub + // as observer aware features and client side markup will be unavailable - if (in_array(ACTIVITY_PUBLIC_INBOX,$AS->recips) || in_array('Public',$AS->recips) || in_array('as:Public',$AS->recips)) { + $test = Activity::get_actor_hublocs($hsig['portable_id'], 'all,not_deleted'); + if ($test) { + foreach ($test as $t) { + if ($t['hubloc_network'] === 'zot6') { + http_status_exit(409, 'Conflict'); + } + } + } - // look for channels with send_stream = PERMS_PUBLIC (accept posts from anybody on the internet) + // fetch the portable_id for the actor, which may or may not be the sender - $r = q("select * from channel where channel_id in (select uid from pconfig where cat = 'perm_limits' and k = 'send_stream' and v = '1' ) and channel_removed = 0 "); - if ($r) { - $channels = array_merge($channels,$r); - } + $v = Activity::get_actor_hublocs($AS->actor['id'], 'activitypub,not_deleted'); - // look for channels that are following hashtags. These will be checked in tgroup_check() - - $r = q("select * from channel where channel_id in (select uid from pconfig where cat = 'system' and k = 'followed_tags' and v != '' ) and channel_removed = 0 "); - if ($r) { - $channels = array_merge($channels,$r); - } + if ($v && $v[0]['hubloc_hash'] !== $hsig['portable_id']) { + // The sender is not actually the activity actor, so verify the LD signature. + // litepub activities (with no LD signature) will always have a matching actor and sender + + if ($AS->signer && is_array($AS->signer) && $AS->signer['id'] !== $AS->actor['id']) { + // the activity wasn't signed by the activity actor + return; + } + if (!$AS->sigok) { + // The activity signature isn't valid. + return; + } + } + + if ($v) { + // The sender has been validated and stored + $observer_hash = $hsig['portable_id']; + } + } + + if (!$observer_hash) { + return; + } + + // verify that this site has permitted communication with the sender. + + $m = parse_url($observer_hash); + + if ($m && $m['scheme'] && $m['host']) { + if (!check_siteallowed($m['scheme'] . '://' . $m['host'])) { + http_status_exit(403, 'Permission denied'); + } + // this site obviously isn't dead because they are trying to communicate with us. + $test = q( + "update site set site_dead = 0 where site_dead = 1 and site_url = '%s' ", + dbesc($m['scheme'] . '://' . $m['host']) + ); + } + if (!check_channelallowed($observer_hash)) { + http_status_exit(403, 'Permission denied'); + } + + // update the hubloc_connected timestamp, ignore failures + + $test = q( + "update hubloc set hubloc_connected = '%s' where hubloc_hash = '%s' and hubloc_network = 'activitypub'", + dbesc(datetime_convert()), + dbesc($observer_hash) + ); - if (! $sys_disabled) { - $channels[] = get_sys_channel(); - } + // Now figure out who the recipients are - } + if ($is_public) { + if (in_array($AS->type, ['Follow', 'Join']) && is_array($AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) { + $channels = q( + "SELECT * from channel where channel_address = '%s' and channel_removed = 0 ", + dbesc(basename($AS->obj['id'])) + ); + } else { + // deliver to anybody following $AS->actor - } + $channels = q( + "SELECT * from channel where channel_id in ( SELECT abook_channel from abook left join xchan on abook_xchan = xchan_hash WHERE xchan_network = 'activitypub' and xchan_hash = '%s' ) and channel_removed = 0 ", + dbesc($observer_hash) + ); + if (!$channels) { + $channels = []; + } - // $channels represents all "potential" recipients. If they are not in this array, they will not receive the activity. - // If they are in this array, we will decide whether or not to deliver on a case-by-case basis. - - if (! $channels) { - logger('no deliveries on this site'); - return; - } + $parent = $AS->parent_id; + if ($parent) { + // this is a comment - deliver to everybody who owns the parent + $owners = q( + "SELECT * from channel where channel_id in ( SELECT uid from item where mid = '%s' ) ", + dbesc($parent) + ); + if ($owners) { + $channels = array_merge($channels, $owners); + } + } + } - // Bto and Bcc will only be present in a C2S transaction and should not be stored. - - $saved_recips = []; - foreach ( [ 'to', 'cc', 'audience' ] as $x ) { - if (array_key_exists($x,$AS->data)) { - $saved_recips[$x] = $AS->data[$x]; - } - } - $AS->set_recips($saved_recips); + if ($channels === false) { + $channels = []; + } + + if (in_array(ACTIVITY_PUBLIC_INBOX, $AS->recips) || in_array('Public', $AS->recips) || in_array('as:Public', $AS->recips)) { + // look for channels with send_stream = PERMS_PUBLIC (accept posts from anybody on the internet) + + $r = q("select * from channel where channel_id in (select uid from pconfig where cat = 'perm_limits' and k = 'send_stream' and v = '1' ) and channel_removed = 0 "); + if ($r) { + $channels = array_merge($channels, $r); + } + + // look for channels that are following hashtags. These will be checked in tgroup_check() + + $r = q("select * from channel where channel_id in (select uid from pconfig where cat = 'system' and k = 'followed_tags' and v != '' ) and channel_removed = 0 "); + if ($r) { + $channels = array_merge($channels, $r); + } - foreach ($channels as $channel) { + if (!$sys_disabled) { + $channels[] = get_sys_channel(); + } + } + } - // Even though activitypub may be enabled for the site, check if the channel has specifically disabled it - if (! PConfig::Get($channel['channel_id'],'system','activitypub',Config::Get('system','activitypub',ACTIVITYPUB_ENABLED))) { - continue; - } - - logger('inbox_channel: ' . $channel['channel_address'],LOGGER_DEBUG); + // $channels represents all "potential" recipients. If they are not in this array, they will not receive the activity. + // If they are in this array, we will decide whether or not to deliver on a case-by-case basis. - switch ($AS->type) { - case 'Follow': - if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) { - // do follow activity - Activity::follow($channel,$AS); - } - break; - case 'Invite': - if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') { - // do follow activity - Activity::follow($channel,$AS); - } - break; - case 'Join': - if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') { - // do follow activity - Activity::follow($channel,$AS); - } - break; - case 'Accept': - // Activitypub for wordpress sends lowercase 'follow' on accept. - // https://github.com/pfefferle/wordpress-activitypub/issues/97 - // Mobilizon sends Accept/"Member" (not in vocabulary) in response to Join/Group - if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && in_array($AS->obj['type'], ['Follow','follow', 'Member'])) { - // do follow activity - Activity::follow($channel,$AS); - } - break; + if (!$channels) { + logger('no deliveries on this site'); + return; + } - case 'Reject': + // Bto and Bcc will only be present in a C2S transaction and should not be stored. - default: - break; + $saved_recips = []; + foreach (['to', 'cc', 'audience'] as $x) { + if (array_key_exists($x, $AS->data)) { + $saved_recips[$x] = $AS->data[$x]; + } + } + $AS->set_recips($saved_recips); - } - // These activities require permissions + foreach ($channels as $channel) { + // Even though activitypub may be enabled for the site, check if the channel has specifically disabled it + if (!PConfig::Get($channel['channel_id'], 'system', 'activitypub', Config::Get('system', 'activitypub', ACTIVITYPUB_ENABLED))) { + continue; + } - $item = null; + logger('inbox_channel: ' . $channel['channel_address'], LOGGER_DEBUG); - switch ($AS->type) { - case 'Update': - if (is_array($AS->obj) && array_key_exists('type',$AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) { - Activity::actor_store($AS->obj['id'],$AS->obj, true /* force cache refresh */); - break; - } - case 'Accept': - if (is_array($AS->obj) && array_key_exists('type',$AS->obj) && (ActivityStreams::is_an_actor($AS->obj['type']) || $AS->obj['type'] === 'Member')) { - break; - } - case 'Create': - case 'Like': - case 'Dislike': - case 'Announce': - case 'Reject': - case 'TentativeAccept': - case 'TentativeReject': - case 'Add': - case 'Arrive': - case 'Block': - case 'Flag': - case 'Ignore': - case 'Invite': - case 'Listen': - case 'Move': - case 'Offer': - case 'Question': - case 'Read': - case 'Travel': - case 'View': - case 'emojiReaction': - case 'EmojiReaction': - case 'EmojiReact': - // These require a resolvable object structure - if (is_array($AS->obj)) { - // The boolean flag enables html cache of the item - $item = Activity::decode_note($AS,true); - } - else { - logger('unresolved object: ' . print_r($AS->obj,true)); - } - break; - case 'Undo': - if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Follow') { - // do unfollow activity - Activity::unfollow($channel,$AS); - break; - } - case 'Leave': - if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') { - // do unfollow activity - Activity::unfollow($channel,$AS); - break; - } - case 'Tombstone': - case 'Delete': - Activity::drop($channel,$observer_hash,$AS); - break; + switch ($AS->type) { + case 'Follow': + if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) { + // do follow activity + Activity::follow($channel, $AS); + } + break; + case 'Invite': + if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') { + // do follow activity + Activity::follow($channel, $AS); + } + break; + case 'Join': + if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') { + // do follow activity + Activity::follow($channel, $AS); + } + break; + case 'Accept': + // Activitypub for wordpress sends lowercase 'follow' on accept. + // https://github.com/pfefferle/wordpress-activitypub/issues/97 + // Mobilizon sends Accept/"Member" (not in vocabulary) in response to Join/Group + if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && in_array($AS->obj['type'], ['Follow', 'follow', 'Member'])) { + // do follow activity + Activity::follow($channel, $AS); + } + break; - case 'Move': - if($observer_hash && $observer_hash === $AS->actor - && is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStream::is_an_actor($AS->obj['type']) - && is_array($AS->tgt) && array_key_exists('type', $AS->tgt) && ActivityStream::is_an_actor($AS->tgt['type'])) { - ActivityPub::move($AS->obj,$AS->tgt); - } - break; - case 'Add': - case 'Remove': + case 'Reject': + default: + break; + } - // for writeable collections as target, it's best to provide an array and include both the type and the id in the target element. - // If it's just a string id, we'll try to fetch the collection when we receive it and that's wasteful since we don't actually need - // the contents. - if (is_array($AS->obj) && isset($AS->tgt)) { - // The boolean flag enables html cache of the item - $item = Activity::decode_note($AS,true); - break; - } - default: - break; + // These activities require permissions - } + $item = null; - if ($item) { - logger('parsed_item: ' . print_r($item,true),LOGGER_DATA); - Activity::store($channel,$observer_hash,$AS,$item); - } + switch ($AS->type) { + case 'Update': + if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) { + Activity::actor_store($AS->obj['id'], $AS->obj, true /* force cache refresh */); + break; + } + case 'Accept': + if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && (ActivityStreams::is_an_actor($AS->obj['type']) || $AS->obj['type'] === 'Member')) { + break; + } + case 'Create': + case 'Like': + case 'Dislike': + case 'Announce': + case 'Reject': + case 'TentativeAccept': + case 'TentativeReject': + case 'Add': + case 'Arrive': + case 'Block': + case 'Flag': + case 'Ignore': + case 'Invite': + case 'Listen': + case 'Move': + case 'Offer': + case 'Question': + case 'Read': + case 'Travel': + case 'View': + case 'emojiReaction': + case 'EmojiReaction': + case 'EmojiReact': + // These require a resolvable object structure + if (is_array($AS->obj)) { + // The boolean flag enables html cache of the item + $item = Activity::decode_note($AS, true); + } else { + logger('unresolved object: ' . print_r($AS->obj, true)); + } + break; + case 'Undo': + if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Follow') { + // do unfollow activity + Activity::unfollow($channel, $AS); + break; + } + case 'Leave': + if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') { + // do unfollow activity + Activity::unfollow($channel, $AS); + break; + } + case 'Tombstone': + case 'Delete': + Activity::drop($channel, $observer_hash, $AS); + break; - } + case 'Move': + if ( + $observer_hash && $observer_hash === $AS->actor + && is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStream::is_an_actor($AS->obj['type']) + && is_array($AS->tgt) && array_key_exists('type', $AS->tgt) && ActivityStream::is_an_actor($AS->tgt['type']) + ) { + ActivityPub::move($AS->obj, $AS->tgt); + } + break; + case 'Add': + case 'Remove': + // for writeable collections as target, it's best to provide an array and include both the type and the id in the target element. + // If it's just a string id, we'll try to fetch the collection when we receive it and that's wasteful since we don't actually need + // the contents. + if (is_array($AS->obj) && isset($AS->tgt)) { + // The boolean flag enables html cache of the item + $item = Activity::decode_note($AS, true); + break; + } + default: + break; + } - http_status_exit(200,'OK'); - } + if ($item) { + logger('parsed_item: ' . print_r($item, true), LOGGER_DATA); + Activity::store($channel, $observer_hash, $AS, $item); + } + } - function get() { - - } + http_status_exit(200, 'OK'); + } + public function get() + { + } } - - - diff --git a/Zotlabs/Module/Inspect.php b/Zotlabs/Module/Inspect.php index e8081496e..dfa8d02fa 100644 --- a/Zotlabs/Module/Inspect.php +++ b/Zotlabs/Module/Inspect.php @@ -6,88 +6,86 @@ use App; use Zotlabs\Web\Controller; use Zotlabs\Lib\Activity; -class Inspect extends Controller { +class Inspect extends Controller +{ - function get() { - - $output = EMPTY_STR; + public function get() + { - if (! is_site_admin()) { - notice( t('Permission denied.') . EOL); - return $output; - } - - $sys = get_sys_channel(); + $output = EMPTY_STR; - if (argc() > 2) { - $item_type = argv(1); - $item_id = argv(2); - } - elseif (argc() > 1) { - $item_type = 'item'; - $item_id = argv(1); - } - - if (! $item_id) { - App::$error = 404; - notice( t('Item not found.') . EOL); - } - - if ($item_type === 'item') { - $r = q("select * from item where uuid = '%s' or id = %d ", - dbesc($item_id), - intval($item_id) - ); - - if ($r) { - xchan_query($r); - $items = fetch_post_tags($r,true); - } + if (!is_site_admin()) { + notice(t('Permission denied.') . EOL); + return $output; + } - if(! $items) { - return $output; - } + $sys = get_sys_channel(); - foreach ($items as $item) { - if ($item['obj']) { - $item['obj'] = json_decode($item['obj'],true); - } - if ($item['target']) { - $item['target'] = json_decode($item['target'],true); - } - if ($item['attach']) { - $item['attach'] = json_decode($item['attach'],true); - } + if (argc() > 2) { + $item_type = argv(1); + $item_id = argv(2); + } elseif (argc() > 1) { + $item_type = 'item'; + $item_id = argv(1); + } - $output .= '' . print_array($item) . '
' . EOL . EOL; + if (!$item_id) { + App::$error = 404; + notice(t('Item not found.') . EOL); + } - $output .= '' . escape_tags(json_encode(Activity::encode_activity($item,true), JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES)) . '
' . EOL . EOL; + if ($item_type === 'item') { + $r = q( + "select * from item where uuid = '%s' or id = %d ", + dbesc($item_id), + intval($item_id) + ); - $output .= '' . escape_tags(json_encode(json_decode(get_iconfig($item['id'],'activitypub','rawmsg'),true), JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES)) . '
' . EOL . EOL; - - } + if ($r) { + xchan_query($r); + $items = fetch_post_tags($r, true); + } - } + if (!$items) { + return $output; + } - if ($item_type === 'xchan') { - $items = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_hash = '%s' or hubloc_addr = '%s' ", - dbesc($item_id), - dbesc($item_id) - ); - - if(! $items) { - return $output; - } + foreach ($items as $item) { + if ($item['obj']) { + $item['obj'] = json_decode($item['obj'], true); + } + if ($item['target']) { + $item['target'] = json_decode($item['target'], true); + } + if ($item['attach']) { + $item['attach'] = json_decode($item['attach'], true); + } - foreach ($items as $item) { - $output .= '' . print_array($item) . '
' . EOL . EOL; - } - } + $output .= '' . print_array($item) . '
' . EOL . EOL; + + $output .= '' . escape_tags(json_encode(Activity::encode_activity($item, true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) . '
' . EOL . EOL; + + $output .= '' . escape_tags(json_encode(json_decode(get_iconfig($item['id'], 'activitypub', 'rawmsg'), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) . '
' . EOL . EOL; + } + } + + if ($item_type === 'xchan') { + $items = q( + "select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_hash = '%s' or hubloc_addr = '%s' ", + dbesc($item_id), + dbesc($item_id) + ); + + if (!$items) { + return $output; + } + + foreach ($items as $item) { + $output .= '' . print_array($item) . '
' . EOL . EOL; + } + } - - return $output; - } - - + return $output; + } } diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php index 38f85fe5a..f400e1ebd 100644 --- a/Zotlabs/Module/Invite.php +++ b/Zotlabs/Module/Invite.php @@ -1,4 +1,5 @@ $max_invites) { + notice(t('Total invitation limit exceeded.') . EOL); + return; + } -class Invite extends Controller { + $recips = ((x($_POST, 'recipients')) ? explode("\n", $_POST['recipients']) : []); + $message = ((x($_POST, 'message')) ? notags(trim($_POST['message'])) : ''); - function post() { - - if (! local_channel()) { - return; - } + $total = 0; - if(! Apps::system_app_installed(local_channel(), 'Invite')) { - return; - } - - check_form_security_token_redirectOnErr('/', 'send_invite'); - - $max_invites = intval(get_config('system','max_invites'), 20); - - $current_invites = intval(get_pconfig(local_channel(),'system','sent_invites')); - if($current_invites > $max_invites) { - notice( t('Total invitation limit exceeded.') . EOL); - return; - }; - - - $recips = ((x($_POST,'recipients')) ? explode("\n",$_POST['recipients']) : []); - $message = ((x($_POST,'message')) ? notags(trim($_POST['message'])) : ''); - - $total = 0; - - if (get_config('system','invitation_only')) { - $invonly = true; - $x = get_pconfig(local_channel(),'system','invites_remaining'); - if ((! $x) && (! is_site_admin())) - return; - } - - foreach ($recips as $recip) { - - $recip = trim($recip); - if(! $recip) - continue; - - if(! validate_email($recip)) { - notice( sprintf( t('%s : Not a valid email address.'), $recip) . EOL); - continue; - } - - else - $nmessage = $message; - - $account = App::get_account(); - - $res = z_mail( - [ - 'toEmail' => $recip, - 'fromName' => ' ', - 'fromEmail' => $account['account_email'], - 'messageSubject' => t('Please join us on $Projectname'), - 'textVersion' => $nmessage, - ] - ); - - if($res) { - $total ++; - $current_invites ++; - set_pconfig(local_channel(),'system','sent_invites',$current_invites); - if($current_invites > $max_invites) { - notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL); - return; - } - } - else { - notice( sprintf( t('%s : Message delivery failed.'), $recip) . EOL); - } - - } - notice( sprintf( tt("%d message sent.", "%d messages sent.", $total) , $total) . EOL); - return; - } - - - function get() { - - if(! local_channel()) { - notice( t('Permission denied.') . EOL); - return; - } + if (get_config('system', 'invitation_only')) { + $invonly = true; + $x = get_pconfig(local_channel(), 'system', 'invites_remaining'); + if ((!$x) && (!is_site_admin())) { + return; + } + } - if(! Apps::system_app_installed(local_channel(), 'Invite')) { - //Do not display any associated widgets at this point - App::$pdl = ''; + foreach ($recips as $recip) { + $recip = trim($recip); + if (!$recip) { + continue; + } - $o = 'Invite App (Not Installed):
'; - $o .= t('Send email invitations to join this network'); - return $o; - } + if (!validate_email($recip)) { + notice(sprintf(t('%s : Not a valid email address.'), $recip) . EOL); + continue; + } else { + $nmessage = $message; + } - nav_set_selected('Invite'); - - $tpl = get_markup_template('invite.tpl'); - $invonly = false; - - if(get_config('system','invitation_only')) { - $invonly = true; - $x = get_pconfig(local_channel(),'system','invites_remaining'); - if((! $x) && (! is_site_admin())) { - notice( t('You have no more invitations available') . EOL); - return ''; - } - } - - if($invonly && ($x || is_site_admin())) { - $invite_code = autoname(8) . rand(1000,9999); - $nmessage = str_replace('$invite_code',$invite_code,$message); - - $r = q("INSERT INTO register (hash,created,uid,password,lang) VALUES ('%s', '%s',0,'','') ", - dbesc($invite_code), - dbesc(datetime_convert()) - ); - - if(! is_site_admin()) { - $x --; - if($x >= 0) - set_pconfig(local_channel(),'system','invites_remaining',$x); - else - return; - } - } - - $ob = App::get_observer(); - if(! $ob) - return $o; - - $channel = App::get_channel(); - - $o = replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("send_invite"), - '$invite' => t('Send invitations'), - '$addr_text' => t('Enter email addresses, one per line:'), - '$msg_text' => t('Your message:'), - '$default_message' => t('Please join my community on $Projectname.') . "\r\n" . "\r\n" - . $linktxt - . (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code:') . " " . $invite_code . "\r\n" . "\r\n" : '') - . t('1. Register at any $Projectname location (they are all inter-connected)') - . "\r\n" . "\r\n" . z_root() . '/register' - . "\r\n" . "\r\n" . t('2. Enter my $Projectname network address into the site searchbar.') - . "\r\n" . "\r\n" . $ob['xchan_addr'] . ' (' . t('or visit') . " " . z_root() . '/channel/' . $channel['channel_address'] . ')' - . "\r\n" . "\r\n" - . t('3. Click [Connect]') - . "\r\n" . "\r\n" , - '$submit' => t('Submit') - )); - - return $o; - } - + $account = App::get_account(); + + $res = z_mail( + [ + 'toEmail' => $recip, + 'fromName' => ' ', + 'fromEmail' => $account['account_email'], + 'messageSubject' => t('Please join us on $Projectname'), + 'textVersion' => $nmessage, + ] + ); + + if ($res) { + $total++; + $current_invites++; + set_pconfig(local_channel(), 'system', 'sent_invites', $current_invites); + if ($current_invites > $max_invites) { + notice(t('Invitation limit exceeded. Please contact your site administrator.') . EOL); + return; + } + } else { + notice(sprintf(t('%s : Message delivery failed.'), $recip) . EOL); + } + } + notice(sprintf(tt("%d message sent.", "%d messages sent.", $total), $total) . EOL); + return; + } + + + public function get() + { + + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } + + if (!Apps::system_app_installed(local_channel(), 'Invite')) { + //Do not display any associated widgets at this point + App::$pdl = ''; + + $o = 'Invite App (Not Installed):
'; + $o .= t('Send email invitations to join this network'); + return $o; + } + + nav_set_selected('Invite'); + + $tpl = get_markup_template('invite.tpl'); + $invonly = false; + + if (get_config('system', 'invitation_only')) { + $invonly = true; + $x = get_pconfig(local_channel(), 'system', 'invites_remaining'); + if ((!$x) && (!is_site_admin())) { + notice(t('You have no more invitations available') . EOL); + return ''; + } + } + + if ($invonly && ($x || is_site_admin())) { + $invite_code = autoname(8) . rand(1000, 9999); + $nmessage = str_replace('$invite_code', $invite_code, $message); + + $r = q( + "INSERT INTO register (hash,created,uid,password,lang) VALUES ('%s', '%s',0,'','') ", + dbesc($invite_code), + dbesc(datetime_convert()) + ); + + if (!is_site_admin()) { + $x--; + if ($x >= 0) { + set_pconfig(local_channel(), 'system', 'invites_remaining', $x); + } else { + return; + } + } + } + + $ob = App::get_observer(); + if (!$ob) { + return $o; + } + + $channel = App::get_channel(); + + $o = replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("send_invite"), + '$invite' => t('Send invitations'), + '$addr_text' => t('Enter email addresses, one per line:'), + '$msg_text' => t('Your message:'), + '$default_message' => t('Please join my community on $Projectname.') . "\r\n" . "\r\n" + . $linktxt + . (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code:') . " " . $invite_code . "\r\n" . "\r\n" : '') + . t('1. Register at any $Projectname location (they are all inter-connected)') + . "\r\n" . "\r\n" . z_root() . '/register' + . "\r\n" . "\r\n" . t('2. Enter my $Projectname network address into the site searchbar.') + . "\r\n" . "\r\n" . $ob['xchan_addr'] . ' (' . t('or visit') . " " . z_root() . '/channel/' . $channel['channel_address'] . ')' + . "\r\n" . "\r\n" + . t('3. Click [Connect]') + . "\r\n" . "\r\n", + '$submit' => t('Submit') + )); + + return $o; + } } diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 527421f65..8ca5ddcd1 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -8,16 +8,16 @@ namespace Zotlabs\Module; * acts as a permalink for local content. * * Otherwise this is the POST destination for most all locally posted - * text stuff. This function handles status, wall-to-wall status, - * local comments, and remote coments that are posted on this site + * text stuff. This function handles status, wall-to-wall status, + * local comments, and remote coments that are posted on this site * (as opposed to being delivered in a feed). - * Also processed here are posts and comments coming through the API. - * All of these become an "item" which is our basic unit of + * Also processed here are posts and comments coming through the API. + * All of these become an "item" which is our basic unit of * information. - * Posts that originate externally or do not fall into the above - * posting categories go through item_store() instead of this function. + * Posts that originate externally or do not fall into the above + * posting categories go through item_store() instead of this function. * - */ + */ use Zotlabs\Lib\Libsync; use Zotlabs\Lib\Activity; @@ -46,1905 +46,1942 @@ require_once('include/security.php'); use Zotlabs\Lib as Zlib; -class Item extends Controller { - - public $return_404 = false; - - function init() { - - - if (ActivityStreams::is_as_request()) { - $item_uuid = argv(1); - if (! $item_uuid) { - http_status_exit(404, 'Not found'); - } - $portable_id = EMPTY_STR; - - $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 "; - - $i = null; - - // do we have the item (at all)? - // add preferential bias to item owners (item_wall = 1) - - $r = q("select * from item where (mid = '%s' or uuid = '%s') $item_normal order by item_wall desc limit 1", - dbesc(z_root() . '/item/' . $item_uuid), - dbesc($item_uuid) - ); - - if (! $r) { - http_status_exit(404,'Not found'); - } - - // process an authenticated fetch - - - $sigdata = HTTPSig::verify(EMPTY_STR); - if ($sigdata['portable_id'] && $sigdata['header_valid']) { - $portable_id = $sigdata['portable_id']; - if (! check_channelallowed($portable_id)) { - http_status_exit(403, 'Permission denied'); - } - if (! check_siteallowed($sigdata['signer'])) { - http_status_exit(403, 'Permission denied'); - } - observer_auth($portable_id); - - $i = q("select id as item_id from item where mid = '%s' $item_normal and owner_xchan = '%s' limit 1 ", - dbesc($r[0]['parent_mid']), - dbesc($portable_id) - ); - } - elseif (Config::get('system','require_authenticated_fetch',false)) { - http_status_exit(403,'Permission denied'); - } - - // if we don't have a parent id belonging to the signer see if we can obtain one as a visitor that we have permission to access - // with a bias towards those items owned by channels on this site (item_wall = 1) - - $sql_extra = item_permissions_sql(0); - - if (! $i) { - $i = q("select id as item_id from item where mid = '%s' $item_normal $sql_extra order by item_wall desc limit 1", - dbesc($r[0]['parent_mid']) - ); - } - - $bear = Activity::token_from_request(); - if ($bear) { - logger('bear: ' . $bear, LOGGER_DEBUG); - if (! $i) { - $t = q("select * from iconfig where cat = 'ocap' and k = 'relay' and v = '%s'", - dbesc($bear) - ); - if ($t) { - $i = q("select id as item_id from item where uuid = '%s' and id = %d $item_normal limit 1", - dbesc($item_uuid), - intval($t[0]['iid']) - ); - } - } - } - - if (! $i) { - http_status_exit(403,'Forbidden'); - } - - // If we get to this point we have determined we can access the original in $r (fetched much further above), so use it. - - xchan_query($r,true); - $items = fetch_post_tags($r,false); - - $chan = channelx_by_n($items[0]['uid']); - - if (! $chan) { - http_status_exit(404, 'Not found'); - } - - if (! perm_is_allowed($chan['channel_id'],get_observer_hash(),'view_stream')) { - http_status_exit(403, 'Forbidden'); - } - - $i = Activity::encode_item($items[0],true); - - if (! $i) { - http_status_exit(404, 'Not found'); - } - - - if ($portable_id && (! intval($items[0]['item_private']))) { - $c = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s'", - intval($items[0]['uid']), - dbesc($portable_id) - ); - if (! $c) { - ThreadListener::store(z_root() . '/item/' . $item_uuid,$portable_id); - } - } - - as_return_and_die($i,$chan); - } - - if (Libzot::is_zot_request()) { - - $item_uuid = argv(1); - - if (! $item_uuid) { - http_status_exit(404, 'Not found'); - } - - $portable_id = EMPTY_STR; - - $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 and not verb in ( 'Follow', 'Ignore' ) "; - - $i = null; - - // do we have the item (at all)? - - $r = q("select * from item where (mid = '%s' or uuid = '%s') $item_normal limit 1", - dbesc(z_root() . '/item/' . $item_uuid), - dbesc($item_uuid) - ); - - if (! $r) { - http_status_exit(404,'Not found'); - } - - // process an authenticated fetch - - $sigdata = HTTPSig::verify(($_SERVER['REQUEST_METHOD'] === 'POST') ? file_get_contents('php://input') : EMPTY_STR); - if ($sigdata['portable_id'] && $sigdata['header_valid']) { - $portable_id = $sigdata['portable_id']; - if (! check_channelallowed($portable_id)) { - http_status_exit(403, 'Permission denied'); - } - if (! check_siteallowed($sigdata['signer'])) { - http_status_exit(403, 'Permission denied'); - } - observer_auth($portable_id); - - $i = q("select id as item_id from item where mid = '%s' $item_normal and owner_xchan = '%s' limit 1", - dbesc($r[0]['parent_mid']), - dbesc($portable_id) - ); - } - elseif (Config::get('system','require_authenticated_fetch',false)) { - http_status_exit(403,'Permission denied'); - } - - // if we don't have a parent id belonging to the signer see if we can obtain one as a visitor that we have permission to access - // with a bias towards those items owned by channels on this site (item_wall = 1) - - $sql_extra = item_permissions_sql(0); - - if (! $i) { - $i = q("select id as item_id from item where mid = '%s' $item_normal $sql_extra order by item_wall desc limit 1", - dbesc($r[0]['parent_mid']) - ); - } - - $bear = Activity::token_from_request(); - if ($bear) { - logger('bear: ' . $bear, LOGGER_DEBUG); - if (! $i) { - $t = q("select * from iconfig where cat = 'ocap' and k = 'relay' and v = '%s'", - dbesc($bear) - ); - if ($t) { - $i = q("select id as item_id from item where uuid = '%s' and id = %d $item_normal limit 1", - dbesc($item_uuid), - intval($t[0]['iid']) - ); - } - } - } - - if (! $i) { - http_status_exit(403,'Forbidden'); - } - - $parents_str = ids_to_querystr($i,'item_id'); - - $items = q("SELECT item.*, item.id AS item_id FROM item WHERE item.parent IN ( %s ) $item_normal order by item.id asc", - dbesc($parents_str) - ); - - if (! $items) { - http_status_exit(404, 'Not found'); - } - - xchan_query($items,true); - $items = fetch_post_tags($items,true); - - if (! $items) { - http_status_exit(404, 'Not found'); - } - $chan = channelx_by_n($items[0]['uid']); - - if (! $chan) { - http_status_exit(404, 'Not found'); - } - - if (! perm_is_allowed($chan['channel_id'],get_observer_hash(),'view_stream')) { - http_status_exit(403, 'Forbidden'); - } - - $i = Activity::encode_item_collection($items,'conversation/' . $item_uuid,'OrderedCollection',true, count($items)); - if ($portable_id && (! intval($items[0]['item_private']))) { - ThreadListener::store(z_root() . '/item/' . $item_uuid,$portable_id); - } - - if (! $i) { - http_status_exit(404, 'Not found'); - } - $x = array_merge(['@context' => [ - ACTIVITYSTREAMS_JSONLD_REV, - 'https://w3id.org/security/v1', - Activity::ap_schema() - ]], $i); - - $headers = []; - $headers['Content-Type'] = 'application/x-nomad+json' ; - $x['signature'] = LDSignatures::sign($x,$chan); - $ret = json_encode($x, JSON_UNESCAPED_SLASHES); - $headers['Digest'] = HTTPSig::generate_digest_header($ret); - $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; - $h = HTTPSig::create_sig($headers,$chan['channel_prvkey'],channel_url($chan)); - HTTPSig::set_headers($h); - echo $ret; - killme(); - - } - - // if it isn't a drop command and isn't a post method and wasn't handled already, - // the default action is a browser request for a persistent uri and this should return - // the text/html page of the item. - - if (argc() > 1 && argv(1) !== 'drop') { - $x = q("select uid, item_wall, llink, mid from item where mid = '%s' or mid = '%s' or uuid = '%s'", - dbesc(z_root() . '/item/' . argv(1)), - dbesc(z_root() . '/activity/' . argv(1)), - dbesc(argv(1)) - ); - if ($x) { - foreach ($x as $xv) { - if (intval($xv['item_wall'])) { - $c = channelx_by_n($xv['uid']); - if ($c) { - goaway($c['xchan_url'] . '?mid=' . gen_link_id($xv['mid'])); - } - } - } - goaway($x[0]['llink']); - } - - // save this state and catch it in the get() function - $this->return_404 = true; - } - } - - function post() { - - if ((! local_channel()) && (! remote_channel()) && (! isset($_REQUEST['anonname']))) { - return; - } - - // drop an array of items. - - if (isset($_REQUEST['dropitems'])) { - $arr_drop = explode(',',$_REQUEST['dropitems']); - drop_items($arr_drop); - $json = array('success' => 1); - echo json_encode($json); - killme(); - } - - - $uid = local_channel(); - $channel = null; - $observer = null; - $token = EMPTY_STR; - $datarray = []; - $item_starred = false; - $item_uplink = false; - $item_notshown = false; - $item_nsfw = false; - $item_relay = false; - $item_mentionsme = false; - $item_verified = false; - $item_retained = false; - $item_rss = false; - $item_deleted = false; - $item_hidden = false; - $item_delayed = false; - $item_pending_remove = false; - $item_blocked = false; - - $post_tags = false; - $pub_copy = false; - - - - - /** - * Is this a reply to something? - */ - - $parent = ((isset($_REQUEST['parent'])) ? intval($_REQUEST['parent']) : 0); - $parent_mid = ((isset($_REQUEST['parent_mid'])) ? trim($_REQUEST['parent_mid']) : ''); - - $hidden_mentions = ((isset($_REQUEST['hidden_mentions'])) ? trim($_REQUEST['hidden_mentions']) : ''); - - - /** - * Who is viewing this page and posting this thing - */ - - $remote_xchan = ((isset($_REQUEST['remote_xchan'])) ? trim($_REQUEST['remote_xchan']) : false); - $remote_observer = xchan_match( ['xchan_hash' => $remote_xchan ] ); - - if (! $remote_observer) { - $remote_xchan = $remote_observer = false; - } - - // This is the local channel representing who the posted item will belong to. - - $profile_uid = ((isset($_REQUEST['profile_uid'])) ? intval($_REQUEST['profile_uid']) : 0); - - // *If* you are logged in as the site admin you are allowed to create top-level items for the sys channel. - // This would typically be a webpage or webpage element. - // Comments and replies are excluded because further below we also check for sys channel ownership and - // will make a copy of the parent that you can interact with in your own stream - - $sys = get_sys_channel(); - if ($sys && $profile_uid && ($sys['channel_id'] == $profile_uid) && is_site_admin() && ! $parent) { - $uid = intval($sys['channel_id']); - $channel = $sys; - $observer = $sys; - } - - call_hooks('post_local_start', $_REQUEST); - - // logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA); - - $api_source = ((isset($_REQUEST['api_source']) && $_REQUEST['api_source']) ? true : false); - - $nocomment = 0; - if (isset($_REQUEST['comments_enabled'])) { - $nocomment = 1 - intval($_REQUEST['comments_enabled']); - } - - // this is in days, convert to absolute time - $channel_comments_closed = get_pconfig($profile_uid,'system','close_comments'); - if (intval($channel_comments_closed)) { - $channel_comments_closed = datetime_convert(date_Default_timezone_get(),'UTC', 'now + ' . intval($channel_comments_closed) . ' days'); - } - else { - $channel_comments_closed = NULL_DATE; - } - - $comments_closed = ((isset($_REQUEST['comments_closed']) && $_REQUEST['comments_closed']) ? datetime_convert(date_default_timezone_get(),'UTC',$_REQUEST['comments_closed']) : $channel_comments_closed); - - $is_poll = ((trim($_REQUEST['poll_answers'][0]) != '' && trim($_REQUEST['poll_answers'][1]) != '') ? true : false); - - // 'origin' (if non-zero) indicates that this network is where the message originated, - // for the purpose of relaying comments to other conversation members. - // If using the API from a device (leaf node) you must set origin to 1 (default) or leave unset. - // If the API is used from another network with its own distribution - // and deliveries, you may wish to set origin to 0 or false and allow the other - // network to relay comments. - - // If you are unsure, it is prudent (and important) to leave it unset. - - $origin = (($api_source && array_key_exists('origin',$_REQUEST)) ? intval($_REQUEST['origin']) : 1); - - // To represent message-ids on other networks - this will create an iconfig record - - $namespace = (($api_source && array_key_exists('namespace',$_REQUEST)) ? strip_tags($_REQUEST['namespace']) : ''); - $remote_id = (($api_source && array_key_exists('remote_id',$_REQUEST)) ? strip_tags($_REQUEST['remote_id']) : ''); - - $owner_hash = null; - - $message_id = ((x($_REQUEST,'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); - $created = ((x($_REQUEST,'created')) ? datetime_convert(date_default_timezone_get(),'UTC',$_REQUEST['created']) : datetime_convert()); - - // Because somebody will probably try this and create a mess - - if ($created <= NULL_DATE) { - $created = datetime_convert(); - } - - $post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0); - - $app = ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''); - $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); - $preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0); - $categories = ((x($_REQUEST,'category')) ? escape_tags($_REQUEST['category']) : ''); - $webpage = ((x($_REQUEST,'webpage')) ? intval($_REQUEST['webpage']) : 0); - $item_obscured = ((x($_REQUEST,'obscured')) ? intval($_REQUEST['obscured']) : 0); - $pagetitle = ((x($_REQUEST,'pagetitle')) ? escape_tags(urlencode($_REQUEST['pagetitle'])) : ''); - $layout_mid = ((x($_REQUEST,'layout_mid')) ? escape_tags($_REQUEST['layout_mid']): ''); - $plink = ((x($_REQUEST,'permalink')) ? escape_tags($_REQUEST['permalink']) : ''); - $obj_type = ((x($_REQUEST,'obj_type')) ? escape_tags($_REQUEST['obj_type']) : ACTIVITY_OBJ_NOTE); - - - $item_unpublished = ((isset($_REQUEST['draft'])) ? intval($_REQUEST['draft']) : 0); - - // allow API to bulk load a bunch of imported items without sending out a bunch of posts. - $nopush = ((x($_REQUEST,'nopush')) ? intval($_REQUEST['nopush']) : 0); - - /* - * Check service class limits - */ - if ($uid && !(x($_REQUEST,'parent')) && !(x($_REQUEST,'post_id'))) { - $ret = $this->item_check_service_class($uid,(($_REQUEST['webpage'] == ITEM_TYPE_WEBPAGE) ? true : false)); - if (!$ret['success']) { - notice( t($ret['message']) . EOL) ; - if($api_source) - return ( [ 'success' => false, 'message' => 'service class exception' ] ); - if(x($_REQUEST,'return')) - goaway(z_root() . "/" . $return_path ); - killme(); - } - } - - if ($pagetitle) { - $pagetitle = strtolower(URLify::transliterate($pagetitle)); - } - - $item_flags = $item_restrict = 0; - $expires = NULL_DATE; - - $route = ''; - $parent_item = null; - $parent_contact = null; - $thr_parent = ''; - $parid = 0; - $r = false; - - - // If this is a comment, find the parent and preset some stuff - - if ($parent || $parent_mid) { - - if (! x($_REQUEST,'type')) { - $_REQUEST['type'] = 'net-comment'; - } - if ($obj_type == ACTIVITY_OBJ_NOTE) { - $obj_type = ACTIVITY_OBJ_COMMENT; - } - - // fetch the parent item - - if ($parent) { - $r = q("SELECT * FROM item WHERE id = %d LIMIT 1", - intval($parent) - ); - } - elseif ($parent_mid && $uid) { - // This is coming from an API source, and we are logged in - $r = q("SELECT * FROM item WHERE mid = '%s' AND uid = %d LIMIT 1", - dbesc($parent_mid), - intval($uid) - ); - } - - // if this isn't the real parent of the conversation, find it - if ($r) { - $parid = $r[0]['parent']; - $parent_mid = $r[0]['mid']; - if ($r[0]['id'] != $r[0]['parent']) { - $r = q("SELECT * FROM item WHERE id = parent AND parent = %d LIMIT 1", - intval($parid) - ); - } - - // if interacting with a pubstream item (owned by the sys channel), - // create a copy of the parent in your stream - - // $r may have changed. Check it again before trying to use it. - - if ($r && local_channel() && (! is_sys_channel(local_channel()))) { - $old_id = $r[0]['id']; - $r = [ copy_of_pubitem(App::get_channel(), $r[0]['mid']) ]; - if ($r[0]['id'] !== $old_id) { - // keep track that a copy was made to display a special status notice that is unique to this condition - $pub_copy = true; - } - } - } - - if (! $r) { - notice( t('Unable to locate original post.') . EOL); - if ($api_source) { - return ( [ 'success' => false, 'message' => 'invalid post id' ] ); - } - if (x($_REQUEST,'return')) { - goaway(z_root() . "/" . $return_path ); - } - killme(); - } - - xchan_query($r,true); - - $parent_item = $r[0]; - $parent = $r[0]['id']; - - // multi-level threading - preserve the info but re-parent to our single level threading - - $thr_parent = $parent_mid; - - $route = $parent_item['route']; - - } - - if ($parent_item && isset($parent_item['replyto']) && $parent_item['replyto']) { - $replyto = unserialise($parent_item['replyto']); - } - - $moderated = false; - - if (! $observer) { - $observer = App::get_observer(); - if (! $observer) { - // perhaps we're allowing moderated comments from anonymous viewers - $observer = anon_identity_init($_REQUEST); - if ($observer) { - $moderated = true; - $remote_xchan = $remote_observer = $observer; - } - } - } - - if (! $observer) { - notice( t('Permission denied.') . EOL) ; - if ($api_source) { - return ( [ 'success' => false, 'message' => 'permission denied' ] ); - } - if (x($_REQUEST,'return')) { - goaway(z_root() . "/" . $return_path ); - } - killme(); - } - - if ($parent) { - logger('mod_item: item_post parent=' . $parent); - $can_comment = false; - - $can_comment = can_comment_on_post($observer['xchan_hash'],$parent_item); - if (! $can_comment) { - if ((array_key_exists('owner',$parent_item)) && intval($parent_item['owner']['abook_self']) == 1 ) { - $can_comment = perm_is_allowed($profile_uid,$observer['xchan_hash'],'post_comments'); - } - } - - if (! $can_comment) { - notice( t('Permission denied.') . EOL) ; - if($api_source) - return ( [ 'success' => false, 'message' => 'permission denied' ] ); - if(x($_REQUEST,'return')) - goaway(z_root() . "/" . $return_path ); - killme(); - } - } - else { - // fixme - $webpage could also be a wiki page or article and require a different permission to be checked. - if(! perm_is_allowed($profile_uid,$observer['xchan_hash'],($webpage) ? 'write_pages' : 'post_wall')) { - notice( t('Permission denied.') . EOL) ; - if($api_source) - return ( [ 'success' => false, 'message' => 'permission denied' ] ); - if(x($_REQUEST,'return')) - goaway(z_root() . "/" . $return_path ); - killme(); - } - } - - // check if this author is being moderated through the 'moderated' (negative) permission - // when posting wall-to-wall - if ($moderated === false && intval($uid) !== intval($profile_uid)) { - $moderated = perm_is_allowed($profile_uid,$observer['xchan_hash'],'moderated'); - } - - // If this is a comment, check the moderated permission of the parent; who may be on another site - $remote_moderated = (($parent) ? their_perms_contains($profile_uid,$parent_item['owner_xchan'],'moderated') : false); - if ($remote_moderated) { - notice( t('Comment may be moderated.') . EOL); - } - - // is this an edited post? - - $orig_post = null; - - if ($namespace && $remote_id) { - // It wasn't an internally generated post - see if we've got an item matching this remote service id - $i = q("select iid from iconfig where cat = 'system' and k = '%s' and v = '%s' limit 1", - dbesc($namespace), - dbesc($remote_id) - ); - if($i) - $post_id = $i[0]['iid']; - } - - $iconfig = null; - - if($post_id) { - $i = q("SELECT * FROM item WHERE uid = %d AND id = %d LIMIT 1", - intval($profile_uid), - intval($post_id) - ); - if(! count($i)) - killme(); - $orig_post = $i[0]; - $iconfig = q("select * from iconfig where iid = %d", - intval($post_id) - ); - } - - - if(! $channel) { - if($uid && $uid == $profile_uid) { - $channel = App::get_channel(); - } - else { - // posting as yourself but not necessarily to a channel you control - $r = q("select * from channel left join account on channel_account_id = account_id where channel_id = %d LIMIT 1", - intval($profile_uid) - ); - if($r) - $channel = $r[0]; - } - } - - - if(! $channel) { - logger("mod_item: no channel."); - if($api_source) - return ( [ 'success' => false, 'message' => 'no channel' ] ); - if(x($_REQUEST,'return')) - goaway(z_root() . "/" . $return_path ); - killme(); - } - - $owner_xchan = null; - - $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($channel['channel_hash']) - ); - if($r && count($r)) { - $owner_xchan = $r[0]; - } - else { - logger("mod_item: no owner."); - if($api_source) - return ( [ 'success' => false, 'message' => 'no owner' ] ); - if(x($_REQUEST,'return')) - goaway(z_root() . "/" . $return_path ); - killme(); - } - - $walltowall = false; - $walltowall_comment = false; - - if($remote_xchan && ! $moderated) - $observer = $remote_observer; - - if($observer) { - logger('mod_item: post accepted from ' . $observer['xchan_name'] . ' for ' . $owner_xchan['xchan_name'], LOGGER_DEBUG); - - // wall-to-wall detection. - // For top-level posts, if the author and owner are different it's a wall-to-wall - // For comments, We need to additionally look at the parent and see if it's a wall post that originated locally. - - if($observer['xchan_name'] != $owner_xchan['xchan_name']) { - if(($parent_item) && ($parent_item['item_wall'] && $parent_item['item_origin'])) { - $walltowall_comment = true; - $walltowall = true; - } - if(! $parent) { - $walltowall = true; - } - } - } - - if (! isset($replyto)) { - if (strpos($owner_xchan['xchan_hash'],'http') === 0) { - $replyto = $owner_xchan['xchan_hash']; - } - else { - $replyto = $owner_xchan['xchan_url']; - } - } - - - $acl = new AccessControl($channel); - - $view_policy = PermissionLimits::Get($channel['channel_id'],'view_stream'); - $comment_policy = ((isset($_REQUEST['comments_from']) && intval($_REQUEST['comments_from'])) ? intval($_REQUEST['comments_from']) : PermissionLimits::Get($channel['channel_id'],'post_comments')); - - $public_policy = ((x($_REQUEST,'public_policy')) ? escape_tags($_REQUEST['public_policy']) : map_scope($view_policy,true)); - if($webpage) - $public_policy = ''; - if($public_policy) - $private = 1; - - if($orig_post) { - - $private = 0; - // webpages and unpublished drafts are allowed to change ACLs after the fact. Normal conversation items aren't. - if($webpage || intval($orig_post['item_unpublished'])) { - $acl->set_from_array($_REQUEST); - } - else { - $acl->set($orig_post); - $public_policy = $orig_post['public_policy']; - $private = $orig_post['item_private']; - } - - if($public_policy || $acl->is_private()) { - $private = (($private) ? $private : 1); - } - - $location = $orig_post['location']; - $coord = $orig_post['coord']; - $verb = $orig_post['verb']; - $app = $orig_post['app']; - $title = escape_tags(trim($_REQUEST['title'])); - $summary = trim($_REQUEST['summary']); - $body = trim($_REQUEST['body']); - - $item_flags = $orig_post['item_flags']; - $item_origin = $orig_post['item_origin']; - $item_unseen = $orig_post['item_unseen']; - $item_starred = $orig_post['item_starred']; - $item_uplink = $orig_post['item_uplink']; - $item_wall = $orig_post['item_wall']; - $item_thread_top = $orig_post['item_thread_top']; - $item_notshown = $orig_post['item_notshown']; - $item_nsfw = $orig_post['item_nsfw']; - $item_relay = $orig_post['item_relay']; - $item_mentionsme = $orig_post['item_mentionsme']; - $item_nocomment = $orig_post['item_nocomment']; - $item_obscured = $orig_post['item_obscured']; - $item_verified = $orig_post['item_verified']; - $item_retained = $orig_post['item_retained']; - $item_rss = $orig_post['item_rss']; - $item_deleted = $orig_post['item_deleted']; - $item_type = $orig_post['item_type']; - $item_hidden = $orig_post['item_hidden']; - $item_delayed = $orig_post['item_delayed']; - $item_pending_remove = $orig_post['item_pending_remove']; - $item_blocked = $orig_post['item_blocked']; - - - - $postopts = $orig_post['postopts']; - $created = ((intval($orig_post['item_unpublished'])) ? $created : $orig_post['created']); - $expires = ((intval($orig_post['item_unpublished'])) ? NULL_DATE : $orig_post['expires']); - $mid = $orig_post['mid']; - $parent_mid = $orig_post['parent_mid']; - $plink = $orig_post['plink']; - - } - else { - if(! $walltowall) { - if((array_key_exists('contact_allow',$_REQUEST)) - || (array_key_exists('group_allow',$_REQUEST)) - || (array_key_exists('contact_deny',$_REQUEST)) - || (array_key_exists('group_deny',$_REQUEST))) { - $acl->set_from_array($_REQUEST); - } - elseif(! $api_source) { - - // if no ACL has been defined and we aren't using the API, the form - // didn't send us any parameters. This means there's no ACL or it has - // been reset to the default audience. - // If $api_source is set and there are no ACL parameters, we default - // to the channel permissions which were set in the ACL contructor. - - $acl->set(array('allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '')); - } - } - - - $location = ((isset($_REQUEST['location'])) ? notags(trim($_REQUEST['location'])) : EMPTY_STR); - $coord = ((isset($_REQUEST['coord'])) ? notags(trim($_REQUEST['coord'])) : EMPTY_STR); - $verb = ((isset($_REQUEST['verb'])) ? notags(trim($_REQUEST['verb'])) : EMPTY_STR); - $title = ((isset($_REQUEST['title'])) ? escape_tags(trim($_REQUEST['title'])) : EMPTY_STR); - $summary = ((isset($_REQUEST['summary'])) ? trim($_REQUEST['summary']) : EMPTY_STR);; - $body = ((isset($_REQUEST['body'])) ? trim($_REQUEST['body']) : EMPTY_STR); - $body .= ((isset($_REQUEST['attachment'])) ? trim($_REQUEST['attachment']) : EMPTY_STR); - $postopts = ''; - - $allow_empty = ((array_key_exists('allow_empty',$_REQUEST)) ? intval($_REQUEST['allow_empty']) : 0); - - $private = ((isset($private) && $private) ? $private : intval($acl->is_private() || ($public_policy))); - - // If this is a comment, set the permissions from the parent. - - if($parent_item) { - $private = 0; - $acl->set($parent_item); - $private = ((intval($parent_item['item_private']) ? $parent_item['item_private'] : $acl->is_private())); - $public_policy = $parent_item['public_policy']; - $owner_hash = $parent_item['owner_xchan']; - $webpage = $parent_item['item_type']; - $comment_policy = $parent_item['comment_policy']; - $item_nocomment = $parent_item['item_nocomment']; - $comments_closed = $parent_item['comments_closed']; - } - - if((! $allow_empty) && (! strlen($body))) { - if($preview) - killme(); - info( t('Empty post discarded.') . EOL ); - if($api_source) - return ( [ 'success' => false, 'message' => 'no content' ] ); - if(x($_REQUEST,'return')) - goaway(z_root() . "/" . $return_path ); - killme(); - } - } - - - - if(Apps::system_app_installed($profile_uid,'Expire Posts')) { - if(x($_REQUEST,'expire')) { - $expires = datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expire']); - if($expires <= datetime_convert()) - $expires = NULL_DATE; - } - } - - - $mimetype = notags(trim($_REQUEST['mimetype'])); - if(! $mimetype) - $mimetype = 'text/x-multicode'; - - - $execflag = ((intval($uid) == intval($profile_uid) - && ($channel['channel_pageflags'] & PAGE_ALLOWCODE)) ? true : false); - - if($preview) { - $summary = z_input_filter($summary,$mimetype,$execflag); - $body = z_input_filter($body,$mimetype,$execflag); - } - - - $arr = [ 'profile_uid' => $profile_uid, 'summary' => $summary, 'content' => $body, 'mimetype' => $mimetype ]; - call_hooks('post_content',$arr); - $summary = $arr['summary']; - $body = $arr['content']; - $mimetype = $arr['mimetype']; - - - $gacl = $acl->get(); - $str_contact_allow = $gacl['allow_cid']; - $str_group_allow = $gacl['allow_gid']; - $str_contact_deny = $gacl['deny_cid']; - $str_group_deny = $gacl['deny_gid']; - - - // if the acl contains a single contact and it's a group, add a mention. This is for compatibility - // with other groups implementations which require a mention to trigger group delivery. - - if (($str_contact_allow) && (! $str_group_allow) && (! $str_contact_deny) && (! $str_group_deny)) { - $cida = expand_acl($str_contact_allow); - if (count($cida) === 1) { - $netgroups = get_forum_channels($profile_uid,1); - if ($netgroups) { - foreach($netgroups as $ng) { - if ($ng['xchan_hash'] == $cida[0]) { - if (! is_array($post_tags)) { - $post_tags = []; - } - $post_tags[] = array( - 'uid' => $profile_uid, - 'ttype' => TERM_MENTION, - 'otype' => TERM_OBJ_POST, - 'term' => $ng['xchan_name'], - 'url' => $ng['xchan_url'] - ); - - $colls = get_xconfig($ng['xchan_hash'],'activitypub','collections'); - if ($colls && is_array($colls) && isset($colls['wall'])) { - $datarray['target'] = [ - 'id' => $colls['wall'], - 'type' => 'Collection', - 'attributedTo' => (in_array($ng['xchan_network'],['nomad','zot6']) ? $ng['xchan_url'] : $ng['xchan_hash']) - ]; - $datarray['tgt_type'] = 'Collection'; - } - } - } - } - } - } - - $groupww = false; - - // if this is a wall-to-wall post to a group, turn it into a direct message - - $role = get_pconfig($profile_uid,'system','permissions_role'); - - $rolesettings = PermissionRoles::role_perms($role); - - $channel_type = isset($rolesettings['channel_type']) ? $rolesettings['channel_type'] : 'normal'; - - $is_group = (($channel_type === 'group') ? true : false); - - if (($is_group) && ($walltowall) && (! $walltowall_comment)) { - $groupww = true; - $str_contact_allow = $owner_xchan['xchan_hash']; - $str_group_allow = ''; - } - - - if(in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) { - - // BBCODE alert: the following functions assume bbcode input - // and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.) - // we may need virtual or template classes to implement the possible alternatives - - if(strpos($body,'[/summary]') !== false) { - $match = ''; - $cnt = preg_match("/\[summary\](.*?)\[\/summary\]/ism",$body,$match); - if($cnt) { - $summary .= $match[1]; - } - $body_content = preg_replace("/^(.*?)\[summary\](.*?)\[\/summary\]/ism", '',$body); - $body = trim($body_content); - } - - $summary = cleanup_bbcode($summary); - $body = cleanup_bbcode($body); - - // Look for tags and linkify them - $summary_tags = linkify_tags($summary, ($uid) ? $uid : $profile_uid); - $body_tags = linkify_tags($body, ($uid) ? $uid : $profile_uid); - $comment_tags = linkify_tags($hidden_mentions, ($uid) ? $uid : $profile_uid); - - foreach ( [ $summary_tags, $body_tags, $comment_tags ] as $results ) { - - if ($results) { - - // Set permissions based on tag replacements - set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item, $private); - - if (! isset($post_tags)) { - $post_tags = []; - } - foreach ($results as $result) { - $success = $result['success']; - if ($success['replaced']) { - - // suppress duplicate mentions/tags - $already_tagged = false; - foreach ($post_tags as $pt) { - if ($pt['term'] === $success['term'] && $pt['url'] === $success['url'] && intval($pt['ttype']) === intval($success['termtype'])) { - $already_tagged = true; - break; - } - } - if ($already_tagged) { - continue; - } - - $post_tags[] = array( - 'uid' => $profile_uid, - 'ttype' => $success['termtype'], - 'otype' => TERM_OBJ_POST, - 'term' => $success['term'], - 'url' => $success['url'] - ); - - // support #collection syntax to post to a collection - // this is accomplished by adding a pcategory tag for each collection target - // this is checked inside tag_deliver() to create a second delivery chain - - if ($success['termtype'] === TERM_HASHTAG) { - $r = q("select xchan_url from channel left join xchan on xchan_hash = channel_hash where channel_address = '%s' and channel_parent = '%s' and channel_removed = 0", - dbesc($success['term']), - dbesc(get_observer_hash()) - ); - if ($r) { - $post_tags[] = [ - 'uid' => $profile_uid, - 'ttype' => TERM_PCATEGORY, - 'otype' => TERM_OBJ_POST, - 'term' => $success['term'] . '@' . App::get_hostname(), - 'url' => $r[0]['xchan_url'] - ]; - } - } - } - } - } - } - - - /** - * process collections selected manually - */ - - if (array_key_exists('collections',$_REQUEST) && is_array($_REQUEST['collections']) && count($_REQUEST['collections'])) { - foreach ($_REQUEST['collections'] as $clct) { - $r = q("select xchan_url, xchan_hash from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1", - dbesc($clct) - ); - if ($r) { - if (! isset($post_tags)) { - $post_tags = []; - } - $post_tags[] = [ - 'uid' => $profile_uid, - 'ttype' => TERM_PCATEGORY, - 'otype' => TERM_OBJ_POST, - 'term' => $clct, - 'url' => $r[0]['xchan_url'] - ]; - } - } - } - - if(($str_contact_allow) && (! $str_group_allow)) { - // direct message - private between individual channels but not groups - $private = 2; - } - - if ($private) { - - // for edited posts, re-use any existing OCAP token (if found). - // Otherwise generate a new one. - - if ($iconfig) { - foreach ($iconfig as $cfg) { - if ($cfg['cat'] === 'ocap' && $cfg['k'] === 'relay') { - $token = $cfg['v']; - } - } - } - if (! $token) { - $token = new_token(); - } - } - - - /** - * - * When a photo was uploaded into the message using the (profile wall) ajax - * uploader, The permissions are initially set to disallow anybody but the - * owner from seeing it. This is because the permissions may not yet have been - * set for the post. If it's private, the photo permissions should be set - * appropriately. But we didn't know the final permissions on the post until - * now. So now we'll look for links of uploaded photos and attachments that are in the - * post and set them to the same permissions as the post itself. - * - * If the post was end-to-end encrypted we can't find images and attachments in the body, - * use our media_str input instead which only contains these elements - but only do this - * when encrypted content exists because the photo/attachment may have been removed from - * the post and we should keep it private. If it's encrypted we have no way of knowing - * so we'll set the permissions regardless and realise that the media may not be - * referenced in the post. - * - */ - - if(! $preview) { - fix_attached_permissions($profile_uid,((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny, $token); - } - - - $attachments = ''; - $match = false; - - if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) { - $attachments = []; - $i = 0; - foreach($match[2] as $mtch) { - $attach_link = ''; - $hash = substr($mtch,0,strpos($mtch,',')); - $rev = intval(substr($mtch,strpos($mtch,','))); - $r = attach_by_hash_nodata($hash, $observer['xchan_hash'], $rev); - if($r['success']) { - $attachments[] = array( - 'href' => z_root() . '/attach/' . $r['data']['hash'], - 'length' => $r['data']['filesize'], - 'type' => $r['data']['filetype'], - 'title' => urlencode($r['data']['filename']), - 'revision' => $r['data']['revision'] - ); - } - $body = str_replace($match[1][$i],$attach_link,$body); - $i++; - } - } - - - if(preg_match_all('/(\[share=(.*?)\](.*?)\[\/share\])/',$body,$match)) { - // process share by id - - $i = 0; - foreach($match[2] as $mtch) { - $reshare = new \Zotlabs\Lib\Share($mtch); - $body = str_replace($match[1][$i],$reshare->bbcode(),$body); - $i++; - } - } - - } - - // BBCODE end alert - - if(strlen($categories)) { - if (! isset($post_tags)) { - $post_tags = []; - } - - $cats = explode(',',$categories); - foreach($cats as $cat) { - - if($webpage == ITEM_TYPE_CARD) { - $catlink = z_root() . '/cards/' . $channel['channel_address'] . '?f=&cat=' . urlencode(trim($cat)); - } - elseif($webpage == ITEM_TYPE_ARTICLE) { - $catlink = z_root() . '/articles/' . $channel['channel_address'] . '?f=&cat=' . urlencode(trim($cat)); - } - else { - $catlink = $owner_xchan['xchan_url'] . '?f=&cat=' . urlencode(trim($cat)); - } - - $post_tags[] = array( - 'uid' => $profile_uid, - 'ttype' => TERM_CATEGORY, - 'otype' => TERM_OBJ_POST, - 'term' => trim($cat), - 'url' => $catlink - ); - } - } - - if($orig_post) { - // preserve original tags - $t = q("select * from term where oid = %d and otype = %d and uid = %d and ttype in ( %d, %d, %d )", - intval($orig_post['id']), - intval(TERM_OBJ_POST), - intval($profile_uid), - intval(TERM_UNKNOWN), - intval(TERM_FILE), - intval(TERM_COMMUNITYTAG) - ); - if($t) { - if (! isset($post_tags)) { - $post_tags = []; - } - - foreach($t as $t1) { - $post_tags[] = array( - 'uid' => $profile_uid, - 'ttype' => $t1['ttype'], - 'otype' => TERM_OBJ_POST, - 'term' => $t1['term'], - 'url' => $t1['url'], - ); - } - } - } - - - $item_unseen = ((local_channel() != $profile_uid) ? 1 : 0); - $item_wall = ((isset($_REQUEST['type']) && ($_REQUEST['type'] === 'wall' || $_REQUEST['type'] === 'wall-comment')) ? 1 : 0); - $item_origin = (($origin) ? 1 : 0); - $item_nocomment = ((isset($item_nocomment)) ? $item_nocomment : $nocomment); - - - // determine if this is a wall post - - if($parent) { - $item_wall = $parent_item['item_wall']; - } - else { - if(! $webpage) { - $item_wall = 1; - } - } - - - if($moderated) - $item_blocked = ITEM_MODERATED; - - - if(! strlen($verb)) - $verb = ACTIVITY_POST ; - - $notify_type = (($parent) ? 'comment-new' : 'wall-new' ); - - if (! (isset($mid) && $mid)) { - if($message_id) { - $mid = $message_id; - } - else { - $uuid = new_uuid(); - $mid = z_root() . '/item/' . $uuid; - } - } - - - if($is_poll) { - $poll = [ - 'question' => $body, - 'answers' => $_REQUEST['poll_answers'], - 'multiple_answers' => $_REQUEST['poll_multiple_answers'], - 'expire_value' => $_REQUEST['poll_expire_value'], - 'expire_unit' => $_REQUEST['poll_expire_unit'] - ]; - $obj = $this->extract_poll_data($poll, [ 'item_private' => $private, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_contact_deny ]); - } - else { - $obj = $this->extract_bb_poll_data($body,[ 'item_private' => $private, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_contact_deny ]); - } - - - if ($obj) { - $obj['url'] = $obj['id'] = $mid; - $obj['attributedTo'] = channel_url($channel); - $datarray['obj'] = $obj; - $obj_type = 'Question'; - if ($obj['endTime']) { - $d = datetime_convert('UTC','UTC', $obj['endTime']); - if ($d > NULL_DATE) { - $comments_closed = $d; - } - } - } - - if(! $parent_mid) { - $parent_mid = $mid; - } - - if($parent_item) - $parent_mid = $parent_item['mid']; - - - - // Fallback so that we alway have a thr_parent - - if(!$thr_parent) - $thr_parent = $mid; - - - $item_thread_top = ((! $parent) ? 1 : 0); - - - // fix permalinks for cards, etc. - - if($webpage == ITEM_TYPE_CARD) { - $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : $uuid); - } - if(($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_CARD)) { - $r = q("select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.iid = %d limit 1", - intval($parent_item['id']) - ); - if($r) { - $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $r[0]['v']; - } - } - - if($webpage == ITEM_TYPE_ARTICLE) { - $plink = z_root() . '/articles/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : $uuid); - } - if(($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_ARTICLE)) { - $r = q("select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.iid = %d limit 1", - intval($parent_item['id']) - ); - if($r) { - $plink = z_root() . '/articles/' . $channel['channel_address'] . '/' . $r[0]['v']; - } - } - - if ((! (isset($plink) && $plink)) && $item_thread_top) { - $plink = z_root() . '/item/' . $uuid; - } - - if (array_path_exists('obj/id',$datarray)) { - $datarray['obj']['id'] = $mid; - } - - $datarray['aid'] = $channel['channel_account_id']; - $datarray['uid'] = $profile_uid; - $datarray['uuid'] = $uuid; - $datarray['owner_xchan'] = (($owner_hash) ? $owner_hash : $owner_xchan['xchan_hash']); - $datarray['author_xchan'] = $observer['xchan_hash']; - $datarray['created'] = $created; - $datarray['edited'] = (($orig_post && (! intval($orig_post['item_unpublished']))) ? datetime_convert() : $created); - $datarray['expires'] = $expires; - $datarray['commented'] = (($orig_post && (! intval($orig_post['item_unpublished']))) ? datetime_convert() : $created); - $datarray['received'] = (($orig_post && (! intval($orig_post['item_unpublished']))) ? datetime_convert() : $created); - $datarray['changed'] = (($orig_post && (! intval($orig_post['item_unpublished']))) ? datetime_convert() : $created); - $datarray['comments_closed'] = $comments_closed; - $datarray['mid'] = $mid; - $datarray['parent_mid'] = $parent_mid; - $datarray['mimetype'] = $mimetype; - $datarray['title'] = $title; - $datarray['summary'] = $summary; - $datarray['body'] = $body; - $datarray['app'] = $app; - $datarray['location'] = $location; - $datarray['coord'] = $coord; - $datarray['verb'] = $verb; - $datarray['obj_type'] = $obj_type; - $datarray['allow_cid'] = $str_contact_allow; - $datarray['allow_gid'] = $str_group_allow; - $datarray['deny_cid'] = $str_contact_deny; - $datarray['deny_gid'] = $str_group_deny; - $datarray['attach'] = $attachments; - $datarray['thr_parent'] = $thr_parent; - $datarray['postopts'] = $postopts; - $datarray['item_unseen'] = intval($item_unseen); - $datarray['item_wall'] = intval($item_wall); - $datarray['item_origin'] = intval($item_origin); - $datarray['item_type'] = $webpage; - $datarray['item_private'] = intval($private); - $datarray['item_thread_top'] = intval($item_thread_top); - $datarray['item_unseen'] = intval($item_unseen); - $datarray['item_starred'] = intval($item_starred); - $datarray['item_uplink'] = intval($item_uplink); - $datarray['item_consensus'] = 0; - $datarray['item_notshown'] = intval($item_notshown); - $datarray['item_nsfw'] = intval($item_nsfw); - $datarray['item_relay'] = intval($item_relay); - $datarray['item_mentionsme'] = intval($item_mentionsme); - $datarray['item_nocomment'] = intval($item_nocomment); - $datarray['item_obscured'] = intval($item_obscured); - $datarray['item_verified'] = intval($item_verified); - $datarray['item_retained'] = intval($item_retained); - $datarray['item_rss'] = intval($item_rss); - $datarray['item_deleted'] = intval($item_deleted); - $datarray['item_hidden'] = intval($item_hidden); - $datarray['item_unpublished'] = intval($item_unpublished); - $datarray['item_delayed'] = intval($item_delayed); - $datarray['item_pending_remove'] = intval($item_pending_remove); - $datarray['item_blocked'] = intval($item_blocked); - $datarray['layout_mid'] = $layout_mid; - $datarray['public_policy'] = $public_policy; - $datarray['comment_policy'] = ((is_numeric($comment_policy)) ? map_scope($comment_policy) : $comment_policy); // only map scope if it is numeric, otherwise use what we have - $datarray['term'] = $post_tags; - $datarray['plink'] = $plink; - $datarray['route'] = $route; - $datarray['replyto'] = $replyto; - - // A specific ACL over-rides public_policy completely - - if(! empty_acl($datarray)) - $datarray['public_policy'] = ''; - - if ($iconfig) { - $datarray['iconfig'] = $iconfig; - } - if ($private) { - IConfig::set($datarray,'ocap','relay',$token); - } - - if(! array_key_exists('obj',$datarray)) { - $copy = $datarray; - $copy['author'] = $observer; - $datarray['obj'] = Activity::encode_item($copy,((get_config('system','activitypub', ACTIVITYPUB_ENABLED)) ? true : false)); - $recips = []; - $i = $datarray['obj']; - if ($i['to']) { - $recips['to'] = $i['to']; - } - if ($i['cc']) { - $recips['cc'] = $i['cc']; - } - IConfig::Set($datarray,'activitypub','recips',$recips); - } - - Activity::rewrite_mentions($datarray); - - // preview mode - prepare the body for display and send it via json - - if($preview) { - require_once('include/conversation.php'); - - $datarray['owner'] = $owner_xchan; - $datarray['author'] = $observer; - $datarray['attach'] = json_encode($datarray['attach']); - $o = conversation(array($datarray),'search',false,'preview'); - // logger('preview: ' . $o, LOGGER_DEBUG); - echo json_encode(array('preview' => $o)); - killme(); - } - - // Let 'post_local' event listeners know if this is an edit. - // We will unset it immediately afterward. - - if ($orig_post) { - $datarray['edit'] = true; - } - - // suppress duplicates, *unless* you're editing an existing post. This could get picked up - // as a duplicate if you're editing it very soon after posting it initially and you edited - // some attribute besides the content, such as title or categories. - - if(PConfig::Get($profile_uid,'system','suppress_duplicates',true) && (! $orig_post)) { - - $z = q("select created from item where uid = %d and created > %s - INTERVAL %s and body = '%s' limit 1", - intval($profile_uid), - db_utcnow(), - db_quoteinterval('2 MINUTE'), - dbesc($body) - ); - - if($z) { - $datarray['cancel'] = 1; - notice( t('Duplicate post suppressed.') . EOL); - logger('Duplicate post. Cancelled.'); - } - } - - call_hooks('post_local',$datarray); - - // This is no longer needed - unset($datarray['edit']); - - if (x($datarray,'cancel')) { - logger('mod_item: post cancelled by plugin or duplicate suppressed.'); - if ($return_path) { - goaway(z_root() . "/" . $return_path); - } - if ($api_source) { - return ( [ 'success' => false, 'message' => 'operation cancelled' ] ); - } - $json = array('cancel' => 1); - $json['reload'] = z_root() . '/' . $_REQUEST['jsreload']; - json_return_and_die($json); - } - - - if(mb_strlen($datarray['title']) > 191) - $datarray['title'] = mb_substr($datarray['title'],0,191); - - if($webpage) { - IConfig::Set($datarray,'system', webpage_to_namespace($webpage), - (($pagetitle) ? $pagetitle : basename($datarray['mid'])), true); - } - elseif($namespace) { - IConfig::Set($datarray,'system', $namespace, - (($remote_id) ? $remote_id : basename($datarray['mid'])), true); - } - - if (intval($datarray['item_unpublished'])) { - $draft_msg = t('Draft saved. Use Drafts app to continue editing.'); - } - - if($orig_post) { - $datarray['id'] = $post_id; - - $x = item_store_update($datarray,$execflag); - if(! $parent) { - $r = q("select * from item where id = %d", - intval($post_id) - ); - if($r) { - xchan_query($r); - $sync_item = fetch_post_tags($r); - Libsync::build_sync_packet($profile_uid,array('item' => array(encode_item($sync_item[0],true)))); - } - } - if (! $nopush) { - Run::Summon( [ 'Notifier', 'edit_post', $post_id ] ); - } - - if ($api_source) { - return($x); - } - - - if (intval($datarray['item_unpublished'])) { - info($draft_msg); - } - - - if((x($_REQUEST,'return')) && strlen($return_path)) { - logger('return: ' . $return_path); - goaway(z_root() . "/" . $return_path ); - } - killme(); - } - else - $post_id = 0; - - $post = item_store($datarray,$execflag); - - if ($pub_copy) { - info( t('Your comment has been posted.') . EOL); - } - - $post_id = $post['item_id']; - $datarray = $post['item']; - - - - if($post_id) { - logger('mod_item: saved item ' . $post_id); - - if($parent) { - - // prevent conversations which you are involved from being expired - - if(local_channel()) - retain_item($parent); - - // only send comment notification if this is a wall-to-wall comment and not a DM, - // otherwise it will happen during delivery - - if(($datarray['owner_xchan'] != $datarray['author_xchan']) && (intval($parent_item['item_wall'])) && intval($datarray['item_private']) != 2) { - Enotify::submit(array( - 'type' => NOTIFY_COMMENT, - 'from_xchan' => $datarray['author_xchan'], - 'to_xchan' => $datarray['owner_xchan'], - 'item' => $datarray, - 'link' => z_root() . '/display/' . gen_link_id($datarray['mid']), - 'verb' => ACTIVITY_POST, - 'otype' => 'item', - 'parent' => $parent, - 'parent_mid' => $parent_item['mid'] - )); - - } - } - else { - $parent = $post_id; - - if(($datarray['owner_xchan'] != $datarray['author_xchan']) && ($datarray['item_type'] == ITEM_TYPE_POST)) { - Enotify::submit(array( - 'type' => NOTIFY_WALL, - 'from_xchan' => $datarray['author_xchan'], - 'to_xchan' => $datarray['owner_xchan'], - 'item' => $datarray, - 'link' => z_root() . '/display/' . gen_link_id($datarray['mid']), - 'verb' => ACTIVITY_POST, - 'otype' => 'item' - )); - } - - if($uid && $uid == $profile_uid && (is_item_normal($datarray))) { - q("update channel set channel_lastpost = '%s' where channel_id = %d", - dbesc(datetime_convert()), - intval($uid) - ); - } - } - - // photo comments turn the corresponding item visible to the profile wall - // This way we don't see every picture in your new photo album posted to your wall at once. - // They will show up as people comment on them. - - if(intval($parent_item['item_hidden'])) { - $r = q("UPDATE item SET item_hidden = 0 WHERE id = %d", - intval($parent_item['id']) - ); - } - } - else { - logger('mod_item: unable to retrieve post that was just stored.'); - notice( t('System error. Post not saved.') . EOL); - if($return_path) - goaway(z_root() . "/" . $return_path ); - if($api_source) - return ( [ 'success' => false, 'message' => 'system error' ] ); - killme(); - } - - if(($parent) && ($parent != $post_id)) { - // Store the comment signature information in case we need to relay to Diaspora - //$ditem = $datarray; - //$ditem['author'] = $observer; - //store_diaspora_comment_sig($ditem,$channel,$parent_item, $post_id, (($walltowall_comment) ? 1 : 0)); - } - else { - $r = q("select * from item where id = %d", - intval($post_id) - ); - if($r) { - xchan_query($r); - $sync_item = fetch_post_tags($r); - Libsync::build_sync_packet($profile_uid,array('item' => array(encode_item($sync_item[0],true)))); - } - } - - $datarray['id'] = $post_id; - $datarray['llink'] = z_root() . '/display/' . gen_link_id($datarray['mid']); - - call_hooks('post_local_end', $datarray); - - if ($groupww) { - $nopush = false; - } - - if(! $nopush) { - Run::Summon( [ 'Notifier', $notify_type, $post_id ] ); - } - logger('post_complete'); - - if($moderated) { - info(t('Your post/comment is awaiting approval.') . EOL); - } - - // figure out how to return, depending on from whence we came - - if($api_source) - return $post; - - if (intval($datarray['item_unpublished'])) { - info($draft_msg); - } - - if($return_path) { - goaway(z_root() . "/" . $return_path); - } - - $json = array('success' => 1); - if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) - $json['reload'] = z_root() . '/' . $_REQUEST['jsreload']; - - logger('post_json: ' . print_r($json,true), LOGGER_DEBUG); - - echo json_encode($json); - killme(); - // NOTREACHED - } - - - function get() { - - - if ($this->return_404) { - notice( t('Not found') ); - return; - } - - if((! local_channel()) && (! remote_channel())) - return; - - // allow pinned items to be dropped. 'pin-' was prepended to the id of these - // items so that they would have a unique html id even if the pinned item - // was also displayed in a normal conversation on the same web page. - - $drop_id = str_replace('pin-','',argv(2)); - - if((argc() == 3) && (argv(1) === 'drop') && intval($drop_id)) { - - $i = q("select * from item where id = %d limit 1", - intval($drop_id) - ); - - if($i) { - $can_delete = false; - $local_delete = false; - $regular_delete = false; - - if(local_channel() && local_channel() == $i[0]['uid']) { - $local_delete = true; - } - - $ob_hash = get_observer_hash(); - if($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) { - $can_delete = true; - $regular_delete = true; - } - - // The site admin can delete any post/item on the site. - // If the item originated on this site+channel the deletion will propagate downstream. - // Otherwise just the local copy is removed. - - if(is_site_admin()) { - $local_delete = true; - if(intval($i[0]['item_origin'])) - $can_delete = true; - } - - - if(! ($can_delete || $local_delete)) { - notice( t('Permission denied.') . EOL); - return; - } - - if ($i[0]['resource_type'] === 'event') { - // delete and sync the event separately - $r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1", - dbesc($i[0]['resource_id']), - intval($i[0]['uid']) - ); - if ($r && $regular_delete) { - $sync_event = $r[0]; - q("delete from event WHERE event_hash = '%s' AND uid = %d LIMIT 1", - dbesc($i[0]['resource_id']), - intval($i[0]['uid']) - ); - $sync_event['event_deleted'] = 1; - Libsync::build_sync_packet($i[0]['uid'],array('event' => array($sync_event))); - } - } - - if ($i[0]['resource_type'] === 'photo') { - attach_delete($i[0]['uid'], $i[0]['resource_id'], true ); - $ch = channelx_by_n($i[0]['uid']); - if ($ch && $regular_delete) { - $sync = attach_export_data($ch,$i[0]['resource_id'], true); - if ($sync) { - Libsync::build_sync_packet($i[0]['uid'],array('file' => array($sync))); - } - } - } - - - // if this is a different page type or it's just a local delete - // but not by the item author or owner, do a simple deletion - - $complex = false; - - if(intval($i[0]['item_type']) || ($local_delete && (! $can_delete))) { - drop_item($i[0]['id']); - } - else { - // complex deletion that needs to propagate and be performed in phases - drop_item($i[0]['id'],true,DROPITEM_PHASE1); - $complex = true; - } - - $r = q("select * from item where id = %d", - intval($i[0]['id']) - ); - if($r) { - xchan_query($r); - $sync_item = fetch_post_tags($r); - Libsync::build_sync_packet($i[0]['uid'],array('item' => array(encode_item($sync_item[0],true)))); - } - - if($complex) { - tag_deliver($i[0]['uid'],$i[0]['id']); - } - } - } - } - - - - function item_check_service_class($channel_id,$iswebpage) { - $ret = array('success' => false, 'message' => ''); - - if ($iswebpage) { - $r = q("select count(i.id) as total from item i +class Item extends Controller +{ + + public $return_404 = false; + + public function init() + { + + + if (ActivityStreams::is_as_request()) { + $item_uuid = argv(1); + if (!$item_uuid) { + http_status_exit(404, 'Not found'); + } + $portable_id = EMPTY_STR; + + $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 "; + + $i = null; + + // do we have the item (at all)? + // add preferential bias to item owners (item_wall = 1) + + $r = q( + "select * from item where (mid = '%s' or uuid = '%s') $item_normal order by item_wall desc limit 1", + dbesc(z_root() . '/item/' . $item_uuid), + dbesc($item_uuid) + ); + + if (!$r) { + http_status_exit(404, 'Not found'); + } + + // process an authenticated fetch + + + $sigdata = HTTPSig::verify(EMPTY_STR); + if ($sigdata['portable_id'] && $sigdata['header_valid']) { + $portable_id = $sigdata['portable_id']; + if (!check_channelallowed($portable_id)) { + http_status_exit(403, 'Permission denied'); + } + if (!check_siteallowed($sigdata['signer'])) { + http_status_exit(403, 'Permission denied'); + } + observer_auth($portable_id); + + $i = q( + "select id as item_id from item where mid = '%s' $item_normal and owner_xchan = '%s' limit 1 ", + dbesc($r[0]['parent_mid']), + dbesc($portable_id) + ); + } elseif (Config::get('system', 'require_authenticated_fetch', false)) { + http_status_exit(403, 'Permission denied'); + } + + // if we don't have a parent id belonging to the signer see if we can obtain one as a visitor that we have permission to access + // with a bias towards those items owned by channels on this site (item_wall = 1) + + $sql_extra = item_permissions_sql(0); + + if (!$i) { + $i = q( + "select id as item_id from item where mid = '%s' $item_normal $sql_extra order by item_wall desc limit 1", + dbesc($r[0]['parent_mid']) + ); + } + + $bear = Activity::token_from_request(); + if ($bear) { + logger('bear: ' . $bear, LOGGER_DEBUG); + if (!$i) { + $t = q( + "select * from iconfig where cat = 'ocap' and k = 'relay' and v = '%s'", + dbesc($bear) + ); + if ($t) { + $i = q( + "select id as item_id from item where uuid = '%s' and id = %d $item_normal limit 1", + dbesc($item_uuid), + intval($t[0]['iid']) + ); + } + } + } + + if (!$i) { + http_status_exit(403, 'Forbidden'); + } + + // If we get to this point we have determined we can access the original in $r (fetched much further above), so use it. + + xchan_query($r, true); + $items = fetch_post_tags($r, false); + + $chan = channelx_by_n($items[0]['uid']); + + if (!$chan) { + http_status_exit(404, 'Not found'); + } + + if (!perm_is_allowed($chan['channel_id'], get_observer_hash(), 'view_stream')) { + http_status_exit(403, 'Forbidden'); + } + + $i = Activity::encode_item($items[0], true); + + if (!$i) { + http_status_exit(404, 'Not found'); + } + + + if ($portable_id && (!intval($items[0]['item_private']))) { + $c = q( + "select abook_id from abook where abook_channel = %d and abook_xchan = '%s'", + intval($items[0]['uid']), + dbesc($portable_id) + ); + if (!$c) { + ThreadListener::store(z_root() . '/item/' . $item_uuid, $portable_id); + } + } + + as_return_and_die($i, $chan); + } + + if (Libzot::is_zot_request()) { + $item_uuid = argv(1); + + if (!$item_uuid) { + http_status_exit(404, 'Not found'); + } + + $portable_id = EMPTY_STR; + + $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 and not verb in ( 'Follow', 'Ignore' ) "; + + $i = null; + + // do we have the item (at all)? + + $r = q( + "select * from item where (mid = '%s' or uuid = '%s') $item_normal limit 1", + dbesc(z_root() . '/item/' . $item_uuid), + dbesc($item_uuid) + ); + + if (!$r) { + http_status_exit(404, 'Not found'); + } + + // process an authenticated fetch + + $sigdata = HTTPSig::verify(($_SERVER['REQUEST_METHOD'] === 'POST') ? file_get_contents('php://input') : EMPTY_STR); + if ($sigdata['portable_id'] && $sigdata['header_valid']) { + $portable_id = $sigdata['portable_id']; + if (!check_channelallowed($portable_id)) { + http_status_exit(403, 'Permission denied'); + } + if (!check_siteallowed($sigdata['signer'])) { + http_status_exit(403, 'Permission denied'); + } + observer_auth($portable_id); + + $i = q( + "select id as item_id from item where mid = '%s' $item_normal and owner_xchan = '%s' limit 1", + dbesc($r[0]['parent_mid']), + dbesc($portable_id) + ); + } elseif (Config::get('system', 'require_authenticated_fetch', false)) { + http_status_exit(403, 'Permission denied'); + } + + // if we don't have a parent id belonging to the signer see if we can obtain one as a visitor that we have permission to access + // with a bias towards those items owned by channels on this site (item_wall = 1) + + $sql_extra = item_permissions_sql(0); + + if (!$i) { + $i = q( + "select id as item_id from item where mid = '%s' $item_normal $sql_extra order by item_wall desc limit 1", + dbesc($r[0]['parent_mid']) + ); + } + + $bear = Activity::token_from_request(); + if ($bear) { + logger('bear: ' . $bear, LOGGER_DEBUG); + if (!$i) { + $t = q( + "select * from iconfig where cat = 'ocap' and k = 'relay' and v = '%s'", + dbesc($bear) + ); + if ($t) { + $i = q( + "select id as item_id from item where uuid = '%s' and id = %d $item_normal limit 1", + dbesc($item_uuid), + intval($t[0]['iid']) + ); + } + } + } + + if (!$i) { + http_status_exit(403, 'Forbidden'); + } + + $parents_str = ids_to_querystr($i, 'item_id'); + + $items = q( + "SELECT item.*, item.id AS item_id FROM item WHERE item.parent IN ( %s ) $item_normal order by item.id asc", + dbesc($parents_str) + ); + + if (!$items) { + http_status_exit(404, 'Not found'); + } + + xchan_query($items, true); + $items = fetch_post_tags($items, true); + + if (!$items) { + http_status_exit(404, 'Not found'); + } + $chan = channelx_by_n($items[0]['uid']); + + if (!$chan) { + http_status_exit(404, 'Not found'); + } + + if (!perm_is_allowed($chan['channel_id'], get_observer_hash(), 'view_stream')) { + http_status_exit(403, 'Forbidden'); + } + + $i = Activity::encode_item_collection($items, 'conversation/' . $item_uuid, 'OrderedCollection', true, count($items)); + if ($portable_id && (!intval($items[0]['item_private']))) { + ThreadListener::store(z_root() . '/item/' . $item_uuid, $portable_id); + } + + if (!$i) { + http_status_exit(404, 'Not found'); + } + $x = array_merge(['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + Activity::ap_schema() + ]], $i); + + $headers = []; + $headers['Content-Type'] = 'application/x-nomad+json'; + $x['signature'] = LDSignatures::sign($x, $chan); + $ret = json_encode($x, JSON_UNESCAPED_SLASHES); + $headers['Digest'] = HTTPSig::generate_digest_header($ret); + $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; + $h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], channel_url($chan)); + HTTPSig::set_headers($h); + echo $ret; + killme(); + } + + // if it isn't a drop command and isn't a post method and wasn't handled already, + // the default action is a browser request for a persistent uri and this should return + // the text/html page of the item. + + if (argc() > 1 && argv(1) !== 'drop') { + $x = q( + "select uid, item_wall, llink, mid from item where mid = '%s' or mid = '%s' or uuid = '%s'", + dbesc(z_root() . '/item/' . argv(1)), + dbesc(z_root() . '/activity/' . argv(1)), + dbesc(argv(1)) + ); + if ($x) { + foreach ($x as $xv) { + if (intval($xv['item_wall'])) { + $c = channelx_by_n($xv['uid']); + if ($c) { + goaway($c['xchan_url'] . '?mid=' . gen_link_id($xv['mid'])); + } + } + } + goaway($x[0]['llink']); + } + + // save this state and catch it in the get() function + $this->return_404 = true; + } + } + + public function post() + { + + if ((!local_channel()) && (!remote_channel()) && (!isset($_REQUEST['anonname']))) { + return; + } + + // drop an array of items. + + if (isset($_REQUEST['dropitems'])) { + $arr_drop = explode(',', $_REQUEST['dropitems']); + drop_items($arr_drop); + $json = array('success' => 1); + echo json_encode($json); + killme(); + } + + + $uid = local_channel(); + $channel = null; + $observer = null; + $token = EMPTY_STR; + $datarray = []; + $item_starred = false; + $item_uplink = false; + $item_notshown = false; + $item_nsfw = false; + $item_relay = false; + $item_mentionsme = false; + $item_verified = false; + $item_retained = false; + $item_rss = false; + $item_deleted = false; + $item_hidden = false; + $item_delayed = false; + $item_pending_remove = false; + $item_blocked = false; + + $post_tags = false; + $pub_copy = false; + + + /** + * Is this a reply to something? + */ + + $parent = ((isset($_REQUEST['parent'])) ? intval($_REQUEST['parent']) : 0); + $parent_mid = ((isset($_REQUEST['parent_mid'])) ? trim($_REQUEST['parent_mid']) : ''); + + $hidden_mentions = ((isset($_REQUEST['hidden_mentions'])) ? trim($_REQUEST['hidden_mentions']) : ''); + + + /** + * Who is viewing this page and posting this thing + */ + + $remote_xchan = ((isset($_REQUEST['remote_xchan'])) ? trim($_REQUEST['remote_xchan']) : false); + $remote_observer = xchan_match(['xchan_hash' => $remote_xchan]); + + if (!$remote_observer) { + $remote_xchan = $remote_observer = false; + } + + // This is the local channel representing who the posted item will belong to. + + $profile_uid = ((isset($_REQUEST['profile_uid'])) ? intval($_REQUEST['profile_uid']) : 0); + + // *If* you are logged in as the site admin you are allowed to create top-level items for the sys channel. + // This would typically be a webpage or webpage element. + // Comments and replies are excluded because further below we also check for sys channel ownership and + // will make a copy of the parent that you can interact with in your own stream + + $sys = get_sys_channel(); + if ($sys && $profile_uid && ($sys['channel_id'] == $profile_uid) && is_site_admin() && !$parent) { + $uid = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } + + call_hooks('post_local_start', $_REQUEST); + + // logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA); + + $api_source = ((isset($_REQUEST['api_source']) && $_REQUEST['api_source']) ? true : false); + + $nocomment = 0; + if (isset($_REQUEST['comments_enabled'])) { + $nocomment = 1 - intval($_REQUEST['comments_enabled']); + } + + // this is in days, convert to absolute time + $channel_comments_closed = get_pconfig($profile_uid, 'system', 'close_comments'); + if (intval($channel_comments_closed)) { + $channel_comments_closed = datetime_convert(date_Default_timezone_get(), 'UTC', 'now + ' . intval($channel_comments_closed) . ' days'); + } else { + $channel_comments_closed = NULL_DATE; + } + + $comments_closed = ((isset($_REQUEST['comments_closed']) && $_REQUEST['comments_closed']) ? datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['comments_closed']) : $channel_comments_closed); + + $is_poll = ((trim($_REQUEST['poll_answers'][0]) != '' && trim($_REQUEST['poll_answers'][1]) != '') ? true : false); + + // 'origin' (if non-zero) indicates that this network is where the message originated, + // for the purpose of relaying comments to other conversation members. + // If using the API from a device (leaf node) you must set origin to 1 (default) or leave unset. + // If the API is used from another network with its own distribution + // and deliveries, you may wish to set origin to 0 or false and allow the other + // network to relay comments. + + // If you are unsure, it is prudent (and important) to leave it unset. + + $origin = (($api_source && array_key_exists('origin', $_REQUEST)) ? intval($_REQUEST['origin']) : 1); + + // To represent message-ids on other networks - this will create an iconfig record + + $namespace = (($api_source && array_key_exists('namespace', $_REQUEST)) ? strip_tags($_REQUEST['namespace']) : ''); + $remote_id = (($api_source && array_key_exists('remote_id', $_REQUEST)) ? strip_tags($_REQUEST['remote_id']) : ''); + + $owner_hash = null; + + $message_id = ((x($_REQUEST, 'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); + $created = ((x($_REQUEST, 'created')) ? datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['created']) : datetime_convert()); + + // Because somebody will probably try this and create a mess + + if ($created <= NULL_DATE) { + $created = datetime_convert(); + } + + $post_id = ((x($_REQUEST, 'post_id')) ? intval($_REQUEST['post_id']) : 0); + + $app = ((x($_REQUEST, 'source')) ? strip_tags($_REQUEST['source']) : ''); + $return_path = ((x($_REQUEST, 'return')) ? $_REQUEST['return'] : ''); + $preview = ((x($_REQUEST, 'preview')) ? intval($_REQUEST['preview']) : 0); + $categories = ((x($_REQUEST, 'category')) ? escape_tags($_REQUEST['category']) : ''); + $webpage = ((x($_REQUEST, 'webpage')) ? intval($_REQUEST['webpage']) : 0); + $item_obscured = ((x($_REQUEST, 'obscured')) ? intval($_REQUEST['obscured']) : 0); + $pagetitle = ((x($_REQUEST, 'pagetitle')) ? escape_tags(urlencode($_REQUEST['pagetitle'])) : ''); + $layout_mid = ((x($_REQUEST, 'layout_mid')) ? escape_tags($_REQUEST['layout_mid']) : ''); + $plink = ((x($_REQUEST, 'permalink')) ? escape_tags($_REQUEST['permalink']) : ''); + $obj_type = ((x($_REQUEST, 'obj_type')) ? escape_tags($_REQUEST['obj_type']) : ACTIVITY_OBJ_NOTE); + + + $item_unpublished = ((isset($_REQUEST['draft'])) ? intval($_REQUEST['draft']) : 0); + + // allow API to bulk load a bunch of imported items without sending out a bunch of posts. + $nopush = ((x($_REQUEST, 'nopush')) ? intval($_REQUEST['nopush']) : 0); + + /* + * Check service class limits + */ + if ($uid && !(x($_REQUEST, 'parent')) && !(x($_REQUEST, 'post_id'))) { + $ret = $this->item_check_service_class($uid, (($_REQUEST['webpage'] == ITEM_TYPE_WEBPAGE) ? true : false)); + if (!$ret['success']) { + notice(t($ret['message']) . EOL); + if ($api_source) { + return (['success' => false, 'message' => 'service class exception']); + } + if (x($_REQUEST, 'return')) { + goaway(z_root() . "/" . $return_path); + } + killme(); + } + } + + if ($pagetitle) { + $pagetitle = strtolower(URLify::transliterate($pagetitle)); + } + + $item_flags = $item_restrict = 0; + $expires = NULL_DATE; + + $route = ''; + $parent_item = null; + $parent_contact = null; + $thr_parent = ''; + $parid = 0; + $r = false; + + + // If this is a comment, find the parent and preset some stuff + + if ($parent || $parent_mid) { + if (!x($_REQUEST, 'type')) { + $_REQUEST['type'] = 'net-comment'; + } + if ($obj_type == ACTIVITY_OBJ_NOTE) { + $obj_type = ACTIVITY_OBJ_COMMENT; + } + + // fetch the parent item + + if ($parent) { + $r = q( + "SELECT * FROM item WHERE id = %d LIMIT 1", + intval($parent) + ); + } elseif ($parent_mid && $uid) { + // This is coming from an API source, and we are logged in + $r = q( + "SELECT * FROM item WHERE mid = '%s' AND uid = %d LIMIT 1", + dbesc($parent_mid), + intval($uid) + ); + } + + // if this isn't the real parent of the conversation, find it + if ($r) { + $parid = $r[0]['parent']; + $parent_mid = $r[0]['mid']; + if ($r[0]['id'] != $r[0]['parent']) { + $r = q( + "SELECT * FROM item WHERE id = parent AND parent = %d LIMIT 1", + intval($parid) + ); + } + + // if interacting with a pubstream item (owned by the sys channel), + // create a copy of the parent in your stream + + // $r may have changed. Check it again before trying to use it. + + if ($r && local_channel() && (!is_sys_channel(local_channel()))) { + $old_id = $r[0]['id']; + $r = [copy_of_pubitem(App::get_channel(), $r[0]['mid'])]; + if ($r[0]['id'] !== $old_id) { + // keep track that a copy was made to display a special status notice that is unique to this condition + $pub_copy = true; + } + } + } + + if (!$r) { + notice(t('Unable to locate original post.') . EOL); + if ($api_source) { + return (['success' => false, 'message' => 'invalid post id']); + } + if (x($_REQUEST, 'return')) { + goaway(z_root() . "/" . $return_path); + } + killme(); + } + + xchan_query($r, true); + + $parent_item = $r[0]; + $parent = $r[0]['id']; + + // multi-level threading - preserve the info but re-parent to our single level threading + + $thr_parent = $parent_mid; + + $route = $parent_item['route']; + } + + if ($parent_item && isset($parent_item['replyto']) && $parent_item['replyto']) { + $replyto = unserialise($parent_item['replyto']); + } + + $moderated = false; + + if (!$observer) { + $observer = App::get_observer(); + if (!$observer) { + // perhaps we're allowing moderated comments from anonymous viewers + $observer = anon_identity_init($_REQUEST); + if ($observer) { + $moderated = true; + $remote_xchan = $remote_observer = $observer; + } + } + } + + if (!$observer) { + notice(t('Permission denied.') . EOL); + if ($api_source) { + return (['success' => false, 'message' => 'permission denied']); + } + if (x($_REQUEST, 'return')) { + goaway(z_root() . "/" . $return_path); + } + killme(); + } + + if ($parent) { + logger('mod_item: item_post parent=' . $parent); + $can_comment = false; + + $can_comment = can_comment_on_post($observer['xchan_hash'], $parent_item); + if (!$can_comment) { + if ((array_key_exists('owner', $parent_item)) && intval($parent_item['owner']['abook_self']) == 1) { + $can_comment = perm_is_allowed($profile_uid, $observer['xchan_hash'], 'post_comments'); + } + } + + if (!$can_comment) { + notice(t('Permission denied.') . EOL); + if ($api_source) { + return (['success' => false, 'message' => 'permission denied']); + } + if (x($_REQUEST, 'return')) { + goaway(z_root() . "/" . $return_path); + } + killme(); + } + } else { + // fixme - $webpage could also be a wiki page or article and require a different permission to be checked. + if (!perm_is_allowed($profile_uid, $observer['xchan_hash'], ($webpage) ? 'write_pages' : 'post_wall')) { + notice(t('Permission denied.') . EOL); + if ($api_source) { + return (['success' => false, 'message' => 'permission denied']); + } + if (x($_REQUEST, 'return')) { + goaway(z_root() . "/" . $return_path); + } + killme(); + } + } + + // check if this author is being moderated through the 'moderated' (negative) permission + // when posting wall-to-wall + if ($moderated === false && intval($uid) !== intval($profile_uid)) { + $moderated = perm_is_allowed($profile_uid, $observer['xchan_hash'], 'moderated'); + } + + // If this is a comment, check the moderated permission of the parent; who may be on another site + $remote_moderated = (($parent) ? their_perms_contains($profile_uid, $parent_item['owner_xchan'], 'moderated') : false); + if ($remote_moderated) { + notice(t('Comment may be moderated.') . EOL); + } + + // is this an edited post? + + $orig_post = null; + + if ($namespace && $remote_id) { + // It wasn't an internally generated post - see if we've got an item matching this remote service id + $i = q( + "select iid from iconfig where cat = 'system' and k = '%s' and v = '%s' limit 1", + dbesc($namespace), + dbesc($remote_id) + ); + if ($i) { + $post_id = $i[0]['iid']; + } + } + + $iconfig = null; + + if ($post_id) { + $i = q( + "SELECT * FROM item WHERE uid = %d AND id = %d LIMIT 1", + intval($profile_uid), + intval($post_id) + ); + if (!count($i)) { + killme(); + } + $orig_post = $i[0]; + $iconfig = q( + "select * from iconfig where iid = %d", + intval($post_id) + ); + } + + + if (!$channel) { + if ($uid && $uid == $profile_uid) { + $channel = App::get_channel(); + } else { + // posting as yourself but not necessarily to a channel you control + $r = q( + "select * from channel left join account on channel_account_id = account_id where channel_id = %d LIMIT 1", + intval($profile_uid) + ); + if ($r) { + $channel = $r[0]; + } + } + } + + + if (!$channel) { + logger("mod_item: no channel."); + if ($api_source) { + return (['success' => false, 'message' => 'no channel']); + } + if (x($_REQUEST, 'return')) { + goaway(z_root() . "/" . $return_path); + } + killme(); + } + + $owner_xchan = null; + + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($channel['channel_hash']) + ); + if ($r && count($r)) { + $owner_xchan = $r[0]; + } else { + logger("mod_item: no owner."); + if ($api_source) { + return (['success' => false, 'message' => 'no owner']); + } + if (x($_REQUEST, 'return')) { + goaway(z_root() . "/" . $return_path); + } + killme(); + } + + $walltowall = false; + $walltowall_comment = false; + + if ($remote_xchan && !$moderated) { + $observer = $remote_observer; + } + + if ($observer) { + logger('mod_item: post accepted from ' . $observer['xchan_name'] . ' for ' . $owner_xchan['xchan_name'], LOGGER_DEBUG); + + // wall-to-wall detection. + // For top-level posts, if the author and owner are different it's a wall-to-wall + // For comments, We need to additionally look at the parent and see if it's a wall post that originated locally. + + if ($observer['xchan_name'] != $owner_xchan['xchan_name']) { + if (($parent_item) && ($parent_item['item_wall'] && $parent_item['item_origin'])) { + $walltowall_comment = true; + $walltowall = true; + } + if (!$parent) { + $walltowall = true; + } + } + } + + if (!isset($replyto)) { + if (strpos($owner_xchan['xchan_hash'], 'http') === 0) { + $replyto = $owner_xchan['xchan_hash']; + } else { + $replyto = $owner_xchan['xchan_url']; + } + } + + + $acl = new AccessControl($channel); + + $view_policy = PermissionLimits::Get($channel['channel_id'], 'view_stream'); + $comment_policy = ((isset($_REQUEST['comments_from']) && intval($_REQUEST['comments_from'])) ? intval($_REQUEST['comments_from']) : PermissionLimits::Get($channel['channel_id'], 'post_comments')); + + $public_policy = ((x($_REQUEST, 'public_policy')) ? escape_tags($_REQUEST['public_policy']) : map_scope($view_policy, true)); + if ($webpage) { + $public_policy = ''; + } + if ($public_policy) { + $private = 1; + } + + if ($orig_post) { + $private = 0; + // webpages and unpublished drafts are allowed to change ACLs after the fact. Normal conversation items aren't. + if ($webpage || intval($orig_post['item_unpublished'])) { + $acl->set_from_array($_REQUEST); + } else { + $acl->set($orig_post); + $public_policy = $orig_post['public_policy']; + $private = $orig_post['item_private']; + } + + if ($public_policy || $acl->is_private()) { + $private = (($private) ? $private : 1); + } + + $location = $orig_post['location']; + $coord = $orig_post['coord']; + $verb = $orig_post['verb']; + $app = $orig_post['app']; + $title = escape_tags(trim($_REQUEST['title'])); + $summary = trim($_REQUEST['summary']); + $body = trim($_REQUEST['body']); + + $item_flags = $orig_post['item_flags']; + $item_origin = $orig_post['item_origin']; + $item_unseen = $orig_post['item_unseen']; + $item_starred = $orig_post['item_starred']; + $item_uplink = $orig_post['item_uplink']; + $item_wall = $orig_post['item_wall']; + $item_thread_top = $orig_post['item_thread_top']; + $item_notshown = $orig_post['item_notshown']; + $item_nsfw = $orig_post['item_nsfw']; + $item_relay = $orig_post['item_relay']; + $item_mentionsme = $orig_post['item_mentionsme']; + $item_nocomment = $orig_post['item_nocomment']; + $item_obscured = $orig_post['item_obscured']; + $item_verified = $orig_post['item_verified']; + $item_retained = $orig_post['item_retained']; + $item_rss = $orig_post['item_rss']; + $item_deleted = $orig_post['item_deleted']; + $item_type = $orig_post['item_type']; + $item_hidden = $orig_post['item_hidden']; + $item_delayed = $orig_post['item_delayed']; + $item_pending_remove = $orig_post['item_pending_remove']; + $item_blocked = $orig_post['item_blocked']; + + + $postopts = $orig_post['postopts']; + $created = ((intval($orig_post['item_unpublished'])) ? $created : $orig_post['created']); + $expires = ((intval($orig_post['item_unpublished'])) ? NULL_DATE : $orig_post['expires']); + $mid = $orig_post['mid']; + $parent_mid = $orig_post['parent_mid']; + $plink = $orig_post['plink']; + } else { + if (!$walltowall) { + if ( + (array_key_exists('contact_allow', $_REQUEST)) + || (array_key_exists('group_allow', $_REQUEST)) + || (array_key_exists('contact_deny', $_REQUEST)) + || (array_key_exists('group_deny', $_REQUEST)) + ) { + $acl->set_from_array($_REQUEST); + } elseif (!$api_source) { + // if no ACL has been defined and we aren't using the API, the form + // didn't send us any parameters. This means there's no ACL or it has + // been reset to the default audience. + // If $api_source is set and there are no ACL parameters, we default + // to the channel permissions which were set in the ACL contructor. + + $acl->set(array('allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '')); + } + } + + + $location = ((isset($_REQUEST['location'])) ? notags(trim($_REQUEST['location'])) : EMPTY_STR); + $coord = ((isset($_REQUEST['coord'])) ? notags(trim($_REQUEST['coord'])) : EMPTY_STR); + $verb = ((isset($_REQUEST['verb'])) ? notags(trim($_REQUEST['verb'])) : EMPTY_STR); + $title = ((isset($_REQUEST['title'])) ? escape_tags(trim($_REQUEST['title'])) : EMPTY_STR); + $summary = ((isset($_REQUEST['summary'])) ? trim($_REQUEST['summary']) : EMPTY_STR); + $body = ((isset($_REQUEST['body'])) ? trim($_REQUEST['body']) : EMPTY_STR); + $body .= ((isset($_REQUEST['attachment'])) ? trim($_REQUEST['attachment']) : EMPTY_STR); + $postopts = ''; + + $allow_empty = ((array_key_exists('allow_empty', $_REQUEST)) ? intval($_REQUEST['allow_empty']) : 0); + + $private = ((isset($private) && $private) ? $private : intval($acl->is_private() || ($public_policy))); + + // If this is a comment, set the permissions from the parent. + + if ($parent_item) { + $private = 0; + $acl->set($parent_item); + $private = ((intval($parent_item['item_private']) ? $parent_item['item_private'] : $acl->is_private())); + $public_policy = $parent_item['public_policy']; + $owner_hash = $parent_item['owner_xchan']; + $webpage = $parent_item['item_type']; + $comment_policy = $parent_item['comment_policy']; + $item_nocomment = $parent_item['item_nocomment']; + $comments_closed = $parent_item['comments_closed']; + } + + if ((!$allow_empty) && (!strlen($body))) { + if ($preview) { + killme(); + } + info(t('Empty post discarded.') . EOL); + if ($api_source) { + return (['success' => false, 'message' => 'no content']); + } + if (x($_REQUEST, 'return')) { + goaway(z_root() . "/" . $return_path); + } + killme(); + } + } + + + if (Apps::system_app_installed($profile_uid, 'Expire Posts')) { + if (x($_REQUEST, 'expire')) { + $expires = datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['expire']); + if ($expires <= datetime_convert()) { + $expires = NULL_DATE; + } + } + } + + + $mimetype = notags(trim($_REQUEST['mimetype'])); + if (!$mimetype) { + $mimetype = 'text/x-multicode'; + } + + + $execflag = ((intval($uid) == intval($profile_uid) + && ($channel['channel_pageflags'] & PAGE_ALLOWCODE)) ? true : false); + + if ($preview) { + $summary = z_input_filter($summary, $mimetype, $execflag); + $body = z_input_filter($body, $mimetype, $execflag); + } + + + $arr = ['profile_uid' => $profile_uid, 'summary' => $summary, 'content' => $body, 'mimetype' => $mimetype]; + call_hooks('post_content', $arr); + $summary = $arr['summary']; + $body = $arr['content']; + $mimetype = $arr['mimetype']; + + + $gacl = $acl->get(); + $str_contact_allow = $gacl['allow_cid']; + $str_group_allow = $gacl['allow_gid']; + $str_contact_deny = $gacl['deny_cid']; + $str_group_deny = $gacl['deny_gid']; + + + // if the acl contains a single contact and it's a group, add a mention. This is for compatibility + // with other groups implementations which require a mention to trigger group delivery. + + if (($str_contact_allow) && (!$str_group_allow) && (!$str_contact_deny) && (!$str_group_deny)) { + $cida = expand_acl($str_contact_allow); + if (count($cida) === 1) { + $netgroups = get_forum_channels($profile_uid, 1); + if ($netgroups) { + foreach ($netgroups as $ng) { + if ($ng['xchan_hash'] == $cida[0]) { + if (!is_array($post_tags)) { + $post_tags = []; + } + $post_tags[] = array( + 'uid' => $profile_uid, + 'ttype' => TERM_MENTION, + 'otype' => TERM_OBJ_POST, + 'term' => $ng['xchan_name'], + 'url' => $ng['xchan_url'] + ); + + $colls = get_xconfig($ng['xchan_hash'], 'activitypub', 'collections'); + if ($colls && is_array($colls) && isset($colls['wall'])) { + $datarray['target'] = [ + 'id' => $colls['wall'], + 'type' => 'Collection', + 'attributedTo' => ((in_array($ng['xchan_network'], ['zot6', 'nomad'])) ? $ng['xchan_url'] : $ng['xchan_hash']) + ]; + $datarray['tgt_type'] = 'Collection'; + } + } + } + } + } + } + + $groupww = false; + + // if this is a wall-to-wall post to a group, turn it into a direct message + + $role = get_pconfig($profile_uid, 'system', 'permissions_role'); + + $rolesettings = PermissionRoles::role_perms($role); + + $channel_type = isset($rolesettings['channel_type']) ? $rolesettings['channel_type'] : 'normal'; + + $is_group = (($channel_type === 'group') ? true : false); + + if (($is_group) && ($walltowall) && (!$walltowall_comment)) { + $groupww = true; + $str_contact_allow = $owner_xchan['xchan_hash']; + $str_group_allow = ''; + } + + + if (in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) { + // BBCODE alert: the following functions assume bbcode input + // and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.) + // we may need virtual or template classes to implement the possible alternatives + + if (strpos($body, '[/summary]') !== false) { + $match = ''; + $cnt = preg_match("/\[summary\](.*?)\[\/summary\]/ism", $body, $match); + if ($cnt) { + $summary .= $match[1]; + } + $body_content = preg_replace("/^(.*?)\[summary\](.*?)\[\/summary\]/ism", '', $body); + $body = trim($body_content); + } + + $summary = cleanup_bbcode($summary); + $body = cleanup_bbcode($body); + + // Look for tags and linkify them + $summary_tags = linkify_tags($summary, ($uid) ? $uid : $profile_uid); + $body_tags = linkify_tags($body, ($uid) ? $uid : $profile_uid); + $comment_tags = linkify_tags($hidden_mentions, ($uid) ? $uid : $profile_uid); + + foreach ([$summary_tags, $body_tags, $comment_tags] as $results) { + if ($results) { + // Set permissions based on tag replacements + set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item, $private); + + if (!isset($post_tags)) { + $post_tags = []; + } + foreach ($results as $result) { + $success = $result['success']; + if ($success['replaced']) { + // suppress duplicate mentions/tags + $already_tagged = false; + foreach ($post_tags as $pt) { + if ($pt['term'] === $success['term'] && $pt['url'] === $success['url'] && intval($pt['ttype']) === intval($success['termtype'])) { + $already_tagged = true; + break; + } + } + if ($already_tagged) { + continue; + } + + $post_tags[] = array( + 'uid' => $profile_uid, + 'ttype' => $success['termtype'], + 'otype' => TERM_OBJ_POST, + 'term' => $success['term'], + 'url' => $success['url'] + ); + + // support #collection syntax to post to a collection + // this is accomplished by adding a pcategory tag for each collection target + // this is checked inside tag_deliver() to create a second delivery chain + + if ($success['termtype'] === TERM_HASHTAG) { + $r = q( + "select xchan_url from channel left join xchan on xchan_hash = channel_hash where channel_address = '%s' and channel_parent = '%s' and channel_removed = 0", + dbesc($success['term']), + dbesc(get_observer_hash()) + ); + if ($r) { + $post_tags[] = [ + 'uid' => $profile_uid, + 'ttype' => TERM_PCATEGORY, + 'otype' => TERM_OBJ_POST, + 'term' => $success['term'] . '@' . App::get_hostname(), + 'url' => $r[0]['xchan_url'] + ]; + } + } + } + } + } + } + + + /** + * process collections selected manually + */ + + if (array_key_exists('collections', $_REQUEST) && is_array($_REQUEST['collections']) && count($_REQUEST['collections'])) { + foreach ($_REQUEST['collections'] as $clct) { + $r = q( + "select xchan_url, xchan_hash from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1", + dbesc($clct) + ); + if ($r) { + if (!isset($post_tags)) { + $post_tags = []; + } + $post_tags[] = [ + 'uid' => $profile_uid, + 'ttype' => TERM_PCATEGORY, + 'otype' => TERM_OBJ_POST, + 'term' => $clct, + 'url' => $r[0]['xchan_url'] + ]; + } + } + } + + if (($str_contact_allow) && (!$str_group_allow)) { + // direct message - private between individual channels but not groups + $private = 2; + } + + if ($private) { + // for edited posts, re-use any existing OCAP token (if found). + // Otherwise generate a new one. + + if ($iconfig) { + foreach ($iconfig as $cfg) { + if ($cfg['cat'] === 'ocap' && $cfg['k'] === 'relay') { + $token = $cfg['v']; + } + } + } + if (!$token) { + $token = new_token(); + } + } + + + /** + * + * When a photo was uploaded into the message using the (profile wall) ajax + * uploader, The permissions are initially set to disallow anybody but the + * owner from seeing it. This is because the permissions may not yet have been + * set for the post. If it's private, the photo permissions should be set + * appropriately. But we didn't know the final permissions on the post until + * now. So now we'll look for links of uploaded photos and attachments that are in the + * post and set them to the same permissions as the post itself. + * + * If the post was end-to-end encrypted we can't find images and attachments in the body, + * use our media_str input instead which only contains these elements - but only do this + * when encrypted content exists because the photo/attachment may have been removed from + * the post and we should keep it private. If it's encrypted we have no way of knowing + * so we'll set the permissions regardless and realise that the media may not be + * referenced in the post. + * + */ + + if (!$preview) { + fix_attached_permissions($profile_uid, ((strpos($body, '[/crypt]')) ? $_POST['media_str'] : $body), $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $token); + } + + + $attachments = ''; + $match = false; + + if (preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/', $body, $match)) { + $attachments = []; + $i = 0; + foreach ($match[2] as $mtch) { + $attach_link = ''; + $hash = substr($mtch, 0, strpos($mtch, ',')); + $rev = intval(substr($mtch, strpos($mtch, ','))); + $r = attach_by_hash_nodata($hash, $observer['xchan_hash'], $rev); + if ($r['success']) { + $attachments[] = array( + 'href' => z_root() . '/attach/' . $r['data']['hash'], + 'length' => $r['data']['filesize'], + 'type' => $r['data']['filetype'], + 'title' => urlencode($r['data']['filename']), + 'revision' => $r['data']['revision'] + ); + } + $body = str_replace($match[1][$i], $attach_link, $body); + $i++; + } + } + + + if (preg_match_all('/(\[share=(.*?)\](.*?)\[\/share\])/', $body, $match)) { + // process share by id + + $i = 0; + foreach ($match[2] as $mtch) { + $reshare = new \Zotlabs\Lib\Share($mtch); + $body = str_replace($match[1][$i], $reshare->bbcode(), $body); + $i++; + } + } + } + + // BBCODE end alert + + if (strlen($categories)) { + if (!isset($post_tags)) { + $post_tags = []; + } + + $cats = explode(',', $categories); + foreach ($cats as $cat) { + if ($webpage == ITEM_TYPE_CARD) { + $catlink = z_root() . '/cards/' . $channel['channel_address'] . '?f=&cat=' . urlencode(trim($cat)); + } elseif ($webpage == ITEM_TYPE_ARTICLE) { + $catlink = z_root() . '/articles/' . $channel['channel_address'] . '?f=&cat=' . urlencode(trim($cat)); + } else { + $catlink = $owner_xchan['xchan_url'] . '?f=&cat=' . urlencode(trim($cat)); + } + + $post_tags[] = array( + 'uid' => $profile_uid, + 'ttype' => TERM_CATEGORY, + 'otype' => TERM_OBJ_POST, + 'term' => trim($cat), + 'url' => $catlink + ); + } + } + + if ($orig_post) { + // preserve original tags + $t = q( + "select * from term where oid = %d and otype = %d and uid = %d and ttype in ( %d, %d, %d )", + intval($orig_post['id']), + intval(TERM_OBJ_POST), + intval($profile_uid), + intval(TERM_UNKNOWN), + intval(TERM_FILE), + intval(TERM_COMMUNITYTAG) + ); + if ($t) { + if (!isset($post_tags)) { + $post_tags = []; + } + + foreach ($t as $t1) { + $post_tags[] = array( + 'uid' => $profile_uid, + 'ttype' => $t1['ttype'], + 'otype' => TERM_OBJ_POST, + 'term' => $t1['term'], + 'url' => $t1['url'], + ); + } + } + } + + + $item_unseen = ((local_channel() != $profile_uid) ? 1 : 0); + $item_wall = ((isset($_REQUEST['type']) && ($_REQUEST['type'] === 'wall' || $_REQUEST['type'] === 'wall-comment')) ? 1 : 0); + $item_origin = (($origin) ? 1 : 0); + $item_nocomment = ((isset($item_nocomment)) ? $item_nocomment : $nocomment); + + + // determine if this is a wall post + + if ($parent) { + $item_wall = $parent_item['item_wall']; + } else { + if (!$webpage) { + $item_wall = 1; + } + } + + + if ($moderated) { + $item_blocked = ITEM_MODERATED; + } + + + if (!strlen($verb)) { + $verb = ACTIVITY_POST; + } + + $notify_type = (($parent) ? 'comment-new' : 'wall-new'); + + if (!(isset($mid) && $mid)) { + if ($message_id) { + $mid = $message_id; + } else { + $uuid = new_uuid(); + $mid = z_root() . '/item/' . $uuid; + } + } + + + if ($is_poll) { + $poll = [ + 'question' => $body, + 'answers' => $_REQUEST['poll_answers'], + 'multiple_answers' => $_REQUEST['poll_multiple_answers'], + 'expire_value' => $_REQUEST['poll_expire_value'], + 'expire_unit' => $_REQUEST['poll_expire_unit'] + ]; + $obj = $this->extract_poll_data($poll, ['item_private' => $private, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_contact_deny]); + } else { + $obj = $this->extract_bb_poll_data($body, ['item_private' => $private, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_contact_deny]); + } + + + if ($obj) { + $obj['url'] = $obj['id'] = $mid; + $obj['attributedTo'] = channel_url($channel); + $datarray['obj'] = $obj; + $obj_type = 'Question'; + if ($obj['endTime']) { + $d = datetime_convert('UTC', 'UTC', $obj['endTime']); + if ($d > NULL_DATE) { + $comments_closed = $d; + } + } + } + + if (!$parent_mid) { + $parent_mid = $mid; + } + + if ($parent_item) { + $parent_mid = $parent_item['mid']; + } + + + // Fallback so that we alway have a thr_parent + + if (!$thr_parent) { + $thr_parent = $mid; + } + + + $item_thread_top = ((!$parent) ? 1 : 0); + + + // fix permalinks for cards, etc. + + if ($webpage == ITEM_TYPE_CARD) { + $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : $uuid); + } + if (($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_CARD)) { + $r = q( + "select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.iid = %d limit 1", + intval($parent_item['id']) + ); + if ($r) { + $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $r[0]['v']; + } + } + + if ($webpage == ITEM_TYPE_ARTICLE) { + $plink = z_root() . '/articles/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : $uuid); + } + if (($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_ARTICLE)) { + $r = q( + "select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.iid = %d limit 1", + intval($parent_item['id']) + ); + if ($r) { + $plink = z_root() . '/articles/' . $channel['channel_address'] . '/' . $r[0]['v']; + } + } + + if ((!(isset($plink) && $plink)) && $item_thread_top) { + $plink = z_root() . '/item/' . $uuid; + } + + if (array_path_exists('obj/id', $datarray)) { + $datarray['obj']['id'] = $mid; + } + + $datarray['aid'] = $channel['channel_account_id']; + $datarray['uid'] = $profile_uid; + $datarray['uuid'] = $uuid; + $datarray['owner_xchan'] = (($owner_hash) ? $owner_hash : $owner_xchan['xchan_hash']); + $datarray['author_xchan'] = $observer['xchan_hash']; + $datarray['created'] = $created; + $datarray['edited'] = (($orig_post && (!intval($orig_post['item_unpublished']))) ? datetime_convert() : $created); + $datarray['expires'] = $expires; + $datarray['commented'] = (($orig_post && (!intval($orig_post['item_unpublished']))) ? datetime_convert() : $created); + $datarray['received'] = (($orig_post && (!intval($orig_post['item_unpublished']))) ? datetime_convert() : $created); + $datarray['changed'] = (($orig_post && (!intval($orig_post['item_unpublished']))) ? datetime_convert() : $created); + $datarray['comments_closed'] = $comments_closed; + $datarray['mid'] = $mid; + $datarray['parent_mid'] = $parent_mid; + $datarray['mimetype'] = $mimetype; + $datarray['title'] = $title; + $datarray['summary'] = $summary; + $datarray['body'] = $body; + $datarray['app'] = $app; + $datarray['location'] = $location; + $datarray['coord'] = $coord; + $datarray['verb'] = $verb; + $datarray['obj_type'] = $obj_type; + $datarray['allow_cid'] = $str_contact_allow; + $datarray['allow_gid'] = $str_group_allow; + $datarray['deny_cid'] = $str_contact_deny; + $datarray['deny_gid'] = $str_group_deny; + $datarray['attach'] = $attachments; + $datarray['thr_parent'] = $thr_parent; + $datarray['postopts'] = $postopts; + $datarray['item_unseen'] = intval($item_unseen); + $datarray['item_wall'] = intval($item_wall); + $datarray['item_origin'] = intval($item_origin); + $datarray['item_type'] = $webpage; + $datarray['item_private'] = intval($private); + $datarray['item_thread_top'] = intval($item_thread_top); + $datarray['item_unseen'] = intval($item_unseen); + $datarray['item_starred'] = intval($item_starred); + $datarray['item_uplink'] = intval($item_uplink); + $datarray['item_consensus'] = 0; + $datarray['item_notshown'] = intval($item_notshown); + $datarray['item_nsfw'] = intval($item_nsfw); + $datarray['item_relay'] = intval($item_relay); + $datarray['item_mentionsme'] = intval($item_mentionsme); + $datarray['item_nocomment'] = intval($item_nocomment); + $datarray['item_obscured'] = intval($item_obscured); + $datarray['item_verified'] = intval($item_verified); + $datarray['item_retained'] = intval($item_retained); + $datarray['item_rss'] = intval($item_rss); + $datarray['item_deleted'] = intval($item_deleted); + $datarray['item_hidden'] = intval($item_hidden); + $datarray['item_unpublished'] = intval($item_unpublished); + $datarray['item_delayed'] = intval($item_delayed); + $datarray['item_pending_remove'] = intval($item_pending_remove); + $datarray['item_blocked'] = intval($item_blocked); + $datarray['layout_mid'] = $layout_mid; + $datarray['public_policy'] = $public_policy; + $datarray['comment_policy'] = ((is_numeric($comment_policy)) ? map_scope($comment_policy) : $comment_policy); // only map scope if it is numeric, otherwise use what we have + $datarray['term'] = $post_tags; + $datarray['plink'] = $plink; + $datarray['route'] = $route; + $datarray['replyto'] = $replyto; + + // A specific ACL over-rides public_policy completely + + if (!empty_acl($datarray)) { + $datarray['public_policy'] = ''; + } + + if ($iconfig) { + $datarray['iconfig'] = $iconfig; + } + if ($private) { + IConfig::set($datarray, 'ocap', 'relay', $token); + } + + if (!array_key_exists('obj', $datarray)) { + $copy = $datarray; + $copy['author'] = $observer; + $datarray['obj'] = Activity::encode_item($copy, ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? true : false)); + $recips = []; + $i = $datarray['obj']; + if ($i['to']) { + $recips['to'] = $i['to']; + } + if ($i['cc']) { + $recips['cc'] = $i['cc']; + } + IConfig::Set($datarray, 'activitypub', 'recips', $recips); + } + + Activity::rewrite_mentions($datarray); + + // preview mode - prepare the body for display and send it via json + + if ($preview) { + require_once('include/conversation.php'); + + $datarray['owner'] = $owner_xchan; + $datarray['author'] = $observer; + $datarray['attach'] = json_encode($datarray['attach']); + $o = conversation(array($datarray), 'search', false, 'preview'); + // logger('preview: ' . $o, LOGGER_DEBUG); + echo json_encode(array('preview' => $o)); + killme(); + } + + // Let 'post_local' event listeners know if this is an edit. + // We will unset it immediately afterward. + + if ($orig_post) { + $datarray['edit'] = true; + } + + // suppress duplicates, *unless* you're editing an existing post. This could get picked up + // as a duplicate if you're editing it very soon after posting it initially and you edited + // some attribute besides the content, such as title or categories. + + if (PConfig::Get($profile_uid, 'system', 'suppress_duplicates', true) && (!$orig_post)) { + $z = q( + "select created from item where uid = %d and created > %s - INTERVAL %s and body = '%s' limit 1", + intval($profile_uid), + db_utcnow(), + db_quoteinterval('2 MINUTE'), + dbesc($body) + ); + + if ($z) { + $datarray['cancel'] = 1; + notice(t('Duplicate post suppressed.') . EOL); + logger('Duplicate post. Cancelled.'); + } + } + + call_hooks('post_local', $datarray); + + // This is no longer needed + unset($datarray['edit']); + + if (x($datarray, 'cancel')) { + logger('mod_item: post cancelled by plugin or duplicate suppressed.'); + if ($return_path) { + goaway(z_root() . "/" . $return_path); + } + if ($api_source) { + return (['success' => false, 'message' => 'operation cancelled']); + } + $json = array('cancel' => 1); + $json['reload'] = z_root() . '/' . $_REQUEST['jsreload']; + json_return_and_die($json); + } + + + if (mb_strlen($datarray['title']) > 191) { + $datarray['title'] = mb_substr($datarray['title'], 0, 191); + } + + if ($webpage) { + IConfig::Set( + $datarray, + 'system', + webpage_to_namespace($webpage), + (($pagetitle) ? $pagetitle : basename($datarray['mid'])), + true + ); + } elseif ($namespace) { + IConfig::Set( + $datarray, + 'system', + $namespace, + (($remote_id) ? $remote_id : basename($datarray['mid'])), + true + ); + } + + if (intval($datarray['item_unpublished'])) { + $draft_msg = t('Draft saved. Use Drafts app to continue editing.'); + } + + if ($orig_post) { + $datarray['id'] = $post_id; + + $x = item_store_update($datarray, $execflag); + if (!$parent) { + $r = q( + "select * from item where id = %d", + intval($post_id) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + Libsync::build_sync_packet($profile_uid, array('item' => array(encode_item($sync_item[0], true)))); + } + } + if (!$nopush) { + Run::Summon(['Notifier', 'edit_post', $post_id]); + } + + if ($api_source) { + return ($x); + } + + + if (intval($datarray['item_unpublished'])) { + info($draft_msg); + } + + + if ((x($_REQUEST, 'return')) && strlen($return_path)) { + logger('return: ' . $return_path); + goaway(z_root() . "/" . $return_path); + } + killme(); + } else { + $post_id = 0; + } + + $post = item_store($datarray, $execflag); + + if ($pub_copy) { + info(t('Your comment has been posted.') . EOL); + } + + $post_id = $post['item_id']; + $datarray = $post['item']; + + + if ($post_id) { + logger('mod_item: saved item ' . $post_id); + + if ($parent) { + // prevent conversations which you are involved from being expired + + if (local_channel()) { + retain_item($parent); + } + + // only send comment notification if this is a wall-to-wall comment and not a DM, + // otherwise it will happen during delivery + + if (($datarray['owner_xchan'] != $datarray['author_xchan']) && (intval($parent_item['item_wall'])) && intval($datarray['item_private']) != 2) { + Enotify::submit(array( + 'type' => NOTIFY_COMMENT, + 'from_xchan' => $datarray['author_xchan'], + 'to_xchan' => $datarray['owner_xchan'], + 'item' => $datarray, + 'link' => z_root() . '/display/' . gen_link_id($datarray['mid']), + 'verb' => ACTIVITY_POST, + 'otype' => 'item', + 'parent' => $parent, + 'parent_mid' => $parent_item['mid'] + )); + } + } else { + $parent = $post_id; + + if (($datarray['owner_xchan'] != $datarray['author_xchan']) && ($datarray['item_type'] == ITEM_TYPE_POST)) { + Enotify::submit(array( + 'type' => NOTIFY_WALL, + 'from_xchan' => $datarray['author_xchan'], + 'to_xchan' => $datarray['owner_xchan'], + 'item' => $datarray, + 'link' => z_root() . '/display/' . gen_link_id($datarray['mid']), + 'verb' => ACTIVITY_POST, + 'otype' => 'item' + )); + } + + if ($uid && $uid == $profile_uid && (is_item_normal($datarray))) { + q( + "update channel set channel_lastpost = '%s' where channel_id = %d", + dbesc(datetime_convert()), + intval($uid) + ); + } + } + + // photo comments turn the corresponding item visible to the profile wall + // This way we don't see every picture in your new photo album posted to your wall at once. + // They will show up as people comment on them. + + if (intval($parent_item['item_hidden'])) { + $r = q( + "UPDATE item SET item_hidden = 0 WHERE id = %d", + intval($parent_item['id']) + ); + } + } else { + logger('mod_item: unable to retrieve post that was just stored.'); + notice(t('System error. Post not saved.') . EOL); + if ($return_path) { + goaway(z_root() . "/" . $return_path); + } + if ($api_source) { + return (['success' => false, 'message' => 'system error']); + } + killme(); + } + + if (($parent) && ($parent != $post_id)) { + // Store the comment signature information in case we need to relay to Diaspora + //$ditem = $datarray; + //$ditem['author'] = $observer; + //store_diaspora_comment_sig($ditem,$channel,$parent_item, $post_id, (($walltowall_comment) ? 1 : 0)); + } else { + $r = q( + "select * from item where id = %d", + intval($post_id) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + Libsync::build_sync_packet($profile_uid, array('item' => array(encode_item($sync_item[0], true)))); + } + } + + $datarray['id'] = $post_id; + $datarray['llink'] = z_root() . '/display/' . gen_link_id($datarray['mid']); + + call_hooks('post_local_end', $datarray); + + if ($groupww) { + $nopush = false; + } + + if (!$nopush) { + Run::Summon(['Notifier', $notify_type, $post_id]); + } + logger('post_complete'); + + if ($moderated) { + info(t('Your post/comment is awaiting approval.') . EOL); + } + + // figure out how to return, depending on from whence we came + + if ($api_source) { + return $post; + } + + if (intval($datarray['item_unpublished'])) { + info($draft_msg); + } + + if ($return_path) { + goaway(z_root() . "/" . $return_path); + } + + $json = array('success' => 1); + if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) { + $json['reload'] = z_root() . '/' . $_REQUEST['jsreload']; + } + + logger('post_json: ' . print_r($json, true), LOGGER_DEBUG); + + echo json_encode($json); + killme(); + // NOTREACHED + } + + + public function get() + { + + + if ($this->return_404) { + notice(t('Not found')); + return; + } + + if ((!local_channel()) && (!remote_channel())) { + return; + } + + // allow pinned items to be dropped. 'pin-' was prepended to the id of these + // items so that they would have a unique html id even if the pinned item + // was also displayed in a normal conversation on the same web page. + + $drop_id = str_replace('pin-', '', argv(2)); + + if ((argc() == 3) && (argv(1) === 'drop') && intval($drop_id)) { + $i = q( + "select * from item where id = %d limit 1", + intval($drop_id) + ); + + if ($i) { + $can_delete = false; + $local_delete = false; + $regular_delete = false; + + if (local_channel() && local_channel() == $i[0]['uid']) { + $local_delete = true; + } + + $ob_hash = get_observer_hash(); + if ($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) { + $can_delete = true; + $regular_delete = true; + } + + // The site admin can delete any post/item on the site. + // If the item originated on this site+channel the deletion will propagate downstream. + // Otherwise just the local copy is removed. + + if (is_site_admin()) { + $local_delete = true; + if (intval($i[0]['item_origin'])) { + $can_delete = true; + } + } + + + if (!($can_delete || $local_delete)) { + notice(t('Permission denied.') . EOL); + return; + } + + if ($i[0]['resource_type'] === 'event') { + // delete and sync the event separately + $r = q( + "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1", + dbesc($i[0]['resource_id']), + intval($i[0]['uid']) + ); + if ($r && $regular_delete) { + $sync_event = $r[0]; + q( + "delete from event WHERE event_hash = '%s' AND uid = %d LIMIT 1", + dbesc($i[0]['resource_id']), + intval($i[0]['uid']) + ); + $sync_event['event_deleted'] = 1; + Libsync::build_sync_packet($i[0]['uid'], array('event' => array($sync_event))); + } + } + + if ($i[0]['resource_type'] === 'photo') { + attach_delete($i[0]['uid'], $i[0]['resource_id'], true); + $ch = channelx_by_n($i[0]['uid']); + if ($ch && $regular_delete) { + $sync = attach_export_data($ch, $i[0]['resource_id'], true); + if ($sync) { + Libsync::build_sync_packet($i[0]['uid'], array('file' => array($sync))); + } + } + } + + + // if this is a different page type or it's just a local delete + // but not by the item author or owner, do a simple deletion + + $complex = false; + + if (intval($i[0]['item_type']) || ($local_delete && (!$can_delete))) { + drop_item($i[0]['id']); + } else { + // complex deletion that needs to propagate and be performed in phases + drop_item($i[0]['id'], true, DROPITEM_PHASE1); + $complex = true; + } + + $r = q( + "select * from item where id = %d", + intval($i[0]['id']) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + Libsync::build_sync_packet($i[0]['uid'], array('item' => array(encode_item($sync_item[0], true)))); + } + + if ($complex) { + tag_deliver($i[0]['uid'], $i[0]['id']); + } + } + } + } + + + public function item_check_service_class($channel_id, $iswebpage) + { + $ret = array('success' => false, 'message' => ''); + + if ($iswebpage) { + $r = q( + "select count(i.id) as total from item i right join channel c on (i.author_xchan=c.channel_hash and i.uid=c.channel_id ) and i.parent=i.id and i.item_type = %d and i.item_deleted = 0 and i.uid= %d ", - intval(ITEM_TYPE_WEBPAGE), - intval($channel_id) - ); - } - else { - $r = q("select count(id) as total from item where parent = id and item_wall = 1 and uid = %d " . item_normal(), - intval($channel_id) - ); - } - - if(! $r) { - $ret['message'] = t('Unable to obtain post information from database.'); - return $ret; - } + intval(ITEM_TYPE_WEBPAGE), + intval($channel_id) + ); + } else { + $r = q( + "select count(id) as total from item where parent = id and item_wall = 1 and uid = %d " . item_normal(), + intval($channel_id) + ); + } + + if (!$r) { + $ret['message'] = t('Unable to obtain post information from database.'); + return $ret; + } - if (!$iswebpage) { - $max = engr_units_to_bytes(service_class_fetch($channel_id,'total_items')); - if(! service_class_allows($channel_id,'total_items',$r[0]['total'])) { - $result['message'] .= upgrade_message() . sprintf( t('You have reached your limit of %1$.0f top level posts.'),$max); - return $result; - } - } - else { - $max = engr_units_to_bytes(service_class_fetch($channel_id,'total_pages')); - if(! service_class_allows($channel_id,'total_pages',$r[0]['total'])) { - $result['message'] .= upgrade_message() . sprintf( t('You have reached your limit of %1$.0f webpages.'),$max); - return $result; - } - } - - $ret['success'] = true; - return $ret; - } - - function extract_bb_poll_data(&$body,$item) { + if (!$iswebpage) { + $max = engr_units_to_bytes(service_class_fetch($channel_id, 'total_items')); + if (!service_class_allows($channel_id, 'total_items', $r[0]['total'])) { + $result['message'] .= upgrade_message() . sprintf(t('You have reached your limit of %1$.0f top level posts.'), $max); + return $result; + } + } else { + $max = engr_units_to_bytes(service_class_fetch($channel_id, 'total_pages')); + if (!service_class_allows($channel_id, 'total_pages', $r[0]['total'])) { + $result['message'] .= upgrade_message() . sprintf(t('You have reached your limit of %1$.0f webpages.'), $max); + return $result; + } + } - $multiple = false; + $ret['success'] = true; + return $ret; + } - if (strpos($body,'[/question]') === false && strpos($body,'[/answer]') === false) { - return false; - } - if (strpos($body,'[nobb]') !== false) { - return false; - } + public function extract_bb_poll_data(&$body, $item) + { - $obj = []; - $ptr = []; - $matches = null; - $obj['type'] = 'Question'; + $multiple = false; - if (preg_match_all('/\[answer\](.*?)\[\/answer\]/ism',$body,$matches,PREG_SET_ORDER)) { - foreach ($matches as $match) { - $ptr[] = [ 'name' => $match[1], 'type' => 'Note', 'replies' => [ 'type' => 'Collection', 'totalItems' => 0 ]]; - $body = str_replace('[answer]' . $match[1] . '[/answer]', EMPTY_STR, $body); - } - } + if (strpos($body, '[/question]') === false && strpos($body, '[/answer]') === false) { + return false; + } + if (strpos($body, '[nobb]') !== false) { + return false; + } - $matches = null; + $obj = []; + $ptr = []; + $matches = null; + $obj['type'] = 'Question'; - if (preg_match('/\[question\](.*?)\[\/question\]/ism',$body,$matches)) { - $obj['content'] = bbcode($matches[1]); - $body = str_replace('[question]' . $matches[1] . '[/question]', $matches[1], $body); - $obj['oneOf'] = $ptr; - } + if (preg_match_all('/\[answer\](.*?)\[\/answer\]/ism', $body, $matches, PREG_SET_ORDER)) { + foreach ($matches as $match) { + $ptr[] = ['name' => $match[1], 'type' => 'Note', 'replies' => ['type' => 'Collection', 'totalItems' => 0]]; + $body = str_replace('[answer]' . $match[1] . '[/answer]', EMPTY_STR, $body); + } + } - $matches = null; - - if (preg_match('/\[question=multiple\](.*?)\[\/question\]/ism',$body,$matches)) { - $obj['content'] = bbcode($matches[1]); - $body = str_replace('[question=multiple]' . $matches[1] . '[/question]', $matches[1], $body); - $obj['anyOf'] = $ptr; - } + $matches = null; - $matches = null; - - if (preg_match('/\[ends\](.*?)\[\/ends\]/ism',$body,$matches)) { - $obj['endTime'] = datetime_convert(date_default_timezone_get(),'UTC', $matches[1],ATOM_TIME); - $body = str_replace('[ends]' . $matches[1] . '[/ends]', EMPTY_STR, $body); - } + if (preg_match('/\[question\](.*?)\[\/question\]/ism', $body, $matches)) { + $obj['content'] = bbcode($matches[1]); + $body = str_replace('[question]' . $matches[1] . '[/question]', $matches[1], $body); + $obj['oneOf'] = $ptr; + } - if ($item['item_private']) { - $obj['to'] = Activity::map_acl($item); - } - else { - $obj['to'] = [ ACTIVITY_PUBLIC_INBOX ]; - } - - return $obj; + $matches = null; - } + if (preg_match('/\[question=multiple\](.*?)\[\/question\]/ism', $body, $matches)) { + $obj['content'] = bbcode($matches[1]); + $body = str_replace('[question=multiple]' . $matches[1] . '[/question]', $matches[1], $body); + $obj['anyOf'] = $ptr; + } - function extract_poll_data($poll, $item) { + $matches = null; - $multiple = intval($poll['multiple_answers']); - $expire_value = intval($poll['expire_value']); - $expire_unit = $poll['expire_unit']; - $question = $poll['question']; - $answers = $poll['answers']; + if (preg_match('/\[ends\](.*?)\[\/ends\]/ism', $body, $matches)) { + $obj['endTime'] = datetime_convert(date_default_timezone_get(), 'UTC', $matches[1], ATOM_TIME); + $body = str_replace('[ends]' . $matches[1] . '[/ends]', EMPTY_STR, $body); + } - $obj = []; - $ptr = []; - $obj['type'] = 'Question'; - $obj['content'] = bbcode($question); + if ($item['item_private']) { + $obj['to'] = Activity::map_acl($item); + } else { + $obj['to'] = [ACTIVITY_PUBLIC_INBOX]; + } - foreach($answers as $answer) { - if(trim($answer)) - $ptr[] = [ 'name' => escape_tags($answer), 'type' => 'Note', 'replies' => [ 'type' => 'Collection', 'totalItems' => 0 ]]; - } + return $obj; + } - if($multiple) { - $obj['anyOf'] = $ptr; - } - else { - $obj['oneOf'] = $ptr; - } + public function extract_poll_data($poll, $item) + { - $obj['endTime'] = datetime_convert(date_default_timezone_get(), 'UTC', 'now + ' . $expire_value . ' ' . $expire_unit, ATOM_TIME); + $multiple = intval($poll['multiple_answers']); + $expire_value = intval($poll['expire_value']); + $expire_unit = $poll['expire_unit']; + $question = $poll['question']; + $answers = $poll['answers']; - if ($item['item_private']) { - $obj['to'] = Activity::map_acl($item); - } - else { - $obj['to'] = [ ACTIVITY_PUBLIC_INBOX ]; - } + $obj = []; + $ptr = []; + $obj['type'] = 'Question'; + $obj['content'] = bbcode($question); - return $obj; + foreach ($answers as $answer) { + if (trim($answer)) { + $ptr[] = ['name' => escape_tags($answer), 'type' => 'Note', 'replies' => ['type' => 'Collection', 'totalItems' => 0]]; + } + } - } + if ($multiple) { + $obj['anyOf'] = $ptr; + } else { + $obj['oneOf'] = $ptr; + } + $obj['endTime'] = datetime_convert(date_default_timezone_get(), 'UTC', 'now + ' . $expire_value . ' ' . $expire_unit, ATOM_TIME); + + if ($item['item_private']) { + $obj['to'] = Activity::map_acl($item); + } else { + $obj['to'] = [ACTIVITY_PUBLIC_INBOX]; + } + + return $obj; + } } diff --git a/Zotlabs/Module/Jwks.php b/Zotlabs/Module/Jwks.php index 660b37568..3e0dd544f 100644 --- a/Zotlabs/Module/Jwks.php +++ b/Zotlabs/Module/Jwks.php @@ -5,57 +5,58 @@ namespace Zotlabs\Module; use Zotlabs\Lib\Keyutils; use Zotlabs\Web\Controller; -class Jwks extends Controller { +class Jwks extends Controller +{ - function init() { - - Keyutils::pemtome(get_config('system','pubkey'),$m,$e); + public function init() + { - /** - * RFC7518 - * - 6.3.1.1. "n" (Modulus) Parameter + Keyutils::pemtome(get_config('system', 'pubkey'), $m, $e); - The "n" (modulus) parameter contains the modulus value for the RSA - public key. It is represented as a Base64urlUInt-encoded value. + /** + * RFC7518 + * + * 6.3.1.1. "n" (Modulus) Parameter + * + * The "n" (modulus) parameter contains the modulus value for the RSA + * public key. It is represented as a Base64urlUInt-encoded value. + * + * Note that implementers have found that some cryptographic libraries + * prefix an extra zero-valued octet to the modulus representations they + * return, for instance, returning 257 octets for a 2048-bit key, rather + * than 256. Implementations using such libraries will need to take + * care to omit the extra octet from the base64url-encoded + * representation. + * + */ - Note that implementers have found that some cryptographic libraries - prefix an extra zero-valued octet to the modulus representations they - return, for instance, returning 257 octets for a 2048-bit key, rather - than 256. Implementations using such libraries will need to take - care to omit the extra octet from the base64url-encoded - representation. - * - */ + $l = strlen((string)$m); + if ($l & 1) { + $m = substr((string)$m, 1); + } - $l = strlen((string) $m); - if ($l & 1) { - $m = substr((string) $m,1); - } - - $keys = [ - [ - 'e' => base64url_encode($e), - 'n' => base64url_encode($m), - 'kty' => 'RSA', - 'kid' => '0', - ] - ]; + $keys = [ + [ + 'e' => base64url_encode($e), + 'n' => base64url_encode($m), + 'kty' => 'RSA', + 'kid' => '0', + ] + ]; - $ret = [ - 'keys' => $keys - ]; + $ret = [ + 'keys' => $keys + ]; - if (argc() > 1) { - $entry = intval(argv(1)); - if ($keys[$entry]) { - unset($keys[$entry]['kid']); - json_return_and_die($keys[$entry],'application/jwk+json'); - } - } + if (argc() > 1) { + $entry = intval(argv(1)); + if ($keys[$entry]) { + unset($keys[$entry]['kid']); + json_return_and_die($keys[$entry], 'application/jwk+json'); + } + } - json_return_and_die($ret,'application/jwk-set+json'); - - } -} \ No newline at end of file + json_return_and_die($ret, 'application/jwk-set+json'); + } +} diff --git a/Zotlabs/Module/Lang.php b/Zotlabs/Module/Lang.php index 9858beecd..53f7081af 100644 --- a/Zotlabs/Module/Lang.php +++ b/Zotlabs/Module/Lang.php @@ -1,28 +1,29 @@ Language App (Not Installed):
'; - $o .= t('Change UI language'); - return $o; - } - } + $o = 'Language App (Not Installed):
'; + $o .= t('Change UI language'); + return $o; + } + } - nav_set_selected('Language'); - return lang_selector(); - - } - + nav_set_selected('Language'); + return lang_selector(); + } } diff --git a/Zotlabs/Module/Layouts.php b/Zotlabs/Module/Layouts.php index 33c869a6b..e156fcc1e 100644 --- a/Zotlabs/Module/Layouts.php +++ b/Zotlabs/Module/Layouts.php @@ -1,211 +1,217 @@ 1 && argv(1) === 'sys' && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - \App::$is_sys = true; - } - } + if (argc() > 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + App::$is_sys = true; + } + } - if(argc() > 1) - $which = argv(1); - else - return; + if (argc() > 1) { + $which = argv(1); + } else { + return; + } - Libprofile::load($which); + Libprofile::load($which); + } - } + public function get() + { - function get() { + if (!App::$profile) { + notice(t('Requested profile is not available.') . EOL); + App::$error = 404; + return; + } - if(! \App::$profile) { - notice( t('Requested profile is not available.') . EOL ); - \App::$error = 404; - return; - } + $which = argv(1); - $which = argv(1); + $_SESSION['return_url'] = App::$query_string; - $_SESSION['return_url'] = \App::$query_string; + $uid = local_channel(); + $owner = 0; + $channel = null; + $observer = App::get_observer(); - $uid = local_channel(); - $owner = 0; - $channel = null; - $observer = \App::get_observer(); + $channel = App::get_channel(); - $channel = \App::get_channel(); + if (App::$is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } + } - if(\App::$is_sys && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - $uid = $owner = intval($sys['channel_id']); - $channel = $sys; - $observer = $sys; - } - } + if (!$owner) { + // Figure out who the page owner is. + $r = q( + "select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if ($r) { + $owner = intval($r[0]['channel_id']); + } + } - if(! $owner) { - // Figure out who the page owner is. - $r = q("select channel_id from channel where channel_address = '%s'", - dbesc($which) - ); - if($r) { - $owner = intval($r[0]['channel_id']); - } - } + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + $perms = get_all_perms($owner, $ob_hash); - $perms = get_all_perms($owner,$ob_hash); + if (!$perms['write_pages']) { + notice(t('Permission denied.') . EOL); + return; + } - if(! $perms['write_pages']) { - notice( t('Permission denied.') . EOL); - return; - } + // Block design features from visitors - // Block design features from visitors + if ((!$uid) || ($uid != $owner)) { + notice(t('Permission denied.') . EOL); + return; + } - if((! $uid) || ($uid != $owner)) { - notice( t('Permission denied.') . EOL); - return; - } + // Get the observer, check their permissions - // Get the observer, check their permissions + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + $perms = get_all_perms($owner, $ob_hash); - $perms = get_all_perms($owner,$ob_hash); + if (!$perms['write_pages']) { + notice(t('Permission denied.') . EOL); + return; + } - if(! $perms['write_pages']) { - notice( t('Permission denied.') . EOL); - return; - } + // This feature is not exposed in redbasic ui since it is not clear why one would want to + // download a json encoded pdl file - we dont have a possibility to import it. + // Use the buildin share/install feature instead. - // This feature is not exposed in redbasic ui since it is not clear why one would want to - // download a json encoded pdl file - we dont have a possibility to import it. - // Use the buildin share/install feature instead. - - if((argc() > 3) && (argv(2) === 'share') && (argv(3))) { - $r = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig + if ((argc() > 3) && (argv(2) === 'share') && (argv(3))) { + $r = q( + "select iconfig.v, iconfig.k, mimetype, title, body from iconfig left join item on item.id = iconfig.iid where uid = %d and mid = '%s' and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc", - intval($owner), - dbesc(argv(3)) - ); - if($r) { - header('Content-type: application/x-hubzilla-layout'); - header('Content-Disposition: attachment; filename="' . $r[0]['sid'] . '.pdl"'); - echo json_encode($r); - killme(); - } - } + intval($owner), + dbesc(argv(3)) + ); + if ($r) { + header('Content-type: application/x-hubzilla-layout'); + header('Content-Disposition: attachment; filename="' . $r[0]['sid'] . '.pdl"'); + echo json_encode($r); + killme(); + } + } - // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages - // Nickname is set to the observers xchan, and profile_uid to the owners. - // This lets you post pages at other people's channels. + // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages + // Nickname is set to the observers xchan, and profile_uid to the owners. + // This lets you post pages at other people's channels. - $x = array( - 'webpage' => ITEM_TYPE_PDL, - 'is_owner' => true, - 'nickname' => \App::$profile['channel_address'], - 'showacl' => false, - 'hide_voting' => true, - 'hide_future' => true, - 'hide_expire' => true, - 'hide_location' => true, - 'hide_weblink' => true, - 'hide_attach' => true, - 'hide_preview' => true, - 'disable_comments' => true, - 'ptlabel' => t('Layout Name'), - 'profile_uid' => intval($owner), - 'expanded' => true, - 'placeholdertitle' => t('Layout Description (Optional)'), - 'novoting' => true, - 'bbco_autocomplete' => 'comanche' - ); + $x = array( + 'webpage' => ITEM_TYPE_PDL, + 'is_owner' => true, + 'nickname' => App::$profile['channel_address'], + 'showacl' => false, + 'hide_voting' => true, + 'hide_future' => true, + 'hide_expire' => true, + 'hide_location' => true, + 'hide_weblink' => true, + 'hide_attach' => true, + 'hide_preview' => true, + 'disable_comments' => true, + 'ptlabel' => t('Layout Name'), + 'profile_uid' => intval($owner), + 'expanded' => true, + 'placeholdertitle' => t('Layout Description (Optional)'), + 'novoting' => true, + 'bbco_autocomplete' => 'comanche' + ); - if($_REQUEST['title']) - $x['title'] = $_REQUEST['title']; - if($_REQUEST['body']) - $x['body'] = $_REQUEST['body']; - if($_REQUEST['pagetitle']) - $x['pagetitle'] = $_REQUEST['pagetitle']; + if ($_REQUEST['title']) { + $x['title'] = $_REQUEST['title']; + } + if ($_REQUEST['body']) { + $x['body'] = $_REQUEST['body']; + } + if ($_REQUEST['pagetitle']) { + $x['pagetitle'] = $_REQUEST['pagetitle']; + } - $editor = status_editor($x); + $editor = status_editor($x); - $r = q("select iconfig.iid, iconfig.v, mid, title, body, mimetype, created, edited, item_type from iconfig + $r = q( + "select iconfig.iid, iconfig.v, mid, title, body, mimetype, created, edited, item_type from iconfig left join item on iconfig.iid = item.id where uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' and item_type = %d order by item.created desc", - intval($owner), - intval(ITEM_TYPE_PDL) - ); + intval($owner), + intval(ITEM_TYPE_PDL) + ); - $pages = null; + $pages = null; - if($r) { - $pages = []; - foreach($r as $rr) { - $element_arr = array( - 'type' => 'layout', - 'title' => $rr['title'], - 'body' => $rr['body'], - 'created' => $rr['created'], - 'edited' => $rr['edited'], - 'mimetype' => $rr['mimetype'], - 'pagetitle' => urldecode($rr['v']), - 'mid' => $rr['mid'] - ); - $pages[$rr['iid']][] = array( - 'url' => $rr['iid'], - 'title' => urldecode($rr['v']), - 'descr' => $rr['title'], - 'mid' => $rr['mid'], - 'created' => $rr['created'], - 'edited' => $rr['edited'], - 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]' - ); - } - } + if ($r) { + $pages = []; + foreach ($r as $rr) { + $element_arr = array( + 'type' => 'layout', + 'title' => $rr['title'], + 'body' => $rr['body'], + 'created' => $rr['created'], + 'edited' => $rr['edited'], + 'mimetype' => $rr['mimetype'], + 'pagetitle' => urldecode($rr['v']), + 'mid' => $rr['mid'] + ); + $pages[$rr['iid']][] = array( + 'url' => $rr['iid'], + 'title' => urldecode($rr['v']), + 'descr' => $rr['title'], + 'mid' => $rr['mid'], + 'created' => $rr['created'], + 'edited' => $rr['edited'], + 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]' + ); + } + } - //Build the base URL for edit links - $url = z_root() . '/editlayout/' . $which; + //Build the base URL for edit links + $url = z_root() . '/editlayout/' . $which; - $o .= replace_macros(get_markup_template('layoutlist.tpl'), array( - '$title' => t('Layouts'), - '$create' => t('Create'), - '$help' => '', // array('text' => t('Help'), 'url' => 'help/comanche', 'title' => t('Comanche page description language help')), - '$editor' => $editor, - '$baseurl' => $url, - '$name' => t('Layout Name'), - '$descr' => t('Layout Description'), - '$created' => t('Created'), - '$edited' => t('Edited'), - '$edit' => t('Edit'), - '$share' => t('Share'), - '$download' => t('Download PDL file'), - '$pages' => $pages, - '$channel' => $which, - '$view' => t('View'), - )); - - return $o; - - } + $o .= replace_macros(get_markup_template('layoutlist.tpl'), array( + '$title' => t('Layouts'), + '$create' => t('Create'), + '$help' => '', // array('text' => t('Help'), 'url' => 'help/comanche', 'title' => t('Comanche page description language help')), + '$editor' => $editor, + '$baseurl' => $url, + '$name' => t('Layout Name'), + '$descr' => t('Layout Description'), + '$created' => t('Created'), + '$edited' => t('Edited'), + '$edit' => t('Edit'), + '$share' => t('Share'), + '$download' => t('Download PDL file'), + '$pages' => $pages, + '$channel' => $which, + '$view' => t('View'), + )); + return $o; + } } diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php index 5954040b3..1d2fbf3b9 100644 --- a/Zotlabs/Module/Like.php +++ b/Zotlabs/Module/Like.php @@ -1,4 +1,5 @@ 1 && $test[0] === 'Undo') { - $undo = true; - $activity = $test[1]; - } + if (! $activity) { + return EMPTY_STR; + } - if (! in_array($activity, [ 'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept' ])) { - killme(); - } + // Check for negative (undo) condition + // eg: 'Undo/Like' results in $undo conditional and $activity set to 'Like' - $is_rsvp = in_array($activity, [ 'Accept', 'Reject', 'TentativeAccept' ]); + $test = explode('/', $activity); + if (count($test) > 1 && $test[0] === 'Undo') { + $undo = true; + $activity = $test[1]; + } - // Check for when target is something besides messages, where argv(1) is the type of thing - // and argv(2) is an identifier of things of that type - // We currently only recognise 'profile' but other types could be handled - - - if (! $observer) { - killme(); - } + if (! in_array($activity, [ 'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept' ])) { + killme(); + } - // this is used to like an item or comment - - $item_id = ((argc() == 2) ? notags(trim(argv(1))) : 0); + $is_rsvp = in_array($activity, [ 'Accept', 'Reject', 'TentativeAccept' ]); - logger('like: undo: ' . (($undo) ? 'true' : 'false')); - logger('like: verb ' . $activity . ' item ' . $item_id, LOGGER_DEBUG); - - // get the item. Allow linked photos (which are normally hidden) to be liked + // Check for when target is something besides messages, where argv(1) is the type of thing + // and argv(2) is an identifier of things of that type + // We currently only recognise 'profile' but other types could be handled - $r = q("SELECT * FROM item WHERE id = %d + + if (! $observer) { + killme(); + } + + // this is used to like an item or comment + + $item_id = ((argc() == 2) ? notags(trim(argv(1))) : 0); + + logger('like: undo: ' . (($undo) ? 'true' : 'false')); + logger('like: verb ' . $activity . ' item ' . $item_id, LOGGER_DEBUG); + + // get the item. Allow linked photos (which are normally hidden) to be liked + + $r = q( + "SELECT * FROM item WHERE id = %d and item_type in (0,6,7) and item_deleted = 0 and item_unpublished = 0 and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1", - intval($item_id) - ); + intval($item_id) + ); - // if interacting with a pubstream item, - // create a copy of the parent in your stream. + // if interacting with a pubstream item, + // create a copy of the parent in your stream. - if ($r) { - if (local_channel() && (! is_sys_channel(local_channel()))) { - $r = [ copy_of_pubitem(App::get_channel(), $r[0]['mid']) ]; - } - } + if ($r) { + if (local_channel() && (! is_sys_channel(local_channel()))) { + $r = [ copy_of_pubitem(App::get_channel(), $r[0]['mid']) ]; + } + } - if(! $item_id || (! $r)) { - logger('like: no item ' . $item_id); - killme(); - } + if (! $item_id || (! $r)) { + logger('like: no item ' . $item_id); + killme(); + } - xchan_query($r,true); + xchan_query($r, true); - $item = array_shift($r); + $item = array_shift($r); - $owner_uid = $item['uid']; - $owner_aid = $item['aid']; + $owner_uid = $item['uid']; + $owner_aid = $item['aid']; $can_comment = false; - if ((array_key_exists('owner',$item)) && intval($item['owner']['abook_self'])) { - $can_comment = perm_is_allowed($item['uid'],$observer['xchan_hash'],'post_comments'); - } - else { - $can_comment = can_comment_on_post($observer['xchan_hash'],$item); - } + if ((array_key_exists('owner', $item)) && intval($item['owner']['abook_self'])) { + $can_comment = perm_is_allowed($item['uid'], $observer['xchan_hash'], 'post_comments'); + } else { + $can_comment = can_comment_on_post($observer['xchan_hash'], $item); + } - if (! $can_comment) { - notice( t('Permission denied') . EOL); - killme(); - } + if (! $can_comment) { + notice(t('Permission denied') . EOL); + killme(); + } - $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($item['owner_xchan']) - ); + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['owner_xchan']) + ); - if ($r) { - $thread_owner = array_shift($r); - } - else { - killme(); - } - $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($item['author_xchan']) - ); - if ($r) { - $item_author = array_shift($r); - } - else { - killme(); - } + if ($r) { + $thread_owner = array_shift($r); + } else { + killme(); + } + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['author_xchan']) + ); + if ($r) { + $item_author = array_shift($r); + } else { + killme(); + } - if ($undo) { - $r = q("select * from item where thr_parent = '%s' and verb = '%s' and author_xchan = '%s' and uid = %d and item_deleted = 0 limit 1", - dbesc($item['thr_parent']), - dbesc($activity), - dbesc($observer['xchan_hash']), - intval($owner_uid) - ); + if ($undo) { + $r = q( + "select * from item where thr_parent = '%s' and verb = '%s' and author_xchan = '%s' and uid = %d and item_deleted = 0 limit 1", + dbesc($item['thr_parent']), + dbesc($activity), + dbesc($observer['xchan_hash']), + intval($owner_uid) + ); - xchan_query($r,true); - $r = fetch_post_tags($r,true); - $r[0]['obj'] = json_decode($r[0]['obj'],true); - $object = Activity::encode_activity($r[0],true); - - // do not do either a federated or hard delete on the original reaction - // as we are going to send an Undo to perform this task - // just set item_deleted to update the local conversation + xchan_query($r, true); + $r = fetch_post_tags($r, true); + $r[0]['obj'] = json_decode($r[0]['obj'], true); + $object = Activity::encode_activity($r[0], true); - $retval = q("update item set item_deleted = 1 where id = %d", - intval($r[0]['id']) - ); + // do not do either a federated or hard delete on the original reaction + // as we are going to send an Undo to perform this task + // just set item_deleted to update the local conversation - } - else { - $object = Activity::fetch_item( [ 'id' => $item['mid'] ]); - } + $retval = q( + "update item set item_deleted = 1 where id = %d", + intval($r[0]['id']) + ); + } else { + $object = Activity::fetch_item([ 'id' => $item['mid'] ]); + } - if (! $object) { - killme(); - } + if (! $object) { + killme(); + } - $uuid = new_uuid(); + $uuid = new_uuid(); - // we have everything we need - start building our new item + // we have everything we need - start building our new item - $arr = []; + $arr = []; - $arr['uuid'] = $uuid; + $arr['uuid'] = $uuid; $arr['mid'] = z_root() . (($is_rsvp) ? '/activity/' : '/item/' ) . $uuid; - $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status')); - if ($item['obj_type'] === ACTIVITY_OBJ_EVENT) { - $post_type = t('event'); - } - - $objtype = $item['obj_type']; + $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status')); + if ($item['obj_type'] === ACTIVITY_OBJ_EVENT) { + $post_type = t('event'); + } - $body = $item['body']; - - - if (! intval($item['item_thread_top'])) { - $post_type = 'comment'; - } - - $arr['item_origin'] = 1; - $arr['item_notshown'] = 1; - $arr['item_type'] = $item['item_type']; - - if (intval($item['item_wall'])) { - $arr['item_wall'] = 1; - } - - // if this was a linked photo and was hidden, unhide it and distribute it. - - if (intval($item['item_hidden'])) { - $r = q("update item set item_hidden = 0 where id = %d", - intval($item['id']) - ); + $objtype = $item['obj_type']; - $r = q("select * from item where id = %d", - intval($item['id']) - ); - if ($r) { - xchan_query($r); - $sync_item = fetch_post_tags($r); - Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0],true) ] ]); - } - - Run::Summon( [ 'Notifier','wall-new',$item['id'] ] ); - } + $body = $item['body']; - if ($undo) { - $arr['body'] = t('Undo a previous action'); - $arr['item_notshown'] = 1; - } - else { - if ($activity === 'Like') { - $bodyverb = t('%1$s likes %2$s\'s %3$s'); - } - if ($activity === 'Dislike') { - $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); - } - if ($activity === 'Accept') { - $bodyverb = t('%1$s is attending %2$s\'s %3$s'); - } - if ($activity === 'Reject') { - $bodyverb = t('%1$s is not attending %2$s\'s %3$s'); - } - if ($activity === 'TentativeAccept') { - $bodyverb = t('%1$s may attend %2$s\'s %3$s'); - } - - if (! isset($bodyverb)) { - killme(); - } + if (! intval($item['item_thread_top'])) { + $post_type = 'comment'; + } - $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]'; - $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; - $plink = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]'; + $arr['item_origin'] = 1; + $arr['item_notshown'] = 1; + $arr['item_type'] = $item['item_type']; - $arr['body'] = sprintf( $bodyverb, $alink, $ulink, $plink ); + if (intval($item['item_wall'])) { + $arr['item_wall'] = 1; + } - } + // if this was a linked photo and was hidden, unhide it and distribute it. + + if (intval($item['item_hidden'])) { + $r = q( + "update item set item_hidden = 0 where id = %d", + intval($item['id']) + ); + + $r = q( + "select * from item where id = %d", + intval($item['id']) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0], true) ] ]); + } + + Run::Summon([ 'Notifier','wall-new',$item['id'] ]); + } - if (local_channel() && $activity === 'Accept') { - event_addtocal($item['id'],$channel['channel_id']); - } - - $arr['parent'] = $item['id']; - $arr['thr_parent'] = $item['mid']; - $allow_cid = $item['allow_cid']; - $allow_gid = $item['allow_gid']; - $deny_cid = $item['deny_cid']; - $deny_gid = $item['deny_gid']; - $private = $item['private']; - - $arr['aid'] = $owner_aid; - $arr['uid'] = $owner_uid; + if ($undo) { + $arr['body'] = t('Undo a previous action'); + $arr['item_notshown'] = 1; + } else { + if ($activity === 'Like') { + $bodyverb = t('%1$s likes %2$s\'s %3$s'); + } + if ($activity === 'Dislike') { + $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); + } + if ($activity === 'Accept') { + $bodyverb = t('%1$s is attending %2$s\'s %3$s'); + } + if ($activity === 'Reject') { + $bodyverb = t('%1$s is not attending %2$s\'s %3$s'); + } + if ($activity === 'TentativeAccept') { + $bodyverb = t('%1$s may attend %2$s\'s %3$s'); + } - $arr['item_flags'] = $item['item_flags']; - $arr['item_wall'] = $item['item_wall']; - $arr['parent_mid'] = $item['mid']; - $arr['owner_xchan'] = $thread_owner['xchan_hash']; - $arr['author_xchan'] = $observer['xchan_hash']; - - - - $arr['verb'] = (($undo) ? 'Undo' : $activity); - $arr['obj_type'] = (($undo) ? $activity : $objtype); - $arr['obj'] = $object; - - if ($target) { - $arr['tgt_type'] = $tgttype; - $arr['target'] = $target; - } - - $arr['allow_cid'] = $allow_cid; - $arr['allow_gid'] = $allow_gid; - $arr['deny_cid'] = $deny_cid; - $arr['deny_gid'] = $deny_gid; - $arr['item_private'] = $private; - - call_hooks('post_local',$arr); - - $post = item_store($arr); - $post_id = $post['item_id']; + if (! isset($bodyverb)) { + killme(); + } - // save the conversation from expiration + $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]'; + $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; + $plink = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]'; - if (local_channel() && array_key_exists('item',$post) && (intval($post['item']['id']) != intval($post['item']['parent']))) { - retain_item($post['item']['parent']); - } - - $arr['id'] = $post_id; - - call_hooks('post_local_end', $arr); - - $r = q("select * from item where id = %d", - intval($post_id) - ); - if ($r) { - xchan_query($r); - $sync_item = fetch_post_tags($r); - Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0],true) ] ]); - } + $arr['body'] = sprintf($bodyverb, $alink, $ulink, $plink); + } - Run::Summon( [ 'Notifier', 'like', $post_id ] ); - - killme(); - } - - - + + if (local_channel() && $activity === 'Accept') { + event_addtocal($item['id'], $channel['channel_id']); + } + + $arr['parent'] = $item['id']; + $arr['thr_parent'] = $item['mid']; + $allow_cid = $item['allow_cid']; + $allow_gid = $item['allow_gid']; + $deny_cid = $item['deny_cid']; + $deny_gid = $item['deny_gid']; + $private = $item['private']; + + $arr['aid'] = $owner_aid; + $arr['uid'] = $owner_uid; + + $arr['item_flags'] = $item['item_flags']; + $arr['item_wall'] = $item['item_wall']; + $arr['parent_mid'] = $item['mid']; + $arr['owner_xchan'] = $thread_owner['xchan_hash']; + $arr['author_xchan'] = $observer['xchan_hash']; + + + + $arr['verb'] = (($undo) ? 'Undo' : $activity); + $arr['obj_type'] = (($undo) ? $activity : $objtype); + $arr['obj'] = $object; + + if ($target) { + $arr['tgt_type'] = $tgttype; + $arr['target'] = $target; + } + + $arr['allow_cid'] = $allow_cid; + $arr['allow_gid'] = $allow_gid; + $arr['deny_cid'] = $deny_cid; + $arr['deny_gid'] = $deny_gid; + $arr['item_private'] = $private; + + call_hooks('post_local', $arr); + + $post = item_store($arr); + $post_id = $post['item_id']; + + // save the conversation from expiration + + if (local_channel() && array_key_exists('item', $post) && (intval($post['item']['id']) != intval($post['item']['parent']))) { + retain_item($post['item']['parent']); + } + + $arr['id'] = $post_id; + + call_hooks('post_local_end', $arr); + + $r = q( + "select * from item where id = %d", + intval($post_id) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0], true) ] ]); + } + + Run::Summon([ 'Notifier', 'like', $post_id ]); + + killme(); + } } diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php index fc7ac2e8b..9df5300f0 100644 --- a/Zotlabs/Module/Linkinfo.php +++ b/Zotlabs/Module/Linkinfo.php @@ -1,7 +1,10 @@ true, 'nobody' => true ] ); - if ($result['success']) { - $hdrs=[]; - $h = explode("\n",$result['header']); - foreach ($h as $l) { - list($k,$v) = array_map("trim", explode(":", trim($l), 2)); - $hdrs[strtolower($k)] = $v; - } - if (array_key_exists('content-type', $hdrs)) - $type = $hdrs['content-type']; - if ($type) { - if (stripos($type,'image/') !== false) { - $basename = basename($url); - - if ($zrl) - echo $br . '[zmg alt="' . $basename . '"]' . $url . '[/zmg]' . $br; - else - echo $br . '[img alt="' . $basename . '"]' . $url . '[/img]' . $br; - killme(); - } - if ((stripos($type,'video/') !== false) || ($type === 'application/ogg')) { - $thumb = self::get_video_poster($url); - if($thumb) { - if ($zrl) - echo $br . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . $br; - else - echo $br . '[video poster=\'' . $thumb . '\']' . $url . '[/video]' . $br; - killme(); - } - if ($zrl) - echo $br . '[zvideo]' . $url . '[/zvideo]' . $br; - else - echo $br . '[video]' . $url . '[/video]' . $br; - killme(); - } - if (stripos($type,'audio/') !== false) { - if ($zrl) - echo $br . '[zaudio]' . $url . '[/zaudio]' . $br; - else - echo $br . '[audio]' . $url . '[/audio]' . $br; - killme(); - } - if (strtolower($type) === 'text/calendar') { - $content = z_fetch_url($url,false,0,array('novalidate' => true)); - if ($content['success']) { - $ev = ical_to_ev($content['body']); - if ($ev) { - echo $br . format_event_bbcode($ev[0]) . $br; - killme(); - } - } - } - if (strtolower($type) === 'application/pdf' || strtolower($type) === 'application/x-pdf') { - echo $br . '[embed]' . $url . '[/embed]' . $br; - killme(); - } - } - } - - $template = $br . '[url=%s]%s[/url]%s' . $br; - - $arr = array('url' => $url, 'text' => ''); - - call_hooks('parse_link', $arr); - - if (strlen($arr['text'])) { - echo $arr['text']; - killme(); - } + if (strpos($url, 'geo:') === 0) { + if ($process_embed) { + echo $br . '[map=' . substr($url, 4) . ']' . $br; + } else { + echo $br . '[url]' . $url . '[/url]' . $br; + } + killme(); + } - if ($process_oembed) { - $x = oembed_process($url); - if ($x) { - echo $x; - killme(); - } - } - - if ($process_zotobj) { - $x = Activity::fetch($url, App::get_channel()); - $y = null; - if (is_array($x)) { - if (ActivityStreams::is_an_actor($x['type']) && $x['id']) { - if (check_siteallowed($x['id']) && check_channelallowed($x['id'])) { - $url = $x['url']; - if (is_array($url)) { - $url = $url[0]['href']; - } - $name = (($x['name']) ? $x['name'] . ' (' . $x['preferredUsername'] . ')' : $x['preferredUsername']); + if (strpos($url, 'tel:') === 0 || (is_phone_number($url) !== false)) { + $phone = $url; + if (strpos($url, 'tel:') !== 0) { + $url = 'tel:' . is_phone_number($url); + } + echo $br . '[url=' . $url . ']' . $phone . '[/url]' . $br; + killme(); + } - if (array_path_exists('icon/url',$x)) { - $text = $br . $br . '[zrl=' . $url . '][zmg=300x300]' . $x['icon']['url'] . '[/zmg][/zrl]' ; - } - $text .= $br . $br . '[zrl=' . $url . ']' . $name . '[/zrl]' . $br . $br; - echo $text; - killme(); - } - } - else { - $y = new ActivityStreams($x); - if ($y->is_valid() && $y->type === 'Announce' && is_array($y->obj) - && array_key_exists('object',$y->obj) && array_key_exists('actor',$y->obj)) { - // This is a relayed/forwarded Activity (as opposed to a shared/boosted object) - // Reparse the encapsulated Activity and use that instead - logger('relayed activity',LOGGER_DEBUG); - $y = new ActivityStreams($y->obj); - } - } + $m = parse_url($url); - if ($y && $y->is_valid()) { - $z = Activity::decode_note($y); - $r = q("select hubloc_hash, hubloc_network, hubloc_url from hubloc where hubloc_hash = '%s' OR hubloc_id_url = '%s'", - dbesc(is_array($y->actor) ? $y->actor['id'] : $y->actor), - dbesc(is_array($y->actor) ? $y->actor['id'] : $y->actor) - ); + if (!$m['scheme']) { + if (strpos($url, '@')) { + $xc = discover_by_webbie($url); + if ($xc) { + $x = q( + "select * from xchan where xchan_hash = '%s'", + dbesc($xc) + ); + if ($x) { + $url = $x[0]['xchan_url']; + } + } else { + echo $br . '[url=mailto:' . $url . ']' . $url . '[/url]' . $br; + killme(); + } + } else { + $url = 'http://' . $url; + } + } - if ($r) { - $r = Libzot::zot_record_preferred($r); - if ($z) { - $z['author_xchan'] = $r['hubloc_hash']; - } - } + if ($_GET['title']) { + $title = strip_tags(trim($_GET['title'])); + } - if ($z) { + if ($_GET['description']) { + $text = strip_tags(trim($_GET['description'])); + } - // do not allow somebody to embed a post that was blocked by the site admin - // We *will* let them over-rule any blocks they created themselves - - if (check_siteallowed($r['hubloc_id_url']) && check_channelallowed($z['author_xchan'])) { - $s = new Zlib\Share($z); - echo $s->bbcode(); - killme(); - } - } - } - } - } + if ($_GET['tags']) { + $arr_tags = str_getcsv($_GET['tags']); + if (count($arr_tags)) { + array_walk($arr_tags, 'self::arr_add_hashes'); + $str_tags = $br . implode(' ', $arr_tags) . $br; + } + } + + logger('linkinfo: ' . $url, LOGGER_DEBUG); + + $zrl = is_matrix_url($url); + + if (!$process_embed) { + if ($zrl) { + echo $br . '[zrl]' . $url . '[/zrl]' . $br; + } else { + echo $br . '[url]' . $url . '[/url]' . $br; + } + killme(); + } + + $result = z_fetch_url($url, false, 0, ['novalidate' => true, 'nobody' => true]); + if ($result['success']) { + $hdrs = []; + $h = explode("\n", $result['header']); + foreach ($h as $l) { + list($k, $v) = array_map("trim", explode(":", trim($l), 2)); + $hdrs[strtolower($k)] = $v; + } + if (array_key_exists('content-type', $hdrs)) { + $type = $hdrs['content-type']; + } + if ($type) { + if (stripos($type, 'image/') !== false) { + $basename = basename($url); + + if ($zrl) { + echo $br . '[zmg alt="' . $basename . '"]' . $url . '[/zmg]' . $br; + } else { + echo $br . '[img alt="' . $basename . '"]' . $url . '[/img]' . $br; + } + killme(); + } + if ((stripos($type, 'video/') !== false) || ($type === 'application/ogg')) { + $thumb = self::get_video_poster($url); + if ($thumb) { + if ($zrl) { + echo $br . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . $br; + } else { + echo $br . '[video poster=\'' . $thumb . '\']' . $url . '[/video]' . $br; + } + killme(); + } + if ($zrl) { + echo $br . '[zvideo]' . $url . '[/zvideo]' . $br; + } else { + echo $br . '[video]' . $url . '[/video]' . $br; + } + killme(); + } + if (stripos($type, 'audio/') !== false) { + if ($zrl) { + echo $br . '[zaudio]' . $url . '[/zaudio]' . $br; + } else { + echo $br . '[audio]' . $url . '[/audio]' . $br; + } + killme(); + } + if (strtolower($type) === 'text/calendar') { + $content = z_fetch_url($url, false, 0, array('novalidate' => true)); + if ($content['success']) { + $ev = ical_to_ev($content['body']); + if ($ev) { + echo $br . format_event_bbcode($ev[0]) . $br; + killme(); + } + } + } + if (strtolower($type) === 'application/pdf' || strtolower($type) === 'application/x-pdf') { + echo $br . '[embed]' . $url . '[/embed]' . $br; + killme(); + } + } + } + + $template = $br . '[url=%s]%s[/url]%s' . $br; + + $arr = array('url' => $url, 'text' => ''); + + call_hooks('parse_link', $arr); + + if (strlen($arr['text'])) { + echo $arr['text']; + killme(); + } + + if ($process_oembed) { + $x = oembed_process($url); + if ($x) { + echo $x; + killme(); + } + } + + if ($process_zotobj) { + $x = Activity::fetch($url, App::get_channel()); + $y = null; + if (is_array($x)) { + if (ActivityStreams::is_an_actor($x['type']) && $x['id']) { + if (check_siteallowed($x['id']) && check_channelallowed($x['id'])) { + $url = $x['url']; + if (is_array($url)) { + $url = $url[0]['href']; + } + $name = (($x['name']) ? $x['name'] . ' (' . $x['preferredUsername'] . ')' : $x['preferredUsername']); + + if (array_path_exists('icon/url', $x)) { + $text = $br . $br . '[zrl=' . $url . '][zmg=300x300]' . $x['icon']['url'] . '[/zmg][/zrl]'; + } + $text .= $br . $br . '[zrl=' . $url . ']' . $name . '[/zrl]' . $br . $br; + echo $text; + killme(); + } + } else { + $y = new ActivityStreams($x); + if ( + $y->is_valid() && $y->type === 'Announce' && is_array($y->obj) + && array_key_exists('object', $y->obj) && array_key_exists('actor', $y->obj) + ) { + // This is a relayed/forwarded Activity (as opposed to a shared/boosted object) + // Reparse the encapsulated Activity and use that instead + logger('relayed activity', LOGGER_DEBUG); + $y = new ActivityStreams($y->obj); + } + } + + if ($y && $y->is_valid()) { + $z = Activity::decode_note($y); + $r = q( + "select hubloc_hash, hubloc_network, hubloc_url from hubloc where hubloc_hash = '%s' OR hubloc_id_url = '%s'", + dbesc(is_array($y->actor) ? $y->actor['id'] : $y->actor), + dbesc(is_array($y->actor) ? $y->actor['id'] : $y->actor) + ); + + if ($r) { + $r = Libzot::zot_record_preferred($r); + if ($z) { + $z['author_xchan'] = $r['hubloc_hash']; + } + } + + if ($z) { + // do not allow somebody to embed a post that was blocked by the site admin + // We *will* let them over-rule any blocks they created themselves + + if (check_siteallowed($r['hubloc_id_url']) && check_channelallowed($z['author_xchan'])) { + $s = new Zlib\Share($z); + echo $s->bbcode(); + killme(); + } + } + } + } + } - if ($url && $title && $text) { - - $text = $br . '[quote]' . trim($text) . '[/quote]' . $br; - - $title = str_replace(array("\r","\n"),array('',''),$title); - - $result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags; - - logger('linkinfo (unparsed): returns: ' . $result); - - echo $result; - killme(); - } - - $siteinfo = self::parseurl_getsiteinfo($url); - - // If the site uses this platform, use zrl rather than url so they get zids sent to them by default - - if (is_matrix_url($url)) - $template = str_replace('url','zrl',$template); - - if ($siteinfo["title"] == "") { - echo sprintf($template,$url,$url,'') . $str_tags; - killme(); - } else { - $text = $siteinfo["text"]; - $title = $siteinfo["title"]; - } - - $image = ""; - - if (isset($siteinfo['images']) && is_array($siteinfo['images']) && count($siteinfo["images"])) { - /* Execute below code only if image is present in siteinfo */ - - $total_images = 0; - $max_images = get_config('system','max_bookmark_images'); - if ($max_images === false) - $max_images = 2; - else - $max_images = intval($max_images); - - foreach ($siteinfo["images"] as $imagedata) { - if ($url) { - $image .= sprintf('[url=%s]', $url); - } - $image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]'; - if ($url) { - $image .= '[/url]'; - } - $image .= "\n"; - $total_images ++; - if ($max_images && $max_images >= $total_images) - break; - } - } - - if (strlen($text)) { - $text = $br.'[quote]'.trim($text).'[/quote]'.$br ; - } - - if ($image) { - $text = $br.$br.$image.$text; - } - $title = str_replace(array("\r","\n"),array('',''),$title); - - $result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags; - - logger('linkinfo: returns: ' . $result, LOGGER_DEBUG); - - echo trim($result); - killme(); - - } - - - public static function deletexnode(&$doc, $node) { - $xpath = new \DomXPath($doc); - $list = $xpath->query("//".$node); - foreach ($list as $child) - $child->parentNode->removeChild($child); - } - - public static function completeurl($url, $scheme) { - $urlarr = parse_url($url); - - if (isset($urlarr["scheme"])) - return($url); - - $schemearr = parse_url($scheme); - - $complete = $schemearr["scheme"]."://".$schemearr["host"]; - - if ($schemearr["port"] != "") - $complete .= ":".$schemearr["port"]; - - if (strpos($urlarr['path'],'/') !== 0) - $complete .= '/'; - - $complete .= $urlarr["path"]; - - if ($urlarr["query"] != "") - $complete .= "?".$urlarr["query"]; - - if ($urlarr["fragment"] != "") - $complete .= "#".$urlarr["fragment"]; - - return($complete); - } + if ($url && $title && $text) { + $text = $br . '[quote]' . trim($text) . '[/quote]' . $br; - public static function get_video_poster($url) { + $title = str_replace(array("\r", "\n"), array('', ''), $title); - if(strpos($url,z_root() . '/cloud/') === false) { - return EMPTY_STR; - } - $m = parse_url($url,PHP_URL_PATH); - if($m) { - // strip leading '/cloud/' - $m = substr($m,7); - } - $nick = substr($m,0,strpos($m,'/')); - $p = substr($m,strpos($m,'/')+1); + $result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags; - // get the channel to check permissions - - $u = channelx_by_nick($nick); + logger('linkinfo (unparsed): returns: ' . $result); - if($u && $p) { + echo $result; + killme(); + } - $sql_extra = permissions_sql(intval($u['channel_id'])); + $siteinfo = self::parseurl_getsiteinfo($url); - $r = q("select hash, content from attach where display_path = '%s' and uid = %d and os_storage = 1 $sql_extra limit 1", - dbesc($p), - intval($u['channel_id']) - ); - if($r) { - $path = dbunescbin($r[0]['content']); - if($path && @file_exists($path . '.thumb')) { - return z_root() . '/poster/' . $nick . '/' . $r[0]['hash']; - } - } - } - return EMPTY_STR; - } + // If the site uses this platform, use zrl rather than url so they get zids sent to them by default - - public static function parseurl_getsiteinfo($url) { - $siteinfo = []; - - - $result = z_fetch_url($url,false,0,array('novalidate' => true)); - if (! $result['success']) - return $siteinfo; - - $header = $result['header']; - $body = $result['body']; - - // Check codepage in HTTP headers or HTML if not exist - $cp = (preg_match('/Content-Type: text\/html; charset=(.+)\r\n/i', $header, $o) ? $o[1] : ''); - if (empty($cp)) - $cp = (preg_match('/meta.+content=["|\']text\/html; charset=([^"|\']+)/i', $body, $o) ? $o[1] : 'AUTO'); + if (is_matrix_url($url)) { + $template = str_replace('url', 'zrl', $template); + } - $body = mb_convert_encoding($body, 'UTF-8', $cp); - $body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8"); - - $doc = new \DOMDocument(); - @$doc->loadHTML($body); - - self::deletexnode($doc, 'style'); - self::deletexnode($doc, 'script'); - self::deletexnode($doc, 'option'); - self::deletexnode($doc, 'h1'); - self::deletexnode($doc, 'h2'); - self::deletexnode($doc, 'h3'); - self::deletexnode($doc, 'h4'); - self::deletexnode($doc, 'h5'); - self::deletexnode($doc, 'h6'); - self::deletexnode($doc, 'ol'); - self::deletexnode($doc, 'ul'); - - $xpath = new \DomXPath($doc); - - //$list = $xpath->query("head/title"); - $list = $xpath->query("//title"); - foreach ($list as $node) - $siteinfo["title"] = html_entity_decode($node->nodeValue, ENT_QUOTES, "UTF-8"); - - //$list = $xpath->query("head/meta[@name]"); - $list = $xpath->query("//meta[@name]"); - foreach ($list as $node) { - $attr = []; - if ($node->attributes->length) - foreach ($node->attributes as $attribute) - $attr[$attribute->name] = $attribute->value; - - $attr["content"] = html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"); - - switch (strtolower($attr["name"])) { - case "fulltitle": - $siteinfo["title"] = trim($attr["content"]); - break; - case "description": - $siteinfo["text"] = trim($attr["content"]); - break; - case "thumbnail": - $siteinfo["image"] = $attr["content"]; - break; - case "twitter:image": - $siteinfo["image"] = $attr["content"]; - break; - case "twitter:image:src": - $siteinfo["image"] = $attr["content"]; - break; - case "twitter:card": - if (($siteinfo["type"] == "") || ($attr["content"] == "photo")) { - $siteinfo["type"] = $attr["content"]; - } - break; - case "twitter:description": - $siteinfo["text"] = trim($attr["content"]); - break; - case "twitter:title": - $siteinfo["title"] = trim($attr["content"]); - break; - case "dc.title": - $siteinfo["title"] = trim($attr["content"]); - break; - case "dc.description": - $siteinfo["text"] = trim($attr["content"]); - break; - case "keywords": - $keywords = explode(",", $attr["content"]); - break; - case "news_keywords": - $keywords = explode(",", $attr["content"]); - break; - } - } - - //$list = $xpath->query("head/meta[@property]"); - $list = $xpath->query("//meta[@property]"); - foreach ($list as $node) { - $attr = []; - if ($node->attributes->length) - foreach ($node->attributes as $attribute) - $attr[$attribute->name] = $attribute->value; - - $attr["content"] = html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"); - - switch (strtolower($attr["property"])) { - case "og:image": - $siteinfo["image"] = $attr["content"]; - break; - case "og:title": - $siteinfo["title"] = $attr["content"]; - break; - case "og:description": - $siteinfo["text"] = $attr["content"]; - break; - } - } - - if ($siteinfo["image"] == "") { - $list = $xpath->query("//img[@src]"); - foreach ($list as $node) { - $attr = []; - if ($node->attributes->length) - foreach ($node->attributes as $attribute) - $attr[$attribute->name] = $attribute->value; - - $src = self::completeurl($attr["src"], $url); - $photodata = @getimagesize($src); - - if (($photodata) && ($photodata[0] > 150) and ($photodata[1] > 150)) { - if ($photodata[0] > 300) { - $photodata[1] = round($photodata[1] * (300 / $photodata[0])); - $photodata[0] = 300; - } - if ($photodata[1] > 300) { - $photodata[0] = round($photodata[0] * (300 / $photodata[1])); - $photodata[1] = 300; - } - $siteinfo["images"][] = array("src"=>$src, - "width"=>$photodata[0], - "height"=>$photodata[1]); - } - - } - } else { - $src = self::completeurl($siteinfo["image"], $url); - - unset($siteinfo["image"]); - - $photodata = @getimagesize($src); - - if (($photodata) && ($photodata[0] > 10) and ($photodata[1] > 10)) - $siteinfo["images"][] = array("src"=>$src, - "width"=>$photodata[0], - "height"=>$photodata[1]); - } - - if ($siteinfo["text"] == "") { - $text = ""; - - $list = $xpath->query("//div[@class='article']"); - foreach ($list as $node) - if (strlen($node->nodeValue) > 40) - $text .= " ".trim($node->nodeValue); - - if ($text == "") { - $list = $xpath->query("//div[@class='content']"); - foreach ($list as $node) - if (strlen($node->nodeValue) > 40) - $text .= " ".trim($node->nodeValue); - } - - // If none text was found then take the paragraph content - if ($text == "") { - $list = $xpath->query("//p"); - foreach ($list as $node) - if (strlen($node->nodeValue) > 40) - $text .= " ".trim($node->nodeValue); - } - - if ($text != "") { - $text = trim(str_replace(array("\n", "\r"), array(" ", " "), $text)); - - while (strpos($text, " ")) - $text = trim(str_replace(" ", " ", $text)); - - $siteinfo["text"] = html_entity_decode(substr($text,0,350), ENT_QUOTES, "UTF-8").'...'; - } - } - - return($siteinfo); - } - + if ($siteinfo["title"] == "") { + echo sprintf($template, $url, $url, '') . $str_tags; + killme(); + } else { + $text = $siteinfo["text"]; + $title = $siteinfo["title"]; + } - private static function arr_add_hashes(&$item,$k) { - if (substr($item,0,1) !== '#') { - $item = '#' . $item; - } - } + $image = ""; + if (isset($siteinfo['images']) && is_array($siteinfo['images']) && count($siteinfo["images"])) { + /* Execute below code only if image is present in siteinfo */ + + $total_images = 0; + $max_images = get_config('system', 'max_bookmark_images'); + if ($max_images === false) { + $max_images = 2; + } else { + $max_images = intval($max_images); + } + + foreach ($siteinfo["images"] as $imagedata) { + if ($url) { + $image .= sprintf('[url=%s]', $url); + } + $image .= '[img=' . $imagedata["width"] . 'x' . $imagedata["height"] . ']' . $imagedata["src"] . '[/img]'; + if ($url) { + $image .= '[/url]'; + } + $image .= "\n"; + $total_images++; + if ($max_images && $max_images >= $total_images) { + break; + } + } + } + + if (strlen($text)) { + $text = $br . '[quote]' . trim($text) . '[/quote]' . $br; + } + + if ($image) { + $text = $br . $br . $image . $text; + } + $title = str_replace(array("\r", "\n"), array('', ''), $title); + + $result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags; + + logger('linkinfo: returns: ' . $result, LOGGER_DEBUG); + + echo trim($result); + killme(); + } + + + public static function deletexnode(&$doc, $node) + { + $xpath = new DomXPath($doc); + $list = $xpath->query("//" . $node); + foreach ($list as $child) { + $child->parentNode->removeChild($child); + } + } + + public static function completeurl($url, $scheme) + { + $urlarr = parse_url($url); + + if (isset($urlarr["scheme"])) { + return ($url); + } + + $schemearr = parse_url($scheme); + + $complete = $schemearr["scheme"] . "://" . $schemearr["host"]; + + if ($schemearr["port"] != "") { + $complete .= ":" . $schemearr["port"]; + } + + if (strpos($urlarr['path'], '/') !== 0) { + $complete .= '/'; + } + + $complete .= $urlarr["path"]; + + if ($urlarr["query"] != "") { + $complete .= "?" . $urlarr["query"]; + } + + if ($urlarr["fragment"] != "") { + $complete .= "#" . $urlarr["fragment"]; + } + + return ($complete); + } + + public static function get_video_poster($url) + { + + if (strpos($url, z_root() . '/cloud/') === false) { + return EMPTY_STR; + } + $m = parse_url($url, PHP_URL_PATH); + if ($m) { + // strip leading '/cloud/' + $m = substr($m, 7); + } + $nick = substr($m, 0, strpos($m, '/')); + $p = substr($m, strpos($m, '/') + 1); + + // get the channel to check permissions + + $u = channelx_by_nick($nick); + + if ($u && $p) { + $sql_extra = permissions_sql(intval($u['channel_id'])); + + $r = q( + "select hash, content from attach where display_path = '%s' and uid = %d and os_storage = 1 $sql_extra limit 1", + dbesc($p), + intval($u['channel_id']) + ); + if ($r) { + $path = dbunescbin($r[0]['content']); + if ($path && @file_exists($path . '.thumb')) { + return z_root() . '/poster/' . $nick . '/' . $r[0]['hash']; + } + } + } + return EMPTY_STR; + } + + + public static function parseurl_getsiteinfo($url) + { + $siteinfo = []; + + + $result = z_fetch_url($url, false, 0, array('novalidate' => true)); + if (!$result['success']) { + return $siteinfo; + } + + $header = $result['header']; + $body = $result['body']; + + // Check codepage in HTTP headers or HTML if not exist + $cp = (preg_match('/Content-Type: text\/html; charset=(.+)\r\n/i', $header, $o) ? $o[1] : ''); + if (empty($cp)) { + $cp = (preg_match('/meta.+content=["|\']text\/html; charset=([^"|\']+)/i', $body, $o) ? $o[1] : 'AUTO'); + } + + $body = mb_convert_encoding($body, 'UTF-8', $cp); + $body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8"); + + $doc = new DOMDocument(); + @$doc->loadHTML($body); + + self::deletexnode($doc, 'style'); + self::deletexnode($doc, 'script'); + self::deletexnode($doc, 'option'); + self::deletexnode($doc, 'h1'); + self::deletexnode($doc, 'h2'); + self::deletexnode($doc, 'h3'); + self::deletexnode($doc, 'h4'); + self::deletexnode($doc, 'h5'); + self::deletexnode($doc, 'h6'); + self::deletexnode($doc, 'ol'); + self::deletexnode($doc, 'ul'); + + $xpath = new DomXPath($doc); + + //$list = $xpath->query("head/title"); + $list = $xpath->query("//title"); + foreach ($list as $node) { + $siteinfo["title"] = html_entity_decode($node->nodeValue, ENT_QUOTES, "UTF-8"); + } + + //$list = $xpath->query("head/meta[@name]"); + $list = $xpath->query("//meta[@name]"); + foreach ($list as $node) { + $attr = []; + if ($node->attributes->length) { + foreach ($node->attributes as $attribute) { + $attr[$attribute->name] = $attribute->value; + } + } + + $attr["content"] = html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"); + + switch (strtolower($attr["name"])) { + case "fulltitle": + $siteinfo["title"] = trim($attr["content"]); + break; + case "description": + $siteinfo["text"] = trim($attr["content"]); + break; + case "thumbnail": + $siteinfo["image"] = $attr["content"]; + break; + case "twitter:image": + $siteinfo["image"] = $attr["content"]; + break; + case "twitter:image:src": + $siteinfo["image"] = $attr["content"]; + break; + case "twitter:card": + if (($siteinfo["type"] == "") || ($attr["content"] == "photo")) { + $siteinfo["type"] = $attr["content"]; + } + break; + case "twitter:description": + $siteinfo["text"] = trim($attr["content"]); + break; + case "twitter:title": + $siteinfo["title"] = trim($attr["content"]); + break; + case "dc.title": + $siteinfo["title"] = trim($attr["content"]); + break; + case "dc.description": + $siteinfo["text"] = trim($attr["content"]); + break; + case "keywords": + $keywords = explode(",", $attr["content"]); + break; + case "news_keywords": + $keywords = explode(",", $attr["content"]); + break; + } + } + + //$list = $xpath->query("head/meta[@property]"); + $list = $xpath->query("//meta[@property]"); + foreach ($list as $node) { + $attr = []; + if ($node->attributes->length) { + foreach ($node->attributes as $attribute) { + $attr[$attribute->name] = $attribute->value; + } + } + + $attr["content"] = html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"); + + switch (strtolower($attr["property"])) { + case "og:image": + $siteinfo["image"] = $attr["content"]; + break; + case "og:title": + $siteinfo["title"] = $attr["content"]; + break; + case "og:description": + $siteinfo["text"] = $attr["content"]; + break; + } + } + + if ($siteinfo["image"] == "") { + $list = $xpath->query("//img[@src]"); + foreach ($list as $node) { + $attr = []; + if ($node->attributes->length) { + foreach ($node->attributes as $attribute) { + $attr[$attribute->name] = $attribute->value; + } + } + + $src = self::completeurl($attr["src"], $url); + $photodata = @getimagesize($src); + + if (($photodata) && ($photodata[0] > 150) and ($photodata[1] > 150)) { + if ($photodata[0] > 300) { + $photodata[1] = round($photodata[1] * (300 / $photodata[0])); + $photodata[0] = 300; + } + if ($photodata[1] > 300) { + $photodata[0] = round($photodata[0] * (300 / $photodata[1])); + $photodata[1] = 300; + } + $siteinfo["images"][] = array("src" => $src, + "width" => $photodata[0], + "height" => $photodata[1]); + } + } + } else { + $src = self::completeurl($siteinfo["image"], $url); + + unset($siteinfo["image"]); + + $photodata = @getimagesize($src); + + if (($photodata) && ($photodata[0] > 10) and ($photodata[1] > 10)) { + $siteinfo["images"][] = array("src" => $src, + "width" => $photodata[0], + "height" => $photodata[1]); + } + } + + if ($siteinfo["text"] == "") { + $text = ""; + + $list = $xpath->query("//div[@class='article']"); + foreach ($list as $node) { + if (strlen($node->nodeValue) > 40) { + $text .= " " . trim($node->nodeValue); + } + } + + if ($text == "") { + $list = $xpath->query("//div[@class='content']"); + foreach ($list as $node) { + if (strlen($node->nodeValue) > 40) { + $text .= " " . trim($node->nodeValue); + } + } + } + + // If none text was found then take the paragraph content + if ($text == "") { + $list = $xpath->query("//p"); + foreach ($list as $node) { + if (strlen($node->nodeValue) > 40) { + $text .= " " . trim($node->nodeValue); + } + } + } + + if ($text != "") { + $text = trim(str_replace(array("\n", "\r"), array(" ", " "), $text)); + + while (strpos($text, " ")) { + $text = trim(str_replace(" ", " ", $text)); + } + + $siteinfo["text"] = html_entity_decode(substr($text, 0, 350), ENT_QUOTES, "UTF-8") . '...'; + } + } + + return ($siteinfo); + } + + + private static function arr_add_hashes(&$item, $k) + { + if (substr($item, 0, 1) !== '#') { + $item = '#' . $item; + } + } } diff --git a/Zotlabs/Module/Lists.php b/Zotlabs/Module/Lists.php index 599a19abb..02cdf5115 100644 --- a/Zotlabs/Module/Lists.php +++ b/Zotlabs/Module/Lists.php @@ -1,4 +1,5 @@ 100) { - $ret = Activity::paged_collection_init($total,App::$query_string); - } - else { - $members = AccessList::members($group['uid'],$group['id'], false, App::$pager['start'], App::$pager['itemspage']); - $ret = Activity::encode_follow_collection($members, App::$query_string, 'OrderedCollection',$total); - } + if (App::$pager['unset'] && $total > 100) { + $ret = Activity::paged_collection_init($total, App::$query_string); + } else { + $members = AccessList::members($group['uid'], $group['id'], false, App::$pager['start'], App::$pager['itemspage']); + $ret = Activity::encode_follow_collection($members, App::$query_string, 'OrderedCollection', $total); + } - as_return_and_die($ret,$channel); + as_return_and_die($ret, $channel); + } - } + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } - if (! local_channel()) { - notice( t('Permission denied.') . EOL); - return; - } + App::$profile_uid = local_channel(); + nav_set_selected('Access Lists'); + } - App::$profile_uid = local_channel(); - nav_set_selected('Access Lists'); - } + public function post() + { - function post() { - - if (! local_channel()) { - notice( t('Permission denied.') . EOL); - return; - } - - if ((argc() == 2) && (argv(1) === 'new')) { - check_form_security_token_redirectOnErr('/lists/new', 'group_edit'); - - $name = notags(trim($_POST['groupname'])); - $public = intval($_POST['public']); - $r = AccessList::add(local_channel(),$name,$public); - if ($r) { - info( t('Access list created.') . EOL ); - } - else { - notice( t('Could not create access list.') . EOL ); - } - goaway(z_root() . '/lists'); - - } - if ((argc() == 2) && (intval(argv(1)))) { - check_form_security_token_redirectOnErr('/lists', 'group_edit'); - - $r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1", - intval(argv(1)), - intval(local_channel()) - ); - if (! $r) { - $r = q("select * from pgrp where id = %d limit 1", - intval(argv(1)) - ); - if ($r) { - notice( t('Permission denied.') . EOL ); - } else { - notice( t('Access list not found.') . EOL ); - } - goaway(z_root() . '/connections'); - - } - $group = array_shift($r); - $groupname = notags(trim($_POST['groupname'])); - $public = intval($_POST['public']); - - if ((strlen($groupname)) && (($groupname != $group['gname']) || ($public != $group['visible']))) { - $r = q("UPDATE pgrp SET gname = '%s', visible = %d WHERE uid = %d AND id = %d", - dbesc($groupname), - intval($public), - intval(local_channel()), - intval($group['id']) - ); - if ($r) { - info( t('Access list updated.') . EOL ); - } - Libsync::build_sync_packet(local_channel(),null,true); - } - - goaway(z_root() . '/lists/' . argv(1) . '/' . argv(2)); - } - return; - } - - function get() { + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } - $change = false; - - logger('mod_lists: ' . App::$cmd,LOGGER_DEBUG); - + if ((argc() == 2) && (argv(1) === 'new')) { + check_form_security_token_redirectOnErr('/lists/new', 'group_edit'); - if (argc() > 2 && argv(1) === 'view') { - $grp = argv(2); - if ($grp) { - $r = q("select * from pgrp where hash = '%s' and deleted = 0", - dbesc($grp) - ); - if ($r) { - $uid = $r[0]['uid']; - if (local_channel() && local_channel() == $uid) { - goaway(z_root() . '/lists/' . $r[0]['id']); - } - if (! ($r[0]['visible'] && perm_is_allowed($uid,get_observer_hash(),'view_contacts'))) { - notice( t('Permission denied') . EOL); - return; - } - $members = []; - $memberlist = AccessList::members($uid, $r[0]['id']); + $name = notags(trim($_POST['groupname'])); + $public = intval($_POST['public']); + $r = AccessList::add(local_channel(), $name, $public); + if ($r) { + info(t('Access list created.') . EOL); + } else { + notice(t('Could not create access list.') . EOL); + } + goaway(z_root() . '/lists'); + } + if ((argc() == 2) && (intval(argv(1)))) { + check_form_security_token_redirectOnErr('/lists', 'group_edit'); - if ($memberlist) { - foreach ($memberlist as $member) { - $members[] = micropro($member,true,'mpgroup', 'card'); - } - } - $o = replace_macros(get_markup_template('listmembers.tpl'), [ - '$title' => t('List members'), - '$members' => $members - ]); - return $o; - } - else { - notice ( t('List not found') . EOL); - return; - } - } - } + $r = q( + "SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1", + intval(argv(1)), + intval(local_channel()) + ); + if (!$r) { + $r = q( + "select * from pgrp where id = %d limit 1", + intval(argv(1)) + ); + if ($r) { + notice(t('Permission denied.') . EOL); + } else { + notice(t('Access list not found.') . EOL); + } + goaway(z_root() . '/connections'); + } + $group = array_shift($r); + $groupname = notags(trim($_POST['groupname'])); + $public = intval($_POST['public']); + + if ((strlen($groupname)) && (($groupname != $group['gname']) || ($public != $group['visible']))) { + $r = q( + "UPDATE pgrp SET gname = '%s', visible = %d WHERE uid = %d AND id = %d", + dbesc($groupname), + intval($public), + intval(local_channel()), + intval($group['id']) + ); + if ($r) { + info(t('Access list updated.') . EOL); + } + Libsync::build_sync_packet(local_channel(), null, true); + } + + goaway(z_root() . '/lists/' . argv(1) . '/' . argv(2)); + } + return; + } + + public function get() + { + + $change = false; + + // logger('mod_lists: ' . App::$cmd, LOGGER_DEBUG); + + // Switch to text mode interface if we have more than 'n' contacts or group members, else loading avatars will lead to poor interactivity + + $switchtotext = get_pconfig(local_channel(), 'system', 'listedit_image_limit', get_config('system', 'listedit_image_limit', 1000)); + + if ((argc() == 1) || ((argc() == 2) && (argv(1) === 'new'))) { + if (!local_channel()) { + notice(t('Permission denied') . EOL); + return; + } + + $new = (((argc() == 2) && (argv(1) === 'new')) ? true : false); + + $groups = q( + "SELECT id, gname FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + intval(local_channel()) + ); + + $i = 0; + foreach ($groups as $group) { + $entries[$i]['name'] = $group['gname']; + $entries[$i]['id'] = $group['id']; + $entries[$i]['count'] = count(AccessList::members(local_channel(), $group['id'])); + $i++; + } + + $tpl = get_markup_template('privacy_groups.tpl'); + $o = replace_macros($tpl, [ + '$title' => t('Access Lists'), + '$add_new_label' => t('Create access list'), + '$new' => $new, + + // new group form + '$gname' => array('groupname', t('Access list name')), + '$public' => array('public', t('Members are visible to other channels'), false), + '$form_security_token' => get_form_security_token("group_edit"), + '$submit' => t('Submit'), + + // groups list + '$title' => t('Access Lists'), + '$name_label' => t('Name'), + '$count_label' => t('Members'), + '$entries' => $entries + ]); + + return $o; + } + + $context = array('$submit' => t('Submit')); + $tpl = get_markup_template('group_edit.tpl'); + + if ((argc() == 3) && (argv(1) === 'drop')) { + if (!local_channel()) { + notice(t('Permission denied') . EOL); + return; + } - - - if (! local_channel()) { - notice( t('Permission denied') . EOL); - return; - } - - - - // Switch to text mode interface if we have more than 'n' contacts or group members, else loading avatars will lead to poor interactivity - - $switchtotext = get_pconfig(local_channel(),'system','listedit_image_limit',get_config('system','listedit_image_limit', 1000)); - - if ((argc() == 1) || ((argc() == 2) && (argv(1) === 'new'))) { - - $new = (((argc() == 2) && (argv(1) === 'new')) ? true : false); - - $groups = q("SELECT id, gname FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", - intval(local_channel()) - ); - - $i = 0; - foreach ($groups as $group) { - $entries[$i]['name'] = $group['gname']; - $entries[$i]['id'] = $group['id']; - $entries[$i]['count'] = count(AccessList::members(local_channel(),$group['id'])); - $i++; - } - - $tpl = get_markup_template('privacy_groups.tpl'); - $o = replace_macros($tpl, [ - '$title' => t('Access Lists'), - '$add_new_label' => t('Create access list'), - '$new' => $new, - - // new group form - '$gname' => array('groupname',t('Access list name')), - '$public' => array('public',t('Members are visible to other channels'), false), - '$form_security_token' => get_form_security_token("group_edit"), - '$submit' => t('Submit'), - - // groups list - '$title' => t('Access Lists'), - '$name_label' => t('Name'), - '$count_label' => t('Members'), - '$entries' => $entries - ]); - - return $o; - - } - - $context = array('$submit' => t('Submit')); - $tpl = get_markup_template('group_edit.tpl'); - - if((argc() == 3) && (argv(1) === 'drop')) { check_form_security_token_redirectOnErr('/lists', 'group_drop', 't'); - - if(intval(argv(2))) { - $r = q("SELECT gname FROM pgrp WHERE id = %d AND uid = %d LIMIT 1", - intval(argv(2)), - intval(local_channel()) - ); - if($r) - $result = AccessList::remove(local_channel(),$r[0]['gname']); - if($result) - info( t('Access list removed.') . EOL); - else - notice( t('Unable to remove access list.') . EOL); - } - goaway(z_root() . '/lists'); - // NOTREACHED - } - - - if((argc() > 2) && intval(argv(1)) && argv(2)) { - - check_form_security_token_ForbiddenOnErr('group_member_change', 't'); - - $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 limit 1", - dbesc(base64url_decode(argv(2))), - intval(local_channel()) - ); - if(count($r)) - $change = base64url_decode(argv(2)); - - } - if(argc() > 1) { - - require_once('include/acl_selectors.php'); + if (intval(argv(2))) { + $r = q( + "SELECT gname FROM pgrp WHERE id = %d AND uid = %d LIMIT 1", + intval(argv(2)), + intval(local_channel()) + ); + if ($r) { + $result = AccessList::remove(local_channel(), $r[0]['gname']); + } + if ($result) { + info(t('Access list removed.') . EOL); + } else { + notice(t('Unable to remove access list.') . EOL); + } + } + goaway(z_root() . '/lists'); + // NOTREACHED + } - if (strlen(argv(1)) <= 11 && intval(argv(1))) { - $r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d AND deleted = 0 LIMIT 1", - intval(argv(1)), - intval(local_channel()) - ); - } - else { - $r = q("SELECT * FROM pgrp WHERE hash = '%s' AND uid = %d AND deleted = 0 LIMIT 1", - dbesc(argv(1)), - intval(local_channel()) - ); - } - - if(! $r) { - $r = q("SELECT * FROM pgrp WHERE id = %d AND deleted = 0 LIMIT 1", - intval(argv(1)), - ); - if ($r) { - notice( t('Permission denied.') . EOL ); - } - else { - notice( t('Access list not found.') . EOL ); - } - goaway(z_root() . '/connections'); - } - $group = $r[0]; - $members = AccessList::members(local_channel(), $group['id']); + if ((argc() > 2) && intval(argv(1)) && argv(2)) { + if (!local_channel()) { + notice(t('Permission denied') . EOL); + return; + } - $preselected = []; - if(count($members)) { - foreach($members as $member) - if(! in_array($member['xchan_hash'],$preselected)) - $preselected[] = $member['xchan_hash']; - } - - if($change) { - - if(in_array($change,$preselected)) { - AccessList::member_remove(local_channel(),$group['gname'],$change); - } - else { - AccessList::member_add(local_channel(),$group['gname'],$change); - } - - $members = AccessList::members(local_channel(), $group['id']); - - $preselected = []; - if(count($members)) { - foreach($members as $member) - $preselected[] = $member['xchan_hash']; - } + check_form_security_token_ForbiddenOnErr('group_member_change', 't'); + + $r = q( + "SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 limit 1", + dbesc(base64url_decode(argv(2))), + intval(local_channel()) + ); + if (count($r)) { + $change = base64url_decode(argv(2)); + } + } + + if (argc() > 1) { + require_once('include/acl_selectors.php'); + + if (strlen(argv(1)) <= 11 && intval(argv(1))) { + $r = q( + "SELECT * FROM pgrp WHERE id = %d AND deleted = 0 LIMIT 1", + intval(argv(1)) + ); + } else { + $r = q( + "SELECT * FROM pgrp WHERE hash = '%s' AND deleted = 0 LIMIT 1", + dbesc(argv(1)) + ); + } + + if (! $r) { + notice(t('Access list not found.') . EOL); + return; } - $context = $context + array( - '$title' => sprintf(t('Access List: %s'), $group['gname']), - '$details_label' => t('Edit'), - '$gname' => array('groupname',t('Access list name: '),$group['gname'], ''), - '$gid' => $group['id'], - '$drop' => $drop_txt, - '$public' => array('public',t('Members are visible to other channels'), $group['visible'], ''), - '$form_security_token_edit' => get_form_security_token('group_edit'), - '$delete' => t('Delete access list'), - '$form_security_token_drop' => get_form_security_token("group_drop"), - ); - - } - - if(! isset($group)) - return; - - $groupeditor = array( - 'label_members' => t('List members'), - 'members' => [], - 'label_contacts' => t('Not in this list'), - 'contacts' => [], - ); - - $sec_token = addslashes(get_form_security_token('group_member_change')); - $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : 'card'); - foreach($members as $member) { - if($member['xchan_url']) { - $member['archived'] = (intval($member['abook_archived']) ? true : false); - $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;'; - $groupeditor['members'][] = micropro($member,true,'mpgroup', $textmode); + $group = array_shift($r); + $uid = $group['uid']; + $owner = (local_channel() && intval(local_channel()) === intval($group['uid'])); + + if (!$owner) { + // public view of group members if permitted + if (!($group['visible'] && perm_is_allowed($uid, get_observer_hash(), 'view_contacts'))) { + notice(t('Permission denied') . EOL); + return; + } + $members = []; + $memberlist = AccessList::members($uid, $group['id']); + + if ($memberlist) { + foreach ($memberlist as $member) { + $members[] = micropro($member, true, 'mpgroup', 'card'); + } + } + $o = replace_macros(get_markup_template('listmembers.tpl'), [ + '$title' => t('List members'), + '$members' => $members + ]); + return $o; } - else - AccessList::member_remove(local_channel(),$group['gname'],$member['xchan_hash']); - } - - $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_self = 0 and abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc", - intval(local_channel()) - ); - - if(count($r)) { - $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : 'card'); - foreach($r as $member) { - if(! in_array($member['xchan_hash'],$preselected)) { - $member['archived'] = (intval($member['abook_archived']) ? true : false); - $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;'; - $groupeditor['contacts'][] = micropro($member,true,'mpall', $textmode); - } - } - } - - $context['$groupeditor'] = $groupeditor; - $context['$desc'] = t('Select a channel to toggle membership'); - - if($change) { - $tpl = get_markup_template('groupeditor.tpl'); - echo replace_macros($tpl, $context); - killme(); - } - - return replace_macros($tpl, $context); - - } - - + + $members = AccessList::members(local_channel(), $group['id']); + + $preselected = []; + if (count($members)) { + foreach ($members as $member) { + if (!in_array($member['xchan_hash'], $preselected)) { + $preselected[] = $member['xchan_hash']; + } + } + } + + if ($change) { + if (in_array($change, $preselected)) { + AccessList::member_remove(local_channel(), $group['gname'], $change); + } else { + AccessList::member_add(local_channel(), $group['gname'], $change); + } + + $members = AccessList::members(local_channel(), $group['id']); + + $preselected = []; + if (count($members)) { + foreach ($members as $member) { + $preselected[] = $member['xchan_hash']; + } + } + } + + $context = $context + array( + '$title' => sprintf(t('Access List: %s'), $group['gname']), + '$details_label' => t('Edit'), + '$gname' => array('groupname', t('Access list name: '), $group['gname'], ''), + '$gid' => $group['id'], + '$drop' => $drop_txt, + '$public' => array('public', t('Members are visible to other channels'), $group['visible'], ''), + '$form_security_token_edit' => get_form_security_token('group_edit'), + '$delete' => t('Delete access list'), + '$form_security_token_drop' => get_form_security_token("group_drop"), + ); + } + + if (!isset($group)) { + return; + } + + $groupeditor = array( + 'label_members' => t('List members'), + 'members' => [], + 'label_contacts' => t('Not in this list'), + 'contacts' => [], + ); + + $sec_token = addslashes(get_form_security_token('group_member_change')); + $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : 'card'); + foreach ($members as $member) { + if ($member['xchan_url']) { + $member['archived'] = (intval($member['abook_archived']) ? true : false); + $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;'; + $groupeditor['members'][] = micropro($member, true, 'mpgroup', $textmode); + } else { + AccessList::member_remove(local_channel(), $group['gname'], $member['xchan_hash']); + } + } + + $r = q( + "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_self = 0 and abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc", + intval(local_channel()) + ); + + if (count($r)) { + $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : 'card'); + foreach ($r as $member) { + if (!in_array($member['xchan_hash'], $preselected)) { + $member['archived'] = (intval($member['abook_archived']) ? true : false); + $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;'; + $groupeditor['contacts'][] = micropro($member, true, 'mpall', $textmode); + } + } + } + + $context['$groupeditor'] = $groupeditor; + $context['$desc'] = t('Select a channel to toggle membership'); + + if ($change) { + $tpl = get_markup_template('groupeditor.tpl'); + echo replace_macros($tpl, $context); + killme(); + } + + return replace_macros($tpl, $context); + } } diff --git a/Zotlabs/Module/Lockview.php b/Zotlabs/Module/Lockview.php index cbca9cdd6..6bb6bce31 100644 --- a/Zotlabs/Module/Lockview.php +++ b/Zotlabs/Module/Lockview.php @@ -1,176 +1,187 @@ 1) ? argv(1) : 0); - if (is_numeric($type)) { - $item_id = intval($type); - $type='item'; - } - else { - $item_id = ((argc() > 2) ? intval(argv(2)) : 0); - } - - if(! $item_id) - killme(); - - if (! in_array($type, array('item', 'photo', 'attach', 'event', 'menu_item', 'chatroom'))) - killme(); - - // we have different naming in in menu_item table and chatroom table - switch($type) { - case 'menu_item': - $id = 'mitem_id'; - break; - case 'chatroom': - $id = 'cr_id'; - break; - default: - $id = 'id'; - break; - } - - $r = q("SELECT * FROM %s WHERE $id = %d LIMIT 1", - dbesc($type), - intval($item_id) - ); - - if(! $r) - killme(); - - $item = $r[0]; - - // we have different naming in in menu_item table and chatroom table - switch($type) { - case 'menu_item': - $uid = $item['mitem_channel_id']; - break; - case 'chatroom': - $uid = $item['cr_uid']; - break; - default: - $uid = $item['uid']; - break; - } + if (local_channel()) { + $at = q( + "select * from atoken where atoken_uid = %d", + intval(local_channel()) + ); + if ($at) { + foreach ($at as $t) { + $atokens[] = atoken_xchan($t); + } + } + } - if ($type === 'item') { - $recips = get_iconfig($item['id'],'activitypub','recips'); - if ($recips) { - $o = '' . t('Visible to:') . ''; - $l = []; - if (isset($recips['to'])) { - if (! is_array($recips['to'])) { - $recips['to'] = [ $recips['to'] ]; - } - $l = array_merge($l,$recips['to']); - } - if (isset($recips['cc'])) { - if (! is_array($recips['cc'])) { - $recips['cc'] = [ $recips['cc'] ]; - } - $l = array_merge($l,$recips['cc']); - } - for ($x = 0; $x < count($l); $x ++) { - if($l[$x] !== ACTIVITY_PUBLIC_INBOX) { - $l[$x] = '' . $l[$x] . ''; - } - } - echo $o . implode(', ',$l); - killme(); - } - } + $type = ((argc() > 1) ? argv(1) : 0); + if (is_numeric($type)) { + $item_id = intval($type); + $type = 'item'; + } else { + $item_id = ((argc() > 2) ? intval(argv(2)) : 0); + } - - if(intval($item['item_private']) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) - && (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) { + if (!$item_id) { + killme(); + } - if ($item['mid'] === $item['parent_mid']) { - echo '' . translate_scope('specific') . ''; - killme(); - } - } - - $allowed_users = expand_acl($item['allow_cid']); - $allowed_groups = expand_acl($item['allow_gid']); - $deny_users = expand_acl($item['deny_cid']); - $deny_groups = expand_acl($item['deny_gid']); - - $o = '' . t('Visible to:') . ''; - $l = []; - - stringify_array_elms($allowed_groups,true); - stringify_array_elms($allowed_users,true); - stringify_array_elms($deny_groups,true); - stringify_array_elms($deny_users,true); - + if (!in_array($type, array('item', 'photo', 'attach', 'event', 'menu_item', 'chatroom'))) { + killme(); + } - if(count($allowed_groups)) { - $r = q("SELECT gname FROM pgrp WHERE hash IN ( " . implode(', ', $allowed_groups) . " )"); - if($r) - foreach($r as $rr) - $l[] = '' . $rr['gname'] . ''; - } - if(count($allowed_users)) { - $r = q("SELECT xchan_name FROM xchan WHERE xchan_hash IN ( " . implode(', ',$allowed_users) . " )"); - if($r) - foreach($r as $rr) - $l[] = '' . $rr['xchan_name'] . ''; - if($atokens) { - foreach($atokens as $at) { - if(in_array("'" . $at['xchan_hash'] . "'",$allowed_users)) { - $l[] = '' . $at['xchan_name'] . ''; - } - } - } - } + // we have different naming in in menu_item table and chatroom table + switch ($type) { + case 'menu_item': + $id = 'mitem_id'; + break; + case 'chatroom': + $id = 'cr_id'; + break; + default: + $id = 'id'; + break; + } - if(count($deny_groups)) { - $r = q("SELECT gname FROM pgrp WHERE hash IN ( " . implode(', ', $deny_groups) . " )"); - if($r) - foreach($r as $rr) - $l[] = ''; - } - if(count($deny_users)) { - $r = q("SELECT xchan_name FROM xchan WHERE xchan_hash IN ( " . implode(', ', $deny_users) . " )"); - if($r) - foreach($r as $rr) - $l[] = '' . $rr['gname'] . ''; + $r = q( + "SELECT * FROM %s WHERE $id = %d LIMIT 1", + dbesc($type), + intval($item_id) + ); - if($atokens) { - foreach($atokens as $at) { - if(in_array("'" . $at['xchan_hash'] . "'",$deny_users)) { - $l[] = '' . $rr['xchan_name'] . ''; - } - } - } + if (!$r) { + killme(); + } + + $item = $r[0]; + + // we have different naming in in menu_item table and chatroom table + switch ($type) { + case 'menu_item': + $uid = $item['mitem_channel_id']; + break; + case 'chatroom': + $uid = $item['cr_uid']; + break; + default: + $uid = $item['uid']; + break; + } + + if ($type === 'item') { + $recips = get_iconfig($item['id'], 'activitypub', 'recips'); + if ($recips) { + $o = '' . $at['xchan_name'] . '' . t('Visible to:') . ''; + $l = []; + if (isset($recips['to'])) { + if (!is_array($recips['to'])) { + $recips['to'] = [$recips['to']]; + } + $l = array_merge($l, $recips['to']); + } + if (isset($recips['cc'])) { + if (!is_array($recips['cc'])) { + $recips['cc'] = [$recips['cc']]; + } + $l = array_merge($l, $recips['cc']); + } + for ($x = 0; $x < count($l); $x++) { + if ($l[$x] !== ACTIVITY_PUBLIC_INBOX) { + $l[$x] = '' . $l[$x] . ''; + } + } + echo $o . implode(', ', $l); + killme(); + } + } - } - - echo $o . implode($l); - killme(); - - - } - + if ( + intval($item['item_private']) && (!strlen($item['allow_cid'])) && (!strlen($item['allow_gid'])) + && (!strlen($item['deny_cid'])) && (!strlen($item['deny_gid'])) + ) { + if ($item['mid'] === $item['parent_mid']) { + echo '' . translate_scope('specific') . ''; + killme(); + } + } + + $allowed_users = expand_acl($item['allow_cid']); + $allowed_groups = expand_acl($item['allow_gid']); + $deny_users = expand_acl($item['deny_cid']); + $deny_groups = expand_acl($item['deny_gid']); + + $o = '' . t('Visible to:') . ''; + $l = []; + + stringify_array_elms($allowed_groups, true); + stringify_array_elms($allowed_users, true); + stringify_array_elms($deny_groups, true); + stringify_array_elms($deny_users, true); + + + if (count($allowed_groups)) { + $r = q("SELECT gname FROM pgrp WHERE hash IN ( " . implode(', ', $allowed_groups) . " )"); + if ($r) { + foreach ($r as $rr) { + $l[] = '' . $rr['gname'] . ''; + } + } + } + if (count($allowed_users)) { + $r = q("SELECT xchan_name FROM xchan WHERE xchan_hash IN ( " . implode(', ', $allowed_users) . " )"); + if ($r) { + foreach ($r as $rr) { + $l[] = '' . $rr['xchan_name'] . ''; + } + } + if ($atokens) { + foreach ($atokens as $at) { + if (in_array("'" . $at['xchan_hash'] . "'", $allowed_users)) { + $l[] = '' . $at['xchan_name'] . ''; + } + } + } + } + + if (count($deny_groups)) { + $r = q("SELECT gname FROM pgrp WHERE hash IN ( " . implode(', ', $deny_groups) . " )"); + if ($r) { + foreach ($r as $rr) { + $l[] = ''; + } + } + } + if (count($deny_users)) { + $r = q("SELECT xchan_name FROM xchan WHERE xchan_hash IN ( " . implode(', ', $deny_users) . " )"); + if ($r) { + foreach ($r as $rr) { + $l[] = '' . $rr['gname'] . ''; + } + } + + if ($atokens) { + foreach ($atokens as $at) { + if (in_array("'" . $at['xchan_hash'] . "'", $deny_users)) { + $l[] = '' . $rr['xchan_name'] . ''; + } + } + } + } + + echo $o . implode($l); + killme(); + } } diff --git a/Zotlabs/Module/Locs.php b/Zotlabs/Module/Locs.php index b6ecc9161..b95d8ad46 100644 --- a/Zotlabs/Module/Locs.php +++ b/Zotlabs/Module/Locs.php @@ -1,138 +1,147 @@ t('Manage Channel Locations'), - '$loc' => t('Location'), - '$addr' => t('Address'), - '$mkprm' => t('Primary'), - '$drop' => t('Drop'), - '$submit' => t('Submit'), - '$sync' => t('Publish these settings'), - '$sync_text' => t('Please wait several minutes between consecutive operations.'), - '$drop_text' => t('When possible, drop a location by logging into that website/hub and removing your channel.'), - '$last_resort' => t('Use this form to drop the location if the hub is no longer operating.'), - '$hubs' => $r, - '$base_url' => z_root() - ] ); - - return $o; - } - + if ($_REQUEST['primary']) { + $hubloc_id = intval($_REQUEST['primary']); + if ($hubloc_id) { + $r = q( + "select hubloc_id from hubloc where hubloc_id = %d and hubloc_hash = '%s' limit 1", + intval($hubloc_id), + dbesc($channel['channel_hash']) + ); + + if (!$r) { + notice(t('Location not found.') . EOL); + return; + } + + $r = q( + "update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' ", + dbesc($channel['channel_hash']) + ); + $r = q( + "update hubloc set hubloc_primary = 1 where hubloc_id = %d and hubloc_hash = '%s'", + intval($hubloc_id), + dbesc($channel['channel_hash']) + ); + + $x = q( + "select * from hubloc where hubloc_id = %d and hubloc_hash = '%s' ", + intval($hubloc_id), + dbesc($channel['channel_hash']) + ); + if ($x) { + hubloc_change_primary($x[0]); + } + + Run::Summon(['Notifier', 'refresh_all', $channel['channel_id']]); + return; + } + } + + + if ($_REQUEST['drop']) { + $hubloc_id = intval($_REQUEST['drop']); + + if ($hubloc_id) { + $r = q( + "select * from hubloc where hubloc_id = %d and hubloc_url != '%s' and hubloc_hash = '%s' limit 1", + intval($hubloc_id), + dbesc(z_root()), + dbesc($channel['channel_hash']) + ); + + if (!$r) { + notice(t('Location not found.') . EOL); + return; + } + if (intval($r[0]['hubloc_primary'])) { + $x = q( + "select hubloc_id from hubloc where hubloc_primary = 1 and hubloc_hash = '%s'", + dbesc($channel['channel_hash']) + ); + if (!$x) { + notice(t('Location lookup failed.')); + return; + } + if (count($x) == 1) { + notice(t('Please select another location to become primary before removing the primary location.') . EOL); + return; + } + } + + $r = q( + "update hubloc set hubloc_deleted = 1 where hubloc_id = %d and hubloc_hash = '%s'", + intval($hubloc_id), + dbesc($channel['channel_hash']) + ); + Run::Summon(['Notifier', 'refresh_all', $channel['channel_id']]); + return; + } + } + } + + + public function get() + { + + + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } + + $channel = App::get_channel(); + + if ($_REQUEST['sync']) { + Run::Summon(['Notifier', 'refresh_all', $channel['channel_id']]); + info(t('Pushing location info') . EOL); + goaway(z_root() . '/locs'); + } + + + $r = q( + "select * from hubloc where hubloc_hash = '%s'", + dbesc($channel['channel_hash']) + ); + + if (!$r) { + notice(t('No locations found.') . EOL); + return; + } + + $o = replace_macros(get_markup_template('locmanage.tpl'), [ + '$header' => t('Manage Channel Locations'), + '$loc' => t('Location'), + '$addr' => t('Address'), + '$mkprm' => t('Primary'), + '$drop' => t('Drop'), + '$submit' => t('Submit'), + '$sync' => t('Publish these settings'), + '$sync_text' => t('Please wait several minutes between consecutive operations.'), + '$drop_text' => t('When possible, drop a location by logging into that website/hub and removing your channel.'), + '$last_resort' => t('Use this form to drop the location if the hub is no longer operating.'), + '$hubs' => $r, + '$base_url' => z_root() + ]); + + return $o; + } } diff --git a/Zotlabs/Module/Login.php b/Zotlabs/Module/Login.php index 6430939b4..930cf70f5 100644 --- a/Zotlabs/Module/Login.php +++ b/Zotlabs/Module/Login.php @@ -1,16 +1,21 @@ nuke(); - } - goaway(z_root()); +class Logout extends Controller +{ - } + public function init() + { + if ($_SESSION['delegate'] && $_SESSION['delegate_push']) { + $_SESSION = $_SESSION['delegate_push']; + } else { + App::$session->nuke(); + } + goaway(z_root()); + } } diff --git a/Zotlabs/Module/Lostpass.php b/Zotlabs/Module/Lostpass.php index 072657d7b..b274372e2 100644 --- a/Zotlabs/Module/Lostpass.php +++ b/Zotlabs/Module/Lostpass.php @@ -1,141 +1,147 @@ get_config('system', 'sitename'), + '$siteurl' => z_root(), + '$username' => sprintf(t('Site Member (%s)'), $email), + '$email' => $email, + '$reset_link' => z_root() . '/lostpass?verify=' . $hash + )); + + $subject = email_header_encode(sprintf(t('Password reset requested at %s'), get_config('system', 'sitename')), 'UTF-8'); + + $res = z_mail( + [ + 'toEmail' => $email, + 'messageSubject' => sprintf(t('Password reset requested at %s'), get_config('system', 'sitename')), + 'textVersion' => $message, + ] + ); + + goaway(z_root()); + } -class Lostpass extends \Zotlabs\Web\Controller { + public function get() + { - function post() { - - $loginame = notags(trim($_POST['login-name'])); - if(! $loginame) - goaway(z_root()); - - $r = q("SELECT * FROM account WHERE account_email = '%s' LIMIT 1", - dbesc($loginame) - ); - - if(! $r) { - notice( t('No valid account found.') . EOL); - goaway(z_root()); - } - - $aid = $r[0]['account_id']; - $email = $r[0]['account_email']; - - $hash = random_string(); - - $r = q("UPDATE account SET account_reset = '%s' WHERE account_id = %d", - dbesc($hash), - intval($aid) - ); - if($r) - info( t('Password reset request issued. Check your email.') . EOL); - - $email_tpl = get_intltext_template("lostpass_eml.tpl"); - $message = replace_macros($email_tpl, array( - '$sitename' => get_config('system','sitename'), - '$siteurl' => z_root(), - '$username' => sprintf( t('Site Member (%s)'), $email), - '$email' => $email, - '$reset_link' => z_root() . '/lostpass?verify=' . $hash - )); - - $subject = email_header_encode(sprintf( t('Password reset requested at %s'),get_config('system','sitename')), 'UTF-8'); - - $res = z_mail( - [ - 'toEmail' => $email, - 'messageSubject' => sprintf( t('Password reset requested at %s'), get_config('system','sitename')), - 'textVersion' => $message, - ] - ); - goaway(z_root()); - } - - - function get() { - - - if(x($_GET,'verify')) { - $verify = $_GET['verify']; - - $r = q("SELECT * FROM account WHERE account_reset = '%s' LIMIT 1", - dbesc($verify) - ); - if(! $r) { - notice( t("Request could not be verified. (You may have previously submitted it.) Password reset failed.") . EOL); - goaway(z_root()); - return; - } - - $aid = $r[0]['account_id']; - $email = $r[0]['account_email']; - - $new_password = autoname(6) . mt_rand(100,9999); - - $salt = random_string(32); - $password_encoded = hash('whirlpool', $salt . $new_password); - - $r = q("UPDATE account SET account_salt = '%s', account_password = '%s', account_reset = '', account_flags = (account_flags & ~%d) where account_id = %d", - dbesc($salt), - dbesc($password_encoded), - intval(ACCOUNT_UNVERIFIED), - intval($aid) - ); - - if($r) { - $tpl = get_markup_template('pwdreset.tpl'); - $o .= replace_macros($tpl,array( - '$lbl1' => t('Password Reset'), - '$lbl2' => t('Your password has been reset as requested.'), - '$lbl3' => t('Your new password is'), - '$lbl4' => t('Save or copy your new password - and then'), - '$lbl5' => '' . t('click here to login') . '.', - '$lbl6' => t('Your password may be changed from the Settings page after successful login.'), - '$newpass' => $new_password, - '$baseurl' => z_root() - - )); - - info("Your password has been reset." . EOL); - - $email_tpl = get_intltext_template("passchanged_eml.tpl"); - $message = replace_macros($email_tpl, array( - '$sitename' => \App::$config['sitename'], - '$siteurl' => z_root(), - '$username' => sprintf( t('Site Member (%s)'), $email), - '$email' => $email, - '$new_password' => $new_password, - '$uid' => $newuid ) - ); - - $res = z_mail( - [ - 'toEmail' => $email, - 'messageSubject' => sprintf( t('Your password has changed at %s'), get_config('system','sitename')), - 'textVersion' => $message, - ] - ); + if (x($_GET, 'verify')) { + $verify = $_GET['verify']; - return $o; - } - - } - else { - $tpl = get_markup_template('lostpass.tpl'); - - $o .= replace_macros($tpl,array( - '$title' => t('Forgot your Password?'), - '$desc' => t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'), - '$name' => t('Email Address'), - '$submit' => t('Reset') - )); - - return $o; - } - - } - + $r = q( + "SELECT * FROM account WHERE account_reset = '%s' LIMIT 1", + dbesc($verify) + ); + if (!$r) { + notice(t("Request could not be verified. (You may have previously submitted it.) Password reset failed.") . EOL); + goaway(z_root()); + return; + } + + $aid = $r[0]['account_id']; + $email = $r[0]['account_email']; + + $new_password = autoname(6) . mt_rand(100, 9999); + + $salt = random_string(32); + $password_encoded = hash('whirlpool', $salt . $new_password); + + $r = q( + "UPDATE account SET account_salt = '%s', account_password = '%s', account_reset = '', account_flags = (account_flags & ~%d) where account_id = %d", + dbesc($salt), + dbesc($password_encoded), + intval(ACCOUNT_UNVERIFIED), + intval($aid) + ); + + if ($r) { + $tpl = get_markup_template('pwdreset.tpl'); + $o .= replace_macros($tpl, array( + '$lbl1' => t('Password Reset'), + '$lbl2' => t('Your password has been reset as requested.'), + '$lbl3' => t('Your new password is'), + '$lbl4' => t('Save or copy your new password - and then'), + '$lbl5' => '' . t('click here to login') . '.', + '$lbl6' => t('Your password may be changed from the Settings page after successful login.'), + '$newpass' => $new_password, + '$baseurl' => z_root() + + )); + + info("Your password has been reset." . EOL); + + $email_tpl = get_intltext_template("passchanged_eml.tpl"); + $message = replace_macros($email_tpl, array( + '$sitename' => App::$config['sitename'], + '$siteurl' => z_root(), + '$username' => sprintf(t('Site Member (%s)'), $email), + '$email' => $email, + '$new_password' => $new_password, + '$uid' => $newuid)); + + $res = z_mail( + [ + 'toEmail' => $email, + 'messageSubject' => sprintf(t('Your password has changed at %s'), get_config('system', 'sitename')), + 'textVersion' => $message, + ] + ); + + return $o; + } + } else { + $tpl = get_markup_template('lostpass.tpl'); + + $o .= replace_macros($tpl, array( + '$title' => t('Forgot your Password?'), + '$desc' => t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'), + '$name' => t('Email Address'), + '$submit' => t('Reset') + )); + + return $o; + } + } } diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index a9e41cd06..12261aacd 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -1,6 +1,6 @@ false, - 'url' => '', - 'message' => '' - ]; - - logger('mod_magic: invoked', LOGGER_DEBUG); - - logger('args: ' . print_r($_REQUEST,true),LOGGER_DATA); - - $addr = ((x($_REQUEST,'addr')) ? $_REQUEST['addr'] : ''); - $bdest = ((x($_REQUEST,'bdest')) ? $_REQUEST['bdest'] : ''); - $dest = ((x($_REQUEST,'dest')) ? $_REQUEST['dest'] : ''); - $rev = ((x($_REQUEST,'rev')) ? intval($_REQUEST['rev']) : 0); - $owa = ((x($_REQUEST,'owa')) ? intval($_REQUEST['owa']) : 0); - $delegate = ((x($_REQUEST,'delegate')) ? $_REQUEST['delegate'] : ''); + $ret = [ + 'success' => false, + 'url' => '', + 'message' => '' + ]; - // bdest is preferred as it is hex-encoded and can survive url rewrite and argument parsing - - if ($bdest) { - $dest = hex2bin($bdest); - } - - $parsed = parse_url($dest); + logger('mod_magic: invoked', LOGGER_DEBUG); - if (! $parsed) { - goaway($dest); - } - - $basepath = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : ''); - $owapath = SConfig::get($basepath,'system','openwebauth', $basepath . '/owa'); - - // This is ready-made for a plugin that provides a blacklist or "ask me" before blindly authenticating. - // By default, we'll proceed without asking. - - $arr = [ - 'channel_id' => local_channel(), - 'destination' => $dest, - 'proceed' => true - ]; - - call_hooks('magic_auth',$arr); - $dest = $arr['destination']; - if (! $arr['proceed']) { - goaway($dest); - } - - if((get_observer_hash()) && (stripos($dest,z_root()) === 0)) { + logger('args: ' . print_r($_REQUEST, true), LOGGER_DATA); - // We are already authenticated on this site and a registered observer. - // First check if this is a delegate request on the local system and process accordingly. - // Otherwise redirect. - - if ($delegate) { + $addr = ((x($_REQUEST, 'addr')) ? $_REQUEST['addr'] : ''); + $bdest = ((x($_REQUEST, 'bdest')) ? $_REQUEST['bdest'] : ''); + $dest = ((x($_REQUEST, 'dest')) ? $_REQUEST['dest'] : ''); + $rev = ((x($_REQUEST, 'rev')) ? intval($_REQUEST['rev']) : 0); + $owa = ((x($_REQUEST, 'owa')) ? intval($_REQUEST['owa']) : 0); + $delegate = ((x($_REQUEST, 'delegate')) ? $_REQUEST['delegate'] : ''); - $r = q("select * from channel left join hubloc on channel_hash = hubloc_hash where hubloc_addr = '%s' limit 1", - dbesc($delegate) - ); - - if ($r) { - $c = array_shift($r); - if (perm_is_allowed($c['channel_id'],get_observer_hash(),'delegate')) { - $tmp = $_SESSION; - $_SESSION['delegate_push'] = $tmp; - $_SESSION['delegate_channel'] = $c['channel_id']; - $_SESSION['delegate'] = get_observer_hash(); - $_SESSION['account_id'] = intval($c['channel_account_id']); + // bdest is preferred as it is hex-encoded and can survive url rewrite and argument parsing - change_channel($c['channel_id']); - } - } - } - - goaway($dest); - } - - if (local_channel()) { - $channel = App::get_channel(); - - // OpenWebAuth + if ($bdest) { + $dest = hex2bin($bdest); + } - if ($owa) { + $parsed = parse_url($dest); - $dest = strip_zids($dest); - $dest = strip_query_param($dest,'f'); + if (!$parsed) { + goaway($dest); + } - // We now post to the OWA endpoint. This improves security by providing a signed digest - - $data = json_encode([ 'OpenWebAuth' => random_string() ]); - - $headers = []; + $basepath = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : ''); + $owapath = SConfig::get($basepath, 'system', 'openwebauth', $basepath . '/owa'); + + // This is ready-made for a plugin that provides a blacklist or "ask me" before blindly authenticating. + // By default, we'll proceed without asking. + + $arr = [ + 'channel_id' => local_channel(), + 'destination' => $dest, + 'proceed' => true + ]; + + call_hooks('magic_auth', $arr); + $dest = $arr['destination']; + if (!$arr['proceed']) { + goaway($dest); + } + + if ((get_observer_hash()) && (stripos($dest, z_root()) === 0)) { + // We are already authenticated on this site and a registered observer. + // First check if this is a delegate request on the local system and process accordingly. + // Otherwise redirect. + + if ($delegate) { + $r = q( + "select * from channel left join hubloc on channel_hash = hubloc_hash where hubloc_addr = '%s' limit 1", + dbesc($delegate) + ); + + if ($r) { + $c = array_shift($r); + if (perm_is_allowed($c['channel_id'], get_observer_hash(), 'delegate')) { + $tmp = $_SESSION; + $_SESSION['delegate_push'] = $tmp; + $_SESSION['delegate_channel'] = $c['channel_id']; + $_SESSION['delegate'] = get_observer_hash(); + $_SESSION['account_id'] = intval($c['channel_account_id']); + + change_channel($c['channel_id']); + } + } + } + + goaway($dest); + } + + if (local_channel()) { + $channel = App::get_channel(); + + // OpenWebAuth + + if ($owa) { + $dest = strip_zids($dest); + $dest = strip_query_param($dest, 'f'); + + // We now post to the OWA endpoint. This improves security by providing a signed digest + + $data = json_encode(['OpenWebAuth' => random_string()]); + + $headers = []; $headers['Accept'] = 'application/x-nomad+json, application/x-zot+json'; $headers['Content-Type'] = 'application/x-nomad+json'; - $headers['X-Open-Web-Auth'] = random_string(); - $headers['Digest'] = HTTPSig::generate_digest_header($data); - $headers['Host'] = $parsed['host']; - $headers['(request-target)'] = 'post ' . '/owa'; + $headers['X-Open-Web-Auth'] = random_string(); + $headers['Digest'] = HTTPSig::generate_digest_header($data); + $headers['Host'] = $parsed['host']; + $headers['(request-target)'] = 'post ' . '/owa'; - $headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'], channel_url($channel),true,'sha512'); - $x = z_post_url($owapath,$data,$redirects,[ 'headers' => $headers ]); - logger('owa fetch returned: ' . print_r($x,true),LOGGER_DATA); - if ($x['success']) { - $j = json_decode($x['body'],true); - if ($j['success'] && $j['encrypted_token']) { - // decrypt the token using our private key - $token = ''; - openssl_private_decrypt(base64url_decode($j['encrypted_token']),$token,$channel['channel_prvkey']); - $x = strpbrk($dest,'?&'); - // redirect using the encrypted token which will be exchanged for an authenticated session - $args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token) . (($delegate) ? '&delegate=1' : ''); - goaway($dest . $args); - } - } - } - } - - goaway($dest); - } - + $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel), true, 'sha512'); + $x = z_post_url($owapath, $data, $redirects, ['headers' => $headers]); + logger('owa fetch returned: ' . print_r($x, true), LOGGER_DATA); + if ($x['success']) { + $j = json_decode($x['body'], true); + if ($j['success'] && $j['encrypted_token']) { + // decrypt the token using our private key + $token = ''; + openssl_private_decrypt(base64url_decode($j['encrypted_token']), $token, $channel['channel_prvkey']); + $x = strpbrk($dest, '?&'); + // redirect using the encrypted token which will be exchanged for an authenticated session + $args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token) . (($delegate) ? '&delegate=1' : ''); + goaway($dest . $args); + } + } + } + } + goaway($dest); + } } diff --git a/Zotlabs/Module/Manage.php b/Zotlabs/Module/Manage.php index abc57f73e..e78444cfb 100644 --- a/Zotlabs/Module/Manage.php +++ b/Zotlabs/Module/Manage.php @@ -1,4 +1,5 @@ 1) ? intval(argv(1)) : 0); - - if (argc() > 2) { - if (argv(2) === 'default') { - $r = q("select channel_id from channel where channel_id = %d and channel_account_id = %d limit 1", - intval($change_channel), - intval(get_account_id()) - ); - if ($r) { - q("update account set account_default_channel = %d where account_id = %d", - intval($change_channel), - intval(get_account_id()) - ); - } - goaway(z_root() . '/manage'); - } - elseif (argv(2) === 'menu') { - $state = intval(PConfig::get($change_channel,'system','include_in_menu', 0)); - PConfig::set($change_channel,'system','include_in_menu',1 - $state); - goaway(z_root() . '/manage'); - } - - } + if ((!get_account_id()) || ($_SESSION['delegate'])) { + notice(t('Permission denied.') . EOL); + return; + } - - if ($change_channel) { + nav_set_selected('Manage'); - $r = change_channel($change_channel); - if ((argc() > 2) && !(argv(2) === 'default')) { - goaway(z_root() . '/' . implode('/',array_slice(App::$argv,2))); // Go to whatever is after /manage/, but with the new channel - } - elseif ($r && $r['channel_startpage']) { - goaway(z_root() . '/' . $r['channel_startpage']); // If nothing extra is specified, go to the default page - } - goaway(z_root()); - } - - $channels = null; - - $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ", - intval(get_account_id()) - ); - - $account = App::get_account(); - - if ($r && count($r)) { + $change_channel = ((argc() > 1) ? intval(argv(1)) : 0); - $channels = ((is_site_admin()) ? array_merge ([ get_sys_channel() ], $r) : $r); - for ($x = 0; $x < count($channels); $x ++) { - $channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']); - $channels[$x]['include_in_menu'] = intval(PConfig::get($channels[$x]['channel_id'],'system','include_in_menu',0)); - $channels[$x]['default'] = (($channels[$x]['channel_id'] == $account['account_default_channel']) ? "1" : ''); - $channels[$x]['default_links'] = '1'; - $channels[$x]['collections_label'] = t('Collection'); - $channels[$x]['forum_label'] = t('Group'); - - $c = q("SELECT id, item_wall FROM item + if (argc() > 2) { + if (argv(2) === 'default') { + $r = q( + "select channel_id from channel where channel_id = %d and channel_account_id = %d limit 1", + intval($change_channel), + intval(get_account_id()) + ); + if ($r) { + q( + "update account set account_default_channel = %d where account_id = %d", + intval($change_channel), + intval(get_account_id()) + ); + } + goaway(z_root() . '/manage'); + } elseif (argv(2) === 'menu') { + $state = intval(PConfig::get($change_channel, 'system', 'include_in_menu', 0)); + PConfig::set($change_channel, 'system', 'include_in_menu', 1 - $state); + goaway(z_root() . '/manage'); + } + } + + + if ($change_channel) { + $r = change_channel($change_channel); + + if ((argc() > 2) && !(argv(2) === 'default')) { + goaway(z_root() . '/' . implode('/', array_slice(App::$argv, 2))); // Go to whatever is after /manage/, but with the new channel + } elseif ($r && $r['channel_startpage']) { + goaway(z_root() . '/' . $r['channel_startpage']); // If nothing extra is specified, go to the default page + } + goaway(z_root()); + } + + $channels = null; + + $r = q( + "select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ", + intval(get_account_id()) + ); + + $account = App::get_account(); + + if ($r && count($r)) { + $channels = ((is_site_admin()) ? array_merge([get_sys_channel()], $r) : $r); + for ($x = 0; $x < count($channels); $x++) { + $channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']); + $channels[$x]['include_in_menu'] = intval(PConfig::get($channels[$x]['channel_id'], 'system', 'include_in_menu', 0)); + $channels[$x]['default'] = (($channels[$x]['channel_id'] == $account['account_default_channel']) ? "1" : ''); + $channels[$x]['default_links'] = '1'; + $channels[$x]['collections_label'] = t('Collection'); + $channels[$x]['forum_label'] = t('Group'); + + $c = q( + "SELECT id, item_wall FROM item WHERE item_unseen = 1 and uid = %d " . item_normal(), - intval($channels[$x]['channel_id']) - ); - - if ($c) { - foreach ($c as $it) { - if (intval($it['item_wall'])) { - $channels[$x]['home'] ++; - } - else { - $channels[$x]['network'] ++; - } - } - } - - - $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ", - intval($channels[$x]['channel_id']) - ); - - if ($intr) { - $channels[$x]['intros'] = intval($intr[0]['total']); - } - - $events = q("SELECT etype, dtstart, adjust FROM event + intval($channels[$x]['channel_id']) + ); + + if ($c) { + foreach ($c as $it) { + if (intval($it['item_wall'])) { + $channels[$x]['home']++; + } else { + $channels[$x]['network']++; + } + } + } + + + $intr = q( + "SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ", + intval($channels[$x]['channel_id']) + ); + + if ($intr) { + $channels[$x]['intros'] = intval($intr[0]['total']); + } + + $events = q( + "SELECT etype, dtstart, adjust FROM event WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0 ORDER BY dtstart ASC ", - intval($channels[$x]['channel_id']), - dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')), - dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) - ); - - if ($events) { - $channels[$x]['all_events'] = count($events); + intval($channels[$x]['channel_id']), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) + ); - if ($channels[$x]['all_events']) { - $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d'); - foreach ($events as $e) { - $bd = false; - if ($e['etype'] === 'birthday') { - $channels[$x]['birthdays'] ++; - $bd = true; - } - else { - $channels[$x]['events'] ++; - } - if (datetime_convert('UTC', ((intval($e['adjust'])) ? date_default_timezone_get() : 'UTC'), $e['dtstart'], 'Y-m-d') === $str_now) { - $channels[$x]['all_events_today'] ++; - if ($bd) { - $channels[$x]['birthdays_today'] ++; - } - else { - $channels[$x]['events_today'] ++; - } - } - } - } - } - } + if ($events) { + $channels[$x]['all_events'] = count($events); - } - - $r = q("select count(channel_id) as total from channel where channel_account_id = %d and channel_removed = 0", - intval(get_account_id()) - ); - $limit = account_service_class_fetch(get_account_id(),'total_identities'); - if ($limit !== false) { - $channel_usage_message = sprintf( t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit); - } - else { - $channel_usage_message = ''; - } - - - $create = [ 'new_channel', t('Create a new channel'), t('Create New') ]; - - $delegates = null; + if ($channels[$x]['all_events']) { + $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d'); + foreach ($events as $e) { + $bd = false; + if ($e['etype'] === 'birthday') { + $channels[$x]['birthdays']++; + $bd = true; + } else { + $channels[$x]['events']++; + } + if (datetime_convert('UTC', ((intval($e['adjust'])) ? date_default_timezone_get() : 'UTC'), $e['dtstart'], 'Y-m-d') === $str_now) { + $channels[$x]['all_events_today']++; + if ($bd) { + $channels[$x]['birthdays_today']++; + } else { + $channels[$x]['events_today']++; + } + } + } + } + } + } + } - if (local_channel()) { - $delegates = q("select * from abook left join xchan on abook_xchan = xchan_hash where + $r = q( + "select count(channel_id) as total from channel where channel_account_id = %d and channel_removed = 0", + intval(get_account_id()) + ); + $limit = account_service_class_fetch(get_account_id(), 'total_identities'); + if ($limit !== false) { + $channel_usage_message = sprintf(t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit); + } else { + $channel_usage_message = ''; + } + + + $create = ['new_channel', t('Create a new channel'), t('Create New')]; + + $delegates = null; + + if (local_channel()) { + $delegates = q( + "select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_xchan in ( select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and v like '%s' )", - intval(local_channel()), - intval(local_channel()), - dbesc('%delegate%') - ); - } - - if ($delegates) { - for ($x = 0; $x < count($delegates); $x ++) { - $delegates[$x]['link'] = 'magic?f=&bdest=' . bin2hex($delegates[$x]['xchan_url']) - . '&delegate=' . urlencode($delegates[$x]['xchan_addr']); - $delegates[$x]['channel_name'] = $delegates[$x]['xchan_name']; - $delegates[$x]['delegate'] = 1; - $delegates[$x]['collections_label'] = t('Collection'); - $delegates[$x]['forum_label'] = t('Group'); + intval(local_channel()), + intval(local_channel()), + dbesc('%delegate%') + ); + } - } - } - else { - $delegates = null; - } - - return replace_macros(get_markup_template('channels.tpl'), [ - '$header' => t('Channels'), - '$msg_selected' => t('Current Channel'), - '$selected' => local_channel(), - '$desc' => t('Switch to one of your channels by selecting it.'), - '$msg_default' => t('Default Login Channel'), - '$msg_make_default' => t('Make Default'), - '$msg_include' => t('Add to menu'), - '$msg_no_include' => t('Add to menu'), - '$create' => $create, - '$all_channels' => $channels, - '$mail_format' => t('%d new messages'), - '$intros_format' => t('%d new introductions'), - '$channel_usage_message' => $channel_usage_message, - '$delegated_desc' => t('Delegated Channel'), - '$delegates' => $delegates - ]); - } - + if ($delegates) { + for ($x = 0; $x < count($delegates); $x++) { + $delegates[$x]['link'] = 'magic?f=&bdest=' . bin2hex($delegates[$x]['xchan_url']) + . '&delegate=' . urlencode($delegates[$x]['xchan_addr']); + $delegates[$x]['channel_name'] = $delegates[$x]['xchan_name']; + $delegates[$x]['delegate'] = 1; + $delegates[$x]['collections_label'] = t('Collection'); + $delegates[$x]['forum_label'] = t('Group'); + } + } else { + $delegates = null; + } + + return replace_macros(get_markup_template('channels.tpl'), [ + '$header' => t('Channels'), + '$msg_selected' => t('Current Channel'), + '$selected' => local_channel(), + '$desc' => t('Switch to one of your channels by selecting it.'), + '$msg_default' => t('Default Login Channel'), + '$msg_make_default' => t('Make Default'), + '$msg_include' => t('Add to menu'), + '$msg_no_include' => t('Add to menu'), + '$create' => $create, + '$all_channels' => $channels, + '$mail_format' => t('%d new messages'), + '$intros_format' => t('%d new introductions'), + '$channel_usage_message' => $channel_usage_message, + '$delegated_desc' => t('Delegated Channel'), + '$delegates' => $delegates + ]); + } } diff --git a/Zotlabs/Module/Manifest.php b/Zotlabs/Module/Manifest.php index 778539748..ab3163196 100644 --- a/Zotlabs/Module/Manifest.php +++ b/Zotlabs/Module/Manifest.php @@ -1,60 +1,50 @@ System::get_platform_name(), - 'short_name' => System::get_platform_name(), - 'icons' => [ - [ 'src' => '/images/' . System::get_platform_name() . '-64' . '.png', 'sizes' => '64x64' ], - [ 'src' => '/images/' . System::get_platform_name() . '-192' . '.png', 'sizes' => '192x192' ], - [ 'src' => '/images/' . System::get_platform_name() . '-512' . '.png', 'sizes' => '512x512' ], - [ 'src' => '/images/' . System::get_platform_name() . '.svg', 'sizes' => '600x600' ], - ], - 'scope' => '/', - 'start_url' => z_root(), - 'display' => 'fullscreen', - 'orientation' => 'any', - 'theme_color' => 'blue', - 'background_color' => 'white', - 'share_target' => [ - 'action' => '/rpost', - 'method' => 'POST', - 'enctype' => 'multipart/form-data', - 'params' => [ - 'title' => 'title', - 'text' => 'body', - 'url' => 'url', - 'files' => [ - [ 'name' => 'userfile', - 'accept' => [ 'image/*', 'audio/*', 'video/*', 'text/*', 'application/*' ] - ] - ] - ] - ] - - ]; - - - json_return_and_die($ret,'application/manifest+json'); - } - - - - - - - - - + public function init() + { + $ret = [ + 'name' => System::get_platform_name(), + 'short_name' => System::get_platform_name(), + 'icons' => [ + ['src' => '/images/' . System::get_platform_name() . '-64' . '.png', 'sizes' => '64x64'], + ['src' => '/images/' . System::get_platform_name() . '-192' . '.png', 'sizes' => '192x192'], + ['src' => '/images/' . System::get_platform_name() . '-512' . '.png', 'sizes' => '512x512'], + ['src' => '/images/' . System::get_platform_name() . '.svg', 'sizes' => '600x600'], + ], + 'scope' => '/', + 'start_url' => z_root(), + 'display' => 'fullscreen', + 'orientation' => 'any', + 'theme_color' => 'blue', + 'background_color' => 'white', + 'share_target' => [ + 'action' => '/rpost', + 'method' => 'POST', + 'enctype' => 'multipart/form-data', + 'params' => [ + 'title' => 'title', + 'text' => 'body', + 'url' => 'url', + 'files' => [ + ['name' => 'userfile', + 'accept' => ['image/*', 'audio/*', 'video/*', 'text/*', 'application/*'] + ] + ] + ] + ] + ]; + json_return_and_die($ret, 'application/manifest+json'); + } } diff --git a/Zotlabs/Module/Markup.php b/Zotlabs/Module/Markup.php index 1f43697f1..3641a3ade 100644 --- a/Zotlabs/Module/Markup.php +++ b/Zotlabs/Module/Markup.php @@ -6,17 +6,17 @@ use Zotlabs\Lib\Apps; use Zotlabs\Lib\Libsync; use Zotlabs\Web\Controller; -class Markup extends Controller { +class Markup extends Controller +{ - function get() { + public function get() + { $desc = t('This app adds editor buttons for bold, italic, underline, quote, and possibly other common richtext constructs.'); $text = '' . $at['xchan_name'] . '' . $desc . ''; - return $text; - - } - + return $text; + } } diff --git a/Zotlabs/Module/Menu.php b/Zotlabs/Module/Menu.php index 0fdb398bd..8879a448c 100644 --- a/Zotlabs/Module/Menu.php +++ b/Zotlabs/Module/Menu.php @@ -1,4 +1,5 @@ 1 && argv(1) === 'sys' && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - \App::$is_sys = true; - } - } + if (argc() > 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + App::$is_sys = true; + } + } - if(argc() > 1) - $which = argv(1); - else - return; + if (argc() > 1) { + $which = argv(1); + } else { + return; + } - Libprofile::load($which); - - } - - - function post() { - - if(! \App::$profile) { - return; - } - - $which = argv(1); + Libprofile::load($which); + } - $uid = \App::$profile['channel_id']; - - if(array_key_exists('sys', $_REQUEST) && $_REQUEST['sys'] && is_site_admin()) { - $sys = get_sys_channel(); - $uid = intval($sys['channel_id']); - \App::$is_sys = true; - } - - if(! $uid) - return; - - $_REQUEST['menu_channel_id'] = $uid; - - if($_REQUEST['menu_bookmark']) - $_REQUEST['menu_flags'] |= MENU_BOOKMARK; - if($_REQUEST['menu_system']) - $_REQUEST['menu_flags'] |= MENU_SYSTEM; - - $menu_id = ((argc() > 1) ? intval(argv(1)) : 0); - if($menu_id) { - $_REQUEST['menu_id'] = intval(argv(1)); - $r = menu_edit($_REQUEST); - if($r) { - menu_sync_packet($uid,get_observer_hash(),$menu_id); - //info( t('Menu updated.') . EOL); - goaway(z_root() . '/mitem/' . $which . '/' . $menu_id . ((\App::$is_sys) ? '?f=&sys=1' : '')); - } - else - notice( t('Unable to update menu.'). EOL); - } - else { - $r = menu_create($_REQUEST); - if($r) { - menu_sync_packet($uid,get_observer_hash(),$r); - - //info( t('Menu created.') . EOL); - goaway(z_root() . '/mitem/' . $which . '/' . $r . ((\App::$is_sys) ? '?f=&sys=1' : '')); - } - else - notice( t('Unable to create menu.'). EOL); - - } - } - - - - - function get() { - + public function post() + { + + if (!App::$profile) { + return; + } + + $which = argv(1); - if(! \App::$profile) { - notice( t('Requested profile is not available.') . EOL ); - \App::$error = 404; - return; - } + $uid = App::$profile['channel_id']; - $which = argv(1); + if (array_key_exists('sys', $_REQUEST) && $_REQUEST['sys'] && is_site_admin()) { + $sys = get_sys_channel(); + $uid = intval($sys['channel_id']); + App::$is_sys = true; + } - $_SESSION['return_url'] = \App::$query_string; + if (!$uid) { + return; + } - $uid = local_channel(); - $owner = 0; - $channel = null; - $observer = \App::get_observer(); + $_REQUEST['menu_channel_id'] = $uid; - $channel = \App::get_channel(); + if ($_REQUEST['menu_bookmark']) { + $_REQUEST['menu_flags'] |= MENU_BOOKMARK; + } + if ($_REQUEST['menu_system']) { + $_REQUEST['menu_flags'] |= MENU_SYSTEM; + } - if(\App::$is_sys && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - $uid = $owner = intval($sys['channel_id']); - $channel = $sys; - $observer = $sys; - } - } + $menu_id = ((argc() > 1) ? intval(argv(1)) : 0); + if ($menu_id) { + $_REQUEST['menu_id'] = intval(argv(1)); + $r = menu_edit($_REQUEST); + if ($r) { + menu_sync_packet($uid, get_observer_hash(), $menu_id); + //info( t('Menu updated.') . EOL); + goaway(z_root() . '/mitem/' . $which . '/' . $menu_id . ((App::$is_sys) ? '?f=&sys=1' : '')); + } else { + notice(t('Unable to update menu.') . EOL); + } + } else { + $r = menu_create($_REQUEST); + if ($r) { + menu_sync_packet($uid, get_observer_hash(), $r); - if(! $owner) { - // Figure out who the page owner is. - $r = channelx_by_nick($which); - if($r) { - $owner = intval($r['channel_id']); - } - } + //info( t('Menu created.') . EOL); + goaway(z_root() . '/mitem/' . $which . '/' . $r . ((App::$is_sys) ? '?f=&sys=1' : '')); + } else { + notice(t('Unable to create menu.') . EOL); + } + } + } - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - $perms = get_all_perms($owner,$ob_hash); + public function get() + { - if(! $perms['write_pages']) { - notice( t('Permission denied.') . EOL); - return; - } - // Get the observer, check their permissions + if (!App::$profile) { + notice(t('Requested profile is not available.') . EOL); + App::$error = 404; + return; + } - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + $which = argv(1); - $perms = get_all_perms($owner,$ob_hash); + $_SESSION['return_url'] = App::$query_string; - if(! $perms['write_pages']) { - notice( t('Permission denied.') . EOL); - return; - } + $uid = local_channel(); + $owner = 0; + $channel = null; + $observer = App::get_observer(); - if(argc() == 2) { - - $channel = (($sys) ? $sys : channelx_by_n($owner)); - - // list menus - $x = menu_list($owner); - if($x) { - for($y = 0; $y < count($x); $y ++) { - $m = menu_fetch($x[$y]['menu_name'],$owner,get_observer_hash()); - if($m) - $x[$y]['element'] = '[element]' . base64url_encode(json_encode(menu_element($channel,$m))) . '[/element]'; - $x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false); - } - } - - $create = replace_macros(get_markup_template('menuedit.tpl'), array( - '$menu_name' => array('menu_name', t('Menu Name'), '', t('Unique name (not visible on webpage) - required'), '*'), - '$menu_desc' => array('menu_desc', t('Menu Title'), '', t('Visible on webpage - leave empty for no title'), ''), - '$menu_bookmark' => array('menu_bookmark', t('Allow Bookmarks'), 0 , t('Menu may be used to store saved bookmarks'), array(t('No'), t('Yes'))), - '$submit' => t('Submit and proceed'), - '$sys' => \App::$is_sys, - '$nick' => $which, - '$display' => 'none' - )); - - $o = replace_macros(get_markup_template('menulist.tpl'),array( - '$title' => t('Menus'), - '$create' => $create, - '$menus' => $x, - '$nametitle' => t('Menu Name'), - '$desctitle' => t('Menu Title'), - '$edit' => t('Edit'), - '$drop' => t('Drop'), - '$created' => t('Created'), - '$edited' => t('Edited'), - '$new' => t('New'), - '$bmark' => t('Bookmarks allowed'), - '$hintnew' => t('Create'), - '$hintdrop' => t('Delete this menu'), - '$hintcontent' => t('Edit menu contents'), - '$hintedit' => t('Edit this menu'), - '$nick' => $which, - '$sys' => \App::$is_sys - )); - - return $o; - - } - - if(argc() > 2) { - if(intval(argv(2))) { - - if(argc() == 4 && argv(3) == 'drop') { - menu_sync_packet($owner,get_observer_hash(),intval(argv(1)),true); - $r = menu_delete_id(intval(argv(2)),$owner); - if(!$r) - notice( t('Menu could not be deleted.'). EOL); - - goaway(z_root() . '/menu/' . $which . ((\App::$is_sys) ? '?f=&sys=1' : '')); - } - - $m = menu_fetch_id(intval(argv(2)),$owner); - - if(! $m) { - notice( t('Menu not found.') . EOL); - return ''; - } - - $o = replace_macros(get_markup_template('menuedit.tpl'), array( - '$header' => t('Edit Menu'), - '$sys' => \App::$is_sys, - '$menu_id' => intval(argv(2)), - '$menu_edit_link' => 'mitem/' . $which . '/' . intval(argv(1)) . ((\App::$is_sys) ? '?f=&sys=1' : ''), - '$hintedit' => t('Add or remove entries to this menu'), - '$editcontents' => t('Edit menu contents'), - '$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'), - '$menu_desc' => array('menu_desc', t('Menu title'), $m['menu_desc'], t('Menu title as seen by others'), ''), - '$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), (($m['menu_flags'] & MENU_BOOKMARK) ? 1 : 0), t('Menu may be used to store saved bookmarks'), array(t('No'), t('Yes'))), - '$menu_system' => (($m['menu_flags'] & MENU_SYSTEM) ? 1 : 0), - '$nick' => $which, - '$submit' => t('Submit and proceed') - )); - - return $o; - - } - else { - notice( t('Not found.') . EOL); - return; - } - } - - } - + $channel = App::get_channel(); + + if (App::$is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } + } + + if (!$owner) { + // Figure out who the page owner is. + $r = channelx_by_nick($which); + if ($r) { + $owner = intval($r['channel_id']); + } + } + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner, $ob_hash); + + if (!$perms['write_pages']) { + notice(t('Permission denied.') . EOL); + return; + } + + // Get the observer, check their permissions + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner, $ob_hash); + + if (!$perms['write_pages']) { + notice(t('Permission denied.') . EOL); + return; + } + + if (argc() == 2) { + $channel = (($sys) ? $sys : channelx_by_n($owner)); + + // list menus + $x = menu_list($owner); + if ($x) { + for ($y = 0; $y < count($x); $y++) { + $m = menu_fetch($x[$y]['menu_name'], $owner, get_observer_hash()); + if ($m) { + $x[$y]['element'] = '[element]' . base64url_encode(json_encode(menu_element($channel, $m))) . '[/element]'; + } + $x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false); + } + } + + $create = replace_macros(get_markup_template('menuedit.tpl'), array( + '$menu_name' => array('menu_name', t('Menu Name'), '', t('Unique name (not visible on webpage) - required'), '*'), + '$menu_desc' => array('menu_desc', t('Menu Title'), '', t('Visible on webpage - leave empty for no title'), ''), + '$menu_bookmark' => array('menu_bookmark', t('Allow Bookmarks'), 0, t('Menu may be used to store saved bookmarks'), array(t('No'), t('Yes'))), + '$submit' => t('Submit and proceed'), + '$sys' => App::$is_sys, + '$nick' => $which, + '$display' => 'none' + )); + + $o = replace_macros(get_markup_template('menulist.tpl'), array( + '$title' => t('Menus'), + '$create' => $create, + '$menus' => $x, + '$nametitle' => t('Menu Name'), + '$desctitle' => t('Menu Title'), + '$edit' => t('Edit'), + '$drop' => t('Drop'), + '$created' => t('Created'), + '$edited' => t('Edited'), + '$new' => t('New'), + '$bmark' => t('Bookmarks allowed'), + '$hintnew' => t('Create'), + '$hintdrop' => t('Delete this menu'), + '$hintcontent' => t('Edit menu contents'), + '$hintedit' => t('Edit this menu'), + '$nick' => $which, + '$sys' => App::$is_sys + )); + + return $o; + } + + if (argc() > 2) { + if (intval(argv(2))) { + if (argc() == 4 && argv(3) == 'drop') { + menu_sync_packet($owner, get_observer_hash(), intval(argv(1)), true); + $r = menu_delete_id(intval(argv(2)), $owner); + if (!$r) { + notice(t('Menu could not be deleted.') . EOL); + } + + goaway(z_root() . '/menu/' . $which . ((App::$is_sys) ? '?f=&sys=1' : '')); + } + + $m = menu_fetch_id(intval(argv(2)), $owner); + + if (!$m) { + notice(t('Menu not found.') . EOL); + return ''; + } + + $o = replace_macros(get_markup_template('menuedit.tpl'), array( + '$header' => t('Edit Menu'), + '$sys' => App::$is_sys, + '$menu_id' => intval(argv(2)), + '$menu_edit_link' => 'mitem/' . $which . '/' . intval(argv(1)) . ((App::$is_sys) ? '?f=&sys=1' : ''), + '$hintedit' => t('Add or remove entries to this menu'), + '$editcontents' => t('Edit menu contents'), + '$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'), + '$menu_desc' => array('menu_desc', t('Menu title'), $m['menu_desc'], t('Menu title as seen by others'), ''), + '$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), (($m['menu_flags'] & MENU_BOOKMARK) ? 1 : 0), t('Menu may be used to store saved bookmarks'), array(t('No'), t('Yes'))), + '$menu_system' => (($m['menu_flags'] & MENU_SYSTEM) ? 1 : 0), + '$nick' => $which, + '$submit' => t('Submit and proceed') + )); + + return $o; + } else { + notice(t('Not found.') . EOL); + return; + } + } + } } diff --git a/Zotlabs/Module/Mitem.php b/Zotlabs/Module/Mitem.php index 5aadc790f..e0df97a52 100644 --- a/Zotlabs/Module/Mitem.php +++ b/Zotlabs/Module/Mitem.php @@ -1,7 +1,9 @@ 1 && argv(1) === 'sys' && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - \App::$is_sys = true; - } - } + if (argc() > 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + App::$is_sys = true; + } + } - if(argc() > 1) - $which = argv(1); - else - return; + if (argc() > 1) { + $which = argv(1); + } else { + return; + } - Libprofile::load($which); - - if(argc() < 3) - return; - - $m = menu_fetch_id(intval(argv(2)),\App::$profile['channel_id']); - if(! $m) { - notice( t('Menu not found.') . EOL); - return ''; - } - \App::$data['menu'] = $m; - - } - - function post() { - - if(! \App::$profile) { - return; - } + Libprofile::load($which); - $which = argv(1); + if (argc() < 3) { + return; + } + + $m = menu_fetch_id(intval(argv(2)), App::$profile['channel_id']); + if (!$m) { + notice(t('Menu not found.') . EOL); + return ''; + } + App::$data['menu'] = $m; + } + + public function post() + { + + if (!App::$profile) { + return; + } + + $which = argv(1); - $uid = \App::$profile['channel_id']; - - if(array_key_exists('sys', $_REQUEST) && $_REQUEST['sys'] && is_site_admin()) { - $sys = get_sys_channel(); - $uid = intval($sys['channel_id']); - \App::$is_sys = true; - } - - if(! $uid) - return; + $uid = App::$profile['channel_id']; + + if (array_key_exists('sys', $_REQUEST) && $_REQUEST['sys'] && is_site_admin()) { + $sys = get_sys_channel(); + $uid = intval($sys['channel_id']); + App::$is_sys = true; + } + + if (!$uid) { + return; + } - if(! \App::$data['menu']) - return; - - if(!$_REQUEST['mitem_desc'] || !$_REQUEST['mitem_link']) { - notice( t('Unable to create element.') . EOL); - return; - } - - $_REQUEST['mitem_channel_id'] = $uid; - $_REQUEST['menu_id'] = \App::$data['menu']['menu_id']; - - $_REQUEST['mitem_flags'] = 0; - if($_REQUEST['usezid']) - $_REQUEST['mitem_flags'] |= MENU_ITEM_ZID; - if($_REQUEST['newwin']) - $_REQUEST['mitem_flags'] |= MENU_ITEM_NEWWIN; - - - $mitem_id = ((argc() > 3) ? intval(argv(3)) : 0); - if($mitem_id) { - $_REQUEST['mitem_id'] = $mitem_id; - $r = menu_edit_item($_REQUEST['menu_id'],$uid,$_REQUEST); - if($r) { - menu_sync_packet($uid,get_observer_hash(),$_REQUEST['menu_id']); - //info( t('Menu element updated.') . EOL); - goaway(z_root() . '/mitem/' . $which . '/' . $_REQUEST['menu_id'] . ((\App::$is_sys) ? '?f=&sys=1' : '')); - } - else - notice( t('Unable to update menu element.') . EOL); - - } - else { - $r = menu_add_item($_REQUEST['menu_id'],$uid,$_REQUEST); - if($r) { - menu_sync_packet($uid,get_observer_hash(),$_REQUEST['menu_id']); - //info( t('Menu element added.') . EOL); - if($_REQUEST['submit']) { - goaway(z_root() . '/menu/' . $which . ((\App::$is_sys) ? '?f=&sys=1' : '')); - } - if($_REQUEST['submit-more']) { - goaway(z_root() . '/mitem/' . $which . '/' . $_REQUEST['menu_id'] . '?f=&display=block' . ((\App::$is_sys) ? '&sys=1' : '') ); - } - } - else - notice( t('Unable to add menu element.') . EOL); - - } - - } - - - function get() { - - $uid = local_channel(); - $owner = \App::$profile['channel_id']; - $channel = channelx_by_n($owner); - $observer = \App::get_observer(); + if (!App::$data['menu']) { + return; + } - $which = argv(1); + if (!$_REQUEST['mitem_desc'] || !$_REQUEST['mitem_link']) { + notice(t('Unable to create element.') . EOL); + return; + } - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - - if(\App::$is_sys && is_site_admin()) { - $sys = get_sys_channel(); - $uid = intval($sys['channel_id']); - $channel = $sys; - $ob_hash = $sys['xchan_hash']; - } - - if(! $uid) { - notice( t('Permission denied.') . EOL); - return ''; - } - - if(argc() < 3 || (! \App::$data['menu'])) { - notice( t('Not found.') . EOL); - return ''; - } - - $m = menu_fetch(\App::$data['menu']['menu_name'],$owner,$ob_hash); - \App::$data['menu_item'] = $m; - - $menu_list = menu_list($owner); - - foreach($menu_list as $menus) { - if($menus['menu_name'] != $m['menu']['menu_name']) - $menu_names[] = $menus['menu_name']; - } - - $acl = new \Zotlabs\Access\AccessControl($channel); - - $lockstate = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'); - - if(argc() == 3) { - $r = q("select * from menu_item where mitem_menu_id = %d and mitem_channel_id = %d order by mitem_order asc, mitem_desc asc", - intval(\App::$data['menu']['menu_id']), - intval($owner) - ); - - if($_GET['display']) { - $display = $_GET['display']; - } - else { - $display = (($r) ? 'none' : 'block'); - } + $_REQUEST['mitem_channel_id'] = $uid; + $_REQUEST['menu_id'] = App::$data['menu']['menu_id']; - $create = replace_macros(get_markup_template('mitemedit.tpl'), array( - '$menu_id' => \App::$data['menu']['menu_id'], - '$permissions' => t('Menu Item Permissions'), - '$permdesc' => t("\x28click to open/close\x29"), - '$aclselect' => populate_acl($acl->get(),false), - '$allow_cid' => acl2json($acl->get()['allow_cid']), - '$allow_gid' => acl2json($acl->get()['allow_gid']), - '$deny_cid' => acl2json($acl->get()['deny_cid']), - '$deny_gid' => acl2json($acl->get()['deny_gid']), - '$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link','*'), - '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), '', t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-names"'), - '$usezid' => array('usezid', t('Use magic-auth if available'), true, '', array(t('No'), t('Yes'))), - '$newwin' => array('newwin', t('Open link in new window'), false,'', array(t('No'), t('Yes'))), - '$mitem_order' => array('mitem_order', t('Order in list'),'0',t('Higher numbers will sink to bottom of listing')), - '$submit' => t('Submit and finish'), - '$submit_more' => t('Submit and continue'), - '$display' => $display, - '$lockstate' => $lockstate, - '$menu_names' => $menu_names, - '$nick' => $which, - '$sys' => \App::$is_sys - )); - - $o .= replace_macros(get_markup_template('mitemlist.tpl'),array( - '$title' => t('Menu:'), - '$create' => $create, - '$nametitle' => t('Link Name'), - '$targettitle' => t('Link Target'), - '$menuname' => \App::$data['menu']['menu_name'], - '$menudesc' => \App::$data['menu']['menu_desc'], - '$edmenu' => t('Edit menu'), - '$menu_id' => \App::$data['menu']['menu_id'], - '$mlist' => $r, - '$edit' => t('Edit element'), - '$drop' => t('Drop element'), - '$new' => t('New element'), - '$hintmenu' => t('Edit this menu container'), - '$hintnew' => t('Add menu element'), - '$hintdrop' => t('Delete this menu item'), - '$hintedit' => t('Edit this menu item'), - '$nick' => $which, - )); - - return $o; - } - - - if(argc() > 3) { + $_REQUEST['mitem_flags'] = 0; + if ($_REQUEST['usezid']) { + $_REQUEST['mitem_flags'] |= MENU_ITEM_ZID; + } + if ($_REQUEST['newwin']) { + $_REQUEST['mitem_flags'] |= MENU_ITEM_NEWWIN; + } - if(intval(argv(3))) { - - $m = q("select * from menu_item where mitem_id = %d and mitem_channel_id = %d limit 1", - intval(argv(3)), - intval($owner) - ); - - if(! $m) { - notice( t('Menu item not found.') . EOL); - goaway(z_root() . '/menu/'. $which . ((\App::$is_sys) ? '?f=&sys=1' : '')); - } - - $mitem = $m[0]; - - $lockstate = (($mitem['allow_cid'] || $mitem['allow_gid'] || $mitem['deny_cid'] || $mitem['deny_gid']) ? 'lock' : 'unlock'); - - if(argc() == 5 && argv(4) == 'drop') { - menu_sync_packet($owner,get_observer_hash(),$mitem['mitem_menu_id']); - $r = menu_del_item($mitem['mitem_menu_id'], $owner, intval(argv(3))); - menu_sync_packet($owner,get_observer_hash(),$mitem['mitem_menu_id']); - if($r) - info( t('Menu item deleted.') . EOL); - else - notice( t('Menu item could not be deleted.'). EOL); - - goaway(z_root() . '/mitem/' . $which . '/' . $mitem['mitem_menu_id'] . ((\App::$is_sys) ? '?f=&sys=1' : '')); - } - - // edit menu item - $o = replace_macros(get_markup_template('mitemedit.tpl'), array( - '$header' => t('Edit Menu Element'), - '$menu_id' => \App::$data['menu']['menu_id'], - '$permissions' => t('Menu Item Permissions'), - '$permdesc' => t("\x28click to open/close\x29"), - '$aclselect' => populate_acl($mitem,false), - '$allow_cid' => acl2json($mitem['allow_cid']), - '$allow_gid' => acl2json($mitem['allow_gid']), - '$deny_cid' => acl2json($mitem['deny_cid']), - '$deny_gid' => acl2json($mitem['deny_gid']), - '$mitem_id' => intval(argv(3)), - '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'), - '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'), - '$usezid' => array('usezid', t('Use magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), '', array(t('No'), t('Yes'))), - '$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),'', array(t('No'), t('Yes'))), - '$mitem_order' => array('mitem_order', t('Order in list'),$mitem['mitem_order'],t('Higher numbers will sink to bottom of listing')), - '$submit' => t('Submit'), - '$lockstate' => $lockstate, - '$menu_names' => $menu_names, - '$nick' => $which - )); - - return $o; - } - } - } - + + $mitem_id = ((argc() > 3) ? intval(argv(3)) : 0); + if ($mitem_id) { + $_REQUEST['mitem_id'] = $mitem_id; + $r = menu_edit_item($_REQUEST['menu_id'], $uid, $_REQUEST); + if ($r) { + menu_sync_packet($uid, get_observer_hash(), $_REQUEST['menu_id']); + //info( t('Menu element updated.') . EOL); + goaway(z_root() . '/mitem/' . $which . '/' . $_REQUEST['menu_id'] . ((App::$is_sys) ? '?f=&sys=1' : '')); + } else { + notice(t('Unable to update menu element.') . EOL); + } + } else { + $r = menu_add_item($_REQUEST['menu_id'], $uid, $_REQUEST); + if ($r) { + menu_sync_packet($uid, get_observer_hash(), $_REQUEST['menu_id']); + //info( t('Menu element added.') . EOL); + if ($_REQUEST['submit']) { + goaway(z_root() . '/menu/' . $which . ((App::$is_sys) ? '?f=&sys=1' : '')); + } + if ($_REQUEST['submit-more']) { + goaway(z_root() . '/mitem/' . $which . '/' . $_REQUEST['menu_id'] . '?f=&display=block' . ((App::$is_sys) ? '&sys=1' : '')); + } + } else { + notice(t('Unable to add menu element.') . EOL); + } + } + } + + + public function get() + { + + $uid = local_channel(); + $owner = App::$profile['channel_id']; + $channel = channelx_by_n($owner); + $observer = App::get_observer(); + + $which = argv(1); + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + if (App::$is_sys && is_site_admin()) { + $sys = get_sys_channel(); + $uid = intval($sys['channel_id']); + $channel = $sys; + $ob_hash = $sys['xchan_hash']; + } + + if (!$uid) { + notice(t('Permission denied.') . EOL); + return ''; + } + + if (argc() < 3 || (!App::$data['menu'])) { + notice(t('Not found.') . EOL); + return ''; + } + + $m = menu_fetch(App::$data['menu']['menu_name'], $owner, $ob_hash); + App::$data['menu_item'] = $m; + + $menu_list = menu_list($owner); + + foreach ($menu_list as $menus) { + if ($menus['menu_name'] != $m['menu']['menu_name']) { + $menu_names[] = $menus['menu_name']; + } + } + + $acl = new AccessControl($channel); + + $lockstate = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'); + + if (argc() == 3) { + $r = q( + "select * from menu_item where mitem_menu_id = %d and mitem_channel_id = %d order by mitem_order asc, mitem_desc asc", + intval(App::$data['menu']['menu_id']), + intval($owner) + ); + + if ($_GET['display']) { + $display = $_GET['display']; + } else { + $display = (($r) ? 'none' : 'block'); + } + + $create = replace_macros(get_markup_template('mitemedit.tpl'), array( + '$menu_id' => App::$data['menu']['menu_id'], + '$permissions' => t('Menu Item Permissions'), + '$permdesc' => t("\x28click to open/close\x29"), + '$aclselect' => populate_acl($acl->get(), false), + '$allow_cid' => acl2json($acl->get()['allow_cid']), + '$allow_gid' => acl2json($acl->get()['allow_gid']), + '$deny_cid' => acl2json($acl->get()['deny_cid']), + '$deny_gid' => acl2json($acl->get()['deny_gid']), + '$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link', '*'), + '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), '', t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-names"'), + '$usezid' => array('usezid', t('Use magic-auth if available'), true, '', array(t('No'), t('Yes'))), + '$newwin' => array('newwin', t('Open link in new window'), false, '', array(t('No'), t('Yes'))), + '$mitem_order' => array('mitem_order', t('Order in list'), '0', t('Higher numbers will sink to bottom of listing')), + '$submit' => t('Submit and finish'), + '$submit_more' => t('Submit and continue'), + '$display' => $display, + '$lockstate' => $lockstate, + '$menu_names' => $menu_names, + '$nick' => $which, + '$sys' => App::$is_sys + )); + + $o .= replace_macros(get_markup_template('mitemlist.tpl'), array( + '$title' => t('Menu:'), + '$create' => $create, + '$nametitle' => t('Link Name'), + '$targettitle' => t('Link Target'), + '$menuname' => App::$data['menu']['menu_name'], + '$menudesc' => App::$data['menu']['menu_desc'], + '$edmenu' => t('Edit menu'), + '$menu_id' => App::$data['menu']['menu_id'], + '$mlist' => $r, + '$edit' => t('Edit element'), + '$drop' => t('Drop element'), + '$new' => t('New element'), + '$hintmenu' => t('Edit this menu container'), + '$hintnew' => t('Add menu element'), + '$hintdrop' => t('Delete this menu item'), + '$hintedit' => t('Edit this menu item'), + '$nick' => $which, + )); + + return $o; + } + + + if (argc() > 3) { + if (intval(argv(3))) { + $m = q( + "select * from menu_item where mitem_id = %d and mitem_channel_id = %d limit 1", + intval(argv(3)), + intval($owner) + ); + + if (!$m) { + notice(t('Menu item not found.') . EOL); + goaway(z_root() . '/menu/' . $which . ((App::$is_sys) ? '?f=&sys=1' : '')); + } + + $mitem = $m[0]; + + $lockstate = (($mitem['allow_cid'] || $mitem['allow_gid'] || $mitem['deny_cid'] || $mitem['deny_gid']) ? 'lock' : 'unlock'); + + if (argc() == 5 && argv(4) == 'drop') { + menu_sync_packet($owner, get_observer_hash(), $mitem['mitem_menu_id']); + $r = menu_del_item($mitem['mitem_menu_id'], $owner, intval(argv(3))); + menu_sync_packet($owner, get_observer_hash(), $mitem['mitem_menu_id']); + if ($r) { + info(t('Menu item deleted.') . EOL); + } else { + notice(t('Menu item could not be deleted.') . EOL); + } + + goaway(z_root() . '/mitem/' . $which . '/' . $mitem['mitem_menu_id'] . ((App::$is_sys) ? '?f=&sys=1' : '')); + } + + // edit menu item + $o = replace_macros(get_markup_template('mitemedit.tpl'), array( + '$header' => t('Edit Menu Element'), + '$menu_id' => App::$data['menu']['menu_id'], + '$permissions' => t('Menu Item Permissions'), + '$permdesc' => t("\x28click to open/close\x29"), + '$aclselect' => populate_acl($mitem, false), + '$allow_cid' => acl2json($mitem['allow_cid']), + '$allow_gid' => acl2json($mitem['allow_gid']), + '$deny_cid' => acl2json($mitem['deny_cid']), + '$deny_gid' => acl2json($mitem['deny_gid']), + '$mitem_id' => intval(argv(3)), + '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '', '*'), + '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'), + '$usezid' => array('usezid', t('Use magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), '', array(t('No'), t('Yes'))), + '$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0), '', array(t('No'), t('Yes'))), + '$mitem_order' => array('mitem_order', t('Order in list'), $mitem['mitem_order'], t('Higher numbers will sink to bottom of listing')), + '$submit' => t('Submit'), + '$lockstate' => $lockstate, + '$menu_names' => $menu_names, + '$nick' => $which + )); + + return $o; + } + } + } } diff --git a/Zotlabs/Module/Moderate.php b/Zotlabs/Module/Moderate.php index fa80bf8c3..3397991fe 100644 --- a/Zotlabs/Module/Moderate.php +++ b/Zotlabs/Module/Moderate.php @@ -10,115 +10,118 @@ use Zotlabs\Daemon\Run; require_once('include/conversation.php'); -class Moderate extends Controller { +class Moderate extends Controller +{ - function get() { - if(! local_channel()) { - notice( t('Permission denied.') . EOL); - return; - } + public function get() + { + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } - App::set_pager_itemspage(60); - $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); + App::set_pager_itemspage(60); + $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); - //show all items - if(argc() == 1) { - $r = q("select item.id as item_id, item.* from item where item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc $pager_sql", - intval(local_channel()), - intval(ITEM_MODERATED) - ); - if(! $r) { - info( t('No entries.') . EOL); - } + //show all items + if (argc() == 1) { + $r = q( + "select item.id as item_id, item.* from item where item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc $pager_sql", + intval(local_channel()), + intval(ITEM_MODERATED) + ); + if (!$r) { + info(t('No entries.') . EOL); + } + } - } + // show a single item + if (argc() == 2) { + $post_id = unpack_link_id(escape_tags(argv(1))); - // show a single item - if(argc() == 2) { - $post_id = unpack_link_id(escape_tags(argv(1))); + $r = q( + "select item.id as item_id, item.* from item where item.mid = '%s' and item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc $pager_sql", + dbesc($post_id), + intval(local_channel()), + intval(ITEM_MODERATED) + ); + } - $r = q("select item.id as item_id, item.* from item where item.mid = '%s' and item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc $pager_sql", - dbesc($post_id), - intval(local_channel()), - intval(ITEM_MODERATED) - ); - } + if (argc() > 2) { + $post_id = intval(argv(1)); + if (!$post_id) { + goaway(z_root() . '/moderate'); + } - if(argc() > 2) { - $post_id = intval(argv(1)); - if(! $post_id) - goaway(z_root() . '/moderate'); + $action = argv(2); - $action = argv(2); + $r = q( + "select * from item where uid = %d and id = %d and item_blocked = %d limit 1", + intval(local_channel()), + intval($post_id), + intval(ITEM_MODERATED) + ); - $r = q("select * from item where uid = %d and id = %d and item_blocked = %d limit 1", - intval(local_channel()), - intval($post_id), - intval(ITEM_MODERATED) - ); + if ($r) { + $item = $r[0]; - if($r) { - $item = $r[0]; + if ($action === 'approve') { + q( + "update item set item_blocked = 0 where uid = %d and id = %d", + intval(local_channel()), + intval($post_id) + ); - if($action === 'approve') { - q("update item set item_blocked = 0 where uid = %d and id = %d", - intval(local_channel()), - intval($post_id) - ); + $item['item_blocked'] = 0; - $item['item_blocked'] = 0; + item_update_parent_commented($item); - item_update_parent_commented($item); + notice(t('Comment approved') . EOL); + } elseif ($action === 'drop') { + drop_item($post_id, false); + notice(t('Comment deleted') . EOL); + } - notice( t('Comment approved') . EOL); - } - elseif($action === 'drop') { - drop_item($post_id,false); - notice( t('Comment deleted') . EOL); - } + // refetch the item after changes have been made - // refetch the item after changes have been made - - $r = q("select * from item where id = %d", - intval($post_id) - ); - if($r) { - xchan_query($r); - $sync_item = fetch_post_tags($r); - Libsync::build_sync_packet(local_channel(),array('item' => array(encode_item($sync_item[0],true)))); - } - if($action === 'approve') { - if ($item['id'] !== $item['parent']) { - // if this is a group comment, call tag_deliver() to generate the associated - // Announce activity so microblog destinations will see it in their home timeline - $role = get_pconfig(local_channel(),'system','permissions_role'); - $rolesettings = PermissionRoles::role_perms($role); - $channel_type = isset($rolesettings['channel_type']) ? $rolesettings['channel_type'] : 'normal'; + $r = q( + "select * from item where id = %d", + intval($post_id) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + Libsync::build_sync_packet(local_channel(), array('item' => array(encode_item($sync_item[0], true)))); + } + if ($action === 'approve') { + if ($item['id'] !== $item['parent']) { + // if this is a group comment, call tag_deliver() to generate the associated + // Announce activity so microblog destinations will see it in their home timeline + $role = get_pconfig(local_channel(), 'system', 'permissions_role'); + $rolesettings = PermissionRoles::role_perms($role); + $channel_type = isset($rolesettings['channel_type']) ? $rolesettings['channel_type'] : 'normal'; - $is_group = (($channel_type === 'group') ? true : false); - if ($is_group) { - tag_deliver(local_channel(),$post_id); - } - } - Run::Summon( [ 'Notifier', 'comment-new', $post_id ] ); - } - goaway(z_root() . '/moderate'); - } - } + $is_group = (($channel_type === 'group') ? true : false); + if ($is_group) { + tag_deliver(local_channel(), $post_id); + } + } + Run::Summon(['Notifier', 'comment-new', $post_id]); + } + goaway(z_root() . '/moderate'); + } + } - if($r) { - xchan_query($r); - $items = fetch_post_tags($r,true); - } - else { - $items = []; - } - - $o = conversation($items,'moderate',false,'traditional'); - $o .= alt_pager(count($items)); - return $o; - - } + if ($r) { + xchan_query($r); + $items = fetch_post_tags($r, true); + } else { + $items = []; + } + $o = conversation($items, 'moderate', false, 'traditional'); + $o .= alt_pager(count($items)); + return $o; + } } diff --git a/Zotlabs/Module/Mood.php b/Zotlabs/Module/Mood.php index aa759e8e5..d3e170ecb 100644 --- a/Zotlabs/Module/Mood.php +++ b/Zotlabs/Module/Mood.php @@ -1,4 +1,5 @@ Mood App (Not Installed):
'; - $o .= t('Set your current mood and tell your friends'); - return $o; - } + $poster = App::get_observer(); - nav_set_selected('Mood'); + $uuid = new_uuid(); + $mid = z_root() . '/item/' . $uuid; - $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0'); - - $verbs = get_mood_verbs(); - - $shortlist = []; - foreach($verbs as $k => $v) - if($v !== 'NOTRANSLATION') - $shortlist[] = array($k,$v); - - - $tpl = get_markup_template('mood_content.tpl'); - - $o = replace_macros($tpl,array( - '$title' => t('Mood'), - '$desc' => t('Set your current mood and tell your friends'), - '$verbs' => $shortlist, - '$parent' => $parent, - '$submit' => t('Submit'), - )); - - return $o; - - } - + $action = sprintf(t('%1$s is %2$s', 'mood'), '[zrl=' . $poster['xchan_url'] . ']' . $poster['xchan_name'] . '[/zrl]', $verbs[$verb]); + + $arr = []; + + $arr['aid'] = get_account_id(); + $arr['uid'] = $uid; + $arr['uuid'] = $uuid; + $arr['mid'] = $mid; + $arr['parent_mid'] = (($parent_mid) ? $parent_mid : $mid); + $arr['author_xchan'] = $poster['xchan_hash']; + $arr['owner_xchan'] = (($parent_mid) ? $r[0]['owner_xchan'] : $poster['xchan_hash']); + $arr['title'] = ''; + $arr['allow_cid'] = $allow_cid; + $arr['allow_gid'] = $allow_gid; + $arr['deny_cid'] = $deny_cid; + $arr['deny_gid'] = $deny_gid; + $arr['item_private'] = $private; + $arr['verb'] = $activity; + $arr['body'] = $action; + $arr['item_origin'] = 1; + $arr['item_wall'] = 1; + $arr['item_unseen'] = 1; + if (!$parent_mid) { + $item['item_thread_top'] = 1; + } + + if ((!$arr['plink']) && intval($arr['item_thread_top'])) { + $arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']); + } + + + $post = item_store($arr); + $item_id = $post['item_id']; + + if ($item_id) { + Run::Summon(['Notifier', 'activity', $item_id]); + } + + call_hooks('post_local_end', $arr); + + if ($_SESSION['return_url']) { + goaway(z_root() . '/' . $_SESSION['return_url']); + } + + return; + } + + + public function get() + { + + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } + + if (!Apps::system_app_installed(local_channel(), 'Mood')) { + //Do not display any associated widgets at this point + App::$pdl = ''; + + $o = 'Mood App (Not Installed):
'; + $o .= t('Set your current mood and tell your friends'); + return $o; + } + + nav_set_selected('Mood'); + + $parent = ((x($_GET, 'parent')) ? intval($_GET['parent']) : '0'); + + $verbs = get_mood_verbs(); + + $shortlist = []; + foreach ($verbs as $k => $v) { + if ($v !== 'NOTRANSLATION') { + $shortlist[] = array($k, $v); + } + } + + + $tpl = get_markup_template('mood_content.tpl'); + + $o = replace_macros($tpl, array( + '$title' => t('Mood'), + '$desc' => t('Set your current mood and tell your friends'), + '$verbs' => $shortlist, + '$parent' => $parent, + '$submit' => t('Submit'), + )); + + return $o; + } } diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php index 2a29bb380..4d1f4007a 100644 --- a/Zotlabs/Module/New_channel.php +++ b/Zotlabs/Module/New_channel.php @@ -1,205 +1,209 @@ 1) ? argv(1) : ''); - $cmd = ((argc() > 1) ? argv(1) : ''); - - if($cmd === 'autofill.json') { - $result = array('error' => false, 'message' => ''); - $n = trim($_REQUEST['name']); + if ($cmd === 'autofill.json') { + $result = array('error' => false, 'message' => ''); + $n = trim($_REQUEST['name']); - $x = false; + $x = false; - if(get_config('system','unicode_usernames')) { - $x = punify(mb_strtolower($n)); - } + if (get_config('system', 'unicode_usernames')) { + $x = punify(mb_strtolower($n)); + } - if((! $x) || strlen($x) > 64) - $x = strtolower(\URLify::transliterate($n)); - - $test = []; - - // first name - if(strpos($x,' ')) - $test[] = legal_webbie(substr($x,0,strpos($x,' '))); - if($test[0]) { - // first name plus first initial of last - $test[] = ((strpos($x,' ')) ? $test[0] . legal_webbie(trim(substr($x,strpos($x,' '),2))) : ''); - // first name plus random number - $test[] = $test[0] . mt_rand(1000,9999); - } - // fullname - $test[] = legal_webbie($x); - // fullname plus random number - $test[] = legal_webbie($x) . mt_rand(1000,9999); + if ((!$x) || strlen($x) > 64) { + $x = strtolower(URLify::transliterate($n)); + } - json_return_and_die(check_webbie($test)); - } - - if($cmd === 'checkaddr.json') { - $result = array('error' => false, 'message' => ''); - $n = trim($_REQUEST['nick']); - if(! $n) { - $n = trim($_REQUEST['name']); - } + $test = []; - $x = false; + // first name + if (strpos($x, ' ')) { + $test[] = legal_webbie(substr($x, 0, strpos($x, ' '))); + } + if ($test[0]) { + // first name plus first initial of last + $test[] = ((strpos($x, ' ')) ? $test[0] . legal_webbie(trim(substr($x, strpos($x, ' '), 2))) : ''); + // first name plus random number + $test[] = $test[0] . mt_rand(1000, 9999); + } + // fullname + $test[] = legal_webbie($x); + // fullname plus random number + $test[] = legal_webbie($x) . mt_rand(1000, 9999); - if(get_config('system','unicode_usernames')) { - $x = punify(mb_strtolower($n)); - } + json_return_and_die(check_webbie($test)); + } - if((! $x) || strlen($x) > 64) - $x = strtolower(\URLify::transliterate($n)); + if ($cmd === 'checkaddr.json') { + $result = array('error' => false, 'message' => ''); + $n = trim($_REQUEST['nick']); + if (!$n) { + $n = trim($_REQUEST['name']); + } + + $x = false; + + if (get_config('system', 'unicode_usernames')) { + $x = punify(mb_strtolower($n)); + } + + if ((!$x) || strlen($x) > 64) { + $x = strtolower(URLify::transliterate($n)); + } - $test = []; - - // first name - if(strpos($x,' ')) - $test[] = legal_webbie(substr($x,0,strpos($x,' '))); - if($test[0]) { - // first name plus first initial of last - $test[] = ((strpos($x,' ')) ? $test[0] . legal_webbie(trim(substr($x,strpos($x,' '),2))) : ''); - // first name plus random number - $test[] = $test[0] . mt_rand(1000,9999); - } + $test = []; - $n = legal_webbie($x); - if(strlen($n)) { - $test[] = $n; - $test[] = $n . mt_rand(1000,9999); - } - - for($y = 0; $y < 100; $y ++) - $test[] = 'id' . mt_rand(1000,9999); - - json_return_and_die(check_webbie($test)); - } - - - } - - function post() { - - $arr = $_POST; - - $acc = App::get_account(); - - if(local_channel()) { - $parent_channel = App::get_channel(); - if($parent_channel) { - $arr['parent_hash'] = $parent_channel['channel_hash']; - } - } + // first name + if (strpos($x, ' ')) { + $test[] = legal_webbie(substr($x, 0, strpos($x, ' '))); + } + if ($test[0]) { + // first name plus first initial of last + $test[] = ((strpos($x, ' ')) ? $test[0] . legal_webbie(trim(substr($x, strpos($x, ' '), 2))) : ''); + // first name plus random number + $test[] = $test[0] . mt_rand(1000, 9999); + } - $arr['account_id'] = get_account_id(); - - // prevent execution by delegated channels as well as those not logged in. - // get_account_id() returns the account_id from the session. But \App::$account - // may point to the original authenticated account. - - if((! $acc) || ($acc['account_id'] != $arr['account_id'])) { - notice( t('Permission denied.') . EOL ); - return; - } - - $result = create_identity($arr); - - if(! $result['success']) { - notice($result['message']); - return; - } - - $newuid = $result['channel']['channel_id']; - - change_channel($result['channel']['channel_id']); - - $next_page = get_config('system', 'workflow_channel_next', 'profiles'); - goaway(z_root() . '/' . $next_page); - - } - - function get() { - - $acc = App::get_account(); - - if((! $acc) || $acc['account_id'] != get_account_id()) { - notice( t('Permission denied.') . EOL); - return; - } - - $default_role = ''; - $aid = get_account_id(); - if($aid) { - $r = q("select count(channel_id) as total from channel where channel_account_id = %d", - intval($aid) - ); - if($r && (! intval($r[0]['total']))) { - $default_role = get_config('system','default_permissions_role','social'); - } - - $limit = account_service_class_fetch(get_account_id(),'total_identities'); - - if($r && ($limit !== false)) { - $channel_usage_message = sprintf( t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit); - } - else { - $channel_usage_message = ''; - } - } + $n = legal_webbie($x); + if (strlen($n)) { + $test[] = $n; + $test[] = $n . mt_rand(1000, 9999); + } - $name_help = ''; - $name_help .= (($default_role) - ? t('Your real name is recommended.') - : t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"') - ); - $name_help .= ''; + for ($y = 0; $y < 100; $y++) { + $test[] = 'id' . mt_rand(1000, 9999); + } - $nick_help = ''; - $nick_help .= t('This will be used to create a unique network address (like an email address).'); - if(! get_config('system','unicode_usernames')) { - $nick_help .= ' ' . t('Allowed characters are a-z 0-9, - and _'); - } - $nick_help .= ''; + json_return_and_die(check_webbie($test)); + } + } - $privacy_role = ((x($_REQUEST,'permissions_role')) ? $_REQUEST['permissions_role'] : "" ); + public function post() + { - $perm_roles = \Zotlabs\Access\PermissionRoles::roles(); + $arr = $_POST; - $name = array('name', t('Channel name'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), $name_help, "*"); - $nickhub = '@' . \App::get_hostname(); - $nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), $nick_help, "*"); - $role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role compatible with your usage needs and privacy requirements.'),$perm_roles); - - $o = replace_macros(get_markup_template('new_channel.tpl'), array( - '$title' => t('Create a Channel'), - '$desc' => t('A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things.') , - '$label_import' => t('or import an existing channel from another location.'), - '$name' => $name, - '$role' => $role, - '$default_role' => $default_role, - '$nickname' => $nickname, - '$validate' => t('Validate'), - '$submit' => t('Create'), - '$channel_usage_message' => $channel_usage_message - )); - - return $o; - - } - - + $acc = App::get_account(); + + if (local_channel()) { + $parent_channel = App::get_channel(); + if ($parent_channel) { + $arr['parent_hash'] = $parent_channel['channel_hash']; + } + } + + $arr['account_id'] = get_account_id(); + + // prevent execution by delegated channels as well as those not logged in. + // get_account_id() returns the account_id from the session. But \App::$account + // may point to the original authenticated account. + + if ((!$acc) || ($acc['account_id'] != $arr['account_id'])) { + notice(t('Permission denied.') . EOL); + return; + } + + $result = create_identity($arr); + + if (!$result['success']) { + notice($result['message']); + return; + } + + $newuid = $result['channel']['channel_id']; + + change_channel($result['channel']['channel_id']); + + $next_page = get_config('system', 'workflow_channel_next', 'profiles'); + goaway(z_root() . '/' . $next_page); + } + + public function get() + { + + $acc = App::get_account(); + + if ((!$acc) || $acc['account_id'] != get_account_id()) { + notice(t('Permission denied.') . EOL); + return; + } + + $default_role = ''; + $aid = get_account_id(); + if ($aid) { + $r = q( + "select count(channel_id) as total from channel where channel_account_id = %d", + intval($aid) + ); + if ($r && (!intval($r[0]['total']))) { + $default_role = get_config('system', 'default_permissions_role', 'social'); + } + + $limit = account_service_class_fetch(get_account_id(), 'total_identities'); + + if ($r && ($limit !== false)) { + $channel_usage_message = sprintf(t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit); + } else { + $channel_usage_message = ''; + } + } + + $name_help = ''; + $name_help .= (($default_role) + ? t('Your real name is recommended.') + : t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"') + ); + $name_help .= ''; + + $nick_help = ''; + $nick_help .= t('This will be used to create a unique network address (like an email address).'); + if (!get_config('system', 'unicode_usernames')) { + $nick_help .= ' ' . t('Allowed characters are a-z 0-9, - and _'); + } + $nick_help .= ''; + + $privacy_role = ((x($_REQUEST, 'permissions_role')) ? $_REQUEST['permissions_role'] : ""); + + $perm_roles = PermissionRoles::roles(); + + $name = array('name', t('Channel name'), ((x($_REQUEST, 'name')) ? $_REQUEST['name'] : ''), $name_help, "*"); + $nickhub = '@' . App::get_hostname(); + $nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST, 'nickname')) ? $_REQUEST['nickname'] : ''), $nick_help, "*"); + $role = array('permissions_role', t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role compatible with your usage needs and privacy requirements.'), $perm_roles); + + $o = replace_macros(get_markup_template('new_channel.tpl'), array( + '$title' => t('Create a Channel'), + '$desc' => t('A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things.'), + '$label_import' => t('or import an existing channel from another location.'), + '$name' => $name, + '$role' => $role, + '$default_role' => $default_role, + '$nickname' => $nickname, + '$validate' => t('Validate'), + '$submit' => t('Create'), + '$channel_usage_message' => $channel_usage_message + )); + + return $o; + } } diff --git a/Zotlabs/Module/Notes.php b/Zotlabs/Module/Notes.php index e52742857..5040d4e3b 100644 --- a/Zotlabs/Module/Notes.php +++ b/Zotlabs/Module/Notes.php @@ -1,52 +1,59 @@ true); - if(array_key_exists('note_text',$_REQUEST)) { - $body = escape_tags($_REQUEST['note_text']); - - // I've had my notes vanish into thin air twice in four years. - // Provide a backup copy if there were contents previously - // and there are none being saved now. - - if(! $body) { - $old_text = get_pconfig(local_channel(),'notes','text'); - if($old_text) - set_pconfig(local_channel(),'notes','text.bak',$old_text); - } - set_pconfig(local_channel(),'notes','text',$body); + public function init() + { - - // push updates to channel clones - - if((argc() > 1) && (argv(1) === 'sync')) { - Libsync::build_sync_packet(); - } - - logger('notes saved.', LOGGER_DEBUG); - json_return_and_die($ret); - - } - } + if (!local_channel()) { + return; + } - function get() { + $ret = array('success' => true); + if (array_key_exists('note_text', $_REQUEST)) { + $body = escape_tags($_REQUEST['note_text']); + + // I've had my notes vanish into thin air twice in four years. + // Provide a backup copy if there were contents previously + // and there are none being saved now. + + if (!$body) { + $old_text = get_pconfig(local_channel(), 'notes', 'text'); + if ($old_text) { + set_pconfig(local_channel(), 'notes', 'text.bak', $old_text); + } + } + set_pconfig(local_channel(), 'notes', 'text', $body); + + + // push updates to channel clones + + if ((argc() > 1) && (argv(1) === 'sync')) { + Libsync::build_sync_packet(); + } + + logger('notes saved.', LOGGER_DEBUG); + json_return_and_die($ret); + } + } + + public function get() + { $desc = t('This app allows you to create private notes for your personal use.'); $text = '' . $desc . ''; - if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Notes'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Notes'))) { return $text; } @@ -55,9 +62,5 @@ class Notes extends Controller { $text = '' . $desc . ''; return $text; - } - - - } diff --git a/Zotlabs/Module/Notifications.php b/Zotlabs/Module/Notifications.php index dc0aa00cc..5b9abde5c 100644 --- a/Zotlabs/Module/Notifications.php +++ b/Zotlabs/Module/Notifications.php @@ -1,73 +1,79 @@ 49) { - $r = q("select * from notify where uid = %d + + nav_set_selected('Notifications'); + + $o = ''; + $notif_content = ''; + $notifications_available = false; + + $n = q( + "select count(*) as total from notify where uid = %d and seen = 0", + intval(local_channel()) + ); + if ($n && intval($n[0]['total']) > 49) { + $r = q( + "select * from notify where uid = %d and seen = 0 order by created desc limit 50", - intval(local_channel()) - ); - } - else { - $r1 = q("select * from notify where uid = %d + intval(local_channel()) + ); + } else { + $r1 = q( + "select * from notify where uid = %d and seen = 0 order by created desc limit 50", - intval(local_channel()) - ); + intval(local_channel()) + ); - $r2 = q("select * from notify where uid = %d + $r2 = q( + "select * from notify where uid = %d and seen = 1 order by created desc limit %d", - intval(local_channel()), - intval(50 - intval($n[0]['total'])) - ); - $r = array_merge($r1,$r2); - } - - if($r) { - $notifications_available = true; - foreach ($r as $rr) { - $x = strip_tags(bbcode($rr['msg'])); - $notif_content .= replace_macros(get_markup_template('notify.tpl'),array( - '$item_link' => z_root().'/notify/view/'. $rr['id'], - '$item_image' => $rr['photo'], - '$item_text' => $x, - '$item_when' => relative_date($rr['created']), - '$item_seen' => (($rr['seen']) ? true : false), - '$new' => t('New') - )); - } - } - else { - $notif_content = t('No more system notifications.'); - } - - $o .= replace_macros(get_markup_template('notifications.tpl'),array( - '$notif_header' => t('System Notifications'), - '$notif_link_mark_seen' => t('Mark all seen'), - '$notif_content' => $notif_content, - '$notifications_available' => $notifications_available, - )); - - return $o; - } - + intval(local_channel()), + intval(50 - intval($n[0]['total'])) + ); + $r = array_merge($r1, $r2); + } + + if ($r) { + $notifications_available = true; + foreach ($r as $rr) { + $x = strip_tags(bbcode($rr['msg'])); + $notif_content .= replace_macros(get_markup_template('notify.tpl'), array( + '$item_link' => z_root() . '/notify/view/' . $rr['id'], + '$item_image' => $rr['photo'], + '$item_text' => $x, + '$item_when' => relative_date($rr['created']), + '$item_seen' => (($rr['seen']) ? true : false), + '$new' => t('New') + )); + } + } else { + $notif_content = t('No more system notifications.'); + } + + $o .= replace_macros(get_markup_template('notifications.tpl'), array( + '$notif_header' => t('System Notifications'), + '$notif_link_mark_seen' => t('Mark all seen'), + '$notif_content' => $notif_content, + '$notifications_available' => $notifications_available, + )); + + return $o; + } } diff --git a/Zotlabs/Module/Notify.php b/Zotlabs/Module/Notify.php index e66430849..3bafdfc6a 100644 --- a/Zotlabs/Module/Notify.php +++ b/Zotlabs/Module/Notify.php @@ -1,82 +1,84 @@ 2 && argv(1) === 'view' && intval(argv(2))) { + $r = q( + "select * from notify where id = %d and uid = %d limit 1", + intval(argv(2)), + intval(local_channel()) + ); + if ($r) { + $x = ['channel_id' => local_channel(), 'update' => 'unset']; + call_hooks('update_unseen', $x); + if ((!$_SESSION['sudo']) && ($x['update'] === 'unset' || intval($x['update']))) { + q( + "update notify set seen = 1 where (( parent != '' and parent = '%s' and otype = '%s' ) or link = '%s' ) and uid = %d", + dbesc($r[0]['parent']), + dbesc($r[0]['otype']), + dbesc($r[0]['link']), + intval(local_channel()) + ); + } + goaway($r[0]['link']); + } + notice(sprintf(t('A notification with that id was not found for channel \'%s\''), $channel['channel_name'])); + goaway(z_root()); + } + } - if (argc() > 2 && argv(1) === 'view' && intval(argv(2))) { - $r = q("select * from notify where id = %d and uid = %d limit 1", - intval(argv(2)), - intval(local_channel()) - ); - if ($r) { - $x = [ 'channel_id' => local_channel(), 'update' => 'unset' ]; - call_hooks('update_unseen',$x); - if ((! $_SESSION['sudo']) && ($x['update'] === 'unset' || intval($x['update']))) { - q("update notify set seen = 1 where (( parent != '' and parent = '%s' and otype = '%s' ) or link = '%s' ) and uid = %d", - dbesc($r[0]['parent']), - dbesc($r[0]['otype']), - dbesc($r[0]['link']), - intval(local_channel()) - ); - } - goaway($r[0]['link']); - } - notice( sprintf( t('A notification with that id was not found for channel \'%s\''), $channel['channel_name'])); - goaway(z_root()); - } - - - } - - - function get() { - if (! local_channel()) { - return login(); - } - - $notif_tpl = get_markup_template('notifications.tpl'); - - $not_tpl = get_markup_template('notify.tpl'); - - $r = q("SELECT * from notify where uid = %d and seen = 0 order by created desc", - intval(local_channel()) - ); - - if ($r) { - foreach ($r as $it) { - $notif_content .= replace_macros($not_tpl,array( - '$item_link' => z_root().'/notify/view/'. $it['id'], - '$item_image' => $it['photo'], - '$item_text' => strip_tags(bbcode($it['msg'])), - '$item_when' => relative_date($it['created']) - )); - } - } - else { - $notif_content .= t('No more system notifications.'); - } - - $o .= replace_macros($notif_tpl,array( - '$notif_header' => t('System Notifications'), - '$tabs' => '', // $tabs, - '$notif_content' => $notif_content, - )); - - return $o; - - } + + public function get() + { + if (!local_channel()) { + return login(); + } + + $notif_tpl = get_markup_template('notifications.tpl'); + + $not_tpl = get_markup_template('notify.tpl'); + + $r = q( + "SELECT * from notify where uid = %d and seen = 0 order by created desc", + intval(local_channel()) + ); + + if ($r) { + foreach ($r as $it) { + $notif_content .= replace_macros($not_tpl, array( + '$item_link' => z_root() . '/notify/view/' . $it['id'], + '$item_image' => $it['photo'], + '$item_text' => strip_tags(bbcode($it['msg'])), + '$item_when' => relative_date($it['created']) + )); + } + } else { + $notif_content .= t('No more system notifications.'); + } + + $o .= replace_macros($notif_tpl, array( + '$notif_header' => t('System Notifications'), + '$tabs' => '', // $tabs, + '$notif_content' => $notif_content, + )); + + return $o; + } } diff --git a/Zotlabs/Module/Nullbox.php b/Zotlabs/Module/Nullbox.php index b14fd5dc9..02e90258e 100644 --- a/Zotlabs/Module/Nullbox.php +++ b/Zotlabs/Module/Nullbox.php @@ -4,11 +4,11 @@ namespace Zotlabs\Module; use Zotlabs\Web\Controller; -class Nullbox extends Controller { - - function init() { - http_status_exit(404,'Permission Denied'); - } +class Nullbox extends Controller +{ + public function init() + { + http_status_exit(404, 'Permission Denied'); + } } - diff --git a/Zotlabs/Module/Oauthinfo.php b/Zotlabs/Module/Oauthinfo.php index 2d64b3b8e..7f67f6731 100644 --- a/Zotlabs/Module/Oauthinfo.php +++ b/Zotlabs/Module/Oauthinfo.php @@ -1,22 +1,25 @@ z_root(), - 'authorization_endpoint' => z_root() . '/authorize', - 'jwks_uri' => z_root() . '/jwks', - 'token_endpoint' => z_root() . '/token', - 'userinfo_endpoint' => z_root() . '/userinfo', - 'scopes_supported' => [ 'openid', 'profile', 'email' ], - 'response_types_supported' => [ 'code', 'token', 'id_token', 'code id_token', 'token id_token' ] - ]; + $ret = [ + 'issuer' => z_root(), + 'authorization_endpoint' => z_root() . '/authorize', + 'jwks_uri' => z_root() . '/jwks', + 'token_endpoint' => z_root() . '/token', + 'userinfo_endpoint' => z_root() . '/userinfo', + 'scopes_supported' => ['openid', 'profile', 'email'], + 'response_types_supported' => ['code', 'token', 'id_token', 'code id_token', 'token id_token'] + ]; - json_return_and_die($ret); - } -} \ No newline at end of file + json_return_and_die($ret); + } +} diff --git a/Zotlabs/Module/Oembed.php b/Zotlabs/Module/Oembed.php index aee5ea079..a674805d9 100644 --- a/Zotlabs/Module/Oembed.php +++ b/Zotlabs/Module/Oembed.php @@ -1,36 +1,37 @@ 1) { - if (argv(1) == 'b2h'){ - $url = array( "", trim(hex2bin($_REQUEST['url']))); - echo oembed_replacecb($url); - killme(); - } - - elseif (argv(1) == 'h2b'){ - $text = trim(hex2bin($_REQUEST['text'])); - echo oembed_html2bbcode($text); - killme(); - } - - else { - echo ""; - $src = base64url_decode(argv(1)); - $j = oembed_fetch_url($src); - echo $j['html']; - // logger('mod-oembed ' . $h, LOGGER_ALL); - echo ""; - } - } - killme(); - } - + public function init() + { + // logger('mod_oembed ' . \App::$query_string, LOGGER_ALL); + + if (argc() > 1) { + if (argv(1) == 'b2h') { + $url = array("", trim(hex2bin($_REQUEST['url']))); + echo oembed_replacecb($url); + killme(); + } elseif (argv(1) == 'h2b') { + $text = trim(hex2bin($_REQUEST['text'])); + echo oembed_html2bbcode($text); + killme(); + } else { + echo " "; + $src = base64url_decode(argv(1)); + $j = oembed_fetch_url($src); + echo $j['html']; + // logger('mod-oembed ' . $h, LOGGER_ALL); + echo ""; + } + } + killme(); + } } diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php index 06c965e2c..c15eb6fdd 100644 --- a/Zotlabs/Module/Oep.php +++ b/Zotlabs/Module/Oep.php @@ -1,630 +1,679 @@ 1 && argv(1) === 'html') ? true : false); + if ($_REQUEST['url']) { + $_REQUEST['url'] = strip_zids($_REQUEST['url']); + $url = $_REQUEST['url']; + } + + if (!$url) { + http_status_exit(404, 'Not found'); + } + + $maxwidth = $_REQUEST['maxwidth']; + $maxheight = $_REQUEST['maxheight']; + $format = $_REQUEST['format']; + if ($format && $format !== 'json') { + http_status_exit(501, 'Not implemented'); + } + + if (fnmatch('*/photos/*/album/*', $url)) { + $arr = $this->oep_album_reply($_REQUEST); + } elseif (fnmatch('*/photos/*/image/*', $url)) { + $arr = $this->oep_photo_reply($_REQUEST); + } elseif (fnmatch('*/photos*', $url)) { + $arr = $this->oep_phototop_reply($_REQUEST); + } elseif (fnmatch('*/display/*', $url)) { + $arr = $this->oep_display_reply($_REQUEST); + } elseif (fnmatch('*/channel/*mid=*', $url)) { + $arr = $this->oep_mid_reply($_REQUEST); + } elseif (fnmatch('*/channel*', $url)) { + $arr = $this->oep_profile_reply($_REQUEST); + } elseif (fnmatch('*/profile/*', $url)) { + $arr = $this->oep_profile_reply($_REQUEST); + } elseif (fnmatch('*/cards/*', $url)) { + $arr = $this->oep_cards_reply($_REQUEST); + } elseif (fnmatch('*/articles/*', $url)) { + $arr = $this->oep_articles_reply($_REQUEST); + } + + if ($arr) { + if ($html) { + if ($arr['type'] === 'rich') { + header('Content-Type: text/html'); + echo $arr['html']; + } + } else { + header('Content-Type: application/json+oembed'); + echo json_encode($arr); + } + killme(); + } + + http_status_exit(404, 'Not found'); + } + + public function oep_display_reply($args) + { + + $ret = []; + $url = $args['url']; + $maxwidth = intval($args['maxwidth']); + $maxheight = intval($args['maxheight']); + + if (preg_match('#//(.*?)/display/(.*?)(&|\?|$)#', $url, $matches)) { + $res = $matches[2]; + } + + $res = unpack_link_id($res); + + $item_normal = item_normal(); + + $p = q( + "select * from item where mid like '%s' limit 1", + dbesc($res . '%') + ); + + if (!$p) { + return; + } + + $c = channelx_by_n($p[0]['uid']); -class Oep extends \Zotlabs\Web\Controller { + if (!($c && $res)) { + return; + } - function init() { - - logger('oep: ' . print_r($_REQUEST,true), LOGGER_DEBUG, LOG_INFO); - - $html = ((argc() > 1 && argv(1) === 'html') ? true : false); - if($_REQUEST['url']) { - $_REQUEST['url'] = strip_zids($_REQUEST['url']); - $url = $_REQUEST['url']; - } - - if(! $url) - http_status_exit(404, 'Not found'); - - $maxwidth = $_REQUEST['maxwidth']; - $maxheight = $_REQUEST['maxheight']; - $format = $_REQUEST['format']; - if($format && $format !== 'json') - http_status_exit(501, 'Not implemented'); - - if(fnmatch('*/photos/*/album/*',$url)) - $arr = $this->oep_album_reply($_REQUEST); - elseif(fnmatch('*/photos/*/image/*',$url)) - $arr = $this->oep_photo_reply($_REQUEST); - elseif(fnmatch('*/photos*',$url)) - $arr = $this->oep_phototop_reply($_REQUEST); - elseif(fnmatch('*/display/*',$url)) - $arr = $this->oep_display_reply($_REQUEST); - elseif(fnmatch('*/channel/*mid=*',$url)) - $arr = $this->oep_mid_reply($_REQUEST); - elseif(fnmatch('*/channel*',$url)) - $arr = $this->oep_profile_reply($_REQUEST); - elseif(fnmatch('*/profile/*',$url)) - $arr = $this->oep_profile_reply($_REQUEST); - elseif(fnmatch('*/cards/*',$url)) - $arr = $this->oep_cards_reply($_REQUEST); - elseif(fnmatch('*/articles/*',$url)) - $arr = $this->oep_articles_reply($_REQUEST); - - if($arr) { - if($html) { - if($arr['type'] === 'rich') { - header('Content-Type: text/html'); - echo $arr['html']; - } - } - else { - header('Content-Type: application/json+oembed'); - echo json_encode($arr); - } - killme(); - } - - http_status_exit(404,'Not found'); - - } - - function oep_display_reply($args) { - - $ret = []; - $url = $args['url']; - $maxwidth = intval($args['maxwidth']); - $maxheight = intval($args['maxheight']); + if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_stream')) { + return; + } - if(preg_match('#//(.*?)/display/(.*?)(&|\?|$)#',$url,$matches)) { - $res = $matches[2]; - } + $sql_extra = item_permissions_sql($c['channel_id']); - $res = unpack_link_id($res); + $p = q( + "select * from item where mid like '%s' and uid = %d $sql_extra $item_normal limit 1", + dbesc($res . '%'), + intval($c['channel_id']) + ); - $item_normal = item_normal(); + if (!$p) { + return; + } - $p = q("select * from item where mid like '%s' limit 1", - dbesc($res . '%') - ); + xchan_query($p, true); + $p = fetch_post_tags($p, true); - if(! $p) - return; + // This function can get tripped up if the item is already a reshare + // (the multiple share declarations do not parse cleanly if nested) + // So build a template with a known nonsense string as the content, and then + // replace that known string with the actual rendered content, sending + // each content layer through bbcode() separately. - $c = channelx_by_n($p[0]['uid']); + $x = '2eGriplW^*Jmf4'; - - if(! ($c && $res)) - return; - if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_stream')) - return; - - $sql_extra = item_permissions_sql($c['channel_id']); - - $p = q("select * from item where mid like '%s' and uid = %d $sql_extra $item_normal limit 1", - dbesc($res . '%'), - intval($c['channel_id']) - ); - - if(! $p) - return; - - xchan_query($p,true); - $p = fetch_post_tags($p,true); - - // This function can get tripped up if the item is already a reshare - // (the multiple share declarations do not parse cleanly if nested) - // So build a template with a known nonsense string as the content, and then - // replace that known string with the actual rendered content, sending - // each content layer through bbcode() separately. - - $x = '2eGriplW^*Jmf4'; - - - $o = "[share author='".urlencode($p[0]['author']['xchan_name']). + $o = "[share author='" . urlencode($p[0]['author']['xchan_name']) . "' profile='" . $p[0]['author']['xchan_url'] . "' portable_id='" . $p[0]['author']['xchan_hash'] . - "' avatar='" . $p[0]['author']['xchan_photo_s']. - "' link='" . $p[0]['plink']. + "' avatar='" . $p[0]['author']['xchan_photo_s'] . + "' link='" . $p[0]['plink'] . "' auth='" . (in_array($p[0]['author']['network'],['nomad','zot6']) ? 'true' : 'false') . - "' posted='" . $p[0]['created']. - "' message_id='" . $p[0]['mid']."']"; - if($p[0]['title']) - $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n"; + "' posted='" . $p[0]['created'] . + "' message_id='" . $p[0]['mid'] . "']"; + if ($p[0]['title']) { + $o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n"; + } - $o .= $x; - $o .= "[/share]"; - $o = bbcode($o); - - $o = str_replace($x,bbcode($p[0]['body']),$o); - - $ret['type'] = 'rich'; - - $w = (($maxwidth) ? $maxwidth : 640); - $h = (($maxheight) ? $maxheight : intval($w * 2 / 3)); - - $ret['html'] = ' ' . $o . ''; - - $ret['width'] = $w; - $ret['height'] = $h; - - return $ret; - - } + $o .= $x; + $o .= "[/share]"; + $o = bbcode($o); + + $o = str_replace($x, bbcode($p[0]['body']), $o); + + $ret['type'] = 'rich'; + + $w = (($maxwidth) ? $maxwidth : 640); + $h = (($maxheight) ? $maxheight : intval($w * 2 / 3)); + + $ret['html'] = '' . $o . ''; + + $ret['width'] = $w; + $ret['height'] = $h; + + return $ret; + } - function oep_cards_reply($args) { - - $ret = []; - $url = $args['url']; - $maxwidth = intval($args['maxwidth']); - $maxheight = intval($args['maxheight']); + public function oep_cards_reply($args) + { - if(preg_match('#//(.*?)/cards/(.*?)/(.*?)(&|\?|$)#',$url,$matches)) { - $nick = $matches[2]; - $res = $matches[3]; - } - if(! ($nick && $res)) - return $ret; + $ret = []; + $url = $args['url']; + $maxwidth = intval($args['maxwidth']); + $maxheight = intval($args['maxheight']); - $channel = channelx_by_nick($nick); + if (preg_match('#//(.*?)/cards/(.*?)/(.*?)(&|\?|$)#', $url, $matches)) { + $nick = $matches[2]; + $res = $matches[3]; + } + if (!($nick && $res)) { + return $ret; + } - if(! $channel) - return $ret; + $channel = channelx_by_nick($nick); + + if (!$channel) { + return $ret; + } - if(! perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_pages')) - return $ret; + if (!perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_pages')) { + return $ret; + } - $sql_extra = item_permissions_sql($channel['channel_id'],get_observer_hash()); + $sql_extra = item_permissions_sql($channel['channel_id'], get_observer_hash()); - $r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1", - dbesc($res) - ); - if($r) { - $sql_extra .= " and item.id = " . intval($r[0]['iid']) . " "; - } - else { - return $ret; - } + $r = q( + "select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1", + dbesc($res) + ); + if ($r) { + $sql_extra .= " and item.id = " . intval($r[0]['iid']) . " "; + } else { + return $ret; + } - $r = q("select * from item + $r = q( + "select * from item where item.uid = %d and item_type = %d $sql_extra order by item.created desc", - intval($channel['channel_id']), - intval(ITEM_TYPE_CARD) - ); + intval($channel['channel_id']), + intval(ITEM_TYPE_CARD) + ); - $item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0 + $item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_blocked = 0 "; - if($r) { - xchan_query($r); - $p = fetch_post_tags($r, true); - } + if ($r) { + xchan_query($r); + $p = fetch_post_tags($r, true); + } - $x = '2eGriplW^*Jmf4'; + $x = '2eGriplW^*Jmf4'; - - $o = "[share author='".urlencode($p[0]['author']['xchan_name']). - "' profile='".$p[0]['author']['xchan_url'] . - "' portable_id='".$p[0]['author']['xchan_hash'] . - "' avatar='".$p[0]['author']['xchan_photo_s']. - "' link='".$p[0]['plink']. + + $o = "[share author='" . urlencode($p[0]['author']['xchan_name']) . + "' profile='" . $p[0]['author']['xchan_url'] . + "' portable_id='" . $p[0]['author']['xchan_hash'] . + "' avatar='" . $p[0]['author']['xchan_photo_s'] . + "' link='" . $p[0]['plink'] . "' auth='" . (in_array($p[0]['author']['network'],['nomad','zot6']) ? 'true' : 'false') . - "' posted='".$p[0]['created']. - "' message_id='".$p[0]['mid']."']"; - if($p[0]['title']) - $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n"; + "' posted='" . $p[0]['created'] . + "' message_id='" . $p[0]['mid'] . "']"; + if ($p[0]['title']) { + $o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n"; + } - $o .= $x; - $o .= "[/share]"; - $o = bbcode($o); - - $o = str_replace($x,bbcode($p[0]['body']),$o); - - $ret['type'] = 'rich'; - - $w = (($maxwidth) ? $maxwidth : 640); - $h = (($maxheight) ? $maxheight : intval($w * 2 / 3)); - - $ret['html'] = '' . $o . ''; - - $ret['width'] = $w; - $ret['height'] = $h; - - return $ret; - - } + $o .= $x; + $o .= "[/share]"; + $o = bbcode($o); - function oep_articles_reply($args) { - - $ret = []; - $url = $args['url']; - $maxwidth = intval($args['maxwidth']); - $maxheight = intval($args['maxheight']); + $o = str_replace($x, bbcode($p[0]['body']), $o); - if(preg_match('#//(.*?)/articles/(.*?)/(.*?)(&|\?|$)#',$url,$matches)) { - $nick = $matches[2]; - $res = $matches[3]; - } - if(! ($nick && $res)) - return $ret; + $ret['type'] = 'rich'; - $channel = channelx_by_nick($nick); + $w = (($maxwidth) ? $maxwidth : 640); + $h = (($maxheight) ? $maxheight : intval($w * 2 / 3)); - if(! $channel) - return $ret; + $ret['html'] = '' . $o . ''; + + $ret['width'] = $w; + $ret['height'] = $h; + + return $ret; + } + + public function oep_articles_reply($args) + { + + $ret = []; + $url = $args['url']; + $maxwidth = intval($args['maxwidth']); + $maxheight = intval($args['maxheight']); + + if (preg_match('#//(.*?)/articles/(.*?)/(.*?)(&|\?|$)#', $url, $matches)) { + $nick = $matches[2]; + $res = $matches[3]; + } + if (!($nick && $res)) { + return $ret; + } + + $channel = channelx_by_nick($nick); + + if (!$channel) { + return $ret; + } - if(! perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_pages')) - return $ret; + if (!perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_pages')) { + return $ret; + } - $sql_extra = item_permissions_sql($channel['channel_id'],get_observer_hash()); + $sql_extra = item_permissions_sql($channel['channel_id'], get_observer_hash()); - $r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.v = '%s' limit 1", - dbesc($res) - ); - if($r) { - $sql_extra .= " and item.id = " . intval($r[0]['iid']) . " "; - } - else { - return $ret; - } + $r = q( + "select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.v = '%s' limit 1", + dbesc($res) + ); + if ($r) { + $sql_extra .= " and item.id = " . intval($r[0]['iid']) . " "; + } else { + return $ret; + } - $r = q("select * from item + $r = q( + "select * from item where item.uid = %d and item_type = %d $sql_extra order by item.created desc", - intval($channel['channel_id']), - intval(ITEM_TYPE_ARTICLE) - ); + intval($channel['channel_id']), + intval(ITEM_TYPE_ARTICLE) + ); - $item_normal = " and item.item_hidden = 0 and item.item_type in (0,7) and item.item_deleted = 0 + $item_normal = " and item.item_hidden = 0 and item.item_type in (0,7) and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_blocked = 0 "; - if($r) { - xchan_query($r); - $p = fetch_post_tags($r, true); - } + if ($r) { + xchan_query($r); + $p = fetch_post_tags($r, true); + } - $x = '2eGriplW^*Jmf4'; + $x = '2eGriplW^*Jmf4'; - - $o = "[share author='".urlencode($p[0]['author']['xchan_name']). - "' profile='".$p[0]['author']['xchan_url'] . - "' portable_id='".$p[0]['author']['xchan_hash'] . - "' avatar='".$p[0]['author']['xchan_photo_s']. - "' link='".$p[0]['plink']. + + $o = "[share author='" . urlencode($p[0]['author']['xchan_name']) . + "' profile='" . $p[0]['author']['xchan_url'] . + "' portable_id='" . $p[0]['author']['xchan_hash'] . + "' avatar='" . $p[0]['author']['xchan_photo_s'] . + "' link='" . $p[0]['plink'] . "' auth='" . (in_array($p[0]['author']['network'],['nomad','zot6']) ? 'true' : 'false') . - "' posted='".$p[0]['created']. - "' message_id='".$p[0]['mid']."']"; - if($p[0]['title']) - $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n"; + "' posted='" . $p[0]['created'] . + "' message_id='" . $p[0]['mid'] . "']"; + if ($p[0]['title']) { + $o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n"; + } - $o .= $x; - $o .= "[/share]"; - $o = bbcode($o); - - $o = str_replace($x,bbcode($p[0]['body']),$o); - - $ret['type'] = 'rich'; - - $w = (($maxwidth) ? $maxwidth : 640); - $h = (($maxheight) ? $maxheight : intval($w * 2 / 3)); - - $ret['html'] = '' . $o . ''; - - $ret['width'] = $w; - $ret['height'] = $h; - - return $ret; - - } + $o .= $x; + $o .= "[/share]"; + $o = bbcode($o); - - function oep_mid_reply($args) { - - $ret = []; - $url = $args['url']; - $maxwidth = intval($args['maxwidth']); - $maxheight = intval($args['maxheight']); - - if(preg_match('#//(.*?)/(.*?)/(.*?)/(.*?)mid\=(.*?)(&|$)#',$url,$matches)) { - $chn = $matches[3]; - $res = $matches[5]; - } - - if(! ($chn && $res)) - return; - $c = q("select * from channel where channel_address = '%s' limit 1", - dbesc($chn) - ); - - if(! $c) - return; + $o = str_replace($x, bbcode($p[0]['body']), $o); - if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_stream')) - return; - - $sql_extra = item_permissions_sql($c[0]['channel_id']); - - $p = q("select * from item where mid = '%s' and uid = %d $sql_extra limit 1", - dbesc($res), - intval($c[0]['channel_id']) - ); - if(! $p) - return; - - xchan_query($p,true); - $p = fetch_post_tags($p,true); + $ret['type'] = 'rich'; - // This function can get tripped up if the item is already a reshare - // (the multiple share declarations do not parse cleanly if nested) - // So build a template with a known nonsense string as the content, and then - // replace that known string with the actual rendered content, sending - // each content layer through bbcode() separately. + $w = (($maxwidth) ? $maxwidth : 640); + $h = (($maxheight) ? $maxheight : intval($w * 2 / 3)); - $x = '2eGriplW^*Jmf4'; - - $o = "[share author='".urlencode($p[0]['author']['xchan_name']). - "' profile='".$p[0]['author']['xchan_url'] . - "' portable_id='".$p[0]['author']['xchan_hash'] . - "' avatar='".$p[0]['author']['xchan_photo_s']. - "' link='".$p[0]['plink']. + $ret['html'] = '' . $o . ''; + + $ret['width'] = $w; + $ret['height'] = $h; + + return $ret; + } + + + public function oep_mid_reply($args) + { + + $ret = []; + $url = $args['url']; + $maxwidth = intval($args['maxwidth']); + $maxheight = intval($args['maxheight']); + + if (preg_match('#//(.*?)/(.*?)/(.*?)/(.*?)mid\=(.*?)(&|$)#', $url, $matches)) { + $chn = $matches[3]; + $res = $matches[5]; + } + + if (!($chn && $res)) { + return; + } + $c = q( + "select * from channel where channel_address = '%s' limit 1", + dbesc($chn) + ); + + if (!$c) { + return; + } + + if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_stream')) { + return; + } + + $sql_extra = item_permissions_sql($c[0]['channel_id']); + + $p = q( + "select * from item where mid = '%s' and uid = %d $sql_extra limit 1", + dbesc($res), + intval($c[0]['channel_id']) + ); + if (!$p) { + return; + } + + xchan_query($p, true); + $p = fetch_post_tags($p, true); + + // This function can get tripped up if the item is already a reshare + // (the multiple share declarations do not parse cleanly if nested) + // So build a template with a known nonsense string as the content, and then + // replace that known string with the actual rendered content, sending + // each content layer through bbcode() separately. + + $x = '2eGriplW^*Jmf4'; + + $o = "[share author='" . urlencode($p[0]['author']['xchan_name']) . + "' profile='" . $p[0]['author']['xchan_url'] . + "' portable_id='" . $p[0]['author']['xchan_hash'] . + "' avatar='" . $p[0]['author']['xchan_photo_s'] . + "' link='" . $p[0]['plink'] . "' auth='" . (in_array($p[0]['author']['network'],['nomad','zot6']) ? 'true' : 'false') . - "' posted='".$p[0]['created']. - "' message_id='".$p[0]['mid']."']"; - if($p[0]['title']) - $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n"; - $o .= $x; - $o .= "[/share]"; - $o = bbcode($o); - - $o = str_replace($x,bbcode($p[0]['body']),$o); + "' posted='" . $p[0]['created'] . + "' message_id='" . $p[0]['mid'] . "']"; + if ($p[0]['title']) { + $o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n"; + } + $o .= $x; + $o .= "[/share]"; + $o = bbcode($o); - $ret['type'] = 'rich'; - - $w = (($maxwidth) ? $maxwidth : 640); - $h = (($maxheight) ? $maxheight : intval($w * 2 / 3)); - - $ret['html'] = '' . $o . ''; - - $ret['width'] = $w; - $ret['height'] = $h; - - return $ret; - - } - - function oep_profile_reply($args) { - - - require_once('include/channel.php'); + $o = str_replace($x, bbcode($p[0]['body']), $o); - $url = $args['url']; - - if(preg_match('#//(.*?)/(.*?)/(.*?)(/|\?|&|$)#',$url,$matches)) { - $chn = $matches[3]; - } - - if(! $chn) - return; - - $c = channelx_by_nick($chn); - - if(! $c) - return; - - - $maxwidth = intval($args['maxwidth']); - $maxheight = intval($args['maxheight']); - - $width = 800; - $height = 375; - - if($maxwidth) { - $width = $maxwidth; - $height = (375 / 800) * $width; - } - if($maxheight) { - if($maxheight < $height) { - $width = (800 / 375) * $maxheight; - $height = $maxheight; - } - } - $ret = []; - - $ret['type'] = 'rich'; - $ret['width'] = intval($width); - $ret['height'] = intval($height); - - $ret['html'] = get_zcard_embed($c,get_observer_hash(),array('width' => $width, 'height' => $height)); - - return $ret; - - } - - function oep_album_reply($args) { - - $ret = []; - $url = $args['url']; - $maxwidth = intval($args['maxwidth']); - $maxheight = intval($args['maxheight']); - - if(preg_match('|//(.*?)/(.*?)/(.*?)/album/|',$url,$matches)) { - $chn = $matches[3]; - $res = basename($url); - } - - if(! ($chn && $res)) - return; - $c = q("select * from channel where channel_address = '%s' limit 1", - dbesc($chn) - ); - - if(! $c) - return; - - if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_files')) - return; + $ret['type'] = 'rich'; - $sql_extra = permissions_sql($c[0]['channel_id']); - - $p = q("select resource_id from photo where album = '%s' and uid = %d and imgscale = 0 $sql_extra order by created desc limit 1", - dbesc($res), - intval($c[0]['channel_id']) - ); - if(! $p) - return; - - $res = $p[0]['resource_id']; - - $r = q("select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc", - intval($c[0]['channel_id']), - dbesc($res) - ); - - if($r) { - foreach($r as $rr) { - $foundres = false; - if($maxheight && $rr['height'] > $maxheight) - continue; - if($maxwidth && $rr['width'] > $maxwidth) - continue; - $foundres = true; - break; - } - - if($foundres) { - $ret['type'] = 'link'; - $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale']; - $ret['thumbnail_width'] = $rr['width']; - $ret['thumbnail_height'] = $rr['height']; - } - - - } - return $ret; - - } - - - function oep_phototop_reply($args) { - - $ret = []; - $url = $args['url']; - $maxwidth = intval($args['maxwidth']); - $maxheight = intval($args['maxheight']); - - if(preg_match('|//(.*?)/(.*?)/(.*?)$|',$url,$matches)) { - $chn = $matches[3]; - } - - if(! $chn) - return; - $c = q("select * from channel where channel_address = '%s' limit 1", - dbesc($chn) - ); - - if(! $c) - return; - - if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_files')) - return; + $w = (($maxwidth) ? $maxwidth : 640); + $h = (($maxheight) ? $maxheight : intval($w * 2 / 3)); - $sql_extra = permissions_sql($c[0]['channel_id']); - - $p = q("select resource_id from photo where uid = %d and imgscale = 0 $sql_extra order by created desc limit 1", - intval($c[0]['channel_id']) - ); - if(! $p) - return; - - $res = $p[0]['resource_id']; - - $r = q("select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc", - intval($c[0]['channel_id']), - dbesc($res) - ); - - if($r) { - foreach($r as $rr) { - $foundres = false; - if($maxheight && $rr['height'] > $maxheight) - continue; - if($maxwidth && $rr['width'] > $maxwidth) - continue; - $foundres = true; - break; - } - - if($foundres) { - $ret['type'] = 'link'; - $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale']; - $ret['thumbnail_width'] = $rr['width']; - $ret['thumbnail_height'] = $rr['height']; - } - - - } - return $ret; - - } - - - function oep_photo_reply($args) { - - $ret = []; - $url = $args['url']; - $maxwidth = intval($args['maxwidth']); - $maxheight = intval($args['maxheight']); - - if(preg_match('|//(.*?)/(.*?)/(.*?)/image/|',$url,$matches)) { - $chn = $matches[3]; - $res = basename($url); - } - - if(! ($chn && $res)) - return; - $c = q("select * from channel where channel_address = '%s' limit 1", - dbesc($chn) - ); - - if(! $c) - return; + $ret['html'] = '' . $o . ''; - if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_files')) - return; + $ret['width'] = $w; + $ret['height'] = $h; - $sql_extra = permissions_sql($c[0]['channel_id']); - - - $r = q("select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc", - intval($c[0]['channel_id']), - dbesc($res) - ); - - if($r) { - foreach($r as $rr) { - $foundres = false; - if($maxheight && $rr['height'] > $maxheight) - continue; - if($maxwidth && $rr['width'] > $maxwidth) - continue; - $foundres = true; - break; - } - - if($foundres) { - $ret['type'] = 'link'; - $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale']; - $ret['thumbnail_width'] = $rr['width']; - $ret['thumbnail_height'] = $rr['height']; - } - - - } - return $ret; - - } + return $ret; + } + + public function oep_profile_reply($args) + { + + + require_once('include/channel.php'); + + $url = $args['url']; + + if (preg_match('#//(.*?)/(.*?)/(.*?)(/|\?|&|$)#', $url, $matches)) { + $chn = $matches[3]; + } + + if (!$chn) { + return; + } + + $c = channelx_by_nick($chn); + + if (!$c) { + return; + } + + + $maxwidth = intval($args['maxwidth']); + $maxheight = intval($args['maxheight']); + + $width = 800; + $height = 375; + + if ($maxwidth) { + $width = $maxwidth; + $height = (375 / 800) * $width; + } + if ($maxheight) { + if ($maxheight < $height) { + $width = (800 / 375) * $maxheight; + $height = $maxheight; + } + } + $ret = []; + + $ret['type'] = 'rich'; + $ret['width'] = intval($width); + $ret['height'] = intval($height); + + $ret['html'] = get_zcard_embed($c, get_observer_hash(), array('width' => $width, 'height' => $height)); + + return $ret; + } + + public function oep_album_reply($args) + { + + $ret = []; + $url = $args['url']; + $maxwidth = intval($args['maxwidth']); + $maxheight = intval($args['maxheight']); + + if (preg_match('|//(.*?)/(.*?)/(.*?)/album/|', $url, $matches)) { + $chn = $matches[3]; + $res = basename($url); + } + + if (!($chn && $res)) { + return; + } + $c = q( + "select * from channel where channel_address = '%s' limit 1", + dbesc($chn) + ); + + if (!$c) { + return; + } + + if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_files')) { + return; + } + + $sql_extra = permissions_sql($c[0]['channel_id']); + + $p = q( + "select resource_id from photo where album = '%s' and uid = %d and imgscale = 0 $sql_extra order by created desc limit 1", + dbesc($res), + intval($c[0]['channel_id']) + ); + if (!$p) { + return; + } + + $res = $p[0]['resource_id']; + + $r = q( + "select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc", + intval($c[0]['channel_id']), + dbesc($res) + ); + + if ($r) { + foreach ($r as $rr) { + $foundres = false; + if ($maxheight && $rr['height'] > $maxheight) { + continue; + } + if ($maxwidth && $rr['width'] > $maxwidth) { + continue; + } + $foundres = true; + break; + } + + if ($foundres) { + $ret['type'] = 'link'; + $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale']; + $ret['thumbnail_width'] = $rr['width']; + $ret['thumbnail_height'] = $rr['height']; + } + } + return $ret; + } + + + public function oep_phototop_reply($args) + { + + $ret = []; + $url = $args['url']; + $maxwidth = intval($args['maxwidth']); + $maxheight = intval($args['maxheight']); + + if (preg_match('|//(.*?)/(.*?)/(.*?)$|', $url, $matches)) { + $chn = $matches[3]; + } + + if (!$chn) { + return; + } + $c = q( + "select * from channel where channel_address = '%s' limit 1", + dbesc($chn) + ); + + if (!$c) { + return; + } + + if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_files')) { + return; + } + + $sql_extra = permissions_sql($c[0]['channel_id']); + + $p = q( + "select resource_id from photo where uid = %d and imgscale = 0 $sql_extra order by created desc limit 1", + intval($c[0]['channel_id']) + ); + if (!$p) { + return; + } + + $res = $p[0]['resource_id']; + + $r = q( + "select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc", + intval($c[0]['channel_id']), + dbesc($res) + ); + + if ($r) { + foreach ($r as $rr) { + $foundres = false; + if ($maxheight && $rr['height'] > $maxheight) { + continue; + } + if ($maxwidth && $rr['width'] > $maxwidth) { + continue; + } + $foundres = true; + break; + } + + if ($foundres) { + $ret['type'] = 'link'; + $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale']; + $ret['thumbnail_width'] = $rr['width']; + $ret['thumbnail_height'] = $rr['height']; + } + } + return $ret; + } + + + public function oep_photo_reply($args) + { + + $ret = []; + $url = $args['url']; + $maxwidth = intval($args['maxwidth']); + $maxheight = intval($args['maxheight']); + + if (preg_match('|//(.*?)/(.*?)/(.*?)/image/|', $url, $matches)) { + $chn = $matches[3]; + $res = basename($url); + } + + if (!($chn && $res)) { + return; + } + $c = q( + "select * from channel where channel_address = '%s' limit 1", + dbesc($chn) + ); + + if (!$c) { + return; + } + + if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_files')) { + return; + } + + $sql_extra = permissions_sql($c[0]['channel_id']); + + + $r = q( + "select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc", + intval($c[0]['channel_id']), + dbesc($res) + ); + + if ($r) { + foreach ($r as $rr) { + $foundres = false; + if ($maxheight && $rr['height'] > $maxheight) { + continue; + } + if ($maxwidth && $rr['width'] > $maxwidth) { + continue; + } + $foundres = true; + break; + } + + if ($foundres) { + $ret['type'] = 'link'; + $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale']; + $ret['thumbnail_width'] = $rr['width']; + $ret['thumbnail_height'] = $rr['height']; + } + } + return $ret; + } } diff --git a/Zotlabs/Module/Oexchange.php b/Zotlabs/Module/Oexchange.php index 950965a95..502878497 100644 --- a/Zotlabs/Module/Oexchange.php +++ b/Zotlabs/Module/Oexchange.php @@ -5,73 +5,72 @@ namespace Zotlabs\Module; use App; use Zotlabs\Web\Controller; -class Oexchange extends Controller { +class Oexchange extends Controller +{ - function init() { - - if ((argc() > 1) && (argv(1) === 'xrd')) { - echo replace_macros(get_markup_template('oexchange_xrd.tpl'), [ '$base' => z_root() ] ); - killme(); - } - } - - function get() { - if (! local_channel()) { - if (remote_channel()) { - $observer = App::get_observer(); - if ($observer && $observer['xchan_url']) { - $parsed = @parse_url($observer['xchan_url']); - if (! $parsed) { - notice( t('Unable to find your site.') . EOL); - return; - } - $url = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : ''); - $url .= '/oexchange'; - $result = z_post_url($url,$_REQUEST); - json_return_and_die($result); - } - } - - return login(false); - } - - if ((argc() > 1) && argv(1) === 'done') { - info( t('Post successful.') . EOL); - return; - } - - $url = (((x($_REQUEST,'url')) && strlen($_REQUEST['url'])) - ? urlencode(notags(trim($_REQUEST['url']))) : ''); - $title = (((x($_REQUEST,'title')) && strlen($_REQUEST['title'])) - ? '&title=' . urlencode(notags(trim($_REQUEST['title']))) : ''); - $description = (((x($_REQUEST,'description')) && strlen($_REQUEST['description'])) - ? '&description=' . urlencode(notags(trim($_REQUEST['description']))) : ''); - $tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags'])) - ? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : ''); - - $ret = z_fetch_url(z_root() . '/linkinfo?f=&url=' . $url . $title . $description . $tags); - - if ($ret['success']) { - $s = $ret['body']; - } - - if (! strlen($s)) { - return; - } - - $post = []; - - $post['profile_uid'] = local_channel(); - $post['return'] = '/oexchange/done' ; - $post['body'] = $s; - $post['type'] = 'wall'; - - $_REQUEST = $post; - $mod = new Item(); - $mod->post(); - - } - - - + public function init() + { + + if ((argc() > 1) && (argv(1) === 'xrd')) { + echo replace_macros(get_markup_template('oexchange_xrd.tpl'), ['$base' => z_root()]); + killme(); + } + } + + public function get() + { + if (!local_channel()) { + if (remote_channel()) { + $observer = App::get_observer(); + if ($observer && $observer['xchan_url']) { + $parsed = @parse_url($observer['xchan_url']); + if (!$parsed) { + notice(t('Unable to find your site.') . EOL); + return; + } + $url = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : ''); + $url .= '/oexchange'; + $result = z_post_url($url, $_REQUEST); + json_return_and_die($result); + } + } + + return login(false); + } + + if ((argc() > 1) && argv(1) === 'done') { + info(t('Post successful.') . EOL); + return; + } + + $url = (((x($_REQUEST, 'url')) && strlen($_REQUEST['url'])) + ? urlencode(notags(trim($_REQUEST['url']))) : ''); + $title = (((x($_REQUEST, 'title')) && strlen($_REQUEST['title'])) + ? '&title=' . urlencode(notags(trim($_REQUEST['title']))) : ''); + $description = (((x($_REQUEST, 'description')) && strlen($_REQUEST['description'])) + ? '&description=' . urlencode(notags(trim($_REQUEST['description']))) : ''); + $tags = (((x($_REQUEST, 'tags')) && strlen($_REQUEST['tags'])) + ? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : ''); + + $ret = z_fetch_url(z_root() . '/linkinfo?f=&url=' . $url . $title . $description . $tags); + + if ($ret['success']) { + $s = $ret['body']; + } + + if (!strlen($s)) { + return; + } + + $post = []; + + $post['profile_uid'] = local_channel(); + $post['return'] = '/oexchange/done'; + $post['body'] = $s; + $post['type'] = 'wall'; + + $_REQUEST = $post; + $mod = new Item(); + $mod->post(); + } } diff --git a/Zotlabs/Module/Online.php b/Zotlabs/Module/Online.php index 30cd8d95e..c3d46940b 100644 --- a/Zotlabs/Module/Online.php +++ b/Zotlabs/Module/Online.php @@ -3,13 +3,15 @@ namespace Zotlabs\Module; use Zotlabs\Web\Controller; -class Online extends Controller { +class Online extends Controller +{ - function init() { - $ret = [ 'result' => false ]; - if (argc() != 2) { - json_return_and_die($ret); - } - json_return_and_die(get_online_status(argv(1))); - } + public function init() + { + $ret = ['result' => false]; + if (argc() != 2) { + json_return_and_die($ret); + } + json_return_and_die(get_online_status(argv(1))); + } } diff --git a/Zotlabs/Module/Outbox.php b/Zotlabs/Module/Outbox.php index 53fcbf516..14d7270f8 100644 --- a/Zotlabs/Module/Outbox.php +++ b/Zotlabs/Module/Outbox.php @@ -15,300 +15,303 @@ use Zotlabs\Lib\Config; /** * Implements an ActivityPub outbox. */ +class Outbox extends Controller +{ + public function post() + { + if (argc() < 2) { + killme(); + } -class Outbox extends Controller { + $channel = channelx_by_nick(argv(1)); + if (!$channel) { + killme(); + } - function post() { - if (argc() < 2) { - killme(); - } + if (intval($channel['channel_system'])) { + killme(); + } - $channel = channelx_by_nick(argv(1)); - if (! $channel) { - killme(); - } + // At this point there is unlikely to be an authenticated observer using the C2S ActivityPub API. + // Mostly we're protecting the page from malicious mischief until the project's OAuth2 interface + // is linked to this page. - if (intval($channel['channel_system'])) { - killme(); - } + $observer = App::get_observer(); + if (!$observer) { + killme(); + } - // At this point there is unlikely to be an authenticated observer using the C2S ActivityPub API. - // Mostly we're protecting the page from malicious mischief until the project's OAuth2 interface - // is linked to this page. - - $observer = App::get_observer(); - if (! $observer) { - killme(); - } - - if ($observer['xchan_hash'] !== $channel['channel_hash']) { - if (! perm_is_allowed($channel['channel_id'],$observer['xchan_hash'],'post_wall')) { - logger('outbox post permission denied to ' . $observer['xchan_name']); - killme(); - } - } + if ($observer['xchan_hash'] !== $channel['channel_hash']) { + if (!perm_is_allowed($channel['channel_id'], $observer['xchan_hash'], 'post_wall')) { + logger('outbox post permission denied to ' . $observer['xchan_name']); + killme(); + } + } // disable C2S until we've fully tested it. -return; + return; - $data = file_get_contents('php://input'); - if (! $data) { - return; - } + $data = file_get_contents('php://input'); + if (!$data) { + return; + } - logger('outbox_activity: ' . jindent($data), LOGGER_DATA); - - $AS = new ActivityStreams($data); + logger('outbox_activity: ' . jindent($data), LOGGER_DATA); - if (! $AS->is_valid()) { - return; - } - - if (! PConfig::Get($channel['channel_id'],'system','activitypub',Config::Get('system','activitypub',ACTIVITYPUB_ENABLED))) { - return; - } - - logger('outbox_channel: ' . $channel['channel_address'],LOGGER_DEBUG); + $AS = new ActivityStreams($data); -// switch ($AS->type) { -// case 'Follow': -// if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type']) && isset($AS->obj['id'])) { -// // do follow activity -// Activity::follow($channel,$AS); -// } -// break; -// case 'Invite': -// if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') { -// // do follow activity -// Activity::follow($channel,$AS); -// } -// break; -// case 'Join': -// if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') { -// // do follow activity -// Activity::follow($channel,$AS); -// } -// break; -// case 'Accept': -// // Activitypub for wordpress sends lowercase 'follow' on accept. -// // https://github.com/pfefferle/wordpress-activitypub/issues/97 -// // Mobilizon sends Accept/"Member" (not in vocabulary) in response to Join/Group -// if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && in_array($AS->obj['type'], ['Follow','follow', 'Member'])) { -// // do follow activity -// Activity::follow($channel,$AS); -// } -// break; -// case 'Reject': -// default: -// break; + if (!$AS->is_valid()) { + return; + } + + if (!PConfig::Get($channel['channel_id'], 'system', 'activitypub', Config::Get('system', 'activitypub', ACTIVITYPUB_ENABLED))) { + return; + } + + logger('outbox_channel: ' . $channel['channel_address'], LOGGER_DEBUG); + +// switch ($AS->type) { +// case 'Follow': +// if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type']) && isset($AS->obj['id'])) { +// // do follow activity +// Activity::follow($channel,$AS); +// } +// break; +// case 'Invite': +// if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') { +// // do follow activity +// Activity::follow($channel,$AS); +// } +// break; +// case 'Join': +// if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') { +// // do follow activity +// Activity::follow($channel,$AS); +// } +// break; +// case 'Accept': +// // Activitypub for wordpress sends lowercase 'follow' on accept. +// // https://github.com/pfefferle/wordpress-activitypub/issues/97 +// // Mobilizon sends Accept/"Member" (not in vocabulary) in response to Join/Group +// if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && in_array($AS->obj['type'], ['Follow','follow', 'Member'])) { +// // do follow activity +// Activity::follow($channel,$AS); +// } +// break; +// case 'Reject': +// default: +// break; // -// } +// } - // These activities require permissions + // These activities require permissions - $item = null; + $item = null; - switch ($AS->type) { - case 'Update': - if (is_array($AS->obj) && array_key_exists('type',$AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) { - // pretend this is an old cache entry to force an update of all the actor details - $AS->obj['cached'] = true; - $AS->obj['updated'] = datetime_convert('UTC','UTC','1980-01-01', ATOM_TIME); - Activity::actor_store($AS->obj['id'],$AS->obj); - break; - } - case 'Accept': - if (is_array($AS->obj) && array_key_exists('type',$AS->obj) && (ActivityStreams::is_an_actor($AS->obj['type']) || $AS->obj['type'] === 'Member')) { - break; - } - case 'Create': - case 'Like': - case 'Dislike': - case 'Announce': - case 'Reject': - case 'TentativeAccept': - case 'TentativeReject': - case 'Add': - case 'Arrive': - case 'Block': - case 'Flag': - case 'Ignore': - case 'Invite': - case 'Listen': - case 'Move': - case 'Offer': - case 'Question': - case 'Read': - case 'Travel': - case 'View': - case 'emojiReaction': - case 'EmojiReaction': - case 'EmojiReact': - // These require a resolvable object structure - if (is_array($AS->obj)) { - // The boolean flag enables html cache of the item - $item = Activity::decode_note($AS,true); - } - else { - logger('unresolved object: ' . print_r($AS->obj,true)); - } - break; - case 'Undo': - if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Follow') { - // do unfollow activity - Activity::unfollow($channel,$AS); - break; - } - case 'Leave': - if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') { - // do unfollow activity - Activity::unfollow($channel,$AS); - break; - } - case 'Tombstone': - case 'Delete': - Activity::drop($channel,$observer_hash,$AS); - break; - case 'Move': - if($observer_hash && $observer_hash === $AS->actor - && is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStream::is_an_actor($AS->obj['type']) - && is_array($AS->tgt) && array_key_exists('type', $AS->tgt) && ActivityStream::is_an_actor($AS->tgt['type'])) { - ActivityPub::move($AS->obj,$AS->tgt); - } - break; - case 'Add': - case 'Remove': - default: - break; + switch ($AS->type) { + case 'Update': + if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) { + // pretend this is an old cache entry to force an update of all the actor details + $AS->obj['cached'] = true; + $AS->obj['updated'] = datetime_convert('UTC', 'UTC', '1980-01-01', ATOM_TIME); + Activity::actor_store($AS->obj['id'], $AS->obj); + break; + } + case 'Accept': + if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && (ActivityStreams::is_an_actor($AS->obj['type']) || $AS->obj['type'] === 'Member')) { + break; + } + case 'Create': + case 'Like': + case 'Dislike': + case 'Announce': + case 'Reject': + case 'TentativeAccept': + case 'TentativeReject': + case 'Add': + case 'Arrive': + case 'Block': + case 'Flag': + case 'Ignore': + case 'Invite': + case 'Listen': + case 'Move': + case 'Offer': + case 'Question': + case 'Read': + case 'Travel': + case 'View': + case 'emojiReaction': + case 'EmojiReaction': + case 'EmojiReact': + // These require a resolvable object structure + if (is_array($AS->obj)) { + // The boolean flag enables html cache of the item + $item = Activity::decode_note($AS, true); + } else { + logger('unresolved object: ' . print_r($AS->obj, true)); + } + break; + case 'Undo': + if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Follow') { + // do unfollow activity + Activity::unfollow($channel, $AS); + break; + } + case 'Leave': + if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') { + // do unfollow activity + Activity::unfollow($channel, $AS); + break; + } + case 'Tombstone': + case 'Delete': + Activity::drop($channel, $observer_hash, $AS); + break; + case 'Move': + if ( + $observer_hash && $observer_hash === $AS->actor + && is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStream::is_an_actor($AS->obj['type']) + && is_array($AS->tgt) && array_key_exists('type', $AS->tgt) && ActivityStream::is_an_actor($AS->tgt['type']) + ) { + ActivityPub::move($AS->obj, $AS->tgt); + } + break; + case 'Add': + case 'Remove': + default: + break; + } - } + if ($item) { + logger('parsed_item: ' . print_r($item, true), LOGGER_DATA); + Activity::store($channel, $observer_hash, $AS, $item); + } - if ($item) { - logger('parsed_item: ' . print_r($item,true),LOGGER_DATA); - Activity::store($channel,$observer_hash,$AS,$item); - } - - http_status_exit(200,'OK'); - return; - - } + http_status_exit(200, 'OK'); + return; + } - function get() { + public function get() + { - if (observer_prohibited(true)) { - killme(); - } + if (observer_prohibited(true)) { + killme(); + } - if (argc() < 2) { - killme(); - } + if (argc() < 2) { + killme(); + } - $channel = channelx_by_nick(argv(1)); - if (! $channel) { - killme(); - } + $channel = channelx_by_nick(argv(1)); + if (!$channel) { + killme(); + } -// if (intval($channel['channel_system'])) { -// killme(); -// } - - if (ActivityStreams::is_as_request()) { - $sigdata = HTTPSig::verify(($_SERVER['REQUEST_METHOD'] === 'POST') ? file_get_contents('php://input') : EMPTY_STR); - if ($sigdata['portable_id'] && $sigdata['header_valid']) { - $portable_id = $sigdata['portable_id']; - if (! check_channelallowed($portable_id)) { - http_status_exit(403, 'Permission denied'); - } - if (! check_siteallowed($sigdata['signer'])) { - http_status_exit(403, 'Permission denied'); - } - observer_auth($portable_id); - } - elseif (Config::get('system','require_authenticated_fetch',false)) { - http_status_exit(403,'Permission denied'); - } +// if (intval($channel['channel_system'])) { +// killme(); +// } - $observer_hash = get_observer_hash(); + if (ActivityStreams::is_as_request()) { + $sigdata = HTTPSig::verify(($_SERVER['REQUEST_METHOD'] === 'POST') ? file_get_contents('php://input') : EMPTY_STR); + if ($sigdata['portable_id'] && $sigdata['header_valid']) { + $portable_id = $sigdata['portable_id']; + if (!check_channelallowed($portable_id)) { + http_status_exit(403, 'Permission denied'); + } + if (!check_siteallowed($sigdata['signer'])) { + http_status_exit(403, 'Permission denied'); + } + observer_auth($portable_id); + } elseif (Config::get('system', 'require_authenticated_fetch', false)) { + http_status_exit(403, 'Permission denied'); + } - $params = []; - - $params['begin'] = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin'] : NULL_DATE); - $params['end'] = ((x($_REQUEST,'date_end')) ? $_REQUEST['date_end'] : ''); - $params['type'] = 'json'; - $params['pages'] = ((x($_REQUEST,'pages')) ? intval($_REQUEST['pages']) : 0); - $params['top'] = ((x($_REQUEST,'top')) ? intval($_REQUEST['top']) : 0); - $params['direction'] = ((x($_REQUEST,'direction')) ? dbesc($_REQUEST['direction']) : 'desc'); // unimplemented - $params['cat'] = ((x($_REQUEST,'cat')) ? escape_tags($_REQUEST['cat']) : ''); - $params['compat'] = 1; + $observer_hash = get_observer_hash(); - - $total = items_fetch( - [ - 'total' => true, - 'wall' => '1', - 'datequery' => $params['end'], - 'datequery2' => $params['begin'], - 'direction' => dbesc($params['direction']), - 'pages' => $params['pages'], - 'order' => dbesc('post'), - 'top' => $params['top'], - 'cat' => $params['cat'], - 'compat' => $params['compat'] - ], $channel, $observer_hash, CLIENT_MODE_NORMAL, App::$module - ); + $params = []; - if ($total) { - App::set_pager_total($total); - App::set_pager_itemspage(100); - } + $params['begin'] = ((x($_REQUEST, 'date_begin')) ? $_REQUEST['date_begin'] : NULL_DATE); + $params['end'] = ((x($_REQUEST, 'date_end')) ? $_REQUEST['date_end'] : ''); + $params['type'] = 'json'; + $params['pages'] = ((x($_REQUEST, 'pages')) ? intval($_REQUEST['pages']) : 0); + $params['top'] = ((x($_REQUEST, 'top')) ? intval($_REQUEST['top']) : 0); + $params['direction'] = ((x($_REQUEST, 'direction')) ? dbesc($_REQUEST['direction']) : 'desc'); // unimplemented + $params['cat'] = ((x($_REQUEST, 'cat')) ? escape_tags($_REQUEST['cat']) : ''); + $params['compat'] = 1; - if (App::$pager['unset'] && $total > 100) { - $ret = Activity::paged_collection_init($total,App::$query_string); - } - else { - $items = items_fetch( - [ - 'wall' => '1', - 'datequery' => $params['end'], - 'datequery2' => $params['begin'], - 'records' => intval(App::$pager['itemspage']), - 'start' => intval(App::$pager['start']), - 'direction' => dbesc($params['direction']), - 'pages' => $params['pages'], - 'order' => dbesc('post'), - 'top' => $params['top'], - 'cat' => $params['cat'], - 'compat' => $params['compat'] - ], $channel, $observer_hash, CLIENT_MODE_NORMAL, App::$module - ); - if ($items && $observer_hash) { + $total = items_fetch( + [ + 'total' => true, + 'wall' => '1', + 'datequery' => $params['end'], + 'datequery2' => $params['begin'], + 'direction' => dbesc($params['direction']), + 'pages' => $params['pages'], + 'order' => dbesc('post'), + 'top' => $params['top'], + 'cat' => $params['cat'], + 'compat' => $params['compat'] + ], + $channel, + $observer_hash, + CLIENT_MODE_NORMAL, + App::$module + ); - // check to see if this observer is a connection. If not, register any items - // belonging to this channel for notification of deletion/expiration - - $x = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s'", - intval($channel['channel_id']), - dbesc($observer_hash) - ); - if (! $x) { - foreach ($items as $item) { - if (strpos($item['mid'], z_root()) === 0) { - ThreadListener::store($item['mid'],$observer_hash); - } - } - } - } + if ($total) { + App::set_pager_total($total); + App::set_pager_itemspage(100); + } - $ret = Activity::encode_item_collection($items, App::$query_string, 'OrderedCollection',true, $total); - } + if (App::$pager['unset'] && $total > 100) { + $ret = Activity::paged_collection_init($total, App::$query_string); + } else { + $items = items_fetch( + [ + 'wall' => '1', + 'datequery' => $params['end'], + 'datequery2' => $params['begin'], + 'records' => intval(App::$pager['itemspage']), + 'start' => intval(App::$pager['start']), + 'direction' => dbesc($params['direction']), + 'pages' => $params['pages'], + 'order' => dbesc('post'), + 'top' => $params['top'], + 'cat' => $params['cat'], + 'compat' => $params['compat'] + ], + $channel, + $observer_hash, + CLIENT_MODE_NORMAL, + App::$module + ); - as_return_and_die($ret,$channel); - } - } + if ($items && $observer_hash) { + // check to see if this observer is a connection. If not, register any items + // belonging to this channel for notification of deletion/expiration + + $x = q( + "select abook_id from abook where abook_channel = %d and abook_xchan = '%s'", + intval($channel['channel_id']), + dbesc($observer_hash) + ); + if (!$x) { + foreach ($items as $item) { + if (strpos($item['mid'], z_root()) === 0) { + ThreadListener::store($item['mid'], $observer_hash); + } + } + } + } + + $ret = Activity::encode_item_collection($items, App::$query_string, 'OrderedCollection', true, $total); + } + + as_return_and_die($ret, $channel); + } + } } - - - diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index 5b52e788f..a18f2e2b1 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -11,63 +11,66 @@ use Zotlabs\Web\Controller; * See spec/OpenWebAuth/Home.md * Requests to this endpoint should be signed using HTTP Signatures * using the 'Authorization: Signature' authentication method - * If the signature verifies a token is returned. + * If the signature verifies a token is returned. * - * This token may be exchanged for an authenticated cookie. + * This token may be exchanged for an authenticated cookie. */ +class Owa extends Controller +{ -class Owa extends Controller { + public function init() + { - function init() { + $ret = ['success' => false]; - $ret = [ 'success' => false ]; + if (array_key_exists('REDIRECT_REMOTE_USER', $_SERVER) && (!array_key_exists('HTTP_AUTHORIZATION', $_SERVER))) { + $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['REDIRECT_REMOTE_USER']; + } - if (array_key_exists('REDIRECT_REMOTE_USER',$_SERVER) && (! array_key_exists('HTTP_AUTHORIZATION',$_SERVER))) { - $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['REDIRECT_REMOTE_USER']; - } - - if (array_key_exists('HTTP_AUTHORIZATION',$_SERVER) && substr(trim($_SERVER['HTTP_AUTHORIZATION']),0,9) === 'Signature') { - $sigblock = HTTPSig::parse_sigheader($_SERVER['HTTP_AUTHORIZATION']); - if ($sigblock) { - $keyId = $sigblock['keyId']; - if ($keyId) { - $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash + if (array_key_exists('HTTP_AUTHORIZATION', $_SERVER) && substr(trim($_SERVER['HTTP_AUTHORIZATION']), 0, 9) === 'Signature') { + $sigblock = HTTPSig::parse_sigheader($_SERVER['HTTP_AUTHORIZATION']); + if ($sigblock) { + $keyId = $sigblock['keyId']; + if ($keyId) { + $r = q( + "select * from hubloc left join xchan on hubloc_hash = xchan_hash where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) and xchan_pubkey != '' ", - dbesc(str_replace('acct:','',$keyId)), - dbesc($keyId) - ); - if (! $r) { - $found = discover_by_webbie(str_replace('acct:','',$keyId)); - if ($found) { - $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash + dbesc(str_replace('acct:', '', $keyId)), + dbesc($keyId) + ); + if (!$r) { + $found = discover_by_webbie(str_replace('acct:', '', $keyId)); + if ($found) { + $r = q( + "select * from hubloc left join xchan on hubloc_hash = xchan_hash where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) and xchan_pubkey != '' ", - dbesc(str_replace('acct:','',$keyId)), - dbesc($keyId) - ); - } - } - if ($r) { - foreach ($r as $hubloc) { - $verified = HTTPSig::verify(file_get_contents('php://input'), $hubloc['xchan_pubkey']); - if ($verified && $verified['header_signed'] && $verified['header_valid'] && ($verified['content_valid'] || (! $verified['content_signed']))) { - logger('OWA header: ' . print_r($verified,true),LOGGER_DATA); - logger('OWA success: ' . $hubloc['hubloc_addr'],LOGGER_DATA); - $ret['success'] = true; - $token = random_string(32); - Verify::create('owt',0,$token,$hubloc['hubloc_addr']); - $result = ''; - openssl_public_encrypt($token,$result,$hubloc['xchan_pubkey']); - $ret['encrypted_token'] = base64url_encode($result); - break; - } else { - logger('OWA fail: ' . $hubloc['hubloc_id'] . ' ' . $hubloc['hubloc_addr']); - } - } - } - } - } - } - json_return_and_die($ret,'application/x-nomad+json'); - } + dbesc(str_replace('acct:', '', $keyId)), + dbesc($keyId) + ); + } + } + if ($r) { + foreach ($r as $hubloc) { + $verified = HTTPSig::verify(file_get_contents('php://input'), $hubloc['xchan_pubkey']); + if ($verified && $verified['header_signed'] && $verified['header_valid'] && ($verified['content_valid'] || (!$verified['content_signed']))) { + logger('OWA header: ' . print_r($verified, true), LOGGER_DATA); + logger('OWA success: ' . $hubloc['hubloc_addr'], LOGGER_DATA); + $ret['success'] = true; + $token = random_string(32); + Verify::create('owt', 0, $token, $hubloc['hubloc_addr']); + $result = ''; + openssl_public_encrypt($token, $result, $hubloc['xchan_pubkey']); + $ret['encrypted_token'] = base64url_encode($result); + break; + } else { + logger('OWA fail: ' . $hubloc['hubloc_id'] . ' ' . $hubloc['hubloc_addr']); + } + } + } + } + } + } + json_return_and_die($ret, 'application/x-nomad+json'); + } } diff --git a/Zotlabs/Module/Page.php b/Zotlabs/Module/Page.php index c7ca27cfe..93d606fbb 100644 --- a/Zotlabs/Module/Page.php +++ b/Zotlabs/Module/Page.php @@ -1,194 +1,202 @@ parse($r[0]['body']); - \App::$pdl = $r[0]['body']; - } - elseif($r[0]['layout_mid']) { - $l = q("select body from item where mid = '%s' and uid = %d limit 1", - dbesc($r[0]['layout_mid']), - intval($u[0]['channel_id']) - ); - - if($l) { - \App::$comanche = new \Zotlabs\Render\Comanche(); - \App::$comanche->parse($l[0]['body']); - \App::$pdl = $l[0]['body']; - } - } - - \App::$data['webpage'] = $r; - - } - - function get() { - - $r = \App::$data['webpage']; - if(! $r) - return; - - if($r[0]['item_type'] == ITEM_TYPE_PDL) { - $r[0]['body'] = t('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'); - $r[0]['mimetype'] = 'text/plain'; - $r[0]['title'] = ''; - - } - - xchan_query($r); - $r = fetch_post_tags($r,true); - - if($r[0]['mimetype'] === 'application/x-pdl') - \App::$page['pdl_content'] = true; - - $o .= prepare_page($r[0]); - return $o; - - } - + if ($x) { + // Yes, it's there. You just aren't allowed to see it. + notice(t('Permission denied.') . EOL); + } else { + notice(t('Page not found.') . EOL); + } + return; + } + + if ($r[0]['title']) { + App::$page['title'] = escape_tags($r[0]['title']); + } + + if ($r[0]['item_type'] == ITEM_TYPE_PDL) { + App::$comanche = new Comanche(); + App::$comanche->parse($r[0]['body']); + App::$pdl = $r[0]['body']; + } elseif ($r[0]['layout_mid']) { + $l = q( + "select body from item where mid = '%s' and uid = %d limit 1", + dbesc($r[0]['layout_mid']), + intval($u[0]['channel_id']) + ); + + if ($l) { + App::$comanche = new Comanche(); + App::$comanche->parse($l[0]['body']); + App::$pdl = $l[0]['body']; + } + } + + App::$data['webpage'] = $r; + } + + public function get() + { + + $r = App::$data['webpage']; + if (!$r) { + return; + } + + if ($r[0]['item_type'] == ITEM_TYPE_PDL) { + $r[0]['body'] = t('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'); + $r[0]['mimetype'] = 'text/plain'; + $r[0]['title'] = ''; + } + + xchan_query($r); + $r = fetch_post_tags($r, true); + + if ($r[0]['mimetype'] === 'application/x-pdl') { + App::$page['pdl_content'] = true; + } + + $o .= prepare_page($r[0]); + return $o; + } } diff --git a/Zotlabs/Module/Pconfig.php b/Zotlabs/Module/Pconfig.php index a1e677928..52da386ef 100644 --- a/Zotlabs/Module/Pconfig.php +++ b/Zotlabs/Module/Pconfig.php @@ -1,145 +1,142 @@ disallowed_pconfig())) { + notice(t('This setting requires special processing and editing has been blocked.') . EOL); + return; + } + + if (strpos($k, 'password') !== false) { + $v = obscurify($v); + } + + set_pconfig(local_channel(), $cat, $k, $v); + Libsync::build_sync_packet(); + + if ($aj) { + killme(); + } + + goaway(z_root() . '/pconfig/' . $cat . '/' . $k); + } -class Pconfig extends Controller { + public function get() + { - function post() { - - if (! local_channel()) { - return; - } - - if (isset($_SESSION['delegate']) && $_SESSION['delegate']) { - return; - } - - check_form_security_token_redirectOnErr('/pconfig', 'pconfig'); - - $cat = trim(escape_tags((isset($_POST['cat']) && $_POST['cat']) ? $_POST['cat'] : EMPTY_STR)); - $k = trim(escape_tags((isset($_POST['k']) && $_POST['k']) ? $_POST['k'] : EMPTY_STR)); - $v = trim((isset($_POST['v']) && $_POST['v']) ? $_POST['v'] : EMPTY_STR); - $aj = intval((isset($_POST['aj']) && $_POST['aj']) ? $_POST['aj'] : 0); + if (!local_channel()) { + return login(); + } - // Do not store "serialized" data received in the $_POST - - if (preg_match('|^a:[0-9]+:{.*}$|s',$v)) { - return; - } - - if (in_array(argv(2),$this->disallowed_pconfig())) { - notice( t('This setting requires special processing and editing has been blocked.') . EOL); - return; - } - - if (strpos($k,'password') !== false) { - $v = obscurify($v); - } - - set_pconfig(local_channel(),$cat,$k,$v); - Libsync::build_sync_packet(); - - if ($aj) { - killme(); - } - - goaway(z_root() . '/pconfig/' . $cat . '/' . $k); - - } - - - function get() { - - if (! local_channel()) { - return login(); - } - - $content = '' . t('Configuration Editor') . '
'; - $content .= '' . t('Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature.') . '' . EOL . EOL; - - - - if(argc() == 3) { - $content .= 'pconfig[' . local_channel() . ']' . EOL; - $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . ']' . EOL . EOL; - $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . escape_tags(argv(2)) . '] = ' . get_pconfig(local_channel(),escape_tags(argv(1)),escape_tags(argv(2))) . EOL; - - if(in_array(argv(2),$this->disallowed_pconfig())) { - notice( t('This setting requires special processing and editing has been blocked.') . EOL); - return $content; - } - else - $content .= $this->pconfig_form(escape_tags(argv(1)),escape_tags(argv(2))); - } - - - if(argc() == 2) { - $content .= 'pconfig[' . local_channel() . ']' . EOL; - load_pconfig(local_channel(),escape_tags(argv(1))); - if(\App::$config[local_channel()][escape_tags(argv(1))]) { - foreach(\App::$config[local_channel()][escape_tags(argv(1))] as $k => $x) { - $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . $k . '] = ' . escape_tags($x) . EOL; - } - } - } - - if(argc() == 1) { - - $r = q("select * from pconfig where uid = " . local_channel()); - if($r) { - foreach($r as $rr) { - $content .= 'pconfig[' . local_channel() . '][' . escape_tags($rr['cat']) . '][' . escape_tags($rr['k']) . '] = ' . escape_tags($rr['v']) . EOL; - } - } - } - return $content; - - } - - - function pconfig_form($cat,$k) { - - $o = ''; - - return $o; - - } + $content = '' . t('Configuration Editor') . '
'; + $content .= '' . t('Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature.') . '' . EOL . EOL; + if (argc() == 3) { + $content .= 'pconfig[' . local_channel() . ']' . EOL; + $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . ']' . EOL . EOL; + $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . escape_tags(argv(2)) . '] = ' . get_pconfig(local_channel(), escape_tags(argv(1)), escape_tags(argv(2))) . EOL; - function disallowed_pconfig() { - return array( - 'permissions_role' - ); - } - + if (in_array(argv(2), $this->disallowed_pconfig())) { + notice(t('This setting requires special processing and editing has been blocked.') . EOL); + return $content; + } else { + $content .= $this->pconfig_form(escape_tags(argv(1)), escape_tags(argv(2))); + } + } + + + if (argc() == 2) { + $content .= 'pconfig[' . local_channel() . ']' . EOL; + load_pconfig(local_channel(), escape_tags(argv(1))); + if (App::$config[local_channel()][escape_tags(argv(1))]) { + foreach (App::$config[local_channel()][escape_tags(argv(1))] as $k => $x) { + $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . $k . '] = ' . escape_tags($x) . EOL; + } + } + } + + if (argc() == 1) { + $r = q("select * from pconfig where uid = " . local_channel()); + if ($r) { + foreach ($r as $rr) { + $content .= 'pconfig[' . local_channel() . '][' . escape_tags($rr['cat']) . '][' . escape_tags($rr['k']) . '] = ' . escape_tags($rr['v']) . EOL; + } + } + } + return $content; + } + + + public function pconfig_form($cat, $k) + { + + $o = ''; + + return $o; + } + + + public function disallowed_pconfig() + { + return array( + 'permissions_role' + ); + } } diff --git a/Zotlabs/Module/Pdledit.php b/Zotlabs/Module/Pdledit.php index 13f7bc0da..756601242 100644 --- a/Zotlabs/Module/Pdledit.php +++ b/Zotlabs/Module/Pdledit.php @@ -1,111 +1,119 @@ 2 && argv(2) === 'reset') { - del_pconfig(local_channel(),'system','mod_' . argv(1) . '.pdl'); - goaway(z_root() . '/pdledit'); - } - if(argc() > 1) - $module = 'mod_' . argv(1) . '.pdl'; - else { - $o .= ''; - $o .= ''; + + // list module pdl files + return $o; + } + + $t = get_pconfig(local_channel(), 'system', $module); + $s = @file_get_contents(theme_include($module)); + if (!$s) { + $a = glob('addon/*/' . $module); + if ($a) { + $s = @file_get_contents($a[0]); + } + } + if (!$t) { + $t = $s; + } + if (!$t) { + notice(t('Layout not found.') . EOL); + return ''; + } + + $o = replace_macros(get_markup_template('pdledit.tpl'), array( + '$header' => t('Edit System Page Description'), + '$mname' => t('Module Name:'), + '$help' => t('Layout Help'), + '$another' => t('Edit another layout'), + '$original' => t('System layout'), + '$module' => argv(1), + '$src' => $s, + '$content' => htmlspecialchars($t, ENT_COMPAT, 'UTF-8'), + '$submit' => t('Submit') + )); + + return $o; + } } diff --git a/Zotlabs/Module/Permcat.php b/Zotlabs/Module/Permcat.php index 064c9cefb..6e49ea6ec 100644 --- a/Zotlabs/Module/Permcat.php +++ b/Zotlabs/Module/Permcat.php @@ -2,24 +2,26 @@ namespace Zotlabs\Module; -use \Zotlabs\Lib as Zlib; +use Zotlabs\Lib as Zlib; +use Zotlabs\Web\Controller; -class Permcat extends \Zotlabs\Web\Controller { +class Permcat extends Controller +{ - private $permcats = []; + private $permcats = []; - public function init() { - if(! local_channel()) - return; + public function init() + { + if (! local_channel()) { + return; + } - $permcat = new Zlib\Permcat(local_channel()); + $permcat = new Zlib\Permcat(local_channel()); - if(argc() > 1) - json_return_and_die($permcat->fetch(argv(1))); + if (argc() > 1) { + json_return_and_die($permcat->fetch(argv(1))); + } - json_return_and_die($permcat->listing()); - - } - - -} \ No newline at end of file + json_return_and_die($permcat->listing()); + } +} diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 5db3e0870..f08258bad 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -1,4 +1,5 @@ $resolution, 'channel_id' => $uid, 'default' => $default, 'data' => '', 'mimetype' => '' ]; - call_hooks('get_profile_photo',$d); - - $resolution = $d['imgscale']; - $uid = $d['channel_id']; - $default = $d['default']; - $data = $d['data']; - $mimetype = $d['mimetype']; - - if (! $data) { - $r = q("SELECT * FROM photo WHERE imgscale = %d AND uid = %d AND photo_usage = %d LIMIT 1", - intval($resolution), - intval($uid), - intval(PHOTO_PROFILE) - ); - if ($r) { - $data = dbunescbin($r[0]['content']); - $mimetype = $r[0]['mimetype']; - if (intval($r[0]['os_storage'])) { - $data = file_get_contents($data); - } - } - } - if (! $data) { - $data = fetch_image_from_url($default,$mimetype); - } - if (! $mimetype) { - $mimetype = 'image/png'; - } - } - else { - - $bear = Activity::token_from_request(); - if ($bear) { - logger('bear: ' . $bear, LOGGER_DEBUG); - } + public function init() + { - /** - * Other photos - */ - - /* Check for a cookie to indicate display pixel density, in order to detect high-resolution - displays. This procedure was derived from the "Retina Images" by Jeremey Worboys, - used in accordance with the Creative Commons Attribution 3.0 Unported License. - Project link: https://github.com/Retina-Images/Retina-Images - License link: http://creativecommons.org/licenses/by/3.0/ - */ + if (ActivityStreams::is_as_request()) { + $sigdata = HTTPSig::verify(EMPTY_STR); + if ($sigdata['portable_id'] && $sigdata['header_valid']) { + $portable_id = $sigdata['portable_id']; + if (!check_channelallowed($portable_id)) { + http_status_exit(403, 'Permission denied'); + } + if (!check_siteallowed($sigdata['signer'])) { + http_status_exit(403, 'Permission denied'); + } + observer_auth($portable_id); + } elseif (Config::get('system', 'require_authenticated_fetch', false)) { + http_status_exit(403, 'Permission denied'); + } - $cookie_value = false; - if (isset($_COOKIE['devicePixelRatio'])) { - $cookie_value = intval($_COOKIE['devicePixelRatio']); - } - else { - // Force revalidation of cache on next request - $cache_directive = 'no-cache'; - $status = 'no cookie'; - } - - $resolution = 0; - - if (strpos($photo,'.') !== false) { - $photo = substr($photo,0,strpos($photo,'.')); - } - - if (substr($photo,-2,1) == '-') { - $resolution = intval(substr($photo,-1,1)); - $photo = substr($photo,0,-2); - // If viewing on a high-res screen, attempt to serve a higher resolution image: - if ($resolution == 2 && ($cookie_value > 1)) { - $resolution = 1; - } - } - - $r = q("SELECT uid, photo_usage FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1", - dbesc($photo), - intval($resolution) - ); - if ($r) { + $observer_xchan = get_observer_hash(); + $allowed = false; - $allowed = (-1); + $bear = Activity::token_from_request(); + if ($bear) { + logger('bear: ' . $bear, LOGGER_DEBUG); + } - if (intval($r[0]['photo_usage'])) { - $allowed = 1; - if (intval($r[0]['photo_usage']) === PHOTO_COVER) { - if ($resolution < PHOTO_RES_COVER_1200) { - $allowed = (-1); - } - } - if (intval($r[0]['photo_usage']) === PHOTO_PROFILE) { - if (! in_array($resolution,[4,5,6])) { - $allowed = (-1); - } - } - } + $r = q( + "select * from item where resource_type = 'photo' and resource_id = '%s' limit 1", + dbesc(argv(1)) + ); + if ($r) { + $allowed = attach_can_view($r[0]['uid'], $observer_xchan, argv(1), $bear); + } + if (!$allowed) { + http_status_exit(404, 'Permission denied.'); + } + $channel = channelx_by_n($r[0]['uid']); - if ($allowed === (-1)) { - $allowed = attach_can_view($r[0]['uid'],$observer_xchan,$photo,$bear); - } + $obj = json_decode($r[0]['obj'], true); - $channel = channelx_by_n($r[0]['uid']); + as_return_and_die($obj, $channel); + } - // Now we'll see if we can access the photo - $e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1", - dbesc($photo), - intval($resolution) - ); + $prvcachecontrol = false; + $streaming = null; + $channel = null; + $person = 0; - $exists = (($e) ? true : false); + switch (argc()) { + case 4: + $person = argv(3); + $res = argv(2); + $type = argv(1); + break; + case 2: + $photo = argv(1); + break; + case 1: + default: + killme(); + } - if ($exists && $allowed) { - $data = dbunescbin($e[0]['content']); - $mimetype = $e[0]['mimetype']; - if (intval($e[0]['os_storage'])) { - $streaming = $data; - } + $token = ((isset($_REQUEST['token'])) ? $_REQUEST['token'] : EMPTY_STR); + $observer_xchan = get_observer_hash(); - if ($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '') - $prvcachecontrol = 'no-store, no-cache, must-revalidate'; - } - else { - if (! $allowed) { - http_status_exit(403,'forbidden'); - } - if (! $exists) { - http_status_exit(404,'not found'); - } - } - } - } - - if (! isset($data)) { - if (isset($resolution)) { - switch ($resolution) { - case 4: - $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(),$mimetype); - break; - case 5: - $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(80),$mimetype); - break; - case 6: - $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(48),$mimetype); - break; - default: - killme(); - } - } - } - - if (isset($res) && intval($res) && $res < 500) { - $ph = photo_factory($data, $mimetype); - if ($ph && $ph->is_valid()) { - $ph->scaleImageSquare($res); - $data = $ph->imageString(); - $mimetype = $ph->getType(); - } - } - - if (function_exists('header_remove')) { - header_remove('Pragma'); - header_remove('pragma'); - } - - header("Content-type: " . $mimetype); - - if ($prvcachecontrol) { - - // it is a private photo that they have permission to view. - // tell the browser and infrastructure caches not to cache it, - // in case permissions change before the next access. - - header("Cache-Control: no-store, no-cache, must-revalidate"); - - } - else { - // The cache default for public photos is 1 day to provide a privacy trade-off, - // as somebody reducing photo permissions on a photo that is already - // "in the wild" won't be able to stop the photo from being viewed - // for this amount amount of time once it is cached. - // The privacy expectations of your site members and their perception - // of privacy where it affects the entire project may be affected. - // This has performance considerations but we highly recommend you - // leave it alone. - - $cache = get_config('system','photo_cache_time'); - if (! $cache) { - $cache = (3600 * 24); // 1 day - } - header("Expires: " . gmdate("D, d M Y H:i:s", time() + $cache) . " GMT"); - // Set browser cache age as $cache. But set timeout of 'shared caches' - // much lower in the event that infrastructure caching is present. - $smaxage = intval($cache/12); - header('Cache-Control: s-maxage='.$smaxage.'; max-age=' . $cache . ';'); - - } + $default = z_root() . '/' . get_default_profile_photo(); - // If it's a file resource, stream it. + if (isset($type)) { - if ($streaming && $channel) { - if (strpos($streaming,'store') !== false) { - $istream = fopen($streaming,'rb'); - } - else { - $istream = fopen('store/' . $channel['channel_address'] . '/' . $streaming,'rb'); - } - $ostream = fopen('php://output','wb'); - if ($istream && $ostream) { - pipe_streams($istream,$ostream); - fclose($istream); - fclose($ostream); - } - } - else { - echo $data; - } - killme(); - } - + /** + * Profile photos - Access controls on default profile photos are not honoured since they need to be exchanged with remote sites. + * + */ + + if ($type === 'profile') { + switch ($res) { + case 'm': + $resolution = 5; + $default = z_root() . '/' . get_default_profile_photo(80); + break; + case 's': + $resolution = 6; + $default = z_root() . '/' . get_default_profile_photo(48); + break; + case 'l': + default: + $resolution = 4; + break; + } + } + + $uid = $person; + + $d = ['imgscale' => $resolution, 'channel_id' => $uid, 'default' => $default, 'data' => '', 'mimetype' => '']; + call_hooks('get_profile_photo', $d); + + $resolution = $d['imgscale']; + $uid = $d['channel_id']; + $default = $d['default']; + $data = $d['data']; + $mimetype = $d['mimetype']; + + if (!$data) { + $r = q( + "SELECT * FROM photo WHERE imgscale = %d AND uid = %d AND photo_usage = %d LIMIT 1", + intval($resolution), + intval($uid), + intval(PHOTO_PROFILE) + ); + if ($r) { + $data = dbunescbin($r[0]['content']); + $mimetype = $r[0]['mimetype']; + if (intval($r[0]['os_storage'])) { + $data = file_get_contents($data); + } + } + } + if (!$data) { + $data = fetch_image_from_url($default, $mimetype); + } + if (!$mimetype) { + $mimetype = 'image/png'; + } + } else { + $bear = Activity::token_from_request(); + if ($bear) { + logger('bear: ' . $bear, LOGGER_DEBUG); + } + + + /** + * Other photos + */ + + /* Check for a cookie to indicate display pixel density, in order to detect high-resolution + displays. This procedure was derived from the "Retina Images" by Jeremey Worboys, + used in accordance with the Creative Commons Attribution 3.0 Unported License. + Project link: https://github.com/Retina-Images/Retina-Images + License link: http://creativecommons.org/licenses/by/3.0/ + */ + + $cookie_value = false; + if (isset($_COOKIE['devicePixelRatio'])) { + $cookie_value = intval($_COOKIE['devicePixelRatio']); + } else { + // Force revalidation of cache on next request + $cache_directive = 'no-cache'; + $status = 'no cookie'; + } + + $resolution = 0; + + if (strpos($photo, '.') !== false) { + $photo = substr($photo, 0, strpos($photo, '.')); + } + + if (substr($photo, -2, 1) == '-') { + $resolution = intval(substr($photo, -1, 1)); + $photo = substr($photo, 0, -2); + // If viewing on a high-res screen, attempt to serve a higher resolution image: + if ($resolution == 2 && ($cookie_value > 1)) { + $resolution = 1; + } + } + + $r = q( + "SELECT uid, photo_usage FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1", + dbesc($photo), + intval($resolution) + ); + if ($r) { + $allowed = (-1); + + if (intval($r[0]['photo_usage'])) { + $allowed = 1; + if (intval($r[0]['photo_usage']) === PHOTO_COVER) { + if ($resolution < PHOTO_RES_COVER_1200) { + $allowed = (-1); + } + } + if (intval($r[0]['photo_usage']) === PHOTO_PROFILE) { + if (!in_array($resolution, [4, 5, 6])) { + $allowed = (-1); + } + } + } + + if ($allowed === (-1)) { + $allowed = attach_can_view($r[0]['uid'], $observer_xchan, $photo, $bear); + } + + $channel = channelx_by_n($r[0]['uid']); + + // Now we'll see if we can access the photo + $e = q( + "SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1", + dbesc($photo), + intval($resolution) + ); + + $exists = (($e) ? true : false); + + if ($exists && $allowed) { + $data = dbunescbin($e[0]['content']); + $mimetype = $e[0]['mimetype']; + if (intval($e[0]['os_storage'])) { + $streaming = $data; + } + + if ($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '') { + $prvcachecontrol = 'no-store, no-cache, must-revalidate'; + } + } else { + if (!$allowed) { + http_status_exit(403, 'forbidden'); + } + if (!$exists) { + http_status_exit(404, 'not found'); + } + } + } + } + + if (!isset($data)) { + if (isset($resolution)) { + switch ($resolution) { + case 4: + $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(), $mimetype); + break; + case 5: + $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(80), $mimetype); + break; + case 6: + $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(48), $mimetype); + break; + default: + killme(); + } + } + } + + if (isset($res) && intval($res) && $res < 500) { + $ph = photo_factory($data, $mimetype); + if ($ph && $ph->is_valid()) { + $ph->scaleImageSquare($res); + $data = $ph->imageString(); + $mimetype = $ph->getType(); + } + } + + if (function_exists('header_remove')) { + header_remove('Pragma'); + header_remove('pragma'); + } + + header("Content-type: " . $mimetype); + + if ($prvcachecontrol) { + // it is a private photo that they have permission to view. + // tell the browser and infrastructure caches not to cache it, + // in case permissions change before the next access. + + header("Cache-Control: no-store, no-cache, must-revalidate"); + } else { + // The cache default for public photos is 1 day to provide a privacy trade-off, + // as somebody reducing photo permissions on a photo that is already + // "in the wild" won't be able to stop the photo from being viewed + // for this amount amount of time once it is cached. + // The privacy expectations of your site members and their perception + // of privacy where it affects the entire project may be affected. + // This has performance considerations but we highly recommend you + // leave it alone. + + $cache = get_config('system', 'photo_cache_time'); + if (!$cache) { + $cache = (3600 * 24); // 1 day + } + header("Expires: " . gmdate("D, d M Y H:i:s", time() + $cache) . " GMT"); + // Set browser cache age as $cache. But set timeout of 'shared caches' + // much lower in the event that infrastructure caching is present. + $smaxage = intval($cache / 12); + header('Cache-Control: s-maxage=' . $smaxage . '; max-age=' . $cache . ';'); + } + + // If it's a file resource, stream it. + + if ($streaming && $channel) { + if (strpos($streaming, 'store') !== false) { + $istream = fopen($streaming, 'rb'); + } else { + $istream = fopen('store/' . $channel['channel_address'] . '/' . $streaming, 'rb'); + } + $ostream = fopen('php://output', 'wb'); + if ($istream && $ostream) { + pipe_streams($istream, $ostream); + fclose($istream); + fclose($ostream); + } + } else { + echo $data; + } + killme(); + } } diff --git a/Zotlabs/Module/Photomap.php b/Zotlabs/Module/Photomap.php index 275159ad6..0b2a75224 100644 --- a/Zotlabs/Module/Photomap.php +++ b/Zotlabs/Module/Photomap.php @@ -1,24 +1,25 @@ ' . $desc . ''; - if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Photomap'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Photomap'))) { return $text; } - return $text . '' . t('Edit System Page Description') . '
'; + public function get() + { - $edited = []; + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } - $r = q("select k from pconfig where uid = %d and cat = 'system' and k like '%s' ", - intval(local_channel()), - dbesc('mod_%.pdl') - ); + if (argc() > 2 && argv(2) === 'reset') { + del_pconfig(local_channel(), 'system', 'mod_' . argv(1) . '.pdl'); + goaway(z_root() . '/pdledit'); + } - if($r) { - foreach($r as $rv) { - $edited[] = substr(str_replace('.pdl','',$rv['k']),4); - } - } - - $files = glob('Zotlabs/Module/*.php'); - if($files) { - foreach($files as $f) { - $name = lcfirst(basename($f,'.php')); - $x = theme_include('mod_' . $name . '.pdl'); - if($x) { - $o .= '' . $name . '' . ((in_array($name,$edited)) ? ' ' . t('(modified)') . ' ' . t('Reset') . '': '' ) . '
'; - } - } - } - $addons = glob('addon/*/*.pdl'); - if($addons) { - foreach($addons as $a) { - $name = substr(basename($a, '.pdl'),4); - $o .= '' . $name . '' . ((in_array($name,$edited)) ? ' ' . t('(modified)') . ' ' . t('Reset') . '': '' ) . '
'; - } - } + if (argc() > 1) { + $module = 'mod_' . argv(1) . '.pdl'; + } else { + $o .= ''; + $o .= ''; - - // list module pdl files - return $o; - } - - $t = get_pconfig(local_channel(),'system',$module); - $s = @file_get_contents(theme_include($module)); - if(! $s) { - $a = glob('addon/*/' . $module); - if($a) - $s = @file_get_contents($a[0]); - } - if(! $t) { - $t = $s; - } - if(! $t) { - notice( t('Layout not found.') . EOL); - return ''; - } - - $o = replace_macros(get_markup_template('pdledit.tpl'),array( - '$header' => t('Edit System Page Description'), - '$mname' => t('Module Name:'), - '$help' => t('Layout Help'), - '$another' => t('Edit another layout'), - '$original' => t('System layout'), - '$module' => argv(1), - '$src' => $s, - '$content' => htmlspecialchars($t,ENT_COMPAT,'UTF-8'), - '$submit' => t('Submit') - )); - - return $o; - } - + $edited = []; + + $r = q( + "select k from pconfig where uid = %d and cat = 'system' and k like '%s' ", + intval(local_channel()), + dbesc('mod_%.pdl') + ); + + if ($r) { + foreach ($r as $rv) { + $edited[] = substr(str_replace('.pdl', '', $rv['k']), 4); + } + } + + $files = glob('Zotlabs/Module/*.php'); + if ($files) { + foreach ($files as $f) { + $name = lcfirst(basename($f, '.php')); + $x = theme_include('mod_' . $name . '.pdl'); + if ($x) { + $o .= '' . $name . '' . ((in_array($name, $edited)) ? ' ' . t('(modified)') . ' ' . t('Reset') . '' : '') . '' . t('Edit System Page Description') . '
'; - $o .= '
'; + } + } + } + $addons = glob('addon/*/*.pdl'); + if ($addons) { + foreach ($addons as $a) { + $name = substr(basename($a, '.pdl'), 4); + $o .= '' . $name . '' . ((in_array($name, $edited)) ? ' ' . t('(modified)') . ' ' . t('Reset') . '' : '') . '
'; + } + } + + $o .= '
' . t('This app is currently installed.'); - } - - + return $text . '
' . t('This app is currently installed.'); + } } diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 55ec8583e..fbdae071b 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -1,4 +1,5 @@ 1) { + public function init() + { - $nick = escape_tags(argv(1)); - - Libprofile::load($nick); - - $channelx = channelx_by_nick($nick); + if (observer_prohibited()) { + return; + } - $profile_uid = 0; - - if ($channelx) { - App::$data['channel'] = $channelx; - head_set_icon($channelx['xchan_photo_s']); - $profile_uid = $channelx['channel_id']; - } - - App::$page['htmlhead'] .= "" ; - App::$data['observer'] = App::get_observer(); - } - } - - - - function post() { - - logger('mod-photos: photos_post: begin' , LOGGER_DEBUG); - - logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA); - logger('mod_photos: FILES ' . print_r($_FILES,true), LOGGER_DATA); - - $ph = photo_factory(''); - - $phototypes = $ph->supportedTypes(); - - $page_owner_uid = App::$data['channel']['channel_id']; - - if (! perm_is_allowed($page_owner_uid,get_observer_hash(),'write_storage')) { - notice( t('Permission denied.') . EOL ); - killme_if_ajax(); - return; - } - - $acl = new AccessControl(App::$data['channel']); - - if ((argc() > 3) && (argv(2) === 'album')) { - - $album = argv(3); + if (argc() > 1) { + $nick = escape_tags(argv(1)); - if (! photos_album_exists($page_owner_uid, get_observer_hash(), $album)) { - notice( t('Album not found.') . EOL); - goaway(z_root() . '/' . $_SESSION['photo_return']); - } - - - /* - * DELETE photo album and all its photos - */ - - if ($_REQUEST['dropalbum'] === t('Delete Album')) { - - $folder_hash = ''; - - $r = q("select hash from attach where is_dir = 1 and uid = %d and hash = '%s'", - intval($page_owner_uid), - dbesc($album) - ); - if (! $r) { - notice( t('Album not found.') . EOL); - return; - } - $folder_hash = $r[0]['hash']; - - - $res = []; - $admin_delete = false; + Libprofile::load($nick); - // get the list of photos we are about to delete - - if (remote_channel() && (! local_channel())) { - $str = photos_album_get_db_idstr($page_owner_uid,$album,remote_channel()); - } - elseif (local_channel()) { - $str = photos_album_get_db_idstr(local_channel(),$album); - } - elseif (is_site_admin()) { - $str = photos_album_get_db_idstr_admin($page_owner_uid,$album); - $admin_delete = true; - } - else { - $str = null; - } - - if (! $str) { - goaway(z_root() . '/' . $_SESSION['photo_return']); - } - - $r = q("select id from item where resource_id in ( $str ) and resource_type = 'photo' and uid = %d " . item_normal(), - intval($page_owner_uid) - ); - if($r) { - foreach($r as $rv) { - attach_delete($page_owner_uid, $rv['resource_id'], true ); - } - } - - // remove the associated photos in case they weren't attached to an item (rare) - - q("delete from photo where resource_id in ( $str ) and uid = %d", - intval($page_owner_uid) - ); + $channelx = channelx_by_nick($nick); - q("delete from attach where hash in ( $str ) and uid = %d", - intval($page_owner_uid) - ); - - if ($folder_hash) { - attach_delete($page_owner_uid, $folder_hash, true ); + $profile_uid = 0; - // Sync this action to channel clones, UNLESS it was an admin delete action. - // The admin only has authority to moderate content on their own site. - - if (! $admin_delete) { - $sync = attach_export_data(App::$data['channel'],$folder_hash, true); - if ($sync) { - Libsync::build_sync_packet($page_owner_uid, [ 'file' => [ $sync ] ]); - } - } - } - } - goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']); - } - - if ((argc() > 2) && (x($_REQUEST,'delete')) && ($_REQUEST['delete'] === t('Delete Photo'))) { - // same as above but remove single photo + if ($channelx) { + App::$data['channel'] = $channelx; + head_set_icon($channelx['xchan_photo_s']); + $profile_uid = $channelx['channel_id']; + } - $ob_hash = get_observer_hash(); - - if (! $ob_hash) { - goaway(z_root() . '/' . $_SESSION['photo_return']); - } - - // query to verify ownership of the photo by this viewer - // We've already checked observer permissions to perfom this action - - // This implements the policy that remote channels (visitors and guests) - // which modify content can only modify their own content. - // The page owner can modify anything within their authority, including - // content published by others in their own channel pages. - // The site admin can of course modify anything on their own site for - // maintenance or legal compliance reasons. - - $r = q("SELECT id, resource_id FROM photo WHERE ( xchan = '%s' or uid = %d ) AND resource_id = '%s' LIMIT 1", - dbesc($ob_hash), - intval(local_channel()), - dbesc(argv(2)) - ); - - if ($r) { - attach_delete($page_owner_uid, $r[0]['resource_id'], true ); - $sync = attach_export_data(App::$data['channel'],$r[0]['resource_id'], true); - if ($sync) { - Libsync::build_sync_packet($page_owner_uid, [ 'file' => [ $sync ] ]); - } - } - elseif (is_site_admin()) { - // If the admin deletes a photo, don't check ownership or invoke clone sync - attach_delete($page_owner_uid, argv(2), true); - } - - goaway(z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']); - } - - // perform move_to_album - - if ((argc() > 2) && array_key_exists('move_to_album',$_POST)) { - - $m = q("select folder from attach where hash = '%s' and uid = %d limit 1", - dbesc(argv(2)), - intval($page_owner_uid) - ); - - // we should sanitize the post variable, but probably pointless because the move - // will fail if we can't find the target - - if (($m) && ($m[0]['folder'] != $_POST['move_to_album'])) { - attach_move($page_owner_uid,argv(2),$_POST['move_to_album']); - - $sync = attach_export_data(App::$data['channel'],argv(2),false); - if ($sync) { - Libsync::build_sync_packet($page_owner_uid, [ 'file' => [ $sync ] ]); - } - - // return if this is the only thing being edited - - if (! ($_POST['desc'] && $_POST['newtag'])) { - goaway(z_root() . '/' . $_SESSION['photo_return']); - } - } - } - - // this still needs some work - - if(defined('FIXED')) { - if((x($_POST,'rotate') !== false) && ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) { - logger('rotate'); - - $resource_id = argv(2); - - $r = q("select * from photo where resource_id = '%s' and uid = %d and imgscale = 0 limit 1", - dbesc($resource_id), - intval($page_owner_uid) - ); - if ($r) { - - $ph = photo_factory(@file_get_contents(dbunescbin($r[0]['content'])), $r[0]['mimetype']); - if ($ph && $ph->is_valid()) { - $rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 ); - $ph->rotate($rotate_deg); - - $edited = datetime_convert(); - - q("update attach set filesize = %d, edited = '%s' where hash = '%s' and uid = %d", - strlen($ph->imageString()), - dbescdate($edited), - dbesc($resource_id), - intval($page_owner_uid) - ); - - $ph->saveImage(dbunescbin($r[0]['content'])); - - $arr = [ - 'aid' => get_account_id(), - 'uid' => intval($page_owner_uid), - 'resource_id' => dbesc($resource_id), - 'filename' => $r[0]['filename'], - 'imgscale' => 0, - 'album' => $r[0]['album'], - 'os_path' => $r[0]['os_path'], - 'os_storage' => 1, - 'os_syspath' => dbunescbin($r[0]['content']), - 'display_path' => $r[0]['display_path'], - 'photo_usage' => PHOTO_NORMAL, - 'edited' => dbescdate($edited) - ]; - - $ph->save($arr); - - unset($arr['os_syspath']); - - if($width > 1024 || $height > 1024) - $ph->scaleImage(1024); - $ph->storeThumbnail($arr, PHOTO_RES_1024); - - if($width > 640 || $height > 640) - $ph->scaleImage(640); - $ph->storeThumbnail($arr, PHOTO_RES_640); - - if($width > 320 || $height > 320) - $ph->scaleImage(320); - $ph->storeThumbnail($arr, PHOTO_RES_320); - } - } - }} // end FIXED + App::$page['htmlhead'] .= ""; + App::$data['observer'] = App::get_observer(); + } + } - // edit existing photo properties - - if (x($_POST,'item_id') !== false && intval($_POST['item_id'])) { + public function post() + { - $title = ((x($_POST,'title')) ? escape_tags(trim($_POST['title'])) : EMPTY_STR ); - $desc = ((x($_POST,'desc')) ? escape_tags(trim($_POST['desc'])) : EMPTY_STR ); - $body = ((x($_POST,'body')) ? trim($_POST['body']) : EMPTY_STR); - - $item_id = ((x($_POST,'item_id')) ? intval($_POST['item_id']) : 0); - $is_nsfw = ((x($_POST,'adult')) ? intval($_POST['adult']) : 0); + logger('mod-photos: photos_post: begin', LOGGER_DEBUG); - // convert any supplied posted permissions for storage - - $acl->set_from_array($_POST); - $perm = $acl->get(); - - $resource_id = argv(2); - - $p = q("SELECT mimetype, is_nsfw, filename, title, description, resource_id, imgscale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY imgscale DESC", - dbesc($resource_id), - intval($page_owner_uid) - ); - if ($p) { - // update the photo structure with any of the changed elements which are common to all resolutions - $r = q("UPDATE photo SET title = '%s', description = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' WHERE resource_id = '%s' AND uid = %d", - dbesc($title), - dbesc($desc), - dbesc($perm['allow_cid']), - dbesc($perm['allow_gid']), - dbesc($perm['deny_cid']), - dbesc($perm['deny_gid']), - dbesc($resource_id), - intval($page_owner_uid) - ); - } - - $item_private = (($str_contact_allow || $str_group_allow || $str_contact_deny || $str_group_deny) ? true : false); - - $old_is_nsfw = $p[0]['is_nsfw']; - if ($old_is_nsfw != $is_nsfw) { - $r = q("update photo set is_nsfw = %d where resource_id = '%s' and uid = %d", - intval($is_nsfw), - dbesc($resource_id), - intval($page_owner_uid) - ); - } - - /* Don't make the item visible if the only change was the album name */ - - $visibility = 0; - if ($p[0]['description'] !== $desc || $p[0]['title'] !== $title || $body !== EMPTY_STR) { - $visibility = 1; - } + logger('mod_photos: REQUEST ' . print_r($_REQUEST, true), LOGGER_DATA); + logger('mod_photos: FILES ' . print_r($_FILES, true), LOGGER_DATA); - $r = q("SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1", - intval($item_id), - intval($page_owner_uid) - ); - if (! $r) { - logger('linked photo item not found.'); - notice ( t('linked item not found.') . EOL); - return; - } + $ph = photo_factory(''); - $linked_item = array_shift($r); - - // extract the original footer text - $footer_text = EMPTY_STR; - $orig_text = $linked_item['body']; - $matches = []; + $phototypes = $ph->supportedTypes(); - if (preg_match('/\[footer\](.*?)\[\/footer\]/ism',$orig_text,$matches)) { - $footer_text = $matches[0]; - } - - $body = cleanup_bbcode($body); - $tags = linkify_tags($body, $page_owner_uid); + $page_owner_uid = App::$data['channel']['channel_id']; - $post_tags = []; - if ($tags) { - foreach ($tags as $tag) { - $success = $tag['success']; - if ($success['replaced']) { - // suppress duplicate mentions/tags - $already_tagged = false; - foreach ($post_tags as $pt) { - if ($pt['term'] === $success['term'] && $pt['url'] === $success['url'] && intval($pt['ttype']) === intval($success['termtype'])) { - $already_tagged = true; - break; - } - } - if ($already_tagged) { - continue; - } + if (!perm_is_allowed($page_owner_uid, get_observer_hash(), 'write_storage')) { + notice(t('Permission denied.') . EOL); + killme_if_ajax(); + return; + } - $post_tags[] = [ - 'uid' => $page_owner_uid, - 'ttype' => $success['termtype'], - 'otype' => TERM_OBJ_POST, - 'term' => $success['term'], - 'url' => $success['url'] - ]; - } - } - } - if ($post_tags) { - q("delete from term where otype = 1 and oid = %d", - intval($linked_item['id']) - ); - foreach($post_tags as $t) { - q("insert into term (uid,oid,otype,ttype,term,url) + $acl = new AccessControl(App::$data['channel']); + + if ((argc() > 3) && (argv(2) === 'album')) { + $album = argv(3); + + if (!photos_album_exists($page_owner_uid, get_observer_hash(), $album)) { + notice(t('Album not found.') . EOL); + goaway(z_root() . '/' . $_SESSION['photo_return']); + } + + + /* + * DELETE photo album and all its photos + */ + + if ($_REQUEST['dropalbum'] === t('Delete Album')) { + $folder_hash = ''; + + $r = q( + "select hash from attach where is_dir = 1 and uid = %d and hash = '%s'", + intval($page_owner_uid), + dbesc($album) + ); + if (!$r) { + notice(t('Album not found.') . EOL); + return; + } + $folder_hash = $r[0]['hash']; + + + $res = []; + $admin_delete = false; + + // get the list of photos we are about to delete + + if (remote_channel() && (!local_channel())) { + $str = photos_album_get_db_idstr($page_owner_uid, $album, remote_channel()); + } elseif (local_channel()) { + $str = photos_album_get_db_idstr(local_channel(), $album); + } elseif (is_site_admin()) { + $str = photos_album_get_db_idstr_admin($page_owner_uid, $album); + $admin_delete = true; + } else { + $str = null; + } + + if (!$str) { + goaway(z_root() . '/' . $_SESSION['photo_return']); + } + + $r = q( + "select id from item where resource_id in ( $str ) and resource_type = 'photo' and uid = %d " . item_normal(), + intval($page_owner_uid) + ); + if ($r) { + foreach ($r as $rv) { + attach_delete($page_owner_uid, $rv['resource_id'], true); + } + } + + // remove the associated photos in case they weren't attached to an item (rare) + + q( + "delete from photo where resource_id in ( $str ) and uid = %d", + intval($page_owner_uid) + ); + + q( + "delete from attach where hash in ( $str ) and uid = %d", + intval($page_owner_uid) + ); + + if ($folder_hash) { + attach_delete($page_owner_uid, $folder_hash, true); + + // Sync this action to channel clones, UNLESS it was an admin delete action. + // The admin only has authority to moderate content on their own site. + + if (!$admin_delete) { + $sync = attach_export_data(App::$data['channel'], $folder_hash, true); + if ($sync) { + Libsync::build_sync_packet($page_owner_uid, ['file' => [$sync]]); + } + } + } + } + goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']); + } + + if ((argc() > 2) && (x($_REQUEST, 'delete')) && ($_REQUEST['delete'] === t('Delete Photo'))) { + // same as above but remove single photo + + $ob_hash = get_observer_hash(); + + if (!$ob_hash) { + goaway(z_root() . '/' . $_SESSION['photo_return']); + } + + // query to verify ownership of the photo by this viewer + // We've already checked observer permissions to perfom this action + + // This implements the policy that remote channels (visitors and guests) + // which modify content can only modify their own content. + // The page owner can modify anything within their authority, including + // content published by others in their own channel pages. + // The site admin can of course modify anything on their own site for + // maintenance or legal compliance reasons. + + $r = q( + "SELECT id, resource_id FROM photo WHERE ( xchan = '%s' or uid = %d ) AND resource_id = '%s' LIMIT 1", + dbesc($ob_hash), + intval(local_channel()), + dbesc(argv(2)) + ); + + if ($r) { + attach_delete($page_owner_uid, $r[0]['resource_id'], true); + $sync = attach_export_data(App::$data['channel'], $r[0]['resource_id'], true); + if ($sync) { + Libsync::build_sync_packet($page_owner_uid, ['file' => [$sync]]); + } + } elseif (is_site_admin()) { + // If the admin deletes a photo, don't check ownership or invoke clone sync + attach_delete($page_owner_uid, argv(2), true); + } + + goaway(z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']); + } + + // perform move_to_album + + if ((argc() > 2) && array_key_exists('move_to_album', $_POST)) { + $m = q( + "select folder from attach where hash = '%s' and uid = %d limit 1", + dbesc(argv(2)), + intval($page_owner_uid) + ); + + // we should sanitize the post variable, but probably pointless because the move + // will fail if we can't find the target + + if (($m) && ($m[0]['folder'] != $_POST['move_to_album'])) { + attach_move($page_owner_uid, argv(2), $_POST['move_to_album']); + + $sync = attach_export_data(App::$data['channel'], argv(2), false); + if ($sync) { + Libsync::build_sync_packet($page_owner_uid, ['file' => [$sync]]); + } + + // return if this is the only thing being edited + + if (!($_POST['desc'] && $_POST['newtag'])) { + goaway(z_root() . '/' . $_SESSION['photo_return']); + } + } + } + + // this still needs some work + + if (defined('FIXED')) { + if ((x($_POST, 'rotate') !== false) && ((intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2))) { + logger('rotate'); + + $resource_id = argv(2); + + $r = q( + "select * from photo where resource_id = '%s' and uid = %d and imgscale = 0 limit 1", + dbesc($resource_id), + intval($page_owner_uid) + ); + if ($r) { + $ph = photo_factory(@file_get_contents(dbunescbin($r[0]['content'])), $r[0]['mimetype']); + if ($ph && $ph->is_valid()) { + $rotate_deg = ((intval($_POST['rotate']) == 1) ? 270 : 90); + $ph->rotate($rotate_deg); + + $edited = datetime_convert(); + + q( + "update attach set filesize = %d, edited = '%s' where hash = '%s' and uid = %d", + strlen($ph->imageString()), + dbescdate($edited), + dbesc($resource_id), + intval($page_owner_uid) + ); + + $ph->saveImage(dbunescbin($r[0]['content'])); + + $arr = [ + 'aid' => get_account_id(), + 'uid' => intval($page_owner_uid), + 'resource_id' => dbesc($resource_id), + 'filename' => $r[0]['filename'], + 'imgscale' => 0, + 'album' => $r[0]['album'], + 'os_path' => $r[0]['os_path'], + 'os_storage' => 1, + 'os_syspath' => dbunescbin($r[0]['content']), + 'display_path' => $r[0]['display_path'], + 'photo_usage' => PHOTO_NORMAL, + 'edited' => dbescdate($edited) + ]; + + $ph->save($arr); + + unset($arr['os_syspath']); + + if ($width > 1024 || $height > 1024) { + $ph->scaleImage(1024); + } + $ph->storeThumbnail($arr, PHOTO_RES_1024); + + if ($width > 640 || $height > 640) { + $ph->scaleImage(640); + } + $ph->storeThumbnail($arr, PHOTO_RES_640); + + if ($width > 320 || $height > 320) { + $ph->scaleImage(320); + } + $ph->storeThumbnail($arr, PHOTO_RES_320); + } + } + } + } // end FIXED + + + // edit existing photo properties + + if (x($_POST, 'item_id') !== false && intval($_POST['item_id'])) { + $title = ((x($_POST, 'title')) ? escape_tags(trim($_POST['title'])) : EMPTY_STR); + $desc = ((x($_POST, 'desc')) ? escape_tags(trim($_POST['desc'])) : EMPTY_STR); + $body = ((x($_POST, 'body')) ? trim($_POST['body']) : EMPTY_STR); + + $item_id = ((x($_POST, 'item_id')) ? intval($_POST['item_id']) : 0); + $is_nsfw = ((x($_POST, 'adult')) ? intval($_POST['adult']) : 0); + + // convert any supplied posted permissions for storage + + $acl->set_from_array($_POST); + $perm = $acl->get(); + + $resource_id = argv(2); + + $p = q( + "SELECT mimetype, is_nsfw, filename, title, description, resource_id, imgscale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY imgscale DESC", + dbesc($resource_id), + intval($page_owner_uid) + ); + if ($p) { + // update the photo structure with any of the changed elements which are common to all resolutions + $r = q( + "UPDATE photo SET title = '%s', description = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' WHERE resource_id = '%s' AND uid = %d", + dbesc($title), + dbesc($desc), + dbesc($perm['allow_cid']), + dbesc($perm['allow_gid']), + dbesc($perm['deny_cid']), + dbesc($perm['deny_gid']), + dbesc($resource_id), + intval($page_owner_uid) + ); + } + + $item_private = (($str_contact_allow || $str_group_allow || $str_contact_deny || $str_group_deny) ? true : false); + + $old_is_nsfw = $p[0]['is_nsfw']; + if ($old_is_nsfw != $is_nsfw) { + $r = q( + "update photo set is_nsfw = %d where resource_id = '%s' and uid = %d", + intval($is_nsfw), + dbesc($resource_id), + intval($page_owner_uid) + ); + } + + /* Don't make the item visible if the only change was the album name */ + + $visibility = 0; + if ($p[0]['description'] !== $desc || $p[0]['title'] !== $title || $body !== EMPTY_STR) { + $visibility = 1; + } + + $r = q( + "SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1", + intval($item_id), + intval($page_owner_uid) + ); + if (!$r) { + logger('linked photo item not found.'); + notice(t('linked item not found.') . EOL); + return; + } + + $linked_item = array_shift($r); + + // extract the original footer text + $footer_text = EMPTY_STR; + $orig_text = $linked_item['body']; + $matches = []; + + if (preg_match('/\[footer\](.*?)\[\/footer\]/ism', $orig_text, $matches)) { + $footer_text = $matches[0]; + } + + $body = cleanup_bbcode($body); + $tags = linkify_tags($body, $page_owner_uid); + + $post_tags = []; + if ($tags) { + foreach ($tags as $tag) { + $success = $tag['success']; + if ($success['replaced']) { + // suppress duplicate mentions/tags + $already_tagged = false; + foreach ($post_tags as $pt) { + if ($pt['term'] === $success['term'] && $pt['url'] === $success['url'] && intval($pt['ttype']) === intval($success['termtype'])) { + $already_tagged = true; + break; + } + } + if ($already_tagged) { + continue; + } + + $post_tags[] = [ + 'uid' => $page_owner_uid, + 'ttype' => $success['termtype'], + 'otype' => TERM_OBJ_POST, + 'term' => $success['term'], + 'url' => $success['url'] + ]; + } + } + } + if ($post_tags) { + q( + "delete from term where otype = 1 and oid = %d", + intval($linked_item['id']) + ); + foreach ($post_tags as $t) { + q( + "insert into term (uid,oid,otype,ttype,term,url) values(%d,%d,%d,%d,'%s','%s') ", - intval($page_owner_uid), - intval($linked_item['id']), - intval(TERM_OBJ_POST), - intval($t['ttype']), - dbesc($t['term']), - dbesc($t['url']) - ); - } - } + intval($page_owner_uid), + intval($linked_item['id']), + intval(TERM_OBJ_POST), + intval($t['ttype']), + dbesc($t['term']), + dbesc($t['url']) + ); + } + } - $body = z_input_filter($body,'text/x-multicode'); + $body = z_input_filter($body, 'text/x-multicode'); - $obj = EMPTY_STR; + $obj = EMPTY_STR; - if (isset($linked_item['obj']) && strlen($linked_item['obj'])) { - $obj = json_decode($linked_item['obj'],true); - - $obj['name'] = (($title) ? $title : $p[0]['filename']); - $obj['summary'] = (($desc) ? $desc : $p[0]['filename']); - $obj['updated'] = datetime_convert('UTC','UTC','now',ATOM_TIME); - $obj['source'] = [ 'content' => $body, 'mediaType' => 'text/x-multicode' ]; - $obj['content'] = bbcode($body . $footer_text, [ 'export' => true ]); - if (isset($obj['url']) && is_array($obj['url'])) { - for ($x = 0; $x < count($obj['url']); $x ++) { - $obj['url'][$x]['summary'] = $obj['summary']; - } - } - $obj = json_encode($obj); - } + if (isset($linked_item['obj']) && strlen($linked_item['obj'])) { + $obj = json_decode($linked_item['obj'], true); - // make sure the linked item has the same permissions as the photo regardless of any other changes - $x = q("update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', title = '%s', obj = '%s', body = '%s', edited = '%s', item_private = %d where id = %d", - dbesc($perm['allow_cid']), - dbesc($perm['allow_gid']), - dbesc($perm['deny_cid']), - dbesc($perm['deny_gid']), - dbesc(($desc) ? $desc : $p[0]['filename']), - dbesc($obj), - dbesc($body . $footer_text), - dbesc(datetime_convert()), - intval($acl->is_private()), - intval($item_id) - ); - - // make sure the attach has the same permissions as the photo regardless of any other changes - $x = q("update attach set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where hash = '%s' and uid = %d and is_photo = 1", - dbesc($perm['allow_cid']), - dbesc($perm['allow_gid']), - dbesc($perm['deny_cid']), - dbesc($perm['deny_gid']), - dbesc($resource_id), - intval($page_owner_uid) - ); - + $obj['name'] = (($title) ? $title : $p[0]['filename']); + $obj['summary'] = (($desc) ? $desc : $p[0]['filename']); + $obj['updated'] = datetime_convert('UTC', 'UTC', 'now', ATOM_TIME); + $obj['source'] = ['content' => $body, 'mediaType' => 'text/x-multicode']; + $obj['content'] = bbcode($body . $footer_text, ['export' => true]); + if (isset($obj['url']) && is_array($obj['url'])) { + for ($x = 0; $x < count($obj['url']); $x++) { + $obj['url'][$x]['summary'] = $obj['summary']; + } + } + $obj = json_encode($obj); + } - if($visibility) { - Run::Summon( [ 'Notifier', 'edit_post', $item_id ] ); - } + // make sure the linked item has the same permissions as the photo regardless of any other changes + $x = q( + "update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', title = '%s', obj = '%s', body = '%s', edited = '%s', item_private = %d where id = %d", + dbesc($perm['allow_cid']), + dbesc($perm['allow_gid']), + dbesc($perm['deny_cid']), + dbesc($perm['deny_gid']), + dbesc(($desc) ? $desc : $p[0]['filename']), + dbesc($obj), + dbesc($body . $footer_text), + dbesc(datetime_convert()), + intval($acl->is_private()), + intval($item_id) + ); - $sync = attach_export_data(App::$data['channel'],$resource_id); - - if($sync) - Libsync::build_sync_packet($page_owner_uid, [ 'file' => [ $sync ] ]); - - goaway(z_root() . '/' . $_SESSION['photo_return']); - return; // NOTREACHED - - - } - - - /** - * default post action - upload a photo - */ - - $channel = App::$data['channel']; - $observer = App::$data['observer']; - - $_REQUEST['source'] = 'photos'; - require_once('include/attach.php'); - - if(! local_channel()) { - $_REQUEST['contact_allow'] = expand_acl($channel['channel_allow_cid']); - $_REQUEST['group_allow'] = expand_acl($channel['channel_allow_gid']); - $_REQUEST['contact_deny'] = expand_acl($channel['channel_deny_cid']); - $_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']); - } - + // make sure the attach has the same permissions as the photo regardless of any other changes + $x = q( + "update attach set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where hash = '%s' and uid = %d and is_photo = 1", + dbesc($perm['allow_cid']), + dbesc($perm['allow_gid']), + dbesc($perm['deny_cid']), + dbesc($perm['deny_gid']), + dbesc($resource_id), + intval($page_owner_uid) + ); - $matches = []; - $partial = false; - if(array_key_exists('HTTP_CONTENT_RANGE',$_SERVER)) { - $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/',$_SERVER['HTTP_CONTENT_RANGE'],$matches); - if($pm) { - logger('Content-Range: ' . print_r($matches,true)); - $partial = true; - } - } + if ($visibility) { + Run::Summon(['Notifier', 'edit_post', $item_id]); + } - if($partial) { - $x = save_chunk($channel,$matches[1],$matches[2],$matches[3]); + $sync = attach_export_data(App::$data['channel'], $resource_id); - if($x['partial']) { - header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); - json_return_and_die($x); - } - else { - header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); + if ($sync) { + Libsync::build_sync_packet($page_owner_uid, ['file' => [$sync]]); + } - $_FILES['userfile'] = [ - 'name' => $x['name'], - 'type' => $x['type'], - 'tmp_name' => $x['tmp_name'], - 'error' => $x['error'], - 'size' => $x['size'] - ]; - } - } - else { - if(! array_key_exists('userfile',$_FILES)) { - $_FILES['userfile'] = [ - 'name' => $_FILES['files']['name'], - 'type' => $_FILES['files']['type'], - 'tmp_name' => $_FILES['files']['tmp_name'], - 'error' => $_FILES['files']['error'], - 'size' => $_FILES['files']['size'] - ]; - } - } + goaway(z_root() . '/' . $_SESSION['photo_return']); + return; // NOTREACHED + } - $r = attach_store($channel,get_observer_hash(), '', $_REQUEST); - - if(! $r['success']) { - notice($r['message'] . EOL); - if (is_ajax()) { - killme(); - } - goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']); - } - if ($r['success'] && ! intval($r['data']['is_photo'])) { - notice( sprintf( t('%s: Unsupported photo type. Saved as file.'), escape_tags($r['data']['filename']))); - } - if (is_ajax()) { - killme(); - } - - goaway(z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $r['data']['folder']); - - } - - - - function get() { - - // URLs: - // photos/name - // photos/name/album/xxxxx (xxxxx is album name) - // photos/name/image/xxxxx - - - if(observer_prohibited()) { - notice( t('Public access denied.') . EOL); - return; - } - - $unsafe = 1 - get_safemode(); - - - if(! x(App::$data,'channel')) { - notice( t('No photos selected') . EOL ); - return; - } - - $ph = photo_factory(''); - $phototypes = $ph->supportedTypes(); - - $_SESSION['photo_return'] = App::$cmd; - - // - // Parse arguments - // - - $can_comment = perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),'post_comments'); - - if(argc() > 3) { - $datatype = argv(2); - $datum = argv(3); - } - else { - if(argc() > 2) { - $datatype = argv(2); - $datum = ''; - } - else - $datatype = 'summary'; - } - - if(argc() > 4) - $cmd = argv(4); - else - $cmd = 'view'; - - // - // Setup permissions structures - // - - $can_post = false; - $visitor = 0; - - - $owner_uid = App::$data['channel']['channel_id']; - $owner_aid = App::$data['channel']['channel_account_id']; - - $observer = App::get_observer(); - - $can_post = perm_is_allowed($owner_uid,$observer['xchan_hash'],'write_storage'); - $can_view = perm_is_allowed($owner_uid,$observer['xchan_hash'],'view_storage'); - - if(! $can_view) { - notice( t('Access to this item is restricted.') . EOL); - return; - } - - $sql_item = item_permissions_sql($owner_uid,get_observer_hash()); - $sql_extra = permissions_sql($owner_uid,get_observer_hash(),'photo'); - $sql_attach = permissions_sql($owner_uid,get_observer_hash(),'attach'); - nav_set_selected('Photos'); - - $o = ' + /** + * default post action - upload a photo + */ + + $channel = App::$data['channel']; + $observer = App::$data['observer']; + + $_REQUEST['source'] = 'photos'; + require_once('include/attach.php'); + + if (!local_channel()) { + $_REQUEST['contact_allow'] = expand_acl($channel['channel_allow_cid']); + $_REQUEST['group_allow'] = expand_acl($channel['channel_allow_gid']); + $_REQUEST['contact_deny'] = expand_acl($channel['channel_deny_cid']); + $_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']); + } + + + $matches = []; + $partial = false; + + if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) { + $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches); + if ($pm) { + logger('Content-Range: ' . print_r($matches, true)); + $partial = true; + } + } + + if ($partial) { + $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]); + + if ($x['partial']) { + header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); + json_return_and_die($x); + } else { + header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); + + $_FILES['userfile'] = [ + 'name' => $x['name'], + 'type' => $x['type'], + 'tmp_name' => $x['tmp_name'], + 'error' => $x['error'], + 'size' => $x['size'] + ]; + } + } else { + if (!array_key_exists('userfile', $_FILES)) { + $_FILES['userfile'] = [ + 'name' => $_FILES['files']['name'], + 'type' => $_FILES['files']['type'], + 'tmp_name' => $_FILES['files']['tmp_name'], + 'error' => $_FILES['files']['error'], + 'size' => $_FILES['files']['size'] + ]; + } + } + + $r = attach_store($channel, get_observer_hash(), '', $_REQUEST); + + if (!$r['success']) { + notice($r['message'] . EOL); + if (is_ajax()) { + killme(); + } + goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']); + } + if ($r['success'] && !intval($r['data']['is_photo'])) { + notice(sprintf(t('%s: Unsupported photo type. Saved as file.'), escape_tags($r['data']['filename']))); + } + if (is_ajax()) { + killme(); + } + + goaway(z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $r['data']['folder']); + } + + + public function get() + { + + // URLs: + // photos/name + // photos/name/album/xxxxx (xxxxx is album name) + // photos/name/image/xxxxx + + + if (observer_prohibited()) { + notice(t('Public access denied.') . EOL); + return; + } + + $unsafe = 1 - get_safemode(); + + + if (!x(App::$data, 'channel')) { + notice(t('No photos selected') . EOL); + return; + } + + $ph = photo_factory(''); + $phototypes = $ph->supportedTypes(); + + $_SESSION['photo_return'] = App::$cmd; + + // + // Parse arguments + // + + $can_comment = perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'post_comments'); + + if (argc() > 3) { + $datatype = argv(2); + $datum = argv(3); + } else { + if (argc() > 2) { + $datatype = argv(2); + $datum = ''; + } else { + $datatype = 'summary'; + } + } + + if (argc() > 4) { + $cmd = argv(4); + } else { + $cmd = 'view'; + } + + // + // Setup permissions structures + // + + $can_post = false; + $visitor = 0; + + + $owner_uid = App::$data['channel']['channel_id']; + $owner_aid = App::$data['channel']['channel_account_id']; + + $observer = App::get_observer(); + + $can_post = perm_is_allowed($owner_uid, $observer['xchan_hash'], 'write_storage'); + $can_view = perm_is_allowed($owner_uid, $observer['xchan_hash'], 'view_storage'); + + if (!$can_view) { + notice(t('Access to this item is restricted.') . EOL); + return; + } + + $sql_item = item_permissions_sql($owner_uid, get_observer_hash()); + $sql_extra = permissions_sql($owner_uid, get_observer_hash(), 'photo'); + $sql_attach = permissions_sql($owner_uid, get_observer_hash(), 'attach'); + + nav_set_selected('Photos'); + + $o = ' '; - $o .= "\r\n"; - - $_is_owner = (local_channel() && (local_channel() == $owner_uid)); - - /** - * Display upload form - */ - - if ($can_post) { - - $uploader = ''; - - $ret = array('post_url' => z_root() . '/photos/' . App::$data['channel']['channel_address'], - 'addon_text' => $uploader, - 'default_upload' => true); - - call_hooks('photo_upload_form',$ret); - - /* Show space usage */ - - $r = q("select sum(filesize) as total from photo where aid = %d and imgscale = 0 ", - intval(App::$data['channel']['channel_account_id']) - ); - - - $limit = engr_units_to_bytes(service_class_fetch(App::$data['channel']['channel_id'],'photo_upload_limit')); - if($limit !== false) { - $usage_message = sprintf( t("%1$.2f MB of %2$.2f MB photo storage used."), $r[0]['total'] / 1024000, $limit / 1024000 ); - } - else { - $usage_message = sprintf( t('%1$.2f MB photo storage used.'), $r[0]['total'] / 1024000 ); - } - - if($_is_owner) { - $channel = App::get_channel(); - - $acl = new AccessControl($channel); - $channel_acl = $acl->get(); - - $lockstate = (($acl->is_private()) ? 'lock' : 'unlock'); - } - - $aclselect = (($_is_owner) ? populate_acl($channel_acl,false, PermissionDescription::fromGlobalPermission('view_storage')) : ''); - - // this is wrong but is to work around an issue with js_upload wherein it chokes if these variables - // don't exist. They really should be set to a parseable representation of the channel's default permissions - // which can be processed by getSelected() - - if(! $aclselect) { - $aclselect = ''; - } + $o .= "\r\n"; - $selname = ''; + $_is_owner = (local_channel() && (local_channel() == $owner_uid)); - if($datum) { - $h = attach_by_hash_nodata($datum,get_observer_hash()); - $selname = $h['data']['display_path']; - } + /** + * Display upload form + */ - - $albums = ((array_key_exists('albums', App::$data)) ? App::$data['albums'] : photos_albums_list(App::$data['channel'],App::$data['observer'])); - - if(! $selname) { - $def_album = get_pconfig(App::$data['channel']['channel_id'],'system','photo_path'); - if($def_album) { - $selname = filepath_macro($def_album); - $albums['album'][] = array('text' => $selname); - } - } - - $tpl = get_markup_template('photos_upload.tpl'); - $upload_form = replace_macros($tpl,array( - '$pagename' => t('Upload Photos'), - '$sessid' => session_id(), - '$usage' => $usage_message, - '$nickname' => App::$data['channel']['channel_address'], - '$newalbum_label' => t('Enter an album name'), - '$newalbum_placeholder' => t('or select an existing album (doubleclick)'), - '$visible' => array('visible', t('Create a status post for this upload'), 0, t('If multiple files are selected, the message will be repeated for each photo'), array(t('No'), t('Yes')), 'onclick="showHideBodyTextarea();"'), - '$caption' => array('description', t('Please briefly describe this photo for vision-impaired viewers')), - 'title' => [ 'title', t('Title (optional)') ], - '$body' => array('body', t('Your message (optional)'),'', 'This will only appear in the status post'), - '$albums' => $albums['albums'], - '$selname' => $selname, - '$permissions' => t('Permissions'), - '$aclselect' => $aclselect, - '$allow_cid' => acl2json($channel_acl['allow_cid']), - '$allow_gid' => acl2json($channel_acl['allow_gid']), - '$deny_cid' => acl2json($channel_acl['deny_cid']), - '$deny_gid' => acl2json($channel_acl['deny_gid']), - '$lockstate' => $lockstate, - '$uploader' => $ret['addon_text'], - '$default' => (($ret['default_upload']) ? true : false), - '$uploadurl' => $ret['post_url'], - '$submit' => t('Upload') - - )); - - } - - // - // dispatch request - // - - /* - * Display a single photo album - */ - - if($datatype === 'album') { + if ($can_post) { + $uploader = ''; - head_add_link([ - 'rel' => 'alternate', - 'type' => 'application/json+oembed', - 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string), - 'title' => 'oembed' - ]); + $ret = array('post_url' => z_root() . '/photos/' . App::$data['channel']['channel_address'], + 'addon_text' => $uploader, + 'default_upload' => true); - if($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) { - App::set_pager_itemspage(60); - $album = $x['display_path']; - } - else { - goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']); - } + call_hooks('photo_upload_form', $ret); - if($_GET['order'] === 'posted') - $order = 'created ASC'; - elseif($_GET['order'] === 'name') - $order = 'filename ASC'; - else - $order = 'created DESC'; + /* Show space usage */ - $r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN + $r = q( + "select sum(filesize) as total from photo where aid = %d and imgscale = 0 ", + intval(App::$data['channel']['channel_account_id']) + ); + + + $limit = engr_units_to_bytes(service_class_fetch(App::$data['channel']['channel_id'], 'photo_upload_limit')); + if ($limit !== false) { + $usage_message = sprintf(t("%1$.2f MB of %2$.2f MB photo storage used."), $r[0]['total'] / 1024000, $limit / 1024000); + } else { + $usage_message = sprintf(t('%1$.2f MB photo storage used.'), $r[0]['total'] / 1024000); + } + + if ($_is_owner) { + $channel = App::get_channel(); + + $acl = new AccessControl($channel); + $channel_acl = $acl->get(); + + $lockstate = (($acl->is_private()) ? 'lock' : 'unlock'); + } + + $aclselect = (($_is_owner) ? populate_acl($channel_acl, false, PermissionDescription::fromGlobalPermission('view_storage')) : ''); + + // this is wrong but is to work around an issue with js_upload wherein it chokes if these variables + // don't exist. They really should be set to a parseable representation of the channel's default permissions + // which can be processed by getSelected() + + if (!$aclselect) { + $aclselect = ''; + } + + $selname = ''; + + if ($datum) { + $h = attach_by_hash_nodata($datum, get_observer_hash()); + $selname = $h['data']['display_path']; + } + + + $albums = ((array_key_exists('albums', App::$data)) ? App::$data['albums'] : photos_albums_list(App::$data['channel'], App::$data['observer'])); + + if (!$selname) { + $def_album = get_pconfig(App::$data['channel']['channel_id'], 'system', 'photo_path'); + if ($def_album) { + $selname = filepath_macro($def_album); + $albums['album'][] = array('text' => $selname); + } + } + + $tpl = get_markup_template('photos_upload.tpl'); + $upload_form = replace_macros($tpl, array( + '$pagename' => t('Upload Photos'), + '$sessid' => session_id(), + '$usage' => $usage_message, + '$nickname' => App::$data['channel']['channel_address'], + '$newalbum_label' => t('Enter an album name'), + '$newalbum_placeholder' => t('or select an existing album (doubleclick)'), + '$visible' => array('visible', t('Create a status post for this upload'), 0, t('If multiple files are selected, the message will be repeated for each photo'), array(t('No'), t('Yes')), 'onclick="showHideBodyTextarea();"'), + '$caption' => array('description', t('Please briefly describe this photo for vision-impaired viewers')), + 'title' => ['title', t('Title (optional)')], + '$body' => array('body', t('Your message (optional)'), '', 'This will only appear in the status post'), + '$albums' => $albums['albums'], + '$selname' => $selname, + '$permissions' => t('Permissions'), + '$aclselect' => $aclselect, + '$allow_cid' => acl2json($channel_acl['allow_cid']), + '$allow_gid' => acl2json($channel_acl['allow_gid']), + '$deny_cid' => acl2json($channel_acl['deny_cid']), + '$deny_gid' => acl2json($channel_acl['deny_gid']), + '$lockstate' => $lockstate, + '$uploader' => $ret['addon_text'], + '$default' => (($ret['default_upload']) ? true : false), + '$uploadurl' => $ret['post_url'], + '$submit' => t('Upload') + + )); + } + + // + // dispatch request + // + + /* + * Display a single photo album + */ + + if ($datatype === 'album') { + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string), + 'title' => 'oembed' + ]); + + if ($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) { + App::set_pager_itemspage(60); + $album = $x['display_path']; + } else { + goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']); + } + + if ($_GET['order'] === 'posted') { + $order = 'created ASC'; + } elseif ($_GET['order'] === 'name') { + $order = 'filename ASC'; + } else { + $order = 'created DESC'; + } + + $r = q( + "SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN (SELECT resource_id, max(imgscale) imgscale FROM photo left join attach on folder = '%s' and photo.resource_id = attach.hash WHERE attach.uid = %d AND imgscale <= 4 AND photo_usage IN ( %d, %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale) ORDER BY $order LIMIT %d OFFSET %d", - dbesc($x['hash']), - intval($owner_uid), - intval(PHOTO_NORMAL), - intval(PHOTO_PROFILE), - intval(PHOTO_COVER), - intval($unsafe), - intval(App::$pager['itemspage']), - intval(App::$pager['start']) - ); + dbesc($x['hash']), + intval($owner_uid), + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE), + intval(PHOTO_COVER), + intval($unsafe), + intval(App::$pager['itemspage']), + intval(App::$pager['start']) + ); - // edit album name - $album_edit = null; + // edit album name + $album_edit = null; - if($can_post) { - $album_e = $album; - $albums = ((array_key_exists('albums', App::$data)) ? App::$data['albums'] : photos_albums_list(App::$data['channel'],App::$data['observer'])); - - // @fixme - syncronise actions with DAV - - // $edit_tpl = get_markup_template('album_edit.tpl'); - // $album_edit = replace_macros($edit_tpl,array( - // '$nametext' => t('Enter a new album name'), - // '$name_placeholder' => t('or select an existing one (doubleclick)'), - // '$nickname' => App::$data['channel']['channel_address'], - // '$album' => $album_e, - // '$albums' => $albums['albums'], - // '$hexalbum' => bin2hex($album), - // '$submit' => t('Submit'), - // '$dropsubmit' => t('Delete Album') - // )); - - } - - $order = [ - [ t('Date descending'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $datum ], - [ t('Date ascending'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $datum . '?f=&order=posted'], - [ t('Name ascending'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $datum . '?f=&order=name'] - ]; - - - $photos = []; - if(count($r)) { - $twist = 'rotright'; - foreach($r as $rr) { - - if($twist == 'rotright') - $twist = 'rotleft'; - else - $twist = 'rotright'; - - $ext = $phototypes[$rr['mimetype']]; - - $imgalt_e = $rr['filename']; - $desc_e = $rr['description']; - - $imagelink = (z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id'] - . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '')); - - $photos[] = array( - 'id' => $rr['id'], - 'twist' => ' ' . $twist . rand(2,4), - 'link' => $imagelink, - 'title' => t('View Photo'), - 'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext, - 'alt' => $imgalt_e, - 'desc'=> $desc_e, - 'ext' => $ext, - 'hash'=> $rr['resource_id'], - 'unknown' => t('Unknown') - ); - } - } - - if($_REQUEST['aj']) { - if($photos) { - $o = replace_macros(get_markup_template('photosajax.tpl'),array( - '$photos' => $photos, - '$album_id' => $datum - )); - } - else { - $o = ''; - } - echo $o; - killme(); - } - else { - $o .= ""; - $tpl = get_markup_template('photo_album.tpl'); - $o .= replace_macros($tpl, array( - '$photos' => $photos, - '$album' => $album, - '$album_id' => $datum, - '$file_view' => t('View files'), - '$files_path' => z_root() . '/cloud/' . App::$data['channel']['channel_address'] . '/' . $x['display_path'], - '$album_edit' => array(t('Edit Album'), $album_edit), - '$can_post' => $can_post, - '$upload' => array(t('Add Photos'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/upload/' . $datum), - '$order' => $order, - '$sort' => t('Sort'), - '$upload_form' => $upload_form, - '$usage' => $usage_message - )); + if ($can_post) { + $album_e = $album; + $albums = ((array_key_exists('albums', App::$data)) ? App::$data['albums'] : photos_albums_list(App::$data['channel'], App::$data['observer'])); - return $o; - } - } - - /** - * Display one photo - */ - - if($datatype === 'image') { + // @fixme - syncronise actions with DAV - head_add_link([ - 'rel' => 'alternate', - 'type' => 'application/json+oembed', - 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string), - 'title' => 'oembed' - ]); + // $edit_tpl = get_markup_template('album_edit.tpl'); + // $album_edit = replace_macros($edit_tpl,array( + // '$nametext' => t('Enter a new album name'), + // '$name_placeholder' => t('or select an existing one (doubleclick)'), + // '$nickname' => App::$data['channel']['channel_address'], + // '$album' => $album_e, + // '$albums' => $albums['albums'], + // '$hexalbum' => bin2hex($album), + // '$submit' => t('Submit'), + // '$dropsubmit' => t('Delete Album') + // )); + } - $x = q("select folder from attach where hash = '%s' and uid = %d $sql_attach limit 1", - dbesc($datum), - intval($owner_uid) - ); + $order = [ + [t('Date descending'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $datum], + [t('Date ascending'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $datum . '?f=&order=posted'], + [t('Name ascending'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $datum . '?f=&order=name'] + ]; - // fetch image, item containing image, then comments - - $ph = q("SELECT id,aid,uid,xchan,resource_id,created,edited,title,description,album,filename,mimetype,height,width,filesize,imgscale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM photo WHERE uid = %d AND resource_id = '%s' + + $photos = []; + if (count($r)) { + $twist = 'rotright'; + foreach ($r as $rr) { + if ($twist == 'rotright') { + $twist = 'rotleft'; + } else { + $twist = 'rotright'; + } + + $ext = $phototypes[$rr['mimetype']]; + + $imgalt_e = $rr['filename']; + $desc_e = $rr['description']; + + $imagelink = (z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id'] + . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '')); + + $photos[] = array( + 'id' => $rr['id'], + 'twist' => ' ' . $twist . rand(2, 4), + 'link' => $imagelink, + 'title' => t('View Photo'), + 'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' . $ext, + 'alt' => $imgalt_e, + 'desc' => $desc_e, + 'ext' => $ext, + 'hash' => $rr['resource_id'], + 'unknown' => t('Unknown') + ); + } + } + + if ($_REQUEST['aj']) { + if ($photos) { + $o = replace_macros(get_markup_template('photosajax.tpl'), array( + '$photos' => $photos, + '$album_id' => $datum + )); + } else { + $o = ''; + } + echo $o; + killme(); + } else { + $o .= ""; + $tpl = get_markup_template('photo_album.tpl'); + $o .= replace_macros($tpl, array( + '$photos' => $photos, + '$album' => $album, + '$album_id' => $datum, + '$file_view' => t('View files'), + '$files_path' => z_root() . '/cloud/' . App::$data['channel']['channel_address'] . '/' . $x['display_path'], + '$album_edit' => array(t('Edit Album'), $album_edit), + '$can_post' => $can_post, + '$upload' => array(t('Add Photos'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/upload/' . $datum), + '$order' => $order, + '$sort' => t('Sort'), + '$upload_form' => $upload_form, + '$usage' => $usage_message + )); + + return $o; + } + } + + /** + * Display one photo + */ + + if ($datatype === 'image') { + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string), + 'title' => 'oembed' + ]); + + $x = q( + "select folder from attach where hash = '%s' and uid = %d $sql_attach limit 1", + dbesc($datum), + intval($owner_uid) + ); + + // fetch image, item containing image, then comments + + $ph = q( + "SELECT id,aid,uid,xchan,resource_id,created,edited,title,description,album,filename,mimetype,height,width,filesize,imgscale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM photo WHERE uid = %d AND resource_id = '%s' $sql_extra ORDER BY imgscale ASC ", - intval($owner_uid), - dbesc($datum) - ); - - if(! ($ph && $x)) { - - /* Check again - this time without specifying permissions */ - - $ph = q("SELECT id FROM photo WHERE uid = %d AND resource_id = '%s' LIMIT 1", - intval($owner_uid), - dbesc($datum) - ); - if($ph) - notice( t('Permission denied. Access to this item may be restricted.') . EOL); - else - notice( t('Photo not available') . EOL ); - return; - } - - - - $prevlink = ''; - $nextlink = ''; - - if($_GET['order'] === 'posted') - $order = 'created ASC'; - elseif ($_GET['order'] === 'name') - $order = 'filename ASC'; - else - $order = 'created DESC'; - + intval($owner_uid), + dbesc($datum) + ); - $prvnxt = q("SELECT hash FROM attach WHERE folder = '%s' AND uid = %d AND is_photo = 1 + if (!($ph && $x)) { + /* Check again - this time without specifying permissions */ + + $ph = q( + "SELECT id FROM photo WHERE uid = %d AND resource_id = '%s' LIMIT 1", + intval($owner_uid), + dbesc($datum) + ); + if ($ph) { + notice(t('Permission denied. Access to this item may be restricted.') . EOL); + } else { + notice(t('Photo not available') . EOL); + } + return; + } + + + $prevlink = ''; + $nextlink = ''; + + if ($_GET['order'] === 'posted') { + $order = 'created ASC'; + } elseif ($_GET['order'] === 'name') { + $order = 'filename ASC'; + } else { + $order = 'created DESC'; + } + + + $prvnxt = q( + "SELECT hash FROM attach WHERE folder = '%s' AND uid = %d AND is_photo = 1 $sql_attach ORDER BY $order ", - dbesc($x[0]['folder']), - intval($owner_uid) - ); + dbesc($x[0]['folder']), + intval($owner_uid) + ); - if(count($prvnxt)) { - for($z = 0; $z < count($prvnxt); $z++) { - if($prvnxt[$z]['hash'] == $ph[0]['resource_id']) { - $prv = $z - 1; - $nxt = $z + 1; - if($prv < 0) - $prv = count($prvnxt) - 1; - if($nxt >= count($prvnxt)) - $nxt = 0; - break; - } - } - - $prevlink = z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$prv]['hash'] . (($_GET['order']) ? '?f=&order=' . $_GET['order'] : ''); - $nextlink = z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$nxt]['hash'] . (($_GET['order']) ? '?f=&order=' . $_GET['order'] : ''); - } - - - if(count($ph) == 1) - $hires = $lores = $ph[0]; - if(count($ph) > 1) { - if($ph[1]['imgscale'] == 2) { - // original is 640 or less, we can display it directly - $hires = $lores = $ph[0]; - } - else { - $hires = $ph[0]; - $lores = $ph[1]; - } - } - - $album_link = z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $x[0]['folder']; - $tools = Null; - $lock = Null; - - if($can_post && ($ph[0]['uid'] == $owner_uid)) { - $tools = array( - 'profile'=>array(z_root() . '/profile_photo/use/'.$ph[0]['resource_id'], t('Use as profile photo')), - 'cover'=>array(z_root() . '/cover_photo/use/'.$ph[0]['resource_id'], t('Use as cover photo')), - ); - } - - // lockstate - $lockstate = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) - || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) - ? array('lock', t('Private Photo')) - : array('unlock', Null)); - - App::$page['htmlhead'] .= ''; - - if($prevlink) - $prevlink = array($prevlink, t('Previous')); - - $photo = array( - 'href' => z_root() . '/photo/' . $hires['resource_id'] . '-' . $hires['imgscale'] . '.' . $phototypes[$hires['mimetype']], - 'title'=> t('View Full Size'), - 'src' => z_root() . '/photo/' . $lores['resource_id'] . '-' . $lores['imgscale'] . '.' . $phototypes[$lores['mimetype']] . '?f=&_u=' . datetime_convert('','','','ymdhis') - ); - - if($nextlink) - $nextlink = array($nextlink, t('Next')); - - - // Do we have an item for this photo? - - $linked_items = q("SELECT * FROM item WHERE resource_id = '%s' and resource_type = 'photo' and uid = %d + if (count($prvnxt)) { + for ($z = 0; $z < count($prvnxt); $z++) { + if ($prvnxt[$z]['hash'] == $ph[0]['resource_id']) { + $prv = $z - 1; + $nxt = $z + 1; + if ($prv < 0) { + $prv = count($prvnxt) - 1; + } + if ($nxt >= count($prvnxt)) { + $nxt = 0; + } + break; + } + } + + $prevlink = z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$prv]['hash'] . (($_GET['order']) ? '?f=&order=' . $_GET['order'] : ''); + $nextlink = z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$nxt]['hash'] . (($_GET['order']) ? '?f=&order=' . $_GET['order'] : ''); + } + + + if (count($ph) == 1) { + $hires = $lores = $ph[0]; + } + if (count($ph) > 1) { + if ($ph[1]['imgscale'] == 2) { + // original is 640 or less, we can display it directly + $hires = $lores = $ph[0]; + } else { + $hires = $ph[0]; + $lores = $ph[1]; + } + } + + $album_link = z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $x[0]['folder']; + $tools = null; + $lock = null; + + if ($can_post && ($ph[0]['uid'] == $owner_uid)) { + $tools = array( + 'profile' => array(z_root() . '/profile_photo/use/' . $ph[0]['resource_id'], t('Use as profile photo')), + 'cover' => array(z_root() . '/cover_photo/use/' . $ph[0]['resource_id'], t('Use as cover photo')), + ); + } + + // lockstate + $lockstate = (((strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) + || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid']))) + ? array('lock', t('Private Photo')) + : array('unlock', null)); + + App::$page['htmlhead'] .= ''; + + if ($prevlink) { + $prevlink = array($prevlink, t('Previous')); + } + + $photo = array( + 'href' => z_root() . '/photo/' . $hires['resource_id'] . '-' . $hires['imgscale'] . '.' . $phototypes[$hires['mimetype']], + 'title' => t('View Full Size'), + 'src' => z_root() . '/photo/' . $lores['resource_id'] . '-' . $lores['imgscale'] . '.' . $phototypes[$lores['mimetype']] . '?f=&_u=' . datetime_convert('', '', '', 'ymdhis') + ); + + if ($nextlink) { + $nextlink = array($nextlink, t('Next')); + } + + + // Do we have an item for this photo? + + $linked_items = q( + "SELECT * FROM item WHERE resource_id = '%s' and resource_type = 'photo' and uid = %d $sql_item LIMIT 1", - dbesc($datum), - intval($owner_uid) - ); - - $map = null; - $link_item = null; - - if($linked_items) { - - xchan_query($linked_items); - $linked_items = fetch_post_tags($linked_items,true); - - $link_item = $linked_items[0]; - $item_normal = item_normal(); - - $r = q("select * from item where parent_mid = '%s' + dbesc($datum), + intval($owner_uid) + ); + + $map = null; + $link_item = null; + + if ($linked_items) { + xchan_query($linked_items); + $linked_items = fetch_post_tags($linked_items, true); + + $link_item = $linked_items[0]; + $item_normal = item_normal(); + + $r = q( + "select * from item where parent_mid = '%s' $item_normal and uid = %d $sql_item ", - dbesc($link_item['mid']), - intval($link_item['uid']) - - ); - - if($r) { - xchan_query($r); - $items = fetch_post_tags($r,true); - $sorted_items = conv_sort($items,'commented'); - } - - $tags = []; - if($link_item['term']) { - $cnt = 0; - foreach($link_item['term'] as $t) { - $tags[$cnt] = array(0 => format_term_for_display($t)); - if($can_post && ($ph[0]['uid'] == $owner_uid)) { - $tags[$cnt][1] = 'tagrm/drop/' . $link_item['id'] . '/' . bin2hex($t['term']); //?f=&item=' . $link_item['id']; - $tags[$cnt][2] = t('Remove'); - } - $cnt ++; - } - } - - if((local_channel()) && (local_channel() == $link_item['uid'])) { - q("UPDATE item SET item_unseen = 0 WHERE parent = %d and uid = %d and item_unseen = 1", - intval($link_item['parent']), - intval(local_channel()) - ); - } - - if($link_item['coord'] && Apps::system_app_installed($owner_uid,'Photomap')) { - $map = generate_map($link_item['coord']); - } - } - - // logger('mod_photo: link_item' . print_r($link_item,true)); - - // FIXME - remove this when we move to conversation module - - $comment_items = $sorted_items[0]['children']; + dbesc($link_item['mid']), + intval($link_item['uid']) + ); - $edit = null; - if($can_post) { + if ($r) { + xchan_query($r); + $items = fetch_post_tags($r, true); + $sorted_items = conv_sort($items, 'commented'); + } - $album_e = $ph[0]['album']; - $caption_e = $ph[0]['description']; - $aclselect_e = (($_is_owner) ? populate_acl($ph[0], true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : ''); - $albums = ((array_key_exists('albums', App::$data)) ? App::$data['albums'] : photos_albums_list(App::$data['channel'],App::$data['observer'])); - - $_SESSION['album_return'] = bin2hex($ph[0]['album']); + $tags = []; + if ($link_item['term']) { + $cnt = 0; + foreach ($link_item['term'] as $t) { + $tags[$cnt] = array(0 => format_term_for_display($t)); + if ($can_post && ($ph[0]['uid'] == $owner_uid)) { + $tags[$cnt][1] = 'tagrm/drop/' . $link_item['id'] . '/' . bin2hex($t['term']); //?f=&item=' . $link_item['id']; + $tags[$cnt][2] = t('Remove'); + } + $cnt++; + } + } - $folder_list = attach_folder_select_list($ph[0]['uid']); - $edit_body = htmlspecialchars_decode(undo_post_tagging($link_item['body']),ENT_COMPAT); - // We will regenerate the body footer - $edit_body = preg_replace('/\[footer\](.*?)\[\/footer\]/ism','',$edit_body); + if ((local_channel()) && (local_channel() == $link_item['uid'])) { + q( + "UPDATE item SET item_unseen = 0 WHERE parent = %d and uid = %d and item_unseen = 1", + intval($link_item['parent']), + intval(local_channel()) + ); + } - $edit = [ - 'edit' => t('Edit photo'), - 'id' => $link_item['id'], - 'albums' => $albums['albums'], - 'album' => $album_e, - 'album_select' => [ 'move_to_album', t('Move photo to album'), $x[0]['folder'], '', $folder_list ], - 'newalbum_label' => t('Enter a new album name'), - 'newalbum_placeholder' => t('or select an existing one (doubleclick)'), - 'nickname' => App::$data['channel']['channel_address'], - 'resource_id' => $ph[0]['resource_id'], - 'desc' => [ 'desc', t('Please briefly describe this photo for vision-impaired viewers'), $ph[0]['description'] ], - 'title' => [ 'title', t('Title (optional)'), $ph[0]['title'] ], - 'body' => [ 'body', t('Your message (optional)'),$edit_body, t('This will only appear in the optional status post attached to this photo') ], - 'tag_label' => t('Add a Tag'), - 'permissions' => t('Permissions'), - 'aclselect' => $aclselect_e, - 'allow_cid' => acl2json($ph[0]['allow_cid']), - 'allow_gid' => acl2json($ph[0]['allow_gid']), - 'deny_cid' => acl2json($ph[0]['deny_cid']), - 'deny_gid' => acl2json($ph[0]['deny_gid']), - 'lockstate' => $lockstate[0], - 'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'), - 'item_id' => ((count($linked_items)) ? $link_item['id'] : 0), - 'adult_enabled' => feature_enabled($owner_uid,'adult_photo_flagging'), - 'adult' => array('adult',t('Flag as adult in album view'), intval($ph[0]['is_nsfw']),''), - 'submit' => t('Submit'), - 'delete' => t('Delete Photo'), - 'expandform' => ((x($_GET,'expandform')) ? true : false) - ]; - } - - if(count($linked_items)) { - - $cmnt_tpl = get_markup_template('comment_item.tpl'); - $tpl = get_markup_template('photo_item.tpl'); - $return_url = App::$cmd; - - $like_tpl = get_markup_template('like_noshare.tpl'); - - $likebuttons = ''; - $ilike = false; - $inolike = false; + if ($link_item['coord'] && Apps::system_app_installed($owner_uid, 'Photomap')) { + $map = generate_map($link_item['coord']); + } + } + + // logger('mod_photo: link_item' . print_r($link_item,true)); + + // FIXME - remove this when we move to conversation module + + $comment_items = $sorted_items[0]['children']; + + $edit = null; + if ($can_post) { + $album_e = $ph[0]['album']; + $caption_e = $ph[0]['description']; + $aclselect_e = (($_is_owner) ? populate_acl($ph[0], true, PermissionDescription::fromGlobalPermission('view_storage')) : ''); + $albums = ((array_key_exists('albums', App::$data)) ? App::$data['albums'] : photos_albums_list(App::$data['channel'], App::$data['observer'])); + + $_SESSION['album_return'] = bin2hex($ph[0]['album']); + + $folder_list = attach_folder_select_list($ph[0]['uid']); + $edit_body = htmlspecialchars_decode(undo_post_tagging($link_item['body']), ENT_COMPAT); + // We will regenerate the body footer + $edit_body = preg_replace('/\[footer\](.*?)\[\/footer\]/ism', '', $edit_body); + + $edit = [ + 'edit' => t('Edit photo'), + 'id' => $link_item['id'], + 'albums' => $albums['albums'], + 'album' => $album_e, + 'album_select' => ['move_to_album', t('Move photo to album'), $x[0]['folder'], '', $folder_list], + 'newalbum_label' => t('Enter a new album name'), + 'newalbum_placeholder' => t('or select an existing one (doubleclick)'), + 'nickname' => App::$data['channel']['channel_address'], + 'resource_id' => $ph[0]['resource_id'], + 'desc' => ['desc', t('Please briefly describe this photo for vision-impaired viewers'), $ph[0]['description']], + 'title' => ['title', t('Title (optional)'), $ph[0]['title']], + 'body' => ['body', t('Your message (optional)'), $edit_body, t('This will only appear in the optional status post attached to this photo')], + 'tag_label' => t('Add a Tag'), + 'permissions' => t('Permissions'), + 'aclselect' => $aclselect_e, + 'allow_cid' => acl2json($ph[0]['allow_cid']), + 'allow_gid' => acl2json($ph[0]['allow_gid']), + 'deny_cid' => acl2json($ph[0]['deny_cid']), + 'deny_gid' => acl2json($ph[0]['deny_gid']), + 'lockstate' => $lockstate[0], + 'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'), + 'item_id' => ((count($linked_items)) ? $link_item['id'] : 0), + 'adult_enabled' => feature_enabled($owner_uid, 'adult_photo_flagging'), + 'adult' => array('adult', t('Flag as adult in album view'), intval($ph[0]['is_nsfw']), ''), + 'submit' => t('Submit'), + 'delete' => t('Delete Photo'), + 'expandform' => ((x($_GET, 'expandform')) ? true : false) + ]; + } + + if (count($linked_items)) { + $cmnt_tpl = get_markup_template('comment_item.tpl'); + $tpl = get_markup_template('photo_item.tpl'); + $return_url = App::$cmd; + + $like_tpl = get_markup_template('like_noshare.tpl'); + + $likebuttons = ''; + $ilike = false; + $inolike = false; - if ($items) { - foreach ($items as $i) { - if ($i['verb'] === 'Like' && $i['author_xchan'] === get_observer_hash() && $i['thr_parent'] = $link_item['mid']) { - $ilike = true; - } - if ($i['verb'] === 'Dislike' && $i['author_xchan'] === get_observer_hash() && $i['thr_parent'] === $link_item['mid']) { - $inolike = true; - } - } - } - - if($observer && ($can_post || $can_comment)) { - $likebuttons = [ - 'id' => $link_item['id'], - 'likethis' => t('I like this'), - 'ilike' => $ilike, - 'inolike' => $inolike, - 'nolike' => t('I don\'t like this'), - 'unlikethis' => t('Undo like'), - 'unnolike' => t('Undo dislike'), - 'share' => t('Share'), - 'wait' => t('Please wait') - ]; - } + if ($items) { + foreach ($items as $i) { + if ($i['verb'] === 'Like' && $i['author_xchan'] === get_observer_hash() && $i['thr_parent'] = $link_item['mid']) { + $ilike = true; + } + if ($i['verb'] === 'Dislike' && $i['author_xchan'] === get_observer_hash() && $i['thr_parent'] === $link_item['mid']) { + $inolike = true; + } + } + } - $comments = ''; - if(! $comment_items) { - if($observer && ($can_post || $can_comment)) { - $commentbox = replace_macros($cmnt_tpl,array( - '$return_path' => '', - '$mode' => 'photos', - '$jsreload' => $return_url, - '$type' => 'wall-comment', - '$id' => $link_item['id'], - '$parent' => $link_item['id'], - '$profile_uid' => $owner_uid, - '$mylink' => $observer['xchan_url'], - '$mytitle' => t('This is you'), - '$myphoto' => $observer['xchan_photo_s'], - '$comment' => t('Comment'), - '$submit' => t('Submit'), - '$preview' => t('Preview'), - '$auto_save_draft' => 'true', - '$ww' => '', - '$feature_encrypt' => false - )); - } - } - - $alike = []; - $dlike = []; - - $like = ''; - $dislike = ''; - - $conv_responses = [ - 'like' => [ 'title' => t('Likes','title') ], - 'dislike' => [ 'title' => t('Dislikes','title') ], - 'attendyes' => [ 'title' => t('Attending','title') ], - 'attendno' => [ 'title' => t('Not attending','title') ], - 'attendmaybe' => [ 'title' => t('Might attend' ,'title') ] - ]; - - if($r) { - - foreach($r as $item) { - builtin_activity_puller($item, $conv_responses); - } - - $like_count = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid']] : ''); - $like_list = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : ''); + if ($observer && ($can_post || $can_comment)) { + $likebuttons = [ + 'id' => $link_item['id'], + 'likethis' => t('I like this'), + 'ilike' => $ilike, + 'inolike' => $inolike, + 'nolike' => t('I don\'t like this'), + 'unlikethis' => t('Undo like'), + 'unnolike' => t('Undo dislike'), + 'share' => t('Share'), + 'wait' => t('Please wait') + ]; + } - if(is_array($like_list) && (count($like_list) > MAX_LIKERS)) { - $like_list_part = array_slice($like_list, 0, MAX_LIKERS); - array_push($like_list_part, '' . t('View all') . ''); - } else { - $like_list_part = ''; - } - $like_button_label = tt('Like','Likes',$like_count,'noun'); - - $dislike_count = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid']] : ''); - $dislike_list = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid'] . '-l'] : ''); - $dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun'); - if (is_array($dislike_list) && (count($dislike_list) > MAX_LIKERS)) { - $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS); - array_push($dislike_list_part, '' . t('View all') . ''); - } else { - $dislike_list_part = ''; - } + $comments = ''; + if (!$comment_items) { + if ($observer && ($can_post || $can_comment)) { + $commentbox = replace_macros($cmnt_tpl, array( + '$return_path' => '', + '$mode' => 'photos', + '$jsreload' => $return_url, + '$type' => 'wall-comment', + '$id' => $link_item['id'], + '$parent' => $link_item['id'], + '$profile_uid' => $owner_uid, + '$mylink' => $observer['xchan_url'], + '$mytitle' => t('This is you'), + '$myphoto' => $observer['xchan_photo_s'], + '$comment' => t('Comment'), + '$submit' => t('Submit'), + '$preview' => t('Preview'), + '$auto_save_draft' => 'true', + '$ww' => '', + '$feature_encrypt' => false + )); + } + } - - - $like = ((isset($alike[$link_item['mid']])) ? format_like($alike[$link_item['mid']],$alike[$link_item['mid'] . '-l'],'like',$link_item['mid']) : ''); - $dislike = ((isset($dlike[$link_item['mid']])) ? format_like($dlike[$link_item['mid']],$dlike[$link_item['mid'] . '-l'],'dislike',$link_item['mid']) : ''); - - // display comments - - foreach ($comment_items as $item) { - $comment = ''; - $template = $tpl; - $sparkle = ''; - - if (! visible_activity($item)) { - continue; - } - - $profile_url = zid($item['author']['xchan_url']); - $profile_name = $item['author']['xchan_name']; - $profile_avatar = $item['author']['xchan_photo_m']; - - $profile_link = $profile_url; - - $drop = ''; - - if($observer['xchan_hash'] === $item['author_xchan'] || $observer['xchan_hash'] === $item['owner_xchan']) - $drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); - - - $name_e = $profile_name; - $title_e = $item['title']; - unobscure($item); - $body_e = prepare_text($item['body'],$item['mimetype']); - - $comments .= replace_macros($template,array( - '$id' => $item['id'], - '$mode' => 'photos', - '$profile_url' => $profile_link, - '$name' => $name_e, - '$thumb' => $profile_avatar, - '$sparkle' => $sparkle, - '$title' => $title_e, - '$body' => $body_e, - '$ago' => relative_date($item['created']), - '$indent' => (($item['parent'] != $item['id']) ? ' comment' : ''), - '$drop' => $drop, - '$comment' => $comment - )); - - } - - if($observer && ($can_post || $can_comment)) { - $commentbox = replace_macros($cmnt_tpl,array( - '$return_path' => '', - '$jsreload' => $return_url, - '$type' => 'wall-comment', - '$id' => $link_item['id'], - '$parent' => $link_item['id'], - '$profile_uid' => $owner_uid, - '$mylink' => $observer['xchan_url'], - '$mytitle' => t('This is you'), - '$myphoto' => $observer['xchan_photo_s'], - '$comment' => t('Comment'), - '$submit' => t('Submit'), - '$ww' => '' - )); - } - - } - $paginate = paginate($a); - } - - $album_e = [ $album_link, $ph[0]['album'] ]; - $like_e = $like; - $dislike_e = $dislike; - - - $response_verbs = array('like','dislike'); - - $responses = get_responses($conv_responses,$response_verbs,'',$link_item); - - $o .= replace_macros(get_markup_template('photo_view.tpl'), [ - '$id' => $ph[0]['id'], - '$album' => $album_e, - '$tools_label' => t('Photo Tools'), - '$tools' => $tools, - '$lock' => $lockstate[1], - '$photo' => $photo, - '$prevlink' => $prevlink, - '$nextlink' => $nextlink, - '$title' => $ph[0]['title'], - '$desc' => $ph[0]['description'], - '$filename' => $ph[0]['filename'], - '$unknown' => t('Unknown'), - '$tag_hdr' => t('In This Photo:'), - '$tags' => $tags, - 'responses' => $responses, - '$edit' => $edit, - '$map' => $map, - '$map_text' => t('Map'), - '$likebuttons' => $likebuttons, - '$like' => $like_e, - '$dislike' => $dislike_e, - '$like_count' => $like_count, - '$like_list' => $like_list, - '$like_list_part' => $like_list_part, - '$like_button_label' => $like_button_label, - '$like_modal_title' => t('Likes','noun'), - '$dislike_modal_title' => t('Dislikes','noun'), - '$dislike_count' => $dislike_count, - '$dislike_list' => $dislike_list, - '$dislike_list_part' => $dislike_list_part, - '$dislike_button_label' => $dislike_button_label, - '$modal_dismiss' => t('Close'), - '$comments' => $comments, - '$commentbox' => $commentbox, - '$paginate' => $paginate, - ]); - - App::$data['photo_html'] = $o; - return $o; - } - - // Default - show recent photos - - head_add_link([ - 'rel' => 'alternate', - 'type' => 'application/json+oembed', - 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string), - 'title' => 'oembed' - ]); + $alike = []; + $dlike = []; - App::set_pager_itemspage(60); - - $r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created, p.display_path FROM photo p + $like = ''; + $dislike = ''; + + $conv_responses = [ + 'like' => ['title' => t('Likes', 'title')], + 'dislike' => ['title' => t('Dislikes', 'title')], + 'attendyes' => ['title' => t('Attending', 'title')], + 'attendno' => ['title' => t('Not attending', 'title')], + 'attendmaybe' => ['title' => t('Might attend', 'title')] + ]; + + if ($r) { + foreach ($r as $item) { + builtin_activity_puller($item, $conv_responses); + } + + $like_count = ((x($alike, $link_item['mid'])) ? $alike[$link_item['mid']] : ''); + $like_list = ((x($alike, $link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : ''); + + if (is_array($like_list) && (count($like_list) > MAX_LIKERS)) { + $like_list_part = array_slice($like_list, 0, MAX_LIKERS); + array_push($like_list_part, '' . t('View all') . ''); + } else { + $like_list_part = ''; + } + $like_button_label = tt('Like', 'Likes', $like_count, 'noun'); + + $dislike_count = ((x($dlike, $link_item['mid'])) ? $dlike[$link_item['mid']] : ''); + $dislike_list = ((x($dlike, $link_item['mid'])) ? $dlike[$link_item['mid'] . '-l'] : ''); + $dislike_button_label = tt('Dislike', 'Dislikes', $dislike_count, 'noun'); + if (is_array($dislike_list) && (count($dislike_list) > MAX_LIKERS)) { + $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS); + array_push($dislike_list_part, '' . t('View all') . ''); + } else { + $dislike_list_part = ''; + } + + + $like = ((isset($alike[$link_item['mid']])) ? format_like($alike[$link_item['mid']], $alike[$link_item['mid'] . '-l'], 'like', $link_item['mid']) : ''); + $dislike = ((isset($dlike[$link_item['mid']])) ? format_like($dlike[$link_item['mid']], $dlike[$link_item['mid'] . '-l'], 'dislike', $link_item['mid']) : ''); + + // display comments + + foreach ($comment_items as $item) { + $comment = ''; + $template = $tpl; + $sparkle = ''; + + if (!visible_activity($item)) { + continue; + } + + $profile_url = zid($item['author']['xchan_url']); + $profile_name = $item['author']['xchan_name']; + $profile_avatar = $item['author']['xchan_photo_m']; + + $profile_link = $profile_url; + + $drop = ''; + + if ($observer['xchan_hash'] === $item['author_xchan'] || $observer['xchan_hash'] === $item['owner_xchan']) { + $drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); + } + + + $name_e = $profile_name; + $title_e = $item['title']; + unobscure($item); + $body_e = prepare_text($item['body'], $item['mimetype']); + + $comments .= replace_macros($template, array( + '$id' => $item['id'], + '$mode' => 'photos', + '$profile_url' => $profile_link, + '$name' => $name_e, + '$thumb' => $profile_avatar, + '$sparkle' => $sparkle, + '$title' => $title_e, + '$body' => $body_e, + '$ago' => relative_date($item['created']), + '$indent' => (($item['parent'] != $item['id']) ? ' comment' : ''), + '$drop' => $drop, + '$comment' => $comment + )); + } + + if ($observer && ($can_post || $can_comment)) { + $commentbox = replace_macros($cmnt_tpl, array( + '$return_path' => '', + '$jsreload' => $return_url, + '$type' => 'wall-comment', + '$id' => $link_item['id'], + '$parent' => $link_item['id'], + '$profile_uid' => $owner_uid, + '$mylink' => $observer['xchan_url'], + '$mytitle' => t('This is you'), + '$myphoto' => $observer['xchan_photo_s'], + '$comment' => t('Comment'), + '$submit' => t('Submit'), + '$ww' => '' + )); + } + } + $paginate = paginate($a); + } + + $album_e = [$album_link, $ph[0]['album']]; + $like_e = $like; + $dislike_e = $dislike; + + + $response_verbs = array('like', 'dislike'); + + $responses = get_responses($conv_responses, $response_verbs, '', $link_item); + + $o .= replace_macros(get_markup_template('photo_view.tpl'), [ + '$id' => $ph[0]['id'], + '$album' => $album_e, + '$tools_label' => t('Photo Tools'), + '$tools' => $tools, + '$lock' => $lockstate[1], + '$photo' => $photo, + '$prevlink' => $prevlink, + '$nextlink' => $nextlink, + '$title' => $ph[0]['title'], + '$desc' => $ph[0]['description'], + '$filename' => $ph[0]['filename'], + '$unknown' => t('Unknown'), + '$tag_hdr' => t('In This Photo:'), + '$tags' => $tags, + 'responses' => $responses, + '$edit' => $edit, + '$map' => $map, + '$map_text' => t('Map'), + '$likebuttons' => $likebuttons, + '$like' => $like_e, + '$dislike' => $dislike_e, + '$like_count' => $like_count, + '$like_list' => $like_list, + '$like_list_part' => $like_list_part, + '$like_button_label' => $like_button_label, + '$like_modal_title' => t('Likes', 'noun'), + '$dislike_modal_title' => t('Dislikes', 'noun'), + '$dislike_count' => $dislike_count, + '$dislike_list' => $dislike_list, + '$dislike_list_part' => $dislike_list_part, + '$dislike_button_label' => $dislike_button_label, + '$modal_dismiss' => t('Close'), + '$comments' => $comments, + '$commentbox' => $commentbox, + '$paginate' => $paginate, + ]); + + App::$data['photo_html'] = $o; + return $o; + } + + // Default - show recent photos + + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string), + 'title' => 'oembed' + ]); + + App::set_pager_itemspage(60); + + $r = q( + "SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created, p.display_path FROM photo p INNER JOIN ( SELECT resource_id, max(imgscale) imgscale FROM photo WHERE photo.uid = %d AND photo_usage IN ( %d, %d ) AND is_nsfw = %d $sql_extra group by resource_id ) ph ON (p.resource_id = ph.resource_id and p.imgscale = ph.imgscale) ORDER by p.created DESC LIMIT %d OFFSET %d", - intval(App::$data['channel']['channel_id']), - intval(PHOTO_NORMAL), - intval(PHOTO_PROFILE), - intval($unsafe), - intval(App::$pager['itemspage']), - intval(App::$pager['start']) - ); - - $photos = []; - if($r) { - $twist = 'rotright'; - foreach($r as $rr) { + intval(App::$data['channel']['channel_id']), + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE), + intval($unsafe), + intval(App::$pager['itemspage']), + intval(App::$pager['start']) + ); - if(! attach_can_view_folder(App::$data['channel']['channel_id'],get_observer_hash(),$rr['resource_id'])) - continue; + $photos = []; + if ($r) { + $twist = 'rotright'; + foreach ($r as $rr) { + if (!attach_can_view_folder(App::$data['channel']['channel_id'], get_observer_hash(), $rr['resource_id'])) { + continue; + } - if($twist == 'rotright') - $twist = 'rotleft'; - else - $twist = 'rotright'; - $ext = $phototypes[$rr['mimetype']]; - - $alt_e = $rr['filename']; - $name_e = dirname($rr['display_path']); + if ($twist == 'rotright') { + $twist = 'rotleft'; + } else { + $twist = 'rotright'; + } + $ext = $phototypes[$rr['mimetype']]; - $photos[] = [ - 'id' => $rr['id'], - 'twist' => ' ' . $twist . rand(2,4), - 'link' => z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id'], - 'title' => t('View Photo'), - 'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . ((($rr['imgscale']) == 6) ? 4 : $rr['imgscale']) . '.' . $ext, - 'alt' => $alt_e, - 'album' => [ 'name' => $name_e ], - ]; - } - } - - if($_REQUEST['aj']) { - if($photos) { - $o = replace_macros(get_markup_template('photosajax.tpl'), [ - '$photos' => $photos, - '$album_id' => bin2hex(t('Recent Photos')) - ]); - } - else { - $o = ''; - } - echo $o; - killme(); - } - else { + $alt_e = $rr['filename']; + $name_e = dirname($rr['display_path']); - $o .= ""; + $photos[] = [ + 'id' => $rr['id'], + 'twist' => ' ' . $twist . rand(2, 4), + 'link' => z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id'], + 'title' => t('View Photo'), + 'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . ((($rr['imgscale']) == 6) ? 4 : $rr['imgscale']) . '.' . $ext, + 'alt' => $alt_e, + 'album' => ['name' => $name_e], + ]; + } + } - $o .= replace_macros(get_markup_template('photos_recent.tpl'), [ - '$title' => t('Recent Photos'), - '$album_id' => bin2hex(t('Recent Photos')), - '$file_view' => t('View files'), - '$files_path' => z_root() . '/cloud/' . App::$data['channel']['channel_address'], - '$can_post' => $can_post, - '$upload' => t('Add Photos'), - '$photos' => $photos, - '$upload_form' => $upload_form, - '$usage' => $usage_message - ]); + if ($_REQUEST['aj']) { + if ($photos) { + $o = replace_macros(get_markup_template('photosajax.tpl'), [ + '$photos' => $photos, + '$album_id' => bin2hex(t('Recent Photos')) + ]); + } else { + $o = ''; + } + echo $o; + killme(); + } else { + $o .= ""; - return $o; - } - } + $o .= replace_macros(get_markup_template('photos_recent.tpl'), [ + '$title' => t('Recent Photos'), + '$album_id' => bin2hex(t('Recent Photos')), + '$file_view' => t('View files'), + '$files_path' => z_root() . '/cloud/' . App::$data['channel']['channel_address'], + '$can_post' => $can_post, + '$upload' => t('Add Photos'), + '$photos' => $photos, + '$upload_form' => $upload_form, + '$usage' => $usage_message + ]); + + return $o; + } + } } diff --git a/Zotlabs/Module/Pin.php b/Zotlabs/Module/Pin.php index 1daa7c524..547882cf6 100644 --- a/Zotlabs/Module/Pin.php +++ b/Zotlabs/Module/Pin.php @@ -1,4 +1,5 @@ '%s' $seenstr $item_normal $sql_extra", - intval($sys['channel_id']), - dbesc($loadtime) - ); + intval($sys['channel_id']), + dbesc($loadtime) + ); - if ($pubs) { - foreach($pubs as $p) { - if ($p['author_xchan'] === get_observer_hash()) { - $my_activity ++; - } - else { - $result['pubs'] ++; - } - } - } - } - - if ((argc() > 1) && (argv(1) === 'pubs') && ($notify_pubs)) { + if ($pubs) { + foreach ($pubs as $p) { + if ($p['author_xchan'] === get_observer_hash()) { + $my_activity++; + } else { + $result['pubs']++; + } + } + } + } - $local_result = []; + if ((argc() > 1) && (argv(1) === 'pubs') && ($notify_pubs)) { + $local_result = []; - $r = q("SELECT * FROM item + $r = q( + "SELECT * FROM item WHERE uid = %d AND author_xchan != '%s' AND created > '%s' @@ -191,150 +197,156 @@ class Ping extends Controller { $sql_extra ORDER BY created DESC LIMIT 300", - intval($sys['channel_id']), - dbesc(get_observer_hash()), - dbesc($loadtime) - ); + intval($sys['channel_id']), + dbesc(get_observer_hash()), + dbesc($loadtime) + ); - if ($r) { - xchan_query($r); - foreach ($r as $rr) { - $rr['llink'] = str_replace('display/', 'pubstream/?f=&mid=', $rr['llink']); - $z = Enotify::format($rr); - if ($z) { - $local_result[] = $z; - } - } - } + if ($r) { + xchan_query($r); + foreach ($r as $rr) { + $rr['llink'] = str_replace('display/', 'pubstream/?f=&mid=', $rr['llink']); + $z = Enotify::format($rr); + if ($z) { + $local_result[] = $z; + } + } + } - json_return_and_die( [ 'notify' => $local_result ] ); - } + json_return_and_die(['notify' => $local_result]); + } - if ((! local_channel()) || ($result['invalid'])) { - json_return_and_die($result); - } + if ((!local_channel()) || ($result['invalid'])) { + json_return_and_die($result); + } - /** - * Everything following is only permitted under the context of a locally authenticated site member. - */ + /** + * Everything following is only permitted under the context of a locally authenticated site member. + */ - /** - * Handle "mark all xyz notifications read" requests. - */ + /** + * Handle "mark all xyz notifications read" requests. + */ - // mark all items read - if (x($_REQUEST, 'markRead') && local_channel() && (! $_SESSION['sudo'])) { - switch ($_REQUEST['markRead']) { - case 'stream': - $r = q("UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1", - intval(local_channel()) - ); - $_SESSION['loadtime_stream'] = datetime_convert(); - PConfig::Set(local_channel(),'system','loadtime_stream',$_SESSION['loadtime_stream']); - $_SESSION['loadtime_channel'] = datetime_convert(); - PConfig::Set(local_channel(),'system','loadtime_channel',$_SESSION['loadtime_channel']); - break; - case 'home': - $r = q("UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1 AND item_wall = 1", - intval(local_channel()) - ); - $_SESSION['loadtime_channel'] = datetime_convert(); - PConfig::Set(local_channel(),'system','loadtime_channel',$_SESSION['loadtime_channel']); - break; - case 'all_events': - $r = q("UPDATE event SET dismissed = 1 WHERE uid = %d AND dismissed = 0 AND dtstart < '%s' AND dtstart > '%s' ", - intval(local_channel()), - dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')), - dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) - ); - break; - case 'notify': - $r = q("update notify set seen = 1 where uid = %d", - intval(local_channel()) - ); - break; - case 'pubs': + // mark all items read + if (x($_REQUEST, 'markRead') && local_channel() && (!$_SESSION['sudo'])) { + switch ($_REQUEST['markRead']) { + case 'stream': + $r = q( + "UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1", + intval(local_channel()) + ); + $_SESSION['loadtime_stream'] = datetime_convert(); + PConfig::Set(local_channel(), 'system', 'loadtime_stream', $_SESSION['loadtime_stream']); + $_SESSION['loadtime_channel'] = datetime_convert(); + PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']); + break; + case 'home': + $r = q( + "UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1 AND item_wall = 1", + intval(local_channel()) + ); + $_SESSION['loadtime_channel'] = datetime_convert(); + PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']); + break; + case 'all_events': + $r = q( + "UPDATE event SET dismissed = 1 WHERE uid = %d AND dismissed = 0 AND dtstart < '%s' AND dtstart > '%s' ", + intval(local_channel()), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) + ); + break; + case 'notify': + $r = q( + "update notify set seen = 1 where uid = %d", + intval(local_channel()) + ); + break; + case 'pubs': + $_SESSION['loadtime_pubstream'] = datetime_convert(); + PConfig::Set(local_channel(), 'system', 'loadtime_pubstream', $_SESSION['loadtime_pubstream']); + break; + default: + break; + } + } - $_SESSION['loadtime_pubstream'] = datetime_convert(); - PConfig::Set(local_channel(),'system','loadtime_pubstream',$_SESSION['loadtime_pubstream']); - break; - default: - break; - } - } + if (x($_REQUEST, 'markItemRead') && local_channel() && (!$_SESSION['sudo'])) { + $r = q( + "UPDATE item SET item_unseen = 0 WHERE uid = %d AND parent = %d", + intval(local_channel()), + intval($_REQUEST['markItemRead']) + ); + $id = intval($_REQUEST['markItemRead']); + $seen = PConfig::Get(local_channel(), 'system', 'seen_items', []); + if (!in_array($id, $seen)) { + $seen[] = $id; + } + PConfig::Set(local_channel(), 'system', 'seen_items', $seen); + } - if (x($_REQUEST, 'markItemRead') && local_channel() && (! $_SESSION['sudo'])) { - $r = q("UPDATE item SET item_unseen = 0 WHERE uid = %d AND parent = %d", - intval(local_channel()), - intval($_REQUEST['markItemRead']) - ); - $id = intval($_REQUEST['markItemRead']); - $seen = PConfig::Get(local_channel(),'system','seen_items',[]); - if (! in_array($id,$seen)) { - $seen[] = $id; - } - PConfig::Set(local_channel(),'system','seen_items',$seen); - } + /** + * URL ping/something will return detail for "something", e.g. a json list with which to populate a notification + * dropdown menu. + */ - /** - * URL ping/something will return detail for "something", e.g. a json list with which to populate a notification - * dropdown menu. - */ - - if (argc() > 1 && argv(1) === 'notify') { + if (argc() > 1 && argv(1) === 'notify') { + $t = q( + "SELECT * FROM notify WHERE uid = %d AND seen = 0 ORDER BY CREATED DESC", + intval(local_channel()) + ); - $t = q("SELECT * FROM notify WHERE uid = %d AND seen = 0 ORDER BY CREATED DESC", - intval(local_channel()) - ); + if ($t) { + foreach ($t as $tt) { + $message = trim(strip_tags(bbcode($tt['msg']))); - if ($t) { - foreach ($t as $tt) { - $message = trim(strip_tags(bbcode($tt['msg']))); - - if (strpos($message, $tt['xname']) === 0) - $message = substr($message, strlen($tt['xname']) + 1); + if (strpos($message, $tt['xname']) === 0) { + $message = substr($message, strlen($tt['xname']) + 1); + } - $mid = basename($tt['link']); - $mid = unpack_link_id($mid); + $mid = basename($tt['link']); + $mid = unpack_link_id($mid); - if (in_array($tt['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) { - // we need the thread parent - $r = q("select thr_parent from item where mid = '%s' and uid = %d limit 1", - dbesc($mid), - intval(local_channel()) - ); + if (in_array($tt['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) { + // we need the thread parent + $r = q( + "select thr_parent from item where mid = '%s' and uid = %d limit 1", + dbesc($mid), + intval(local_channel()) + ); - $b64mid = ((strpos($r[0]['thr_parent'], 'b64.') === 0) ? $r[0]['thr_parent'] : gen_link_id($r[0]['thr_parent'])); - } - else { - $b64mid = ((strpos($mid, 'b64.') === 0) ? $mid : gen_link_id($mid)); - } + $b64mid = ((strpos($r[0]['thr_parent'], 'b64.') === 0) ? $r[0]['thr_parent'] : gen_link_id($r[0]['thr_parent'])); + } else { + $b64mid = ((strpos($mid, 'b64.') === 0) ? $mid : gen_link_id($mid)); + } - $notifs[] = array( - 'notify_link' => z_root() . '/notify/view/' . $tt['id'], - 'name' => $tt['xname'], - 'url' => $tt['url'], - 'photo' => $tt['photo'], - 'when' => relative_date($tt['created']), - 'hclass' => (($tt['seen']) ? 'notify-seen' : 'notify-unseen'), - 'b64mid' => (($tt['otype'] == 'item') ? $b64mid : 'undefined'), - 'notify_id' => (($tt['otype'] == 'item') ? $tt['id'] : 'undefined'), - 'message' => $message - ); - } - } + $notifs[] = array( + 'notify_link' => z_root() . '/notify/view/' . $tt['id'], + 'name' => $tt['xname'], + 'url' => $tt['url'], + 'photo' => $tt['photo'], + 'when' => relative_date($tt['created']), + 'hclass' => (($tt['seen']) ? 'notify-seen' : 'notify-unseen'), + 'b64mid' => (($tt['otype'] == 'item') ? $b64mid : 'undefined'), + 'notify_id' => (($tt['otype'] == 'item') ? $tt['id'] : 'undefined'), + 'message' => $message + ); + } + } - json_return_and_die( [ 'notify' => $notifs ] ); - } + json_return_and_die(['notify' => $notifs]); + } - if (argc() > 1 && (argv(1) === 'stream')) { - $local_result = []; + if (argc() > 1 && (argv(1) === 'stream')) { + $local_result = []; - $item_normal_moderate = $item_normal; - $loadtime = get_loadtime('stream'); - - $r = q("SELECT * FROM item + $item_normal_moderate = $item_normal; + $loadtime = get_loadtime('stream'); + + $r = q( + "SELECT * FROM item WHERE uid = %d AND author_xchan != '%s' AND changed > '%s' @@ -343,34 +355,35 @@ class Ping extends Controller { $sql_extra ORDER BY created DESC LIMIT 300", - intval(local_channel()), - dbesc($ob_hash), - dbesc($loadtime) - ); - if ($r) { - xchan_query($r); - foreach ($r as $item) { - $z = Enotify::format($item); + intval(local_channel()), + dbesc($ob_hash), + dbesc($loadtime) + ); + if ($r) { + xchan_query($r); + foreach ($r as $item) { + $z = Enotify::format($item); - if($z) { - $local_result[] = $z; - } - } - } + if ($z) { + $local_result[] = $z; + } + } + } - json_return_and_die( [ 'notify' => $local_result ] ); - } + json_return_and_die(['notify' => $local_result]); + } - if (argc() > 1 && (argv(1) === 'home')) { - $local_result = []; - $item_normal_moderate = $item_normal; + if (argc() > 1 && (argv(1) === 'home')) { + $local_result = []; + $item_normal_moderate = $item_normal; - $sql_extra .= " and item_wall = 1 "; - $item_normal_moderate = item_normal_moderate(); + $sql_extra .= " and item_wall = 1 "; + $item_normal_moderate = item_normal_moderate(); - $loadtime = get_loadtime('channel'); + $loadtime = get_loadtime('channel'); - $r = q("SELECT * FROM item + $r = q( + "SELECT * FROM item WHERE uid = %d AND author_xchan != '%s' AND changed > '%s' @@ -379,406 +392,416 @@ class Ping extends Controller { $sql_extra ORDER BY created DESC LIMIT 300", - intval(local_channel()), - dbesc($ob_hash), - dbesc($loadtime) - ); - if ($r) { - xchan_query($r); - foreach ($r as $item) { - $z = Enotify::format($item); + intval(local_channel()), + dbesc($ob_hash), + dbesc($loadtime) + ); + if ($r) { + xchan_query($r); + foreach ($r as $item) { + $z = Enotify::format($item); - if($z) { - $local_result[] = $z; - } - } - } + if ($z) { + $local_result[] = $z; + } + } + } - json_return_and_die( [ 'notify' => $local_result ] ); - } + json_return_and_die(['notify' => $local_result]); + } + if (argc() > 1 && (argv(1) === 'intros')) { + $local_result = []; - if (argc() > 1 && (argv(1) === 'intros')) { - $local_result = []; + $r = q( + "SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ORDER BY abook_created DESC LIMIT 50", + intval(local_channel()) + ); - $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ORDER BY abook_created DESC LIMIT 50", - intval(local_channel()) - ); + if ($r) { + foreach ($r as $rr) { + $local_result[] = [ + 'notify_link' => z_root() . '/connections/' . $rr['abook_id'], + 'name' => $rr['xchan_name'], + 'addr' => $rr['xchan_addr'], + 'url' => $rr['xchan_url'], + 'photo' => $rr['xchan_photo_s'], + 'when' => relative_date($rr['abook_created']), + 'hclass' => ('notify-unseen'), + 'message' => t('added your channel') + ]; + } + } - if ($r) { - foreach ($r as $rr) { - $local_result[] = [ - 'notify_link' => z_root() . '/connections/' . $rr['abook_id'], - 'name' => $rr['xchan_name'], - 'addr' => $rr['xchan_addr'], - 'url' => $rr['xchan_url'], - 'photo' => $rr['xchan_photo_s'], - 'when' => relative_date($rr['abook_created']), - 'hclass' => ('notify-unseen'), - 'message' => t('added your channel') - ]; - } - } + json_return_and_die(['notify' => $local_result]); + } - json_return_and_die( [ 'notify' => $local_result ] ); - } + if ((argc() > 1 && (argv(1) === 'register')) && is_site_admin()) { + $result = []; - if( (argc() > 1 && (argv(1) === 'register')) && is_site_admin()) { - $result = []; + $r = q( + "SELECT account_email, account_created from account where (account_flags & %d) > 0", + intval(ACCOUNT_PENDING) + ); + if ($r) { + foreach ($r as $rr) { + $result[] = array( + 'notify_link' => z_root() . '/admin/accounts', + 'name' => $rr['account_email'], + 'addr' => $rr['account_email'], + 'url' => '', + 'photo' => z_root() . '/' . get_default_profile_photo(48), + 'when' => relative_date($rr['account_created']), + 'hclass' => ('notify-unseen'), + 'message' => t('requires approval') + ); + } + } - $r = q("SELECT account_email, account_created from account where (account_flags & %d) > 0", - intval(ACCOUNT_PENDING) - ); - if ($r) { - foreach ($r as $rr) { - $result[] = array( - 'notify_link' => z_root() . '/admin/accounts', - 'name' => $rr['account_email'], - 'addr' => $rr['account_email'], - 'url' => '', - 'photo' => z_root() . '/' . get_default_profile_photo(48), - 'when' => relative_date($rr['account_created']), - 'hclass' => ('notify-unseen'), - 'message' => t('requires approval') - ); - } - } + json_return_and_die(['notify' => $result]); + } - json_return_and_die( [ 'notify' => $result ] ); - } + if (argc() > 1 && (argv(1) === 'all_events')) { + $bd_format = t('g A l F d'); // 8 AM Friday January 18 - if (argc() > 1 && (argv(1) === 'all_events')) { - $bd_format = t('g A l F d') ; // 8 AM Friday January 18 + $result = []; - $result = []; - - $r = q("SELECT * FROM event left join xchan on event_xchan = xchan_hash + $r = q( + "SELECT * FROM event left join xchan on event_xchan = xchan_hash WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0 and etype in ( 'event', 'birthday' ) ORDER BY dtstart DESC LIMIT 1000", - intval(local_channel()), - dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')), - dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) - ); + intval(local_channel()), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) + ); - if ($r) { - foreach ($r as $rr) { + if ($r) { + foreach ($r as $rr) { + $strt = datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart']); + $today = ((substr($strt, 0, 10) === datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d')) ? true : false); + $when = day_translate(datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart'], $bd_format)) . (($today) ? ' ' . t('[today]') : ''); - $strt = datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart']); - $today = ((substr($strt, 0, 10) === datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d')) ? true : false); - $when = day_translate(datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart'], $bd_format)) . (($today) ? ' ' . t('[today]') : ''); + $result[] = array( + 'notify_link' => z_root() . '/events', /// @FIXME this takes you to an edit page and it may not be yours, we really want to just view the single event --> '/events/event/' . $rr['event_hash'], + 'name' => $rr['xchan_name'], + 'addr' => $rr['xchan_addr'], + 'url' => $rr['xchan_url'], + 'photo' => $rr['xchan_photo_s'], + 'when' => $when, + 'hclass' => ('notify-unseen'), + 'message' => t('posted an event') + ); + } + } - $result[] = array( - 'notify_link' => z_root() . '/events', /// @FIXME this takes you to an edit page and it may not be yours, we really want to just view the single event --> '/events/event/' . $rr['event_hash'], - 'name' => $rr['xchan_name'], - 'addr' => $rr['xchan_addr'], - 'url' => $rr['xchan_url'], - 'photo' => $rr['xchan_photo_s'], - 'when' => $when, - 'hclass' => ('notify-unseen'), - 'message' => t('posted an event') - ); - } - } + json_return_and_die(['notify' => $result]); + } - json_return_and_die( [ 'notify' => $result ] ); - } + if (argc() > 1 && (argv(1) === 'files')) { + $result = []; - if (argc() > 1 && (argv(1) === 'files')) { - $result = []; - - $r = q("SELECT item.created, xchan.xchan_name, xchan.xchan_addr, xchan.xchan_url, xchan.xchan_photo_s FROM item + $r = q( + "SELECT item.created, xchan.xchan_name, xchan.xchan_addr, xchan.xchan_url, xchan.xchan_photo_s FROM item LEFT JOIN xchan on author_xchan = xchan_hash WHERE item.verb = '%s' AND item.obj_type = '%s' AND item.uid = %d AND item.owner_xchan != '%s' AND item.item_unseen = 1", - dbesc(ACTIVITY_POST), - dbesc(ACTIVITY_OBJ_FILE), - intval(local_channel()), - dbesc($ob_hash) - ); - if ($r) { - foreach ($r as $rr) { - $result[] = array( - 'notify_link' => z_root() . '/sharedwithme', - 'name' => $rr['xchan_name'], - 'addr' => $rr['xchan_addr'], - 'url' => $rr['xchan_url'], - 'photo' => $rr['xchan_photo_s'], - 'when' => relative_date($rr['created']), - 'hclass' => ('notify-unseen'), - 'message' => t('shared a file with you') - ); - } - } + dbesc(ACTIVITY_POST), + dbesc(ACTIVITY_OBJ_FILE), + intval(local_channel()), + dbesc($ob_hash) + ); + if ($r) { + foreach ($r as $rr) { + $result[] = array( + 'notify_link' => z_root() . '/sharedwithme', + 'name' => $rr['xchan_name'], + 'addr' => $rr['xchan_addr'], + 'url' => $rr['xchan_url'], + 'photo' => $rr['xchan_photo_s'], + 'when' => relative_date($rr['created']), + 'hclass' => ('notify-unseen'), + 'message' => t('shared a file with you') + ); + } + } - json_return_and_die( [ 'notify' => $result ] ); - } + json_return_and_die(['notify' => $result]); + } - if (argc() > 1 && (argv(1) === 'reports') && is_site_admin()) { + if (argc() > 1 && (argv(1) === 'reports') && is_site_admin()) { + $local_result = []; - $local_result = []; - - $r = q("SELECT item.created, xchan.xchan_name, xchan.xchan_addr, xchan.xchan_url, xchan.xchan_photo_s FROM item + $r = q( + "SELECT item.created, xchan.xchan_name, xchan.xchan_addr, xchan.xchan_url, xchan.xchan_photo_s FROM item LEFT JOIN xchan on author_xchan = xchan_hash WHERE item.type = '%s' AND item.item_unseen = 1", - dbesc(ITEM_TYPE_REPORT) - ); + dbesc(ITEM_TYPE_REPORT) + ); - if ($r) { - foreach ($r as $rv) { - $result[] = [ - 'notify_link' => z_root() . '/reports', - 'name' => $rv['xchan_name'], - 'addr' => $rv['xchan_addr'], - 'url' => $rv['xchan_url'], - 'photo' => $rv['xchan_photo_s'], - 'when' => relative_date($rv['created']), - 'hclass' => ('notify-unseen'), - 'message' => t('reported content') - ]; - } - } + if ($r) { + foreach ($r as $rv) { + $result[] = [ + 'notify_link' => z_root() . '/reports', + 'name' => $rv['xchan_name'], + 'addr' => $rv['xchan_addr'], + 'url' => $rv['xchan_url'], + 'photo' => $rv['xchan_photo_s'], + 'when' => relative_date($rv['created']), + 'hclass' => ('notify-unseen'), + 'message' => t('reported content') + ]; + } + } - json_return_and_die( [ 'notify' => $result ] ); - } + json_return_and_die(['notify' => $result]); + } + /** + * Normal ping - just the counts, no detail + */ - /** - * Normal ping - just the counts, no detail - */ + if ($vnotify & VNOTIFY_SYSTEM) { + $t = q( + "select count(*) as total from notify where uid = %d and seen = 0", + intval(local_channel()) + ); + if ($t) { + $result['notify'] = intval($t[0]['total']); + } + } - - if ($vnotify & VNOTIFY_SYSTEM) { - $t = q("select count(*) as total from notify where uid = %d and seen = 0", - intval(local_channel()) - ); - if ($t) - $result['notify'] = intval($t[0]['total']); - } - - if ($vnotify & VNOTIFY_FILES) { - $files = q("SELECT count(id) as total FROM item + if ($vnotify & VNOTIFY_FILES) { + $files = q( + "SELECT count(id) as total FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s' AND item_unseen = 1", - dbesc(ACTIVITY_POST), - dbesc(ACTIVITY_OBJ_FILE), - intval(local_channel()), - dbesc($ob_hash) - ); - if ($files) - $result['files'] = intval($files[0]['total']); - } + dbesc(ACTIVITY_POST), + dbesc(ACTIVITY_OBJ_FILE), + intval(local_channel()), + dbesc($ob_hash) + ); + if ($files) { + $result['files'] = intval($files[0]['total']); + } + } - if ($vnotify & VNOTIFY_NETWORK) { - $loadtime = get_loadtime('stream'); - $r = q("SELECT id, author_xchan FROM item + if ($vnotify & VNOTIFY_NETWORK) { + $loadtime = get_loadtime('stream'); + $r = q( + "SELECT id, author_xchan FROM item WHERE uid = %d and changed > '%s' $seenstr $item_normal $sql_extra ", - intval(local_channel()), - dbesc($loadtime) - ); + intval(local_channel()), + dbesc($loadtime) + ); - if($r) { - $arr = array('items' => $r); - call_hooks('network_ping', $arr); + if ($r) { + $arr = array('items' => $r); + call_hooks('network_ping', $arr); - foreach ($r as $it) { - if ($it['author_xchan'] === $ob_hash) { - $my_activity ++; - } - else { - $result['stream'] ++; - } - } - } - } - if (! ($vnotify & VNOTIFY_NETWORK)) { - $result['stream'] = 0; - } + foreach ($r as $it) { + if ($it['author_xchan'] === $ob_hash) { + $my_activity++; + } else { + $result['stream']++; + } + } + } + } + if (!($vnotify & VNOTIFY_NETWORK)) { + $result['stream'] = 0; + } - if ($vnotify & VNOTIFY_CHANNEL) { - $loadtime = get_loadtime('channel'); - $r = q("SELECT id, author_xchan FROM item + if ($vnotify & VNOTIFY_CHANNEL) { + $loadtime = get_loadtime('channel'); + $r = q( + "SELECT id, author_xchan FROM item WHERE item_wall = 1 and uid = %d and changed > '%s' $seenstr $item_normal $sql_extra ", - intval(local_channel()), - dbesc($loadtime) - ); + intval(local_channel()), + dbesc($loadtime) + ); - if ($r) { - foreach ($r as $it) { - if ($it['author_xchan'] === $ob_hash) { - $my_activity ++; - } - else { - $result['home'] ++; - } - } - } - } - if (! ($vnotify & VNOTIFY_CHANNEL)) { - $result['home'] = 0; - } + if ($r) { + foreach ($r as $it) { + if ($it['author_xchan'] === $ob_hash) { + $my_activity++; + } else { + $result['home']++; + } + } + } + } + if (!($vnotify & VNOTIFY_CHANNEL)) { + $result['home'] = 0; + } - if ($vnotify & VNOTIFY_INTRO) { - $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ", - intval(local_channel()) - ); + if ($vnotify & VNOTIFY_INTRO) { + $intr = q( + "SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ", + intval(local_channel()) + ); - if ($intr) - $result['intros'] = intval($intr[0]['total']); - } + if ($intr) { + $result['intros'] = intval($intr[0]['total']); + } + } - $channel = App::get_channel(); + $channel = App::get_channel(); - if ($vnotify & VNOTIFY_REGISTER) { - if (App::$config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) { - $regs = q("SELECT count(account_id) as total from account where (account_flags & %d) > 0", - intval(ACCOUNT_PENDING) - ); - if ($regs) - $result['register'] = intval($regs[0]['total']); - } - } + if ($vnotify & VNOTIFY_REGISTER) { + if (App::$config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) { + $regs = q( + "SELECT count(account_id) as total from account where (account_flags & %d) > 0", + intval(ACCOUNT_PENDING) + ); + if ($regs) { + $result['register'] = intval($regs[0]['total']); + } + } + } - if ($vnotify & VNOTIFY_REPORTS) { - if (is_site_admin()) { - $reps = q("SELECT count(id) as total from item where item_type = %d", - intval(ITEM_TYPE_REPORT) - ); - if ($reps) - $result['reports'] = intval($reps[0]['total']); - } - } + if ($vnotify & VNOTIFY_REPORTS) { + if (is_site_admin()) { + $reps = q( + "SELECT count(id) as total from item where item_type = %d", + intval(ITEM_TYPE_REPORT) + ); + if ($reps) { + $result['reports'] = intval($reps[0]['total']); + } + } + } - if ($vnotify & (VNOTIFY_EVENT|VNOTIFY_EVENTTODAY|VNOTIFY_BIRTHDAY)) { - $events = q("SELECT etype, dtstart, adjust FROM event + if ($vnotify & (VNOTIFY_EVENT | VNOTIFY_EVENTTODAY | VNOTIFY_BIRTHDAY)) { + $events = q( + "SELECT etype, dtstart, adjust FROM event WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0 and etype in ( 'event', 'birthday' ) ORDER BY dtstart ASC ", - intval(local_channel()), - dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')), - dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) - ); + intval(local_channel()), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) + ); - if ($events) { - $result['all_events'] = count($events); + if ($events) { + $result['all_events'] = count($events); - if ($result['all_events']) { - $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d'); - foreach ($events as $x) { - $bd = false; - if ($x['etype'] === 'birthday') { - $result['birthdays'] ++; - $bd = true; - } - else { - $result['events'] ++; - } - if (datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['dtstart'], 'Y-m-d') === $str_now) { - $result['all_events_today'] ++; - if($bd) - $result['birthdays_today'] ++; - else - $result['events_today'] ++; - } - } - } - } - } + if ($result['all_events']) { + $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d'); + foreach ($events as $x) { + $bd = false; + if ($x['etype'] === 'birthday') { + $result['birthdays']++; + $bd = true; + } else { + $result['events']++; + } + if (datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['dtstart'], 'Y-m-d') === $str_now) { + $result['all_events_today']++; + if ($bd) { + $result['birthdays_today']++; + } else { + $result['events_today']++; + } + } + } + } + } + } - if (! ($vnotify & VNOTIFY_EVENT)) - $result['all_events'] = $result['events'] = 0; - if (! ($vnotify & VNOTIFY_EVENTTODAY)) - $result['all_events_today'] = $result['events_today'] = 0; - if (! ($vnotify & VNOTIFY_BIRTHDAY)) - $result['birthdays'] = 0; + if (!($vnotify & VNOTIFY_EVENT)) { + $result['all_events'] = $result['events'] = 0; + } + if (!($vnotify & VNOTIFY_EVENTTODAY)) { + $result['all_events_today'] = $result['events_today'] = 0; + } + if (!($vnotify & VNOTIFY_BIRTHDAY)) { + $result['birthdays'] = 0; + } + if ($vnotify & VNOTIFY_FORUMS) { + $forums = get_forum_channels(local_channel()); - if ($vnotify & VNOTIFY_FORUMS) { - $forums = get_forum_channels(local_channel()); + if ($forums) { + $perms_sql = item_permissions_sql(local_channel()) . item_normal(); + $fcount = count($forums); + $forums['total'] = 0; - if ($forums) { + for ($x = 0; $x < $fcount; $x++) { + $ttype = TERM_FORUM; + $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . protect_sprintf(dbesc($forums[$x]['xchan_name'])) . "'"); - $perms_sql = item_permissions_sql(local_channel()) . item_normal(); - $fcount = count($forums); - $forums['total'] = 0; + $p = ids_to_querystr($p, 'parent'); + $pquery = (($p) ? "OR parent IN ( $p )" : ''); - for ($x = 0; $x < $fcount; $x ++) { - $ttype = TERM_FORUM; - $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . protect_sprintf(dbesc($forums[$x]['xchan_name'])) . "'"); - - $p = ids_to_querystr($p, 'parent'); - $pquery = (($p) ? "OR parent IN ( $p )" : ''); - - $r = q("select sum(item_unseen) as unseen from item + $r = q( + "select sum(item_unseen) as unseen from item where uid = %d and ( owner_xchan = '%s' $pquery ) and item_unseen = 1 $perms_sql ", - intval(local_channel()), - dbesc($forums[$x]['xchan_hash']) - ); - if ($r[0]['unseen']) { - $forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/stream/?f=&pf=1&cid=' . $forums[$x]['abook_id']); - $forums[$x]['name'] = $forums[$x]['xchan_name']; - $forums[$x]['addr'] = $forums[$x]['xchan_addr']; - $forums[$x]['url'] = $forums[$x]['xchan_url']; - $forums[$x]['photo'] = $forums[$x]['xchan_photo_s']; - $forums[$x]['unseen'] = $r[0]['unseen']; - $forums[$x]['private_forum'] = (($forums[$x]['private_forum']) ? 'lock' : ''); - $forums[$x]['message'] = (($forums[$x]['private_forum']) ? t('Private group') : t('Public group')); + intval(local_channel()), + dbesc($forums[$x]['xchan_hash']) + ); + if ($r[0]['unseen']) { + $forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/stream/?f=&pf=1&cid=' . $forums[$x]['abook_id']); + $forums[$x]['name'] = $forums[$x]['xchan_name']; + $forums[$x]['addr'] = $forums[$x]['xchan_addr']; + $forums[$x]['url'] = $forums[$x]['xchan_url']; + $forums[$x]['photo'] = $forums[$x]['xchan_photo_s']; + $forums[$x]['unseen'] = $r[0]['unseen']; + $forums[$x]['private_forum'] = (($forums[$x]['private_forum']) ? 'lock' : ''); + $forums[$x]['message'] = (($forums[$x]['private_forum']) ? t('Private group') : t('Public group')); - $forums['total'] = $forums['total'] + $r[0]['unseen']; + $forums['total'] = $forums['total'] + $r[0]['unseen']; - unset($forums[$x]['abook_id']); - unset($forums[$x]['xchan_hash']); - unset($forums[$x]['xchan_name']); - unset($forums[$x]['xchan_url']); - unset($forums[$x]['xchan_photo_s']); + unset($forums[$x]['abook_id']); + unset($forums[$x]['xchan_hash']); + unset($forums[$x]['xchan_name']); + unset($forums[$x]['xchan_url']); + unset($forums[$x]['xchan_photo_s']); + } else { + unset($forums[$x]); + } + } + $result['forums'] = $forums['total']; + unset($forums['total']); - } - else { - unset($forums[$x]); - } - } - $result['forums'] = $forums['total']; - unset($forums['total']); + $result['forums_sub'] = $forums; + } + } - $result['forums_sub'] = $forums; - } - } + // Mark all of the stream notifications seen if all three of them are caught up. + // This also resets the pconfig storage for items_seen - // Mark all of the stream notifications seen if all three of them are caught up. - // This also resets the pconfig storage for items_seen - - if ((! $my_activity) && (! (intval($result['home']) + intval($result['stream']) + intval($result['pubs'])))) { - PConfig::Delete(local_channel(),'system','seen_items'); + if ((!$my_activity) && (!(intval($result['home']) + intval($result['stream']) + intval($result['pubs'])))) { + PConfig::Delete(local_channel(), 'system', 'seen_items'); - $_SESSION['loadtime_channel'] = datetime_convert(); - $_SESSION['loadtime_stream'] = datetime_convert(); - $_SESSION['loadtime_pubstream'] = datetime_convert(); - - PConfig::Set(local_channel(),'system','loadtime_channel', $_SESSION['loadtime_channel']); - PConfig::Set(local_channel(),'system','loadtime_stream', $_SESSION['loadtime_stream']); - PConfig::Set(local_channel(),'system','loadtime_pubstream', $_SESSION['loadtime_pubstream']); - } + $_SESSION['loadtime_channel'] = datetime_convert(); + $_SESSION['loadtime_stream'] = datetime_convert(); + $_SESSION['loadtime_pubstream'] = datetime_convert(); - json_return_and_die($result); - } + PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']); + PConfig::Set(local_channel(), 'system', 'loadtime_stream', $_SESSION['loadtime_stream']); + PConfig::Set(local_channel(), 'system', 'loadtime_pubstream', $_SESSION['loadtime_pubstream']); + } + json_return_and_die($result); + } } diff --git a/Zotlabs/Module/Plike.php b/Zotlabs/Module/Plike.php index d5022f718..016cb9e2b 100644 --- a/Zotlabs/Module/Plike.php +++ b/Zotlabs/Module/Plike.php @@ -1,4 +1,5 @@ 'Like', - 'dislike' => 'Dislike', - ]; + $acts = [ + 'like' => 'Like', + 'dislike' => 'Dislike', + ]; - // unlike (etc.) reactions are an undo of positive reactions, rather than a negative action. - // The activity is the same in undo actions and will have the same activity mapping + // unlike (etc.) reactions are an undo of positive reactions, rather than a negative action. + // The activity is the same in undo actions and will have the same activity mapping - if(substr($reaction,0,2) === 'un') { - $undo = true; - $reaction = substr($reaction,2); - } + if (substr($reaction, 0, 2) === 'un') { + $undo = true; + $reaction = substr($reaction, 2); + } - if(array_key_exists($reaction,$acts)) { - return (($undo) ? 'Undo/' : EMPTY_STR) . $acts[$reaction]; - } + if (array_key_exists($reaction, $acts)) { + return (($undo) ? 'Undo/' : EMPTY_STR) . $acts[$reaction]; + } - return EMPTY_STR; - - } + return EMPTY_STR; + } - public function get() { + public function get() + { - $undo = false; - $object = $target = null; - $owner_uid = 0; - $post_type = EMPTY_STR; - $objtype = EMPTY_STR; - $allow_cid = $allow_gid = $deny_cid = $deny_gid = ''; - $output = EMPTY_STR; + $undo = false; + $object = $target = null; + $owner_uid = 0; + $post_type = EMPTY_STR; + $objtype = EMPTY_STR; + $allow_cid = $allow_gid = $deny_cid = $deny_gid = ''; + $output = EMPTY_STR; - $sys_channel = get_sys_channel(); - $sys_channel_id = (($sys_channel) ? $sys_channel['channel_id'] : 0); + $sys_channel = get_sys_channel(); + $sys_channel_id = (($sys_channel) ? $sys_channel['channel_id'] : 0); - $observer = App::get_observer(); - - $verb = ((array_key_exists('verb', $_GET)) ? notags(trim($_GET['verb'])) : EMPTY_STR); + $observer = App::get_observer(); - // Figure out what action we're performing - - $activity = $this->reaction_to_activity($verb); + $verb = ((array_key_exists('verb', $_GET)) ? notags(trim($_GET['verb'])) : EMPTY_STR); - if (! $activity) { - return EMPTY_STR; - } + // Figure out what action we're performing - // Check for negative (undo) condition - // eg: 'Undo/Like' results in $undo conditional and $activity set to 'Like' - - $test = explode('/', $activity); - if (count($test) > 1) { - $undo = true; - $activity = $test[1]; - } + $activity = $this->reaction_to_activity($verb); - $is_rsvp = in_array($activity, [ 'Accept', 'Reject', 'TentativeAccept' ]); + if (! $activity) { + return EMPTY_STR; + } - // Check for when target is something besides messages, where argv(1) is the type of thing - // and argv(2) is an identifier of things of that type - // We currently only recognise 'profile' but other types could be handled - - if (argc() == 3) { - - if (! $observer) { - killme(); - } - - if($obj_type == 'profile') { - $r = q("select * from profile where profile_guid = '%s' limit 1", - dbesc($obj_id) - ); + // Check for negative (undo) condition + // eg: 'Undo/Like' results in $undo conditional and $activity set to 'Like' - if (! $r) { - killme(); - } - - $profile = array_shift($r); - - $owner_uid = $profile['uid']; + $test = explode('/', $activity); + if (count($test) > 1) { + $undo = true; + $activity = $test[1]; + } - $public = ((intval($profile['is_default'] )) ? true : false); + $is_rsvp = in_array($activity, [ 'Accept', 'Reject', 'TentativeAccept' ]); - // if this is a private profile, select the destination recipients - - if (! $public) { - $d = q("select abook_xchan from abook where abook_profile = '%s' and abook_channel = %d", - dbesc($profile['profile_guid']), - intval($owner_uid) - ); - if (! $d) { - // No profile could be found. - killme(); - } - - // $d now contains a list of those who can see this profile. - // Set the access accordingly. - - foreach ($d as $dd) { - $allow_cid .= '<' . $dd['abook_xchan'] . '>'; - } - } - - $post_type = t('channel'); - $objtype = ACTIVITY_OBJ_PROFILE; - - } + // Check for when target is something besides messages, where argv(1) is the type of thing + // and argv(2) is an identifier of things of that type + // We currently only recognise 'profile' but other types could be handled - // We'll need the owner of the thing from up above to figure out what channel is the target + if (argc() == 3) { + if (! $observer) { + killme(); + } - if (! ($owner_uid)) { - killme(); - } - - // Check permissions of the observer. If this is the owner (mostly this is the case) - // this will return true for all permissions. - - $perms = get_all_perms($owner_uid,$observer['xchan_hash']); - - if (! ($perms['post_like'] && $perms['view_profile'])) { - killme(); - } + if ($obj_type == 'profile') { + $r = q( + "select * from profile where profile_guid = '%s' limit 1", + dbesc($obj_id) + ); - $channel = channelx_by_n($owner_uid); - - if (! $channel) { - killme(); - } - - $object = json_encode(Activity::fetch_profile([ 'id' => channel_url($channel) ])); + if (! $r) { + killme(); + } - // second like of the same thing is "undo" for the first like - - $z = q("select * from likes where channel_id = %d and liker = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' limit 1", - intval($channel['channel_id']), - dbesc($observer['xchan_hash']), - dbesc($activity), - dbesc(($tgttype)?$tgttype:$objtype), - dbesc($obj_id) - ); - - if($z) { - $z[0]['deleted'] = 1; - Libsync::build_sync_packet($channel['channel_id'],array('likes' => $z)); - - q("delete from likes where id = %d", - intval($z[0]['id']) - ); - if($z[0]['i_mid']) { - $r = q("select id from item where mid = '%s' and uid = %d limit 1", - dbesc($z[0]['i_mid']), - intval($channel['channel_id']) - ); - if($r) - drop_item($r[0]['id'],false); + $profile = array_shift($r); - } - killme(); - } - } + $owner_uid = $profile['uid']; - $uuid = new_uuid(); - - $arr = []; + $public = ((intval($profile['is_default'])) ? true : false); - $arr['uuid'] = $uuid; + // if this is a private profile, select the destination recipients + + if (! $public) { + $d = q( + "select abook_xchan from abook where abook_profile = '%s' and abook_channel = %d", + dbesc($profile['profile_guid']), + intval($owner_uid) + ); + if (! $d) { + // No profile could be found. + killme(); + } + + // $d now contains a list of those who can see this profile. + // Set the access accordingly. + + foreach ($d as $dd) { + $allow_cid .= '<' . $dd['abook_xchan'] . '>'; + } + } + + $post_type = t('channel'); + $objtype = ACTIVITY_OBJ_PROFILE; + } + + // We'll need the owner of the thing from up above to figure out what channel is the target + + if (! ($owner_uid)) { + killme(); + } + + // Check permissions of the observer. If this is the owner (mostly this is the case) + // this will return true for all permissions. + + $perms = get_all_perms($owner_uid, $observer['xchan_hash']); + + if (! ($perms['post_like'] && $perms['view_profile'])) { + killme(); + } + + $channel = channelx_by_n($owner_uid); + + if (! $channel) { + killme(); + } + + $object = json_encode(Activity::fetch_profile([ 'id' => channel_url($channel) ])); + + // second like of the same thing is "undo" for the first like + + $z = q( + "select * from likes where channel_id = %d and liker = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' limit 1", + intval($channel['channel_id']), + dbesc($observer['xchan_hash']), + dbesc($activity), + dbesc(($tgttype) ? $tgttype : $objtype), + dbesc($obj_id) + ); + + if ($z) { + $z[0]['deleted'] = 1; + Libsync::build_sync_packet($channel['channel_id'], array('likes' => $z)); + + q( + "delete from likes where id = %d", + intval($z[0]['id']) + ); + if ($z[0]['i_mid']) { + $r = q( + "select id from item where mid = '%s' and uid = %d limit 1", + dbesc($z[0]['i_mid']), + intval($channel['channel_id']) + ); + if ($r) { + drop_item($r[0]['id'], false); + } + } + killme(); + } + } + + $uuid = new_uuid(); + + $arr = []; + + $arr['uuid'] = $uuid; $arr['mid'] = z_root() . (($is_rsvp) ? '/activity/' : '/item/' ) . $uuid; - - $arr['item_thread_top'] = 1; - $arr['item_origin'] = 1; - $arr['item_wall'] = 1; - - if($verb === 'like') - $bodyverb = t('%1$s likes %2$s\'s %3$s'); - if($verb === 'dislike') - $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); - - if (! isset($bodyverb)) { - killme(); - } + $arr['item_thread_top'] = 1; + $arr['item_origin'] = 1; + $arr['item_wall'] = 1; - $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]'; - $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; - $plink = '[zrl=' . z_root() . '/profile/' . $channel['channel_address'] . ']' . $post_type . '[/zrl]'; - $private = (($public) ? 0 : 1); + if ($verb === 'like') { + $bodyverb = t('%1$s likes %2$s\'s %3$s'); + } + if ($verb === 'dislike') { + $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); + } - - $arr['aid'] = $channel['channel_account_id']; - $arr['uid'] = $owner_uid; + if (! isset($bodyverb)) { + killme(); + } - $arr['item_flags'] = $item['item_flags']; - $arr['item_wall'] = $item['item_wall']; - $arr['parent_mid'] = $arr['mid']; - $arr['owner_xchan'] = $channel['xchan_hash']; - $arr['author_xchan'] = $observer['xchan_hash']; - - - $arr['body'] = sprintf( $bodyverb, $alink, $ulink, $plink ); + $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]'; + $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; + $plink = '[zrl=' . z_root() . '/profile/' . $channel['channel_address'] . ']' . $post_type . '[/zrl]'; + $private = (($public) ? 0 : 1); - if($obj_type === 'profile') { - if($public) { - $arr['body'] .= "\n\n" . '[embed]' . z_root() . '/profile/' . $channel['channel_address'] . '[/embed]'; - } - else - $arr['body'] .= "\n\n[zmg=80x80]" . $profile['thumb'] . '[/zmg]'; - } - - - $arr['verb'] = $activity; - $arr['obj_type'] = $objtype; - $arr['obj'] = $object; - - if ($target) { - $arr['tgt_type'] = $tgttype; - $arr['target'] = $target; - } - - $arr['allow_cid'] = $allow_cid; - $arr['allow_gid'] = $allow_gid; - $arr['deny_cid'] = $deny_cid; - $arr['deny_gid'] = $deny_gid; - $arr['item_private'] = $private; - - call_hooks('post_local',$arr); - - $post = item_store($arr); - $post_id = $post['item_id']; - // save the conversation from expiration + $arr['aid'] = $channel['channel_account_id']; + $arr['uid'] = $owner_uid; - if(local_channel() && array_key_exists('item',$post) && (intval($post['item']['id']) != intval($post['item']['parent']))) - retain_item($post['item']['parent']); - - $arr['id'] = $post_id; - - call_hooks('post_local_end', $arr); - - $r = q("select * from item where id = %d", - intval($post_id) - ); - if($r) { - xchan_query($r); - $sync_item = fetch_post_tags($r); - Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0],true) ] ]); - } - $r = q("insert into likes (channel_id,liker,likee,iid,i_mid,verb,target_type,target_id,target) values (%d,'%s','%s',%d,'%s','%s','%s','%s','%s')", - intval($channel['channel_id']), - dbesc($observer['xchan_hash']), - dbesc($channel['channel_hash']), - intval($post_id), - dbesc($mid), - dbesc($activity), - dbesc(($tgttype)? $tgttype : $objtype), - dbesc($obj_id), - dbesc(($target) ? $target : $object) - ); - $r = q("select * from likes where liker = '%s' and likee = '%s' and i_mid = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' ", - dbesc($observer['xchan_hash']), - dbesc($channel['channel_hash']), - dbesc($mid), - dbesc($activity), - dbesc(($tgttype)? $tgttype : $objtype), - dbesc($obj_id) - ); - if ($r) { - Libsync::build_sync_packet($channel['channel_id'],array('likes' => $r)); - } - - Run::Summon( [ 'Notifier', 'like', $post_id ] ); - - killme(); - } - - - + $arr['item_flags'] = $item['item_flags']; + $arr['item_wall'] = $item['item_wall']; + $arr['parent_mid'] = $arr['mid']; + $arr['owner_xchan'] = $channel['xchan_hash']; + $arr['author_xchan'] = $observer['xchan_hash']; + + + $arr['body'] = sprintf($bodyverb, $alink, $ulink, $plink); + + if ($obj_type === 'profile') { + if ($public) { + $arr['body'] .= "\n\n" . '[embed]' . z_root() . '/profile/' . $channel['channel_address'] . '[/embed]'; + } else { + $arr['body'] .= "\n\n[zmg=80x80]" . $profile['thumb'] . '[/zmg]'; + } + } + + + $arr['verb'] = $activity; + $arr['obj_type'] = $objtype; + $arr['obj'] = $object; + + if ($target) { + $arr['tgt_type'] = $tgttype; + $arr['target'] = $target; + } + + $arr['allow_cid'] = $allow_cid; + $arr['allow_gid'] = $allow_gid; + $arr['deny_cid'] = $deny_cid; + $arr['deny_gid'] = $deny_gid; + $arr['item_private'] = $private; + + call_hooks('post_local', $arr); + + $post = item_store($arr); + $post_id = $post['item_id']; + + // save the conversation from expiration + + if (local_channel() && array_key_exists('item', $post) && (intval($post['item']['id']) != intval($post['item']['parent']))) { + retain_item($post['item']['parent']); + } + + $arr['id'] = $post_id; + + call_hooks('post_local_end', $arr); + + $r = q( + "select * from item where id = %d", + intval($post_id) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0], true) ] ]); + } + + $r = q( + "insert into likes (channel_id,liker,likee,iid,i_mid,verb,target_type,target_id,target) values (%d,'%s','%s',%d,'%s','%s','%s','%s','%s')", + intval($channel['channel_id']), + dbesc($observer['xchan_hash']), + dbesc($channel['channel_hash']), + intval($post_id), + dbesc($mid), + dbesc($activity), + dbesc(($tgttype) ? $tgttype : $objtype), + dbesc($obj_id), + dbesc(($target) ? $target : $object) + ); + $r = q( + "select * from likes where liker = '%s' and likee = '%s' and i_mid = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' ", + dbesc($observer['xchan_hash']), + dbesc($channel['channel_hash']), + dbesc($mid), + dbesc($activity), + dbesc(($tgttype) ? $tgttype : $objtype), + dbesc($obj_id) + ); + if ($r) { + Libsync::build_sync_packet($channel['channel_id'], array('likes' => $r)); + } + + Run::Summon([ 'Notifier', 'like', $post_id ]); + + killme(); + } } diff --git a/Zotlabs/Module/Poco.php b/Zotlabs/Module/Poco.php index 90ae049b6..505e5c0ba 100644 --- a/Zotlabs/Module/Poco.php +++ b/Zotlabs/Module/Poco.php @@ -1,19 +1,21 @@ '; - $allow_gid = EMPTY_STR; - $deny_cid = EMPTY_STR; - $deny_gid = EMPTY_STR; - } - - $arr = []; - - $arr['item_wall'] = 1; - $arr['owner_xchan'] = $channel['channel_hash']; - $arr['author_xchan'] = $channel['channel_hash']; - $arr['allow_cid'] = $allow_cid; - $arr['allow_gid'] = $allow_gid; - $arr['deny_cid'] = $deny_cid; - $arr['deny_gid'] = $deny_gid; - $arr['verb'] = 'Create'; - $arr['item_private'] = 1; - $arr['obj_type'] = 'Note'; - $arr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . $verbs[$verb][2] . ' ' . '[zrl=' . $target['xchan_url'] . ']' . $target['xchan_name'] . '[/zrl]'; - - - $arr['item_origin'] = 1; - $arr['item_wall'] = 1; + $activity = $verbs[$verb][0]; - $obj = Activity::encode_item($arr,((get_config('system','activitypub', ACTIVITYPUB_ENABLED)) ? true : false)); + $xchan = trim($_REQUEST['xchan']); - $i = post_activity_item($arr); + if (!$xchan) { + return; + } - if ($i['success']) { - $item_id = $i['item_id']; - $r = q("select * from item where id = %d", - intval($item_id) - ); - if ($r) { - xchan_query($r); - $sync_item = fetch_post_tags($r); - Libsync::build_sync_packet($uid, [ 'item' => [ encode_item($sync_item[0],true) ] ] ); - } - - info(sprintf( t('You %1$s %2$s'), $verbs[$verb][2], $target['xchan_name'])); - } + $r = q( + "SELECT * FROM xchan where xchan_hash = '%s' LIMIT 1", + dbesc($xchan) + ); - json_return_and_die([ 'success' => true ]); - } - - - - function get() { - - if(! local_channel()) { - notice( t('Permission denied.') . EOL); - return; - } + if (!$r) { + logger('poke: no target.'); + return; + } - if(! Apps::system_app_installed(local_channel(), 'Poke')) { - $o = '' . t('Poke App (Not Installed)') . '
'; - $o .= t('Poke or do something else to somebody'); - return $o; - } + $target = $r[0]; + $parent_item = null; - nav_set_selected('Poke'); - - $name = ''; - $id = ''; - - $verbs = get_poke_verbs(); - - $shortlist = []; - $current = get_pconfig(local_channel(),'system','pokeverb','poke'); - foreach($verbs as $k => $v) { - $shortlist[] = [ $k,$v[1], (($k === $current) ? true : false) ]; - } - - - $title = t('Poke'); - $desc = t('Poke, prod or do other things to somebody'); - - $o = replace_macros(get_markup_template('poke_content.tpl'),array( - '$title' => $title, - '$desc' => $desc, - '$clabel' => t('Recipient'), - '$choice' => t('Choose your default action'), - '$verbs' => $shortlist, - '$submit' => t('Submit'), - '$id' => $id - )); - - return $o; - } + $item_private = 1; + + if ($target) { + $allow_cid = '<' . $target['abook_xchan'] . '>'; + $allow_gid = EMPTY_STR; + $deny_cid = EMPTY_STR; + $deny_gid = EMPTY_STR; + } + + $arr = []; + + $arr['item_wall'] = 1; + $arr['owner_xchan'] = $channel['channel_hash']; + $arr['author_xchan'] = $channel['channel_hash']; + $arr['allow_cid'] = $allow_cid; + $arr['allow_gid'] = $allow_gid; + $arr['deny_cid'] = $deny_cid; + $arr['deny_gid'] = $deny_gid; + $arr['verb'] = 'Create'; + $arr['item_private'] = 1; + $arr['obj_type'] = 'Note'; + $arr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . $verbs[$verb][2] . ' ' . '[zrl=' . $target['xchan_url'] . ']' . $target['xchan_name'] . '[/zrl]'; + + + $arr['item_origin'] = 1; + $arr['item_wall'] = 1; + + $obj = Activity::encode_item($arr, ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? true : false)); + + $i = post_activity_item($arr); + + if ($i['success']) { + $item_id = $i['item_id']; + $r = q( + "select * from item where id = %d", + intval($item_id) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + Libsync::build_sync_packet($uid, ['item' => [encode_item($sync_item[0], true)]]); + } + + info(sprintf(t('You %1$s %2$s'), $verbs[$verb][2], $target['xchan_name'])); + } + + json_return_and_die(['success' => true]); + } + + + public function get() + { + + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } + + if (!Apps::system_app_installed(local_channel(), 'Poke')) { + $o = '' . t('Poke App (Not Installed)') . '
'; + $o .= t('Poke or do something else to somebody'); + return $o; + } + + nav_set_selected('Poke'); + + $name = ''; + $id = ''; + + $verbs = get_poke_verbs(); + + $shortlist = []; + $current = get_pconfig(local_channel(), 'system', 'pokeverb', 'poke'); + foreach ($verbs as $k => $v) { + $shortlist[] = [$k, $v[1], (($k === $current) ? true : false)]; + } + + + $title = t('Poke'); + $desc = t('Poke, prod or do other things to somebody'); + + $o = replace_macros(get_markup_template('poke_content.tpl'), array( + '$title' => $title, + '$desc' => $desc, + '$clabel' => t('Recipient'), + '$choice' => t('Choose your default action'), + '$verbs' => $shortlist, + '$submit' => t('Submit'), + '$id' => $id + )); + + return $o; + } } diff --git a/Zotlabs/Module/Poster.php b/Zotlabs/Module/Poster.php index f1aa2d6b5..c0288e3bd 100644 --- a/Zotlabs/Module/Poster.php +++ b/Zotlabs/Module/Poster.php @@ -6,37 +6,40 @@ use Zotlabs\Web\Controller; require_once('include/security.php'); -class Poster extends Controller { +class Poster extends Controller +{ - function init() { + public function init() + { - $nick = argv(1); - $hash = argv(2); + $nick = argv(1); + $hash = argv(2); - if (! ($nick && $hash)) { - return; - } + if (!($nick && $hash)) { + return; + } - $u = channelx_by_nick($nick); + $u = channelx_by_nick($nick); - if (! $u) { - return; - } + if (!$u) { + return; + } - $sql_extra = permissions_sql(intval($u['channel_id'])); + $sql_extra = permissions_sql(intval($u['channel_id'])); - $r = q("select content from attach where hash = '%s' and uid = %d and os_storage = 1 $sql_extra limit 1", - dbesc($hash), - intval($u['channel_id']) - ); - if ($r) { - $path = dbunescbin($r[0]['content']); - if ($path && @file_exists($path . '.thumb')) { - header('Content-Type: image/jpeg'); - echo file_get_contents($path . '.thumb'); - killme(); - } - } - killme(); - } + $r = q( + "select content from attach where hash = '%s' and uid = %d and os_storage = 1 $sql_extra limit 1", + dbesc($hash), + intval($u['channel_id']) + ); + if ($r) { + $path = dbunescbin($r[0]['content']); + if ($path && @file_exists($path . '.thumb')) { + header('Content-Type: image/jpeg'); + echo file_get_contents($path . '.thumb'); + killme(); + } + } + killme(); + } } diff --git a/Zotlabs/Module/Pretheme.php b/Zotlabs/Module/Pretheme.php index 120fd5359..93702195b 100644 --- a/Zotlabs/Module/Pretheme.php +++ b/Zotlabs/Module/Pretheme.php @@ -1,28 +1,30 @@ get_theme_screenshot($theme), 'desc' => $desc, 'version' => $version, 'credits' => $credits)); - } - killme(); - } - + public function init() + { + + if ($_REQUEST['theme']) { + $theme = $_REQUEST['theme']; + $info = get_theme_info($theme); + if ($info) { + // unfortunately there will be no translation for this string + $desc = $info['description']; + $version = $info['version']; + $credits = $info['credits']; + } else { + $desc = ''; + $version = ''; + $credits = ''; + } + echo json_encode(array('img' => get_theme_screenshot($theme), 'desc' => $desc, 'version' => $version, 'credits' => $credits)); + } + killme(); + } } diff --git a/Zotlabs/Module/Profile.php b/Zotlabs/Module/Profile.php index b3fcf3ceb..f3eadf604 100644 --- a/Zotlabs/Module/Profile.php +++ b/Zotlabs/Module/Profile.php @@ -1,4 +1,5 @@ 1) - $which = argv(1); - else { - notice( t('Requested profile is not available.') . EOL ); - App::$error = 404; - return; - } + if (argc() > 1) { + $which = argv(1); + } else { + notice(t('Requested profile is not available.') . EOL); + App::$error = 404; + return; + } - nav_set_selected('Profile'); - - $profile = ''; - $channel = App::get_channel(); - - if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) { - $which = $channel['channel_address']; - $profile = argv(1); - $r = q("select profile_guid from profile where id = %d and uid = %d limit 1", - intval($profile), - intval(local_channel()) - ); - if(! $r) - $profile = ''; - $profile = $r[0]['profile_guid']; - } - - head_add_link( [ - 'rel' => 'alternate', - 'type' => 'application/atom+xml', - 'title' => t('Posts and comments'), - 'href' => z_root() . '/feed/' . $which - ]); + nav_set_selected('Profile'); - head_add_link( [ - 'rel' => 'alternate', - 'type' => 'application/atom+xml', - 'title' => t('Only posts'), - 'href' => z_root() . '/feed/' . $which . '?f=&top=1' - ]); + $profile = ''; + $channel = App::get_channel(); + + if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) { + $which = $channel['channel_address']; + $profile = argv(1); + $r = q( + "select profile_guid from profile where id = %d and uid = %d limit 1", + intval($profile), + intval(local_channel()) + ); + if (!$r) { + $profile = ''; + } + $profile = $r[0]['profile_guid']; + } + + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/atom+xml', + 'title' => t('Posts and comments'), + 'href' => z_root() . '/feed/' . $which + ]); + + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/atom+xml', + 'title' => t('Only posts'), + 'href' => z_root() . '/feed/' . $which . '?f=&top=1' + ]); - if(! $profile) { - $x = q("select channel_id as profile_uid from channel where channel_address = '%s' limit 1", - dbesc(argv(1)) - ); - if($x) { - \App::$profile = $x[0]; - } - } - - - if(ActivityStreams::is_as_request()) { - $chan = channelx_by_nick(argv(1)); - if(! $chan) - http_status_exit(404, 'Not found'); - $p = Activity::encode_person($chan,true,((get_config('system','activitypub', ACTIVITYPUB_ENABLED)) ? true : false)); - if(! $p) { - http_status_exit(404, 'Not found'); - } - - as_return_and_die([ 'type' => 'Profile', 'describes' => $p ], $chan); - } - - Libprofile::load($which,$profile); - - } - - function get() { - - if(observer_prohibited(true)) { - return login(); - } - - $groups = []; + if (!$profile) { + $x = q( + "select channel_id as profile_uid from channel where channel_address = '%s' limit 1", + dbesc(argv(1)) + ); + if ($x) { + App::$profile = $x[0]; + } + } + if (ActivityStreams::is_as_request()) { + $chan = channelx_by_nick(argv(1)); + if (!$chan) { + http_status_exit(404, 'Not found'); + } + $p = Activity::encode_person($chan, true, ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? true : false)); + if (!$p) { + http_status_exit(404, 'Not found'); + } - $tab = 'profile'; - $o = ''; - - if(! (perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(), 'view_profile'))) { - notice( t('Permission denied.') . EOL); - return; - } - + as_return_and_die(['type' => 'Profile', 'describes' => $p], $chan); + } + + Libprofile::load($which, $profile); + } + + public function get() + { + + if (observer_prohibited(true)) { + return login(); + } + + $groups = []; - if(argc() > 2 && argv(2) === 'vcard') { - header('Content-type: text/vcard'); - header('Content-Disposition: attachment; filename="' . t('vcard') . '-' . $profile['channel_address'] . '.vcf"' ); - echo \App::$profile['profile_vcard']; - killme(); - } - - $is_owner = ((local_channel()) && (local_channel() == \App::$profile['profile_uid']) ? true : false); - - if(\App::$profile['hidewall'] && (! $is_owner) && (! remote_channel())) { - notice( t('Permission denied.') . EOL); - return; - } - - head_add_link([ - 'rel' => 'alternate', - 'type' => 'application/json+oembed', - 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string), - 'title' => 'oembed' - ]); + $tab = 'profile'; + $o = ''; - $o .= Libprofile::advanced(); - call_hooks('profile_advanced',$o); - return $o; - - } - + if (!(perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_profile'))) { + notice(t('Permission denied.') . EOL); + return; + } + + + if (argc() > 2 && argv(2) === 'vcard') { + header('Content-type: text/vcard'); + header('Content-Disposition: attachment; filename="' . t('vcard') . '-' . $profile['channel_address'] . '.vcf"'); + echo App::$profile['profile_vcard']; + killme(); + } + + $is_owner = ((local_channel()) && (local_channel() == App::$profile['profile_uid']) ? true : false); + + if (App::$profile['hidewall'] && (!$is_owner) && (!remote_channel())) { + notice(t('Permission denied.') . EOL); + return; + } + + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string), + 'title' => 'oembed' + ]); + + $o .= Libprofile::advanced(); + call_hooks('profile_advanced', $o); + return $o; + } } diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index ce5734b3f..88dae174d 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -1,4 +1,5 @@ is_valid()) { - - $im->cropImage(300,$srcX,$srcY,$srcW,$srcH); - - $aid = get_account_id(); - - $p = [ - 'aid' => $aid, - 'uid' => local_channel(), - 'resource_id' => $base_image['resource_id'], - 'filename' => $base_image['filename'], - 'album' => t('Profile Photos'), - 'os_path' => $base_image['os_path'], - 'display_path' => $base_image['display_path'], - 'created' => $base_image['created'], - 'edited' => $base_image['edited'] - ]; - - $animated = get_config('system','animated_avatars',true); - - $p['imgscale'] = PHOTO_RES_PROFILE_300; - $p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL); - - $r1 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_300, $animated); - - $im->scaleImage(80); - $p['imgscale'] = PHOTO_RES_PROFILE_80; - - $r2 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_80, $animated); - - $im->scaleImage(48); - $p['imgscale'] = PHOTO_RES_PROFILE_48; - - $r3 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_48, $animated); - - if ($r1 === false || $r2 === false || $r3 === false) { - // if one failed, delete them all so we can start over. - notice( t('Image resize failed.') . EOL ); - $x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d ) ", - dbesc($base_image['resource_id']), - local_channel(), - intval(PHOTO_RES_PROFILE_300), - intval(PHOTO_RES_PROFILE_80), - intval(PHOTO_RES_PROFILE_48) - ); - return; - } - - $channel = App::get_channel(); - - // If setting for the default profile, unset the profile photo flag from any other photos I own - - if ($is_default_profile) { - - $r = q("update profile set photo = '%s', thumb = '%s' where is_default = 1 and uid = %d", - dbesc(z_root() . '/photo/profile/l/' . local_channel()), - dbesc(z_root() . '/photo/profile/m/' . local_channel()), - intval(local_channel()) - ); +class Profile_photo extends Controller +{ - $r = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d + /* @brief Initalize the profile-photo edit view + * + * @return void + * + */ + + public function init() + { + + if (!local_channel()) { + return; + } + + $channel = App::get_channel(); + Libprofile::load($channel['channel_address']); + } + + /* @brief Evaluate posted values + * + * @param $a Current application + * @return void + * + */ + + public function post() + { + + if (!local_channel()) { + return; + } + + check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo'); + + if ((array_key_exists('cropfinal', $_POST)) && (intval($_POST['cropfinal']) == 1)) { + // logger('crop: ' . print_r($_POST,true)); + + // phase 2 - we have finished cropping + + if (argc() != 2) { + notice(t('Image uploaded but image cropping failed.') . EOL); + return; + } + + $image_id = argv(1); + + if (substr($image_id, -2, 1) == '-') { + $scale = substr($image_id, -1, 1); + $image_id = substr($image_id, 0, -2); + } + + // unless proven otherwise + $is_default_profile = 1; + + if ($_REQUEST['profile']) { + $r = q( + "select id, profile_guid, is_default, gender from profile where id = %d and uid = %d limit 1", + intval($_REQUEST['profile']), + intval(local_channel()) + ); + if ($r) { + $profile = array_shift($r); + if (!intval($profile['is_default'])) { + $is_default_profile = 0; + } + } + } + + $srcX = intval($_POST['xstart']); + $srcY = intval($_POST['ystart']); + $srcW = intval($_POST['xfinal']) - $srcX; + $srcH = intval($_POST['yfinal']) - $srcY; + + $r = q( + "SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND imgscale = %d LIMIT 1", + dbesc($image_id), + dbesc(local_channel()), + intval($scale) + ); + if ($r) { + $base_image = array_shift($r); + $base_image['content'] = (($base_image['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); + + $im = photo_factory($base_image['content'], $base_image['mimetype']); + if ($im && $im->is_valid()) { + $im->cropImage(300, $srcX, $srcY, $srcW, $srcH); + + $aid = get_account_id(); + + $p = [ + 'aid' => $aid, + 'uid' => local_channel(), + 'resource_id' => $base_image['resource_id'], + 'filename' => $base_image['filename'], + 'album' => t('Profile Photos'), + 'os_path' => $base_image['os_path'], + 'display_path' => $base_image['display_path'], + 'created' => $base_image['created'], + 'edited' => $base_image['edited'] + ]; + + $animated = get_config('system', 'animated_avatars', true); + + $p['imgscale'] = PHOTO_RES_PROFILE_300; + $p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL); + + $r1 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_300, $animated); + + $im->scaleImage(80); + $p['imgscale'] = PHOTO_RES_PROFILE_80; + + $r2 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_80, $animated); + + $im->scaleImage(48); + $p['imgscale'] = PHOTO_RES_PROFILE_48; + + $r3 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_48, $animated); + + if ($r1 === false || $r2 === false || $r3 === false) { + // if one failed, delete them all so we can start over. + notice(t('Image resize failed.') . EOL); + $x = q( + "delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d ) ", + dbesc($base_image['resource_id']), + local_channel(), + intval(PHOTO_RES_PROFILE_300), + intval(PHOTO_RES_PROFILE_80), + intval(PHOTO_RES_PROFILE_48) + ); + return; + } + + $channel = App::get_channel(); + + // If setting for the default profile, unset the profile photo flag from any other photos I own + + if ($is_default_profile) { + $r = q( + "update profile set photo = '%s', thumb = '%s' where is_default = 1 and uid = %d", + dbesc(z_root() . '/photo/profile/l/' . local_channel()), + dbesc(z_root() . '/photo/profile/m/' . local_channel()), + intval(local_channel()) + ); + + + $r = q( + "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND resource_id != '%s' AND uid = %d", - intval(PHOTO_NORMAL), - intval(PHOTO_PROFILE), - dbesc($base_image['resource_id']), - intval(local_channel()) - ); - + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE), + dbesc($base_image['resource_id']), + intval(local_channel()) + ); - send_profile_photo_activity($channel,$base_image,$profile); - - } - else { - $r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d", - dbesc(z_root() . '/photo/' . $base_image['resource_id'] . '-4'), - dbesc(z_root() . '/photo/' . $base_image['resource_id'] . '-5'), - intval($_REQUEST['profile']), - intval(local_channel()) - ); - } - - // set $send to false in profiles_build_sync() to return the data - // so that we only send one sync packet. - $sync_profiles = profiles_build_sync(local_channel(),false); - - // We'll set the updated profile-photo timestamp even if it isn't the default profile, - // so that browsers will do a cache update unconditionally - // Also set links back to site-specific profile photo url in case it was - // changed to a generic URL by a clone operation. Otherwise the new photo may - // not get pushed to other sites correctly. - - $r = q("UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' + send_profile_photo_activity($channel, $base_image, $profile); + } else { + $r = q( + "update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d", + dbesc(z_root() . '/photo/' . $base_image['resource_id'] . '-4'), + dbesc(z_root() . '/photo/' . $base_image['resource_id'] . '-5'), + intval($_REQUEST['profile']), + intval(local_channel()) + ); + } + + // set $send to false in profiles_build_sync() to return the data + // so that we only send one sync packet. + + $sync_profiles = profiles_build_sync(local_channel(), false); + + // We'll set the updated profile-photo timestamp even if it isn't the default profile, + // so that browsers will do a cache update unconditionally + // Also set links back to site-specific profile photo url in case it was + // changed to a generic URL by a clone operation. Otherwise the new photo may + // not get pushed to other sites correctly. + + $r = q( + "UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s'", - dbesc($im->getType()), - dbesc(datetime_convert()), - dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']), - dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']), - dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']), - dbesc($channel['xchan_hash']) - ); + dbesc($im->getType()), + dbesc(datetime_convert()), + dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']), + dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']), + dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']), + dbesc($channel['xchan_hash']) + ); - photo_profile_setperms(local_channel(),$base_image['resource_id'],$_REQUEST['profile']); + photo_profile_setperms(local_channel(), $base_image['resource_id'], $_REQUEST['profile']); - $sync = attach_export_data($channel,$base_image['resource_id']); - if ($sync) { - Libsync::build_sync_packet($channel['channel_id'],array('file' => array($sync), 'profile' => $sync_profiles)); - } + $sync = attach_export_data($channel, $base_image['resource_id']); + if ($sync) { + Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync), 'profile' => $sync_profiles)); + } - // Similarly, tell the nav bar to bypass the cache and update the avatar image. - $_SESSION['reload_avatar'] = true; - - info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); - - // Update directory in background - Run::Summon( [ 'Directory', $channel['channel_id'] ] ); - - } - else { - notice( t('Unable to process image') . EOL); - } - } - - goaway(z_root() . '/profiles'); - } - - // A new photo was uploaded. Store it and save some important details - // in App::$data for use in the cropping function - - - $hash = photo_new_resource(); - $importing = false; - $smallest = 0; - + // Similarly, tell the nav bar to bypass the cache and update the avatar image. + $_SESSION['reload_avatar'] = true; - if ($_REQUEST['importfile']) { - $hash = $_REQUEST['importfile']; - $importing = true; - } - else { + info(t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); - $matches = []; - $partial = false; + // Update directory in background + Run::Summon(['Directory', $channel['channel_id']]); + } else { + notice(t('Unable to process image') . EOL); + } + } - if (array_key_exists('HTTP_CONTENT_RANGE',$_SERVER)) { - $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/',$_SERVER['HTTP_CONTENT_RANGE'],$matches); - if ($pm) { - logger('Content-Range: ' . print_r($matches,true), LOGGER_DEBUG); - $partial = true; - } - } + goaway(z_root() . '/profiles'); + } - if ($partial) { - $x = save_chunk($channel,$matches[1],$matches[2],$matches[3]); + // A new photo was uploaded. Store it and save some important details + // in App::$data for use in the cropping function - if ($x['partial']) { - header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); - json_return_and_die($x); - } - else { - header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); - $_FILES['userfile'] = [ - 'name' => $x['name'], - 'type' => $x['type'], - 'tmp_name' => $x['tmp_name'], - 'error' => $x['error'], - 'size' => $x['size'] - ]; - } - } - else { - if (! array_key_exists('userfile',$_FILES)) { - $_FILES['userfile'] = [ - 'name' => $_FILES['files']['name'], - 'type' => $_FILES['files']['type'], - 'tmp_name' => $_FILES['files']['tmp_name'], - 'error' => $_FILES['files']['error'], - 'size' => $_FILES['files']['size'] - ]; - } - } + $hash = photo_new_resource(); + $importing = false; + $smallest = 0; - $res = attach_store(App::get_channel(), get_observer_hash(), '', array('album' => t('Profile Photos'), 'hash' => $hash)); - - logger('attach_store: ' . print_r($res,true), LOGGER_DEBUG); - json_return_and_die([ 'message' => $hash ]); - } - - if (($res && intval($res['data']['is_photo'])) || $importing) { - $i = q("select * from photo where resource_id = '%s' and uid = %d order by imgscale", - dbesc($hash), - intval(local_channel()) - ); - - if (! $i) { - notice( t('Image upload failed.') . EOL ); - return; - } - $os_storage = false; - - foreach ($i as $ii) { - if (intval($ii['imgscale']) < PHOTO_RES_640) { - $smallest = intval($ii['imgscale']); - $os_storage = intval($ii['os_storage']); - $imagedata = $ii['content']; - $filetype = $ii['mimetype']; - } - } - } - - $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata)); - $ph = photo_factory($imagedata, $filetype); - - if (! $ph->is_valid()) { - notice( t('Unable to process image.') . EOL ); - return; - } - - return $this->profile_photo_crop_ui_head($ph, $hash, $smallest); + if ($_REQUEST['importfile']) { + $hash = $_REQUEST['importfile']; + $importing = true; + } else { + $matches = []; + $partial = false; - // This will "fall through" to the get() method, and since - // App::$data['imagecrop'] is set, it will proceed to cropping - // rather than present the upload form - } - - - /* @brief Generate content of profile-photo view - * - * @return void - * - */ - - - function get() { - - if (! local_channel()) { - notice( t('Permission denied.') . EOL ); - return; - } - - $channel = App::get_channel(); - $pf = 0; - $newuser = false; - - if (argc() == 2 && argv(1) === 'new') { - $newuser = true; - } - - if (argv(1) === 'use') { - if (argc() < 3) { - notice( t('Permission denied.') . EOL ); - return; - }; - - $resource_id = argv(2); - - $pf = (($_REQUEST['pf']) ? intval($_REQUEST['pf']) : 0); + if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) { + $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches); + if ($pm) { + logger('Content-Range: ' . print_r($matches, true), LOGGER_DEBUG); + $partial = true; + } + } - $c = q("select id, is_default from profile where uid = %d", - intval(local_channel()) - ); + if ($partial) { + $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]); - $multi_profiles = true; + if ($x['partial']) { + header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); + json_return_and_die($x); + } else { + header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); - if (($c) && (count($c) === 1) && (intval($c[0]['is_default']))) { - $_REQUEST['profile'] = $c[0]['id']; - $multi_profiles = false; - } - else { - $_REQUEST['profile'] = $pf; - } + $_FILES['userfile'] = [ + 'name' => $x['name'], + 'type' => $x['type'], + 'tmp_name' => $x['tmp_name'], + 'error' => $x['error'], + 'size' => $x['size'] + ]; + } + } else { + if (!array_key_exists('userfile', $_FILES)) { + $_FILES['userfile'] = [ + 'name' => $_FILES['files']['name'], + 'type' => $_FILES['files']['type'], + 'tmp_name' => $_FILES['files']['tmp_name'], + 'error' => $_FILES['files']['error'], + 'size' => $_FILES['files']['size'] + ]; + } + } - $r = q("SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC", - intval(local_channel()), - dbesc($resource_id) - ); - if (! $r) { - notice( t('Photo not available.') . EOL ); - return; - } - $havescale = false; - foreach ($r as $rr) { - if ($rr['imgscale'] == PHOTO_RES_PROFILE_80) { - $havescale = true; - } - } - - // set an already loaded and cropped photo as profile photo - - if ($havescale) { - // unset any existing profile photos - $r = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d", - intval(PHOTO_NORMAL), - intval(PHOTO_PROFILE), - intval(local_channel()) - ); - - $r = q("UPDATE photo SET photo_usage = %d WHERE uid = %d AND resource_id = '%s'", - intval(PHOTO_PROFILE), - intval(local_channel()), - dbesc($resource_id) - ); - - $r = q("UPDATE xchan set xchan_photo_date = '%s' where xchan_hash = '%s'", - dbesc(datetime_convert()), - dbesc($channel['xchan_hash']) - ); - - photo_profile_setperms(local_channel(),$resource_id,$_REQUEST['profile']); + $res = attach_store(App::get_channel(), get_observer_hash(), '', [ 'album' => t('Profile Photos'), 'hash' => $hash, 'source' => 'photos' ]); - $sync = attach_export_data($channel,$resource_id); - if ($sync) { - Libsync::build_sync_packet($channel['channel_id'],array('file' => array($sync))); - } + logger('attach_store: ' . print_r($res, true), LOGGER_DEBUG); - Run::Summon( [ 'Directory',local_channel() ] ); - goaway(z_root() . '/profiles'); - } - - $r = q("SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", - intval($r[0]['id']), - intval(local_channel()) - - ); - if (! $r) { - notice( t('Photo not available.') . EOL ); - return; - } - - if (intval($r[0]['os_storage'])) { - $data = @file_get_contents(dbunescbin($r[0]['content'])); - } - else { - $data = dbunescbin($r[0]['content']); - } - - $ph = photo_factory($data, $r[0]['mimetype']); - $smallest = 0; - if ($ph->is_valid()) { - // go ahead as if we have just uploaded a new photo to crop - $i = q("select resource_id, imgscale from photo where resource_id = '%s' and uid = %d order by imgscale", - dbesc($r[0]['resource_id']), - intval(local_channel()) - ); - - if ($i) { - $hash = $i[0]['resource_id']; - foreach ($i as $ii) { - if (intval($ii['imgscale']) < PHOTO_RES_640) { - $smallest = intval($ii['imgscale']); - } - } - } - } - - if ($multi_profiles) { - App::$data['importfile'] = $resource_id; - } - else { - $this->profile_photo_crop_ui_head($ph, $hash, $smallest); - } + json_return_and_die(['message' => $hash]); + } - // falls through with App::$data['imagecrop'] set so we go straight to the cropping section + if (($res && intval($res['data']['is_photo'])) || $importing) { + $i = q( + "select * from photo where resource_id = '%s' and uid = %d order by imgscale", + dbesc($hash), + intval(local_channel()) + ); - } - - // present an upload form + if (!$i) { + notice(t('Image upload failed.') . EOL); + return; + } + $os_storage = false; - $profiles = q("select id, profile_name as name, is_default from profile where uid = %d order by id asc", - intval(local_channel()) - ); + foreach ($i as $ii) { + if (intval($ii['imgscale']) < PHOTO_RES_640) { + $smallest = intval($ii['imgscale']); + $os_storage = intval($ii['os_storage']); + $imagedata = $ii['content']; + $filetype = $ii['mimetype']; + } + } + } - if ($profiles) { - for ($x = 0; $x < count($profiles); $x ++) { - $profiles[$x]['selected'] = false; - if ($pf && $profiles[$x]['id'] == $pf) { - $profiles[$x]['selected'] = true; - } - if ((! $pf) && $profiles[$x]['is_default']) { - $profiles[$x]['selected'] = true; - } - } - } + $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata)); + $ph = photo_factory($imagedata, $filetype); - $importing = ((array_key_exists('importfile',App::$data)) ? true : false); - - if (! array_key_exists('imagecrop', App::$data)) { - - $tpl = get_markup_template('profile_photo.tpl'); - - $o .= replace_macros($tpl, [ - '$user' => App::$channel['channel_address'], - '$info' => ((count($profiles) > 1) ? t('Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile') : t('Your profile photo is visible to anybody on the internet and may be distributed to other websites.')), - '$importfile' => (($importing) ? App::$data['importfile'] : ''), - '$lbl_upfile' => t('Upload File:'), - '$lbl_profiles' => t('Select a profile:'), - '$title' => (($importing) ? t('Use Photo for Profile') : t('Change Profile Photo')), - '$submit' => (($importing) ? t('Use') : t('Upload')), - '$profiles' => $profiles, - '$single' => ((count($profiles) == 1) ? true : false), - '$profile0' => $profiles[0], - '$embedPhotos' => t('Use a photo from your albums'), - '$embedPhotosModalTitle' => t('Use a photo from your albums'), - '$embedPhotosModalCancel' => t('Cancel'), - '$embedPhotosModalOK' => t('OK'), - '$modalchooseimages' => t('Choose images to embed'), - '$modalchoosealbum' => t('Choose an album'), - '$modaldiffalbum' => t('Choose a different album'), - '$modalerrorlist' => t('Error getting album list'), - '$modalerrorlink' => t('Error getting photo link'), - '$modalerroralbum' => t('Error getting album'), - '$form_security_token' => get_form_security_token("profile_photo"), - '$select' => t('Select previously uploaded photo'), - ]); - - call_hooks('profile_photo_content_end', $o); - return $o; - } - else { + if (!$ph->is_valid()) { + notice(t('Unable to process image.') . EOL); + return; + } - // present a cropping form + return $this->profile_photo_crop_ui_head($ph, $hash, $smallest); - $filename = App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution']; - $resolution = App::$data['imagecrop_resolution']; - $o .= replace_macros(get_markup_template('cropbody.tpl'), [ - '$filename' => $filename, - '$profile' => intval($_REQUEST['profile']), - '$resource' => App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution'], - '$image_url' => z_root() . '/photo/' . $filename, - '$title' => t('Crop Image'), - '$desc' => t('Please adjust the image cropping for optimum viewing.'), - '$form_security_token' => get_form_security_token("profile_photo"), - '$done' => t('Done Editing') - ]); - return $o; - } - } - - /* @brief Generate the UI for photo-cropping - * - * @param $ph Photo-Factory - * @return void - * - */ - - function profile_photo_crop_ui_head($ph, $hash, $smallest) { - $max_length = get_config('system','max_image_length', MAX_IMAGE_LENGTH); - if ($max_length > 0) { - $ph->scaleImage($max_length); - } - - App::$data['width'] = $ph->getWidth(); - App::$data['height'] = $ph->getHeight(); - - if (App::$data['width'] < 500 || App::$data['height'] < 500) { - $ph->scaleImageUp(400); - App::$data['width'] = $ph->getWidth(); - App::$data['height'] = $ph->getHeight(); - } - - App::$data['imagecrop'] = $hash; - App::$data['imagecrop_resolution'] = $smallest; - App::$page['htmlhead'] .= replace_macros(get_markup_template('crophead.tpl'), []); - return; - } + // This will "fall through" to the get() method, and since + // App::$data['imagecrop'] is set, it will proceed to cropping + // rather than present the upload form + } + + + /* @brief Generate content of profile-photo view + * + * @return void + * + */ + + + public function get() + { + + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } + + $channel = App::get_channel(); + $pf = 0; + $newuser = false; + + if (argc() == 2 && argv(1) === 'new') { + $newuser = true; + } + + if (argv(1) === 'use') { + if (argc() < 3) { + notice(t('Permission denied.') . EOL); + return; + } + + $resource_id = argv(2); + + $pf = (($_REQUEST['pf']) ? intval($_REQUEST['pf']) : 0); + + $c = q( + "select id, is_default from profile where uid = %d", + intval(local_channel()) + ); + + $multi_profiles = true; + + if (($c) && (count($c) === 1) && (intval($c[0]['is_default']))) { + $_REQUEST['profile'] = $c[0]['id']; + $multi_profiles = false; + } else { + $_REQUEST['profile'] = $pf; + } + + $r = q( + "SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC", + intval(local_channel()), + dbesc($resource_id) + ); + if (!$r) { + notice(t('Photo not available.') . EOL); + return; + } + $havescale = false; + foreach ($r as $rr) { + if ($rr['imgscale'] == PHOTO_RES_PROFILE_80) { + $havescale = true; + } + } + + // set an already loaded and cropped photo as profile photo + + if ($havescale) { + // unset any existing profile photos + $r = q( + "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d", + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE), + intval(local_channel()) + ); + + $r = q( + "UPDATE photo SET photo_usage = %d WHERE uid = %d AND resource_id = '%s'", + intval(PHOTO_PROFILE), + intval(local_channel()), + dbesc($resource_id) + ); + + $r = q( + "UPDATE xchan set xchan_photo_date = '%s' where xchan_hash = '%s'", + dbesc(datetime_convert()), + dbesc($channel['xchan_hash']) + ); + + photo_profile_setperms(local_channel(), $resource_id, $_REQUEST['profile']); + + $sync = attach_export_data($channel, $resource_id); + if ($sync) { + Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync))); + } + + Run::Summon(['Directory', local_channel()]); + goaway(z_root() . '/profiles'); + } + + $r = q( + "SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", + intval($r[0]['id']), + intval(local_channel()) + ); + if (!$r) { + notice(t('Photo not available.') . EOL); + return; + } + + if (intval($r[0]['os_storage'])) { + $data = @file_get_contents(dbunescbin($r[0]['content'])); + } else { + $data = dbunescbin($r[0]['content']); + } + + $ph = photo_factory($data, $r[0]['mimetype']); + $smallest = 0; + if ($ph->is_valid()) { + // go ahead as if we have just uploaded a new photo to crop + $i = q( + "select resource_id, imgscale from photo where resource_id = '%s' and uid = %d order by imgscale", + dbesc($r[0]['resource_id']), + intval(local_channel()) + ); + + if ($i) { + $hash = $i[0]['resource_id']; + foreach ($i as $ii) { + if (intval($ii['imgscale']) < PHOTO_RES_640) { + $smallest = intval($ii['imgscale']); + } + } + } + } + + if ($multi_profiles) { + App::$data['importfile'] = $resource_id; + } else { + $this->profile_photo_crop_ui_head($ph, $hash, $smallest); + } + + // falls through with App::$data['imagecrop'] set so we go straight to the cropping section + } + + // present an upload form + + $profiles = q( + "select id, profile_name as name, is_default from profile where uid = %d order by id asc", + intval(local_channel()) + ); + + if ($profiles) { + for ($x = 0; $x < count($profiles); $x++) { + $profiles[$x]['selected'] = false; + if ($pf && $profiles[$x]['id'] == $pf) { + $profiles[$x]['selected'] = true; + } + if ((!$pf) && $profiles[$x]['is_default']) { + $profiles[$x]['selected'] = true; + } + } + } + + $importing = ((array_key_exists('importfile', App::$data)) ? true : false); + + if (!array_key_exists('imagecrop', App::$data)) { + $tpl = get_markup_template('profile_photo.tpl'); + + $o .= replace_macros($tpl, [ + '$user' => App::$channel['channel_address'], + '$info' => ((count($profiles) > 1) ? t('Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile') : t('Your profile photo is visible to anybody on the internet and may be distributed to other websites.')), + '$importfile' => (($importing) ? App::$data['importfile'] : ''), + '$lbl_upfile' => t('Upload File:'), + '$lbl_profiles' => t('Select a profile:'), + '$title' => (($importing) ? t('Use Photo for Profile') : t('Change Profile Photo')), + '$submit' => (($importing) ? t('Use') : t('Upload')), + '$profiles' => $profiles, + '$single' => ((count($profiles) == 1) ? true : false), + '$profile0' => $profiles[0], + '$embedPhotos' => t('Use a photo from your albums'), + '$embedPhotosModalTitle' => t('Use a photo from your albums'), + '$embedPhotosModalCancel' => t('Cancel'), + '$embedPhotosModalOK' => t('OK'), + '$modalchooseimages' => t('Choose images to embed'), + '$modalchoosealbum' => t('Choose an album'), + '$modaldiffalbum' => t('Choose a different album'), + '$modalerrorlist' => t('Error getting album list'), + '$modalerrorlink' => t('Error getting photo link'), + '$modalerroralbum' => t('Error getting album'), + '$form_security_token' => get_form_security_token("profile_photo"), + '$select' => t('Select previously uploaded photo'), + ]); + + call_hooks('profile_photo_content_end', $o); + return $o; + } else { + // present a cropping form + + $filename = App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution']; + $resolution = App::$data['imagecrop_resolution']; + $o .= replace_macros(get_markup_template('cropbody.tpl'), [ + '$filename' => $filename, + '$profile' => intval($_REQUEST['profile']), + '$resource' => App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution'], + '$image_url' => z_root() . '/photo/' . $filename, + '$title' => t('Crop Image'), + '$desc' => t('Please adjust the image cropping for optimum viewing.'), + '$form_security_token' => get_form_security_token("profile_photo"), + '$done' => t('Done Editing') + ]); + return $o; + } + } + + /* @brief Generate the UI for photo-cropping + * + * @param $ph Photo-Factory + * @return void + * + */ + + public function profile_photo_crop_ui_head($ph, $hash, $smallest) + { + $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH); + if ($max_length > 0) { + $ph->scaleImage($max_length); + } + + App::$data['width'] = $ph->getWidth(); + App::$data['height'] = $ph->getHeight(); + + if (App::$data['width'] < 500 || App::$data['height'] < 500) { + $ph->scaleImageUp(400); + App::$data['width'] = $ph->getWidth(); + App::$data['height'] = $ph->getHeight(); + } + + App::$data['imagecrop'] = $hash; + App::$data['imagecrop_resolution'] = $smallest; + App::$page['htmlhead'] .= replace_macros(get_markup_template('crophead.tpl'), []); + return; + } } diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php index 1231e6319..a9630424d 100644 --- a/Zotlabs/Module/Profiles.php +++ b/Zotlabs/Module/Profiles.php @@ -1,519 +1,549 @@ 2) && (argv(1) === "drop") && intval(argv(2))) { - $r = q("SELECT * FROM profile WHERE id = %d AND uid = %d AND is_default = 0 LIMIT 1", - intval(argv(2)), - intval(local_channel()) - ); - if(! $r) { - notice( t('Profile not found.') . EOL); - goaway(z_root() . '/profiles'); - } - $profile_guid = $r[0]['profile_guid']; - - check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't'); - - // move every contact using this profile as their default to the user default - - $r = q("UPDATE abook SET abook_profile = (SELECT profile_guid FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1) WHERE abook_profile = '%s' AND abook_channel = %d ", - intval(local_channel()), - dbesc($profile_guid), - intval(local_channel()) - ); - $r = q("DELETE FROM profile WHERE id = %d AND uid = %d", - intval(argv(2)), - intval(local_channel()) - ); - if($r) - info( t('Profile deleted.') . EOL); - - // @fixme this is a much more complicated sync - add any changed abook entries and - // also add deleted flag to profile structure - // profiles_build_sync is just here as a placeholder - it doesn't work at all here - - // profiles_build_sync(local_channel()); - - goaway(z_root() . '/profiles'); - return; // NOTREACHED - } - - - - - - if((argc() > 1) && (argv(1) === 'new')) { - - // check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't'); - - $r0 = q("SELECT id FROM profile WHERE uid = %d", - intval(local_channel())); - $num_profiles = count($r0); - - $name = t('Profile-') . ($num_profiles + 1); - - $r1 = q("SELECT fullname, photo, thumb FROM profile WHERE uid = %d AND is_default = 1 LIMIT 1", - intval(local_channel())); - - $r2 = profile_store_lowlevel( - [ - 'aid' => intval(get_account_id()), - 'uid' => intval(local_channel()), - 'profile_guid' => new_uuid(), - 'profile_name' => $name, - 'fullname' => $r1[0]['fullname'], - 'photo' => $r1[0]['photo'], - 'thumb' => $r1[0]['thumb'] - ] - ); - - $r3 = q("SELECT id FROM profile WHERE uid = %d AND profile_name = '%s' LIMIT 1", - intval(local_channel()), - dbesc($name) - ); - - info( t('New profile created.') . EOL); - if(count($r3) == 1) - goaway(z_root() . '/profiles/' . $r3[0]['id']); - - goaway(z_root() . '/profiles'); - } - - if((argc() > 2) && (argv(1) === 'clone')) { - - check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't'); - - $r0 = q("SELECT id FROM profile WHERE uid = %d", - intval(local_channel())); - $num_profiles = count($r0); - - $name = t('Profile-') . ($num_profiles + 1); - $r1 = q("SELECT * FROM profile WHERE uid = %d AND id = %d LIMIT 1", - intval(local_channel()), - intval(argv(2)) - ); - if(! count($r1)) { - notice( t('Profile unavailable to clone.') . EOL); - App::$error = 404; - return; - } - unset($r1[0]['id']); - $r1[0]['is_default'] = 0; - $r1[0]['publish'] = 0; - $r1[0]['profile_name'] = $name; - $r1[0]['profile_guid'] = new_uuid(); - - create_table_from_array('profile', $r1[0]); - - $r3 = q("SELECT id FROM profile WHERE uid = %d AND profile_name = '%s' LIMIT 1", - intval(local_channel()), - dbesc($name) - ); - info( t('New profile created.') . EOL); - - profiles_build_sync(local_channel()); - - if(($r3) && (count($r3) == 1)) - goaway(z_root() . '/profiles/' . $r3[0]['id']); - - goaway(z_root() . '/profiles'); - - return; // NOTREACHED - } - - if((argc() > 2) && (argv(1) === 'export')) { - - $r1 = q("SELECT * FROM profile WHERE uid = %d AND id = %d LIMIT 1", - intval(local_channel()), - intval(argv(2)) - ); - if(! $r1) { - notice( t('Profile unavailable to export.') . EOL); - App::$error = 404; - return; - } - header('content-type: application/octet_stream'); - header('Content-Disposition: attachment; filename="' . $r1[0]['profile_name'] . '.json"' ); - - unset($r1[0]['id']); - unset($r1[0]['aid']); - unset($r1[0]['uid']); - unset($r1[0]['is_default']); - unset($r1[0]['publish']); - unset($r1[0]['profile_name']); - unset($r1[0]['profile_guid']); - echo json_encode($r1[0]); - killme(); - } - - if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_channel(),'multi_profiles')) { - if(feature_enabled(local_channel(),'multi_profiles')) - $id = argv(1); - else { - $x = q("select id from profile where uid = %d and is_default = 1", - intval(local_channel()) - ); - if($x) - $id = $x[0]['id']; - } - $r = q("SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1", - intval($id), - intval(local_channel()) - ); - if(! count($r)) { - notice( t('Profile not found.') . EOL); - App::$error = 404; - return; - } - - $chan = App::get_channel(); - - Libprofile::load($chan['channel_address'],$r[0]['profile_guid']); - } - } - - function post() { - - if(! local_channel()) { - notice( t('Permission denied.') . EOL); - return; - } - - $namechanged = false; - - // import from json export file. - // Only import fields that are allowed on this hub - - if(x($_FILES,'userfile')) { - $src = $_FILES['userfile']['tmp_name']; - $filesize = intval($_FILES['userfile']['size']); - if($filesize) { - $j = @json_decode(@file_get_contents($src),true); - @unlink($src); - if($j) { - $fields = get_profile_fields_advanced(); - if($fields) { - foreach($j as $jj => $v) { - foreach($fields as $f => $n) { - if($jj == $f) { - $_POST[$f] = $v; - break; - } - } - } - } - } - } - } - - call_hooks('profile_post', $_POST); - - - if((argc() > 1) && (argv(1) !== "new") && intval(argv(1))) { - $orig = q("SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1", - intval(argv(1)), - intval(local_channel()) - ); - if(! count($orig)) { - notice( t('Profile not found.') . EOL); - return; - } - - check_form_security_token_redirectOnErr('/profiles', 'profile_edit'); - + public function init() + { - $is_default = (($orig[0]['is_default']) ? 1 : 0); - - $profile_name = notags(trim($_POST['profile_name'])); - if(! strlen($profile_name)) { - notice( t('Profile Name is required.') . EOL); - return; - } - - $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; - - $y = substr($dob,0,4); - if((! ctype_digit($y)) || ($y < 1900)) - $ignore_year = true; - else - $ignore_year = false; - - if($dob !== '0000-00-00') { - if(strpos($dob,'0000-') === 0) { - $ignore_year = true; - $dob = substr($dob,5); - } - $dob = datetime_convert('UTC','UTC',(($ignore_year) ? '1900-' . $dob : $dob),(($ignore_year) ? 'm-d' : 'Y-m-d')); - if($ignore_year) - $dob = '0000-' . $dob; - } - - $name = escape_tags(trim($_POST['name'])); - - if($orig[0]['fullname'] != $name) { - $namechanged = true; - - $v = validate_channelname($name); - if($v) { - notice($v); - $namechanged = false; - $name = $orig[0]['fullname']; - } - } - - $pdesc = escape_tags(trim($_POST['pdesc'])); - $gender = escape_tags(trim($_POST['gender'])); - $address = escape_tags(trim($_POST['address'])); - $locality = escape_tags(trim($_POST['locality'])); - $region = escape_tags(trim($_POST['region'])); - $postal_code = escape_tags(trim($_POST['postal_code'])); - $country_name = escape_tags(trim($_POST['country_name'])); - $keywords = escape_tags(trim($_POST['keywords'])); - $marital = escape_tags(trim($_POST['marital'])); - $howlong = escape_tags(trim($_POST['howlong'])); - $sexual = escape_tags(trim($_POST['sexual'])); - $pronouns = escape_tags(trim($_POST['pronouns'])); - $homepage = escape_tags(trim($_POST['homepage'])); - $hometown = escape_tags(trim($_POST['hometown'])); - $politic = escape_tags(trim($_POST['politic'])); - $religion = escape_tags(trim($_POST['religion'])); - - $likes = escape_tags(trim($_POST['likes'])); - $dislikes = escape_tags(trim($_POST['dislikes'])); - - $about = escape_tags(trim($_POST['about'])); - $interest = escape_tags(trim($_POST['interest'])); - $contact = escape_tags(trim($_POST['contact'])); - $channels = escape_tags(trim($_POST['channels'])); - $music = escape_tags(trim($_POST['music'])); - $book = escape_tags(trim($_POST['book'])); - $tv = escape_tags(trim($_POST['tv'])); - $film = escape_tags(trim($_POST['film'])); - $romance = escape_tags(trim($_POST['romance'])); - $work = escape_tags(trim($_POST['work'])); - $education = escape_tags(trim($_POST['education'])); - - $hide_friends = ((intval($_POST['hide_friends'])) ? 1: 0); - - // start fresh and create a new vcard. - // @TODO: preserve the original guid or whatever else needs saving - // $orig_vcard = (($orig[0]['profile_vcard']) ? Reader::read($orig[0]['profile_vcard']) : null); + nav_set_selected('Profiles'); - $orig_vcard = null; + if (!local_channel()) { + return; + } - $channel = App::get_channel(); + if ((argc() > 2) && (argv(1) === "drop") && intval(argv(2))) { + $r = q( + "SELECT * FROM profile WHERE id = %d AND uid = %d AND is_default = 0 LIMIT 1", + intval(argv(2)), + intval(local_channel()) + ); + if (!$r) { + notice(t('Profile not found.') . EOL); + goaway(z_root() . '/profiles'); + } + $profile_guid = $r[0]['profile_guid']; - $default_vcard_cat = ((defined('DEFAULT_VCARD_CAT')) ? DEFAULT_VCARD_CAT : 'HOME'); + check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't'); - $defcard = [ - 'fn' => $name, - 'title' => $pdesc, - 'photo' => $channel['xchan_photo_l'], - 'adr' => [], - 'adr_type' => [ $default_vcard_cat ], - 'url' => [ $homepage ], - 'url_type' => [ $default_vcard_cat ] - ]; + // move every contact using this profile as their default to the user default - $defcard['adr'][] = [ - 0 => '', - 1 => '', - 2 => $address, - 3 => $locality, - 4 => $region, - 5 => $postal_code, - 6 => $country_name - ]; - - $profile_vcard = update_vcard($defcard,$orig_vcard); + $r = q( + "UPDATE abook SET abook_profile = (SELECT profile_guid FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1) WHERE abook_profile = '%s' AND abook_channel = %d ", + intval(local_channel()), + dbesc($profile_guid), + intval(local_channel()) + ); + $r = q( + "DELETE FROM profile WHERE id = %d AND uid = %d", + intval(argv(2)), + intval(local_channel()) + ); + if ($r) { + info(t('Profile deleted.') . EOL); + } - $orig_vcard = Reader::read($profile_vcard); + // @fixme this is a much more complicated sync - add any changed abook entries and + // also add deleted flag to profile structure + // profiles_build_sync is just here as a placeholder - it doesn't work at all here - $profile_vcard = update_vcard($_REQUEST,$orig_vcard); + // profiles_build_sync(local_channel()); + + goaway(z_root() . '/profiles'); + return; // NOTREACHED + } - require_once('include/text.php'); - linkify_tags($likes, local_channel()); - linkify_tags($dislikes, local_channel()); - linkify_tags($about, local_channel()); - linkify_tags($interest, local_channel()); - linkify_tags($interest, local_channel()); - linkify_tags($contact, local_channel()); - linkify_tags($channels, local_channel()); - linkify_tags($music, local_channel()); - linkify_tags($book, local_channel()); - linkify_tags($tv, local_channel()); - linkify_tags($film, local_channel()); - linkify_tags($romance, local_channel()); - linkify_tags($work, local_channel()); - linkify_tags($education, local_channel()); - - - $with = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : ''); - - if(! strlen($howlong)) - $howlong = NULL_DATE; - else - $howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong); - - // linkify the relationship target if applicable - - $withchanged = false; - - if(strlen($with)) { - if($with != strip_tags($orig[0]['partner'])) { - $withchanged = true; - $prf = ''; - $lookup = $with; - if(strpos($lookup,'@') === 0) - $lookup = substr($lookup,1); - $lookup = str_replace('_',' ', $lookup); - $newname = $lookup; - - $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1", - dbesc($newname), - intval(local_channel()) - ); - if(! $r) { - $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_addr = '%s' AND abook_channel = %d LIMIT 1", - dbesc($lookup . '@%'), - intval(local_channel()) - ); - } - if($r) { - $prf = $r[0]['xchan_url']; - $newname = $r[0]['xchan_name']; - } - - - if($prf) { - $with = str_replace($lookup,'' . $newname . '', $with); - if(strpos($with,'@') === 0) - $with = substr($with,1); - } - } - else - $with = $orig[0]['partner']; - } - - $profile_fields_basic = get_profile_fields_basic(); - $profile_fields_advanced = get_profile_fields_advanced(); - $advanced = ((feature_enabled(local_channel(),'advanced_profiles')) ? true : false); - if($advanced) - $fields = $profile_fields_advanced; - else - $fields = $profile_fields_basic; - - $z = q("select * from profdef where true"); - if($z) { - foreach($z as $zz) { - if(array_key_exists($zz['field_name'],$fields)) { - $w = q("select * from profext where channel_id = %d and hash = '%s' and k = '%s' limit 1", - intval(local_channel()), - dbesc($orig[0]['profile_guid']), - dbesc($zz['field_name']) - ); - if($w) { - q("update profext set v = '%s' where id = %d", - dbesc(escape_tags(trim($_POST[$zz['field_name']]))), - intval($w[0]['id']) - ); - } - else { - q("insert into profext ( channel_id, hash, k, v ) values ( %d, '%s', '%s', '%s') ", - intval(local_channel()), - dbesc($orig[0]['profile_guid']), - dbesc($zz['field_name']), - dbesc(escape_tags(trim($_POST[$zz['field_name']]))) - ); - } - } - } - } - - $changes = []; - $value = ''; - if($is_default) { - if($marital != $orig[0]['marital']) { - $changes[] = '[color=#ff0000]♥[/color] ' . t('Marital Status'); - $value = $marital; - } - if($withchanged) { - $changes[] = '[color=#ff0000]♥[/color] ' . t('Romantic Partner'); - $value = strip_tags($with); - } - if($likes != $orig[0]['likes']) { - $changes[] = t('Likes'); - $value = $likes; - } - if($dislikes != $orig[0]['dislikes']) { - $changes[] = t('Dislikes'); - $value = $dislikes; - } - if($work != $orig[0]['employment']) { - $changes[] = t('Work/Employment'); - } - if($religion != $orig[0]['religion']) { - $changes[] = t('Religion'); - $value = $religion; - } - if($politic != $orig[0]['politic']) { - $changes[] = t('Political Views'); - $value = $politic; - } - if($gender != $orig[0]['gender']) { - $changes[] = t('Gender'); - $value = $gender; - } - if($sexual != $orig[0]['sexual']) { - $changes[] = t('Sexual Preference'); - $value = $sexual; - } - if($homepage != $orig[0]['homepage']) { - $changes[] = t('Homepage'); - $value = $homepage; - } - if($interest != $orig[0]['interest']) { - $changes[] = t('Interests'); - $value = $interest; - } - if($address != $orig[0]['address']) { - $changes[] = t('Address'); - // New address not sent in notifications, potential privacy issues - // in case this leaks to unintended recipients. Yes, it's in the public - // profile but that doesn't mean we have to broadcast it to everybody. - } - if($locality != $orig[0]['locality'] || $region != $orig[0]['region'] - || $country_name != $orig[0]['country_name']) { - $changes[] = t('Location'); - $comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' '); - $comma2 = (($region && $country_name) ? ', ' : ''); - $value = $locality . $comma1 . $region . $comma2 . $country_name; - } - - self::profile_activity($changes,$value); - - } - - $r = q("UPDATE profile + if ((argc() > 1) && (argv(1) === 'new')) { + // check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't'); + + $r0 = q( + "SELECT id FROM profile WHERE uid = %d", + intval(local_channel()) + ); + $num_profiles = count($r0); + + $name = t('Profile-') . ($num_profiles + 1); + + $r1 = q( + "SELECT fullname, photo, thumb FROM profile WHERE uid = %d AND is_default = 1 LIMIT 1", + intval(local_channel()) + ); + + $r2 = profile_store_lowlevel( + [ + 'aid' => intval(get_account_id()), + 'uid' => intval(local_channel()), + 'profile_guid' => new_uuid(), + 'profile_name' => $name, + 'fullname' => $r1[0]['fullname'], + 'photo' => $r1[0]['photo'], + 'thumb' => $r1[0]['thumb'] + ] + ); + + $r3 = q( + "SELECT id FROM profile WHERE uid = %d AND profile_name = '%s' LIMIT 1", + intval(local_channel()), + dbesc($name) + ); + + info(t('New profile created.') . EOL); + if (count($r3) == 1) { + goaway(z_root() . '/profiles/' . $r3[0]['id']); + } + + goaway(z_root() . '/profiles'); + } + + if ((argc() > 2) && (argv(1) === 'clone')) { + check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't'); + + $r0 = q( + "SELECT id FROM profile WHERE uid = %d", + intval(local_channel()) + ); + $num_profiles = count($r0); + + $name = t('Profile-') . ($num_profiles + 1); + $r1 = q( + "SELECT * FROM profile WHERE uid = %d AND id = %d LIMIT 1", + intval(local_channel()), + intval(argv(2)) + ); + if (!count($r1)) { + notice(t('Profile unavailable to clone.') . EOL); + App::$error = 404; + return; + } + unset($r1[0]['id']); + $r1[0]['is_default'] = 0; + $r1[0]['publish'] = 0; + $r1[0]['profile_name'] = $name; + $r1[0]['profile_guid'] = new_uuid(); + + create_table_from_array('profile', $r1[0]); + + $r3 = q( + "SELECT id FROM profile WHERE uid = %d AND profile_name = '%s' LIMIT 1", + intval(local_channel()), + dbesc($name) + ); + info(t('New profile created.') . EOL); + + profiles_build_sync(local_channel()); + + if (($r3) && (count($r3) == 1)) { + goaway(z_root() . '/profiles/' . $r3[0]['id']); + } + + goaway(z_root() . '/profiles'); + + return; // NOTREACHED + } + + if ((argc() > 2) && (argv(1) === 'export')) { + $r1 = q( + "SELECT * FROM profile WHERE uid = %d AND id = %d LIMIT 1", + intval(local_channel()), + intval(argv(2)) + ); + if (!$r1) { + notice(t('Profile unavailable to export.') . EOL); + App::$error = 404; + return; + } + header('content-type: application/octet_stream'); + header('Content-Disposition: attachment; filename="' . $r1[0]['profile_name'] . '.json"'); + + unset($r1[0]['id']); + unset($r1[0]['aid']); + unset($r1[0]['uid']); + unset($r1[0]['is_default']); + unset($r1[0]['publish']); + unset($r1[0]['profile_name']); + unset($r1[0]['profile_guid']); + echo json_encode($r1[0]); + killme(); + } + + if (((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_channel(), 'multi_profiles')) { + if (feature_enabled(local_channel(), 'multi_profiles')) { + $id = argv(1); + } else { + $x = q( + "select id from profile where uid = %d and is_default = 1", + intval(local_channel()) + ); + if ($x) { + $id = $x[0]['id']; + } + } + $r = q( + "SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1", + intval($id), + intval(local_channel()) + ); + if (!count($r)) { + notice(t('Profile not found.') . EOL); + App::$error = 404; + return; + } + + $chan = App::get_channel(); + + Libprofile::load($chan['channel_address'], $r[0]['profile_guid']); + } + } + + public function post() + { + + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } + + $namechanged = false; + + // import from json export file. + // Only import fields that are allowed on this hub + + if (x($_FILES, 'userfile')) { + $src = $_FILES['userfile']['tmp_name']; + $filesize = intval($_FILES['userfile']['size']); + if ($filesize) { + $j = @json_decode(@file_get_contents($src), true); + @unlink($src); + if ($j) { + $fields = get_profile_fields_advanced(); + if ($fields) { + foreach ($j as $jj => $v) { + foreach ($fields as $f => $n) { + if ($jj == $f) { + $_POST[$f] = $v; + break; + } + } + } + } + } + } + } + + call_hooks('profile_post', $_POST); + + + if ((argc() > 1) && (argv(1) !== "new") && intval(argv(1))) { + $orig = q( + "SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1", + intval(argv(1)), + intval(local_channel()) + ); + if (!count($orig)) { + notice(t('Profile not found.') . EOL); + return; + } + + check_form_security_token_redirectOnErr('/profiles', 'profile_edit'); + + + $is_default = (($orig[0]['is_default']) ? 1 : 0); + + $profile_name = notags(trim($_POST['profile_name'])); + if (!strlen($profile_name)) { + notice(t('Profile Name is required.') . EOL); + return; + } + + $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; + + $y = substr($dob, 0, 4); + if ((!ctype_digit($y)) || ($y < 1900)) { + $ignore_year = true; + } else { + $ignore_year = false; + } + + if ($dob !== '0000-00-00') { + if (strpos($dob, '0000-') === 0) { + $ignore_year = true; + $dob = substr($dob, 5); + } + $dob = datetime_convert('UTC', 'UTC', (($ignore_year) ? '1900-' . $dob : $dob), (($ignore_year) ? 'm-d' : 'Y-m-d')); + if ($ignore_year) { + $dob = '0000-' . $dob; + } + } + + $name = escape_tags(trim($_POST['name'])); + + if ($orig[0]['fullname'] != $name) { + $namechanged = true; + + $v = validate_channelname($name); + if ($v) { + notice($v); + $namechanged = false; + $name = $orig[0]['fullname']; + } + } + + $pdesc = escape_tags(trim($_POST['pdesc'])); + $gender = escape_tags(trim($_POST['gender'])); + $address = escape_tags(trim($_POST['address'])); + $locality = escape_tags(trim($_POST['locality'])); + $region = escape_tags(trim($_POST['region'])); + $postal_code = escape_tags(trim($_POST['postal_code'])); + $country_name = escape_tags(trim($_POST['country_name'])); + $keywords = escape_tags(trim($_POST['keywords'])); + $marital = escape_tags(trim($_POST['marital'])); + $howlong = escape_tags(trim($_POST['howlong'])); + $sexual = escape_tags(trim($_POST['sexual'])); + $pronouns = escape_tags(trim($_POST['pronouns'])); + $homepage = escape_tags(trim($_POST['homepage'])); + $hometown = escape_tags(trim($_POST['hometown'])); + $politic = escape_tags(trim($_POST['politic'])); + $religion = escape_tags(trim($_POST['religion'])); + + $likes = escape_tags(trim($_POST['likes'])); + $dislikes = escape_tags(trim($_POST['dislikes'])); + + $about = escape_tags(trim($_POST['about'])); + $interest = escape_tags(trim($_POST['interest'])); + $contact = escape_tags(trim($_POST['contact'])); + $channels = escape_tags(trim($_POST['channels'])); + $music = escape_tags(trim($_POST['music'])); + $book = escape_tags(trim($_POST['book'])); + $tv = escape_tags(trim($_POST['tv'])); + $film = escape_tags(trim($_POST['film'])); + $romance = escape_tags(trim($_POST['romance'])); + $work = escape_tags(trim($_POST['work'])); + $education = escape_tags(trim($_POST['education'])); + + $hide_friends = ((intval($_POST['hide_friends'])) ? 1 : 0); + + // start fresh and create a new vcard. + // @TODO: preserve the original guid or whatever else needs saving + // $orig_vcard = (($orig[0]['profile_vcard']) ? Reader::read($orig[0]['profile_vcard']) : null); + + $orig_vcard = null; + + $channel = App::get_channel(); + + $default_vcard_cat = ((defined('DEFAULT_VCARD_CAT')) ? DEFAULT_VCARD_CAT : 'HOME'); + + $defcard = [ + 'fn' => $name, + 'title' => $pdesc, + 'photo' => $channel['xchan_photo_l'], + 'adr' => [], + 'adr_type' => [$default_vcard_cat], + 'url' => [$homepage], + 'url_type' => [$default_vcard_cat] + ]; + + $defcard['adr'][] = [ + 0 => '', + 1 => '', + 2 => $address, + 3 => $locality, + 4 => $region, + 5 => $postal_code, + 6 => $country_name + ]; + + $profile_vcard = update_vcard($defcard, $orig_vcard); + + $orig_vcard = Reader::read($profile_vcard); + + $profile_vcard = update_vcard($_REQUEST, $orig_vcard); + + + require_once('include/text.php'); + linkify_tags($likes, local_channel()); + linkify_tags($dislikes, local_channel()); + linkify_tags($about, local_channel()); + linkify_tags($interest, local_channel()); + linkify_tags($interest, local_channel()); + linkify_tags($contact, local_channel()); + linkify_tags($channels, local_channel()); + linkify_tags($music, local_channel()); + linkify_tags($book, local_channel()); + linkify_tags($tv, local_channel()); + linkify_tags($film, local_channel()); + linkify_tags($romance, local_channel()); + linkify_tags($work, local_channel()); + linkify_tags($education, local_channel()); + + + $with = ((x($_POST, 'with')) ? escape_tags(trim($_POST['with'])) : ''); + + if (!strlen($howlong)) { + $howlong = NULL_DATE; + } else { + $howlong = datetime_convert(date_default_timezone_get(), 'UTC', $howlong); + } + + // linkify the relationship target if applicable + + $withchanged = false; + + if (strlen($with)) { + if ($with != strip_tags($orig[0]['partner'])) { + $withchanged = true; + $prf = ''; + $lookup = $with; + if (strpos($lookup, '@') === 0) { + $lookup = substr($lookup, 1); + } + $lookup = str_replace('_', ' ', $lookup); + $newname = $lookup; + + $r = q( + "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1", + dbesc($newname), + intval(local_channel()) + ); + if (!$r) { + $r = q( + "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_addr = '%s' AND abook_channel = %d LIMIT 1", + dbesc($lookup . '@%'), + intval(local_channel()) + ); + } + if ($r) { + $prf = $r[0]['xchan_url']; + $newname = $r[0]['xchan_name']; + } + + + if ($prf) { + $with = str_replace($lookup, '' . $newname . '', $with); + if (strpos($with, '@') === 0) { + $with = substr($with, 1); + } + } + } else { + $with = $orig[0]['partner']; + } + } + + $profile_fields_basic = get_profile_fields_basic(); + $profile_fields_advanced = get_profile_fields_advanced(); + $advanced = ((feature_enabled(local_channel(), 'advanced_profiles')) ? true : false); + if ($advanced) { + $fields = $profile_fields_advanced; + } else { + $fields = $profile_fields_basic; + } + + $z = q("select * from profdef where true"); + if ($z) { + foreach ($z as $zz) { + if (array_key_exists($zz['field_name'], $fields)) { + $w = q( + "select * from profext where channel_id = %d and hash = '%s' and k = '%s' limit 1", + intval(local_channel()), + dbesc($orig[0]['profile_guid']), + dbesc($zz['field_name']) + ); + if ($w) { + q( + "update profext set v = '%s' where id = %d", + dbesc(escape_tags(trim($_POST[$zz['field_name']]))), + intval($w[0]['id']) + ); + } else { + q( + "insert into profext ( channel_id, hash, k, v ) values ( %d, '%s', '%s', '%s') ", + intval(local_channel()), + dbesc($orig[0]['profile_guid']), + dbesc($zz['field_name']), + dbesc(escape_tags(trim($_POST[$zz['field_name']]))) + ); + } + } + } + } + + $changes = []; + $value = ''; + if ($is_default) { + if ($marital != $orig[0]['marital']) { + $changes[] = '[color=#ff0000]♥[/color] ' . t('Marital Status'); + $value = $marital; + } + if ($withchanged) { + $changes[] = '[color=#ff0000]♥[/color] ' . t('Romantic Partner'); + $value = strip_tags($with); + } + if ($likes != $orig[0]['likes']) { + $changes[] = t('Likes'); + $value = $likes; + } + if ($dislikes != $orig[0]['dislikes']) { + $changes[] = t('Dislikes'); + $value = $dislikes; + } + if ($work != $orig[0]['employment']) { + $changes[] = t('Work/Employment'); + } + if ($religion != $orig[0]['religion']) { + $changes[] = t('Religion'); + $value = $religion; + } + if ($politic != $orig[0]['politic']) { + $changes[] = t('Political Views'); + $value = $politic; + } + if ($gender != $orig[0]['gender']) { + $changes[] = t('Gender'); + $value = $gender; + } + if ($sexual != $orig[0]['sexual']) { + $changes[] = t('Sexual Preference'); + $value = $sexual; + } + if ($homepage != $orig[0]['homepage']) { + $changes[] = t('Homepage'); + $value = $homepage; + } + if ($interest != $orig[0]['interest']) { + $changes[] = t('Interests'); + $value = $interest; + } + if ($address != $orig[0]['address']) { + $changes[] = t('Address'); + // New address not sent in notifications, potential privacy issues + // in case this leaks to unintended recipients. Yes, it's in the public + // profile but that doesn't mean we have to broadcast it to everybody. + } + if ( + $locality != $orig[0]['locality'] || $region != $orig[0]['region'] + || $country_name != $orig[0]['country_name'] + ) { + $changes[] = t('Location'); + $comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' '); + $comma2 = (($region && $country_name) ? ', ' : ''); + $value = $locality . $comma1 . $region . $comma2 . $country_name; + } + + self::profile_activity($changes, $value); + } + + $r = q( + "UPDATE profile SET profile_name = '%s', fullname = '%s', pdesc = '%s', @@ -550,532 +580,545 @@ class Profiles extends Controller { hide_friends = %d, profile_vcard = '%s' WHERE id = %d AND uid = %d", - dbesc($profile_name), - dbesc($name), - dbesc($pdesc), - dbesc($gender), - dbesc($dob), - dbesc($address), - dbesc($locality), - dbesc($region), - dbesc($postal_code), - dbesc($country_name), - dbesc($marital), - dbesc($with), - dbesc($howlong), - dbesc($sexual), - dbesc($pronouns), - dbesc($homepage), - dbesc($hometown), - dbesc($politic), - dbesc($religion), - dbesc($keywords), - dbesc($likes), - dbesc($dislikes), - dbesc($about), - dbesc($interest), - dbesc($contact), - dbesc($channels), - dbesc($music), - dbesc($book), - dbesc($tv), - dbesc($film), - dbesc($romance), - dbesc($work), - dbesc($education), - intval($hide_friends), - dbesc($profile_vcard), - intval(argv(1)), - intval(local_channel()) - ); - - if($r) - info( t('Profile updated.') . EOL); - - $sync = q("select * from profile where id = %d and uid = %d limit 1", - intval(argv(1)), - intval(local_channel()) - ); - if($sync) { - Libsync::build_sync_packet(local_channel(),array('profile' => $sync)); - } + dbesc($profile_name), + dbesc($name), + dbesc($pdesc), + dbesc($gender), + dbesc($dob), + dbesc($address), + dbesc($locality), + dbesc($region), + dbesc($postal_code), + dbesc($country_name), + dbesc($marital), + dbesc($with), + dbesc($howlong), + dbesc($sexual), + dbesc($pronouns), + dbesc($homepage), + dbesc($hometown), + dbesc($politic), + dbesc($religion), + dbesc($keywords), + dbesc($likes), + dbesc($dislikes), + dbesc($about), + dbesc($interest), + dbesc($contact), + dbesc($channels), + dbesc($music), + dbesc($book), + dbesc($tv), + dbesc($film), + dbesc($romance), + dbesc($work), + dbesc($education), + intval($hide_friends), + dbesc($profile_vcard), + intval(argv(1)), + intval(local_channel()) + ); - if (is_sys_channel(local_channel())) { - set_config('system','siteinfo', $about); - } + if ($r) { + info(t('Profile updated.') . EOL); + } - $channel = App::get_channel(); - - if($namechanged && $is_default) { - $r = q("UPDATE xchan SET xchan_name = '%s', xchan_name_date = '%s' WHERE xchan_hash = '%s'", - dbesc($name), - dbesc(datetime_convert()), - dbesc($channel['xchan_hash']) - ); - $r = q("UPDATE channel SET channel_name = '%s' WHERE channel_hash = '%s'", - dbesc($name), - dbesc($channel['xchan_hash']) - ); - if (is_sys_channel(local_channel())) { - set_config('system','sitename',$name); - } - } - - if($is_default) { - Run::Summon( [ 'Directory', local_channel() ] ); - goaway(z_root() . '/profiles/' . $sync[0]['id']); - } - } - } - - - function get() { - - $o = ''; - - $channel = App::get_channel(); - - if(! local_channel()) { - notice( t('Permission denied.') . EOL); - return; - } - - require_once('include/channel.php'); - - $profile_fields_basic = get_profile_fields_basic(); - $profile_fields_advanced = get_profile_fields_advanced(); - - if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_channel(),'multi_profiles')) { - if(feature_enabled(local_channel(),'multi_profiles')) - $id = argv(1); - else { - $x = q("select id from profile where uid = %d and is_default = 1", - intval(local_channel()) - ); - if($x) - $id = $x[0]['id']; - } - $r = q("SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1", - intval($id), - intval(local_channel()) - ); - if(! $r) { - notice( t('Profile not found.') . EOL); - return; - } - - $editselect = 'none'; - - App::$page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array( - '$baseurl' => z_root(), - '$editselect' => $editselect, - )); - - $advanced = ((feature_enabled(local_channel(),'advanced_profiles')) ? true : false); - if($advanced) - $fields = $profile_fields_advanced; - else - $fields = $profile_fields_basic; - - $hide_friends = array( - 'hide_friends', - t('Hide your connections list from viewers of this profile'), - $r[0]['hide_friends'], - '', - array(t('No'),t('Yes')) - ); - - $q = q("select * from profdef where true"); - if($q) { - $extra_fields = []; - - foreach($q as $qq) { - $mine = q("select v from profext where k = '%s' and hash = '%s' and channel_id = %d limit 1", - dbesc($qq['field_name']), - dbesc($r[0]['profile_guid']), - intval(local_channel()) - ); - - if(array_key_exists($qq['field_name'],$fields)) { - $extra_fields[] = array($qq['field_name'],$qq['field_desc'],(($mine) ? $mine[0]['v'] : ''), $qq['field_help']); - } - } - } - - //logger('extra_fields: ' . print_r($extra_fields,true)); + $sync = q( + "select * from profile where id = %d and uid = %d limit 1", + intval(argv(1)), + intval(local_channel()) + ); + if ($sync) { + Libsync::build_sync_packet(local_channel(), array('profile' => $sync)); + } - $vc = $r[0]['profile_vcard']; - $vctmp = (($vc) ? Reader::read($vc) : null); - $vcard = (($vctmp) ? get_vcard_array($vctmp,$r[0]['id']) : [] ); - - $f = get_config('system','birthday_input_format'); - if(! $f) - $f = 'ymd'; - - $is_default = (($r[0]['is_default']) ? 1 : 0); - - $tpl = get_markup_template("profile_edit.tpl"); - $o .= replace_macros($tpl,array( - '$multi_profiles' => ((feature_enabled(local_channel(),'multi_profiles')) ? true : false), - '$form_security_token' => get_form_security_token("profile_edit"), - '$profile_clone_link' => 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone"), - '$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"), - '$fields' => $fields, - '$vcard' => $vcard, - '$guid' => $r[0]['profile_guid'], - '$banner' => t('Edit Profile Details'), - '$submit' => t('Submit'), - '$viewprof' => t('View this profile'), - '$editvis' => t('Edit visibility'), - '$tools_label' => t('Profile Tools'), - '$coverpic' => t('Change cover photo'), - '$profpic' => t('Change profile photo'), - '$cr_prof' => t('Create a new profile using these settings'), - '$cl_prof' => t('Clone this profile'), - '$del_prof' => t('Delete this profile'), - '$addthing' => t('Add profile things'), - '$personal' => t('Personal'), - '$location' => t('Location'), - '$relation' => t('Relationship'), - '$miscellaneous'=> t('Miscellaneous'), - '$exportable' => feature_enabled(local_channel(),'profile_export'), - '$lbl_import' => t('Import profile from file'), - '$lbl_export' => t('Export profile to file'), - '$lbl_gender' => t('Your gender'), - '$lbl_marital' => t('Marital status'), - '$lbl_sexual' => t('Sexual preference'), - '$lbl_pronouns' => t('Pronouns'), - '$baseurl' => z_root(), - '$profile_id' => $r[0]['id'], - '$profile_name' => array('profile_name', t('Profile name'), $r[0]['profile_name'], t('Required'), '*'), - '$is_default' => $is_default, - '$default' => '', // t('This is your default profile.') . EOL . translate_scope(map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'view_profile'))), - '$advanced' => $advanced, - '$name' => array('name', t('Your full name'), $r[0]['fullname'], t('Required'), '*'), - '$pdesc' => array('pdesc', t('Title/Description'), $r[0]['pdesc']), - '$dob' => dob($r[0]['dob']), - '$hide_friends' => $hide_friends, - '$address' => array('address', t('Street address'), $r[0]['address']), - '$locality' => array('locality', t('Locality/City'), $r[0]['locality']), - '$region' => array('region', t('Region/State'), $r[0]['region']), - '$postal_code' => array('postal_code', t('Postal/Zip code'), $r[0]['postal_code']), - '$country_name' => array('country_name', t('Country'), $r[0]['country_name']), - '$gender' => self::gender_selector($r[0]['gender']), - '$gender_min' => self::gender_selector_min($r[0]['gender']), - '$gender_text' => self::gender_text($r[0]['gender']), - '$marital' => self::marital_selector($r[0]['marital']), - '$marital_min' => self::marital_selector_min($r[0]['marital']), - '$with' => array('with', t("Who (if applicable)"), $r[0]['partner'], t('Examples: cathy123, Cathy Williams, cathy@example.com')), - '$howlong' => array('howlong', t('Since (date)'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))), - '$sexual' => self::sexpref_selector($r[0]['sexual']), - '$sexual_min' => self::sexpref_selector_min($r[0]['sexual']), - '$pronouns' => self::pronouns_selector($r[0]['pronouns']), - '$pronouns_min' => self::pronouns_selector($r[0]['pronouns']), - '$about' => array('about', t('Tell us about yourself'), $r[0]['about']), - '$homepage' => array('homepage', t('Homepage URL'), $r[0]['homepage']), - '$hometown' => array('hometown', t('Hometown'), $r[0]['hometown']), - '$politic' => array('politic', t('Political views'), $r[0]['politic']), - '$religion' => array('religion', t('Religious views'), $r[0]['religion']), - '$keywords' => array('keywords', t('Keywords used in directory listings'), $r[0]['keywords'], t('Example: fishing photography software')), - '$likes' => array('likes', t('Likes'), $r[0]['likes']), - '$dislikes' => array('dislikes', t('Dislikes'), $r[0]['dislikes']), - '$music' => array('music', t('Musical interests'), $r[0]['music']), - '$book' => array('book', t('Books, literature'), $r[0]['book']), - '$tv' => array('tv', t('Television'), $r[0]['tv']), - '$film' => array('film', t('Film/Dance/Culture/Entertainment'), $r[0]['film']), - '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']), - '$romance' => array('romance',t('Love/Romance'), $r[0]['romance']), - '$employ' => array('work', t('Work/Employment'), $r[0]['employment']), - '$education' => array('education', t('School/Education'), $r[0]['education']), - '$contact' => array('contact', t('Contact information and social networks'), $r[0]['contact']), - '$channels' => array('channels', t('My other channels'), $r[0]['channels']), - '$extra_fields' => $extra_fields, - '$comms' => t('Communications'), - '$tel_label' => t('Phone'), - '$email_label' => t('Email'), - '$impp_label' => t('Instant messenger'), - '$url_label' => t('Website'), - '$adr_label' => t('Address'), - '$note_label' => t('Note'), - '$mobile' => t('Mobile'), - '$home' => t('Home'), - '$work' => t('Work'), - '$other' => t('Other'), - '$add_card' => t('Add Contact'), - '$add_field' => t('Add Field'), - '$create' => t('Create'), - '$update' => t('Update'), - '$delete' => t('Delete'), - '$cancel' => t('Cancel'), - )); - - $arr = array('profile' => $r[0], 'entry' => $o); - call_hooks('profile_edit', $arr); - - return $o; - } - else { - - $r = q("SELECT * FROM profile WHERE uid = %d", - local_channel()); - if($r) { - - $tpl = get_markup_template('profile_entry.tpl'); - foreach($r as $rr) { - $profiles .= replace_macros($tpl, array( - '$photo' => $rr['thumb'], - '$id' => $rr['id'], - '$alt' => t('Profile Image'), - '$profile_name' => $rr['profile_name'], - '$visible' => (($rr['is_default']) - ? '' . translate_scope(map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'view_profile'))) . '' - : '' . t('Edit visibility') . '') - )); - } - - $tpl_header = get_markup_template('profile_listing_header.tpl'); - $o .= replace_macros($tpl_header,array( - '$header' => t('Edit Profiles'), - '$cr_new' => t('Create New'), - '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"), - '$profiles' => $profiles - )); - - } - return $o; - } - - } + if (is_sys_channel(local_channel())) { + set_config('system', 'siteinfo', $about); + } - static function profile_activity($changed, $value) { + $channel = App::get_channel(); - if(! local_channel() || ! is_array($changed) || ! count($changed)) - return; + if ($namechanged && $is_default) { + $r = q( + "UPDATE xchan SET xchan_name = '%s', xchan_name_date = '%s' WHERE xchan_hash = '%s'", + dbesc($name), + dbesc(datetime_convert()), + dbesc($channel['xchan_hash']) + ); + $r = q( + "UPDATE channel SET channel_name = '%s' WHERE channel_hash = '%s'", + dbesc($name), + dbesc($channel['xchan_hash']) + ); + if (is_sys_channel(local_channel())) { + set_config('system', 'sitename', $name); + } + } - if(! get_pconfig(local_channel(),'system','post_profilechange')) - return; - - $self = App::get_channel(); - - if(! $self) - return; - - $arr = []; - $uuid = new_uuid(); - $mid = z_root() . '/item/' . $uuid; - - $arr['uuid'] = $uuid; - $arr['mid'] = $arr['parent_mid'] = $mid; - $arr['uid'] = local_channel(); - $arr['aid'] = $self['channel_account_id']; - $arr['owner_xchan'] = $arr['author_xchan'] = $self['xchan_hash']; - - $arr['item_wall'] = 1; - $arr['item_origin'] = 1; - $arr['item_thread_top'] = 1; - $arr['verb'] = ACTIVITY_UPDATE; - $arr['obj_type'] = ACTIVITY_OBJ_PROFILE; - - $arr['plink'] = z_root() . '/channel/' . $self['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']); - - $A = '[url=' . z_root() . '/channel/' . $self['channel_address'] . ']' . $self['channel_name'] . '[/url]'; + if ($is_default) { + Run::Summon(['Directory', local_channel()]); + goaway(z_root() . '/profiles/' . $sync[0]['id']); + } + } + } - $changes = ''; - $t = count($changed); - $z = 0; - foreach($changed as $ch) { - if(strlen($changes)) { - if ($z == ($t - 1)) - $changes .= t(' and '); - else - $changes .= t(', '); - } - $z ++; - $changes .= $ch; - } + public function get() + { - $prof = '[url=' . z_root() . '/profile/' . $self['channel_address'] . ']' . t('public profile') . '[/url]'; + $o = ''; - if($t == 1 && strlen($value)) { - // if it's a url, the HTML quotes will mess it up, so link it and don't try and zidify it because we don't know what it points to. - $value = preg_replace_callback("/([^\]\='".'"'."]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ismu", 'red_zrl_callback', $value); - // take out the bookmark indicator - if(substr($value,0,2) === '#^') - $value = str_replace('#^','',$value); + $channel = App::get_channel(); - $message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value); - $message .= "\n\n" . sprintf( t('Visit %1$s\'s %2$s'), $A, $prof); - } - else { - $message = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes); - } + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } - $arr['body'] = $message; + require_once('include/channel.php'); - $arr['obj'] = [ - 'type' => ACTIVITY_OBJ_PROFILE, - 'summary' => bbcode($message), - 'source' => [ 'mediaType' => 'text/x-multicode', 'summary' => $message ], - 'id' => $self['xchan_url'], - 'url' => z_root() . '/profile/' . $self['channel_address'] - ]; + $profile_fields_basic = get_profile_fields_basic(); + $profile_fields_advanced = get_profile_fields_advanced(); - - $arr['allow_cid'] = $self['channel_allow_cid']; - $arr['allow_gid'] = $self['channel_allow_gid']; - $arr['deny_cid'] = $self['channel_deny_cid']; - $arr['deny_gid'] = $self['channel_deny_gid']; + if (((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_channel(), 'multi_profiles')) { + if (feature_enabled(local_channel(), 'multi_profiles')) { + $id = argv(1); + } else { + $x = q( + "select id from profile where uid = %d and is_default = 1", + intval(local_channel()) + ); + if ($x) { + $id = $x[0]['id']; + } + } + $r = q( + "SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1", + intval($id), + intval(local_channel()) + ); + if (!$r) { + notice(t('Profile not found.') . EOL); + return; + } - $res = item_store($arr); - $i = $res['item_id']; + $editselect = 'none'; - if($i) { - // FIXME - limit delivery in notifier.php to those specificed in the perms argument - Run::Summon( [ 'Notifier','activity', $i, 'PERMS_R_PROFILE' ] ); - } + App::$page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array( + '$baseurl' => z_root(), + '$editselect' => $editselect, + )); - } + $advanced = ((feature_enabled(local_channel(), 'advanced_profiles')) ? true : false); + if ($advanced) { + $fields = $profile_fields_advanced; + } else { + $fields = $profile_fields_basic; + } -static function gender_selector($current="",$suffix="") { - $o = ''; - $select = array('', t('Male'), t('Female'), t('Currently Male'), t('Currently Female'), t('Mostly Male'), t('Mostly Female'), t('Transgender'), t('Intersex'), t('Transsexual'), t('Hermaphrodite'), t('Neuter'), t('Non-specific'), t('Other'), t('Undecided')); + $hide_friends = array( + 'hide_friends', + t('Hide your connections list from viewers of this profile'), + $r[0]['hide_friends'], + '', + array(t('No'), t('Yes')) + ); - call_hooks('gender_selector', $select); + $q = q("select * from profdef where true"); + if ($q) { + $extra_fields = []; - $o .= "'; - return $o; -} + foreach ($q as $qq) { + $mine = q( + "select v from profext where k = '%s' and hash = '%s' and channel_id = %d limit 1", + dbesc($qq['field_name']), + dbesc($r[0]['profile_guid']), + intval(local_channel()) + ); -static function gender_selector_min($current="",$suffix="") { - $o = ''; - $select = array('', t('Male'), t('Female'), t('Other')); + if (array_key_exists($qq['field_name'], $fields)) { + $extra_fields[] = array($qq['field_name'], $qq['field_desc'], (($mine) ? $mine[0]['v'] : ''), $qq['field_help']); + } + } + } - call_hooks('gender_selector_min', $select); + //logger('extra_fields: ' . print_r($extra_fields,true)); - $o .= "'; - return $o; -} + $vc = $r[0]['profile_vcard']; + $vctmp = (($vc) ? Reader::read($vc) : null); + $vcard = (($vctmp) ? get_vcard_array($vctmp, $r[0]['id']) : []); -static function pronouns_selector($current="",$suffix="") { - $o = ''; - $select = array('', t('He/Him'), t('She/Her'), t('They/Them')); + $f = get_config('system', 'birthday_input_format'); + if (!$f) { + $f = 'ymd'; + } - call_hooks('pronouns_selector', $select); + $is_default = (($r[0]['is_default']) ? 1 : 0); - $o .= "'; - return $o; -} + $tpl = get_markup_template("profile_edit.tpl"); + $o .= replace_macros($tpl, array( + '$multi_profiles' => ((feature_enabled(local_channel(), 'multi_profiles')) ? true : false), + '$form_security_token' => get_form_security_token("profile_edit"), + '$profile_clone_link' => 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone"), + '$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"), + '$fields' => $fields, + '$vcard' => $vcard, + '$guid' => $r[0]['profile_guid'], + '$banner' => t('Edit Profile Details'), + '$submit' => t('Submit'), + '$viewprof' => t('View this profile'), + '$editvis' => t('Edit visibility'), + '$tools_label' => t('Profile Tools'), + '$coverpic' => t('Change cover photo'), + '$profpic' => t('Change profile photo'), + '$cr_prof' => t('Create a new profile using these settings'), + '$cl_prof' => t('Clone this profile'), + '$del_prof' => t('Delete this profile'), + '$addthing' => t('Add profile things'), + '$personal' => t('Personal'), + '$location' => t('Location'), + '$relation' => t('Relationship'), + '$miscellaneous' => t('Miscellaneous'), + '$exportable' => feature_enabled(local_channel(), 'profile_export'), + '$lbl_import' => t('Import profile from file'), + '$lbl_export' => t('Export profile to file'), + '$lbl_gender' => t('Your gender'), + '$lbl_marital' => t('Marital status'), + '$lbl_sexual' => t('Sexual preference'), + '$lbl_pronouns' => t('Pronouns'), + '$baseurl' => z_root(), + '$profile_id' => $r[0]['id'], + '$profile_name' => array('profile_name', t('Profile name'), $r[0]['profile_name'], t('Required'), '*'), + '$is_default' => $is_default, + '$default' => '', // t('This is your default profile.') . EOL . translate_scope(map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'view_profile'))), + '$advanced' => $advanced, + '$name' => array('name', t('Your full name'), $r[0]['fullname'], t('Required'), '*'), + '$pdesc' => array('pdesc', t('Title/Description'), $r[0]['pdesc']), + '$dob' => dob($r[0]['dob']), + '$hide_friends' => $hide_friends, + '$address' => array('address', t('Street address'), $r[0]['address']), + '$locality' => array('locality', t('Locality/City'), $r[0]['locality']), + '$region' => array('region', t('Region/State'), $r[0]['region']), + '$postal_code' => array('postal_code', t('Postal/Zip code'), $r[0]['postal_code']), + '$country_name' => array('country_name', t('Country'), $r[0]['country_name']), + '$gender' => self::gender_selector($r[0]['gender']), + '$gender_min' => self::gender_selector_min($r[0]['gender']), + '$gender_text' => self::gender_text($r[0]['gender']), + '$marital' => self::marital_selector($r[0]['marital']), + '$marital_min' => self::marital_selector_min($r[0]['marital']), + '$with' => array('with', t("Who (if applicable)"), $r[0]['partner'], t('Examples: cathy123, Cathy Williams, cathy@example.com')), + '$howlong' => array('howlong', t('Since (date)'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC', date_default_timezone_get(), $r[0]['howlong']))), + '$sexual' => self::sexpref_selector($r[0]['sexual']), + '$sexual_min' => self::sexpref_selector_min($r[0]['sexual']), + '$pronouns' => self::pronouns_selector($r[0]['pronouns']), + '$pronouns_min' => self::pronouns_selector($r[0]['pronouns']), + '$about' => array('about', t('Tell us about yourself'), $r[0]['about']), + '$homepage' => array('homepage', t('Homepage URL'), $r[0]['homepage']), + '$hometown' => array('hometown', t('Hometown'), $r[0]['hometown']), + '$politic' => array('politic', t('Political views'), $r[0]['politic']), + '$religion' => array('religion', t('Religious views'), $r[0]['religion']), + '$keywords' => array('keywords', t('Keywords used in directory listings'), $r[0]['keywords'], t('Example: fishing photography software')), + '$likes' => array('likes', t('Likes'), $r[0]['likes']), + '$dislikes' => array('dislikes', t('Dislikes'), $r[0]['dislikes']), + '$music' => array('music', t('Musical interests'), $r[0]['music']), + '$book' => array('book', t('Books, literature'), $r[0]['book']), + '$tv' => array('tv', t('Television'), $r[0]['tv']), + '$film' => array('film', t('Film/Dance/Culture/Entertainment'), $r[0]['film']), + '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']), + '$romance' => array('romance', t('Love/Romance'), $r[0]['romance']), + '$employ' => array('work', t('Work/Employment'), $r[0]['employment']), + '$education' => array('education', t('School/Education'), $r[0]['education']), + '$contact' => array('contact', t('Contact information and social networks'), $r[0]['contact']), + '$channels' => array('channels', t('My other channels'), $r[0]['channels']), + '$extra_fields' => $extra_fields, + '$comms' => t('Communications'), + '$tel_label' => t('Phone'), + '$email_label' => t('Email'), + '$impp_label' => t('Instant messenger'), + '$url_label' => t('Website'), + '$adr_label' => t('Address'), + '$note_label' => t('Note'), + '$mobile' => t('Mobile'), + '$home' => t('Home'), + '$work' => t('Work'), + '$other' => t('Other'), + '$add_card' => t('Add Contact'), + '$add_field' => t('Add Field'), + '$create' => t('Create'), + '$update' => t('Update'), + '$delete' => t('Delete'), + '$cancel' => t('Cancel'), + )); + + $arr = array('profile' => $r[0], 'entry' => $o); + call_hooks('profile_edit', $arr); + + return $o; + } else { + $r = q( + "SELECT * FROM profile WHERE uid = %d", + local_channel() + ); + if ($r) { + $tpl = get_markup_template('profile_entry.tpl'); + foreach ($r as $rr) { + $profiles .= replace_macros($tpl, array( + '$photo' => $rr['thumb'], + '$id' => $rr['id'], + '$alt' => t('Profile Image'), + '$profile_name' => $rr['profile_name'], + '$visible' => (($rr['is_default']) + ? '' . translate_scope(map_scope(PermissionLimits::Get($channel['channel_id'], 'view_profile'))) . '' + : '' . t('Edit visibility') . '') + )); + } + + $tpl_header = get_markup_template('profile_listing_header.tpl'); + $o .= replace_macros($tpl_header, array( + '$header' => t('Edit Profiles'), + '$cr_new' => t('Create New'), + '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"), + '$profiles' => $profiles + )); + } + return $o; + } + } + + public static function profile_activity($changed, $value) + { + + if (!local_channel() || !is_array($changed) || !count($changed)) { + return; + } + + if (!get_pconfig(local_channel(), 'system', 'post_profilechange')) { + return; + } + + $self = App::get_channel(); + + if (!$self) { + return; + } + + $arr = []; + $uuid = new_uuid(); + $mid = z_root() . '/item/' . $uuid; + + $arr['uuid'] = $uuid; + $arr['mid'] = $arr['parent_mid'] = $mid; + $arr['uid'] = local_channel(); + $arr['aid'] = $self['channel_account_id']; + $arr['owner_xchan'] = $arr['author_xchan'] = $self['xchan_hash']; + + $arr['item_wall'] = 1; + $arr['item_origin'] = 1; + $arr['item_thread_top'] = 1; + $arr['verb'] = ACTIVITY_UPDATE; + $arr['obj_type'] = ACTIVITY_OBJ_PROFILE; + + $arr['plink'] = z_root() . '/channel/' . $self['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']); + + $A = '[url=' . z_root() . '/channel/' . $self['channel_address'] . ']' . $self['channel_name'] . '[/url]'; -static function gender_text($current="",$suffix="") { - $o = ''; + $changes = ''; + $t = count($changed); + $z = 0; + foreach ($changed as $ch) { + if (strlen($changes)) { + if ($z == ($t - 1)) { + $changes .= t(' and '); + } else { + $changes .= t(', '); + } + } + $z++; + $changes .= $ch; + } - if(! get_config('system','profile_gender_textfield')) - return $o; + $prof = '[url=' . z_root() . '/profile/' . $self['channel_address'] . ']' . t('public profile') . '[/url]'; - $o .= ""; - return $o; -} + if ($t == 1 && strlen($value)) { + // if it's a url, the HTML quotes will mess it up, so link it and don't try and zidify it because we don't know what it points to. + $value = preg_replace_callback("/([^\]\='" . '"' . "]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ismu", 'red_zrl_callback', $value); + // take out the bookmark indicator + if (substr($value, 0, 2) === '#^') { + $value = str_replace('#^', '', $value); + } + + $message = sprintf(t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value); + $message .= "\n\n" . sprintf(t('Visit %1$s\'s %2$s'), $A, $prof); + } else { + $message = sprintf(t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes); + } + + $arr['body'] = $message; + + $arr['obj'] = [ + 'type' => ACTIVITY_OBJ_PROFILE, + 'summary' => bbcode($message), + 'source' => ['mediaType' => 'text/x-multicode', 'summary' => $message], + 'id' => $self['xchan_url'], + 'url' => z_root() . '/profile/' . $self['channel_address'] + ]; + $arr['allow_cid'] = $self['channel_allow_cid']; + $arr['allow_gid'] = $self['channel_allow_gid']; + $arr['deny_cid'] = $self['channel_deny_cid']; + $arr['deny_gid'] = $self['channel_deny_gid']; + + $res = item_store($arr); + $i = $res['item_id']; + + if ($i) { + // FIXME - limit delivery in notifier.php to those specificed in the perms argument + Run::Summon(['Notifier', 'activity', $i, 'PERMS_R_PROFILE']); + } + } + + public static function gender_selector($current = "", $suffix = "") + { + $o = ''; + $select = array('', t('Male'), t('Female'), t('Currently Male'), t('Currently Female'), t('Mostly Male'), t('Mostly Female'), t('Transgender'), t('Intersex'), t('Transsexual'), t('Hermaphrodite'), t('Neuter'), t('Non-specific'), t('Other'), t('Undecided')); + + call_hooks('gender_selector', $select); + + $o .= "'; + return $o; + } + + public static function gender_selector_min($current = "", $suffix = "") + { + $o = ''; + $select = array('', t('Male'), t('Female'), t('Other')); + + call_hooks('gender_selector_min', $select); + + $o .= "'; + return $o; + } + + public static function pronouns_selector($current = "", $suffix = "") + { + $o = ''; + $select = array('', t('He/Him'), t('She/Her'), t('They/Them')); + + call_hooks('pronouns_selector', $select); + + $o .= "'; + return $o; + } + public static function gender_text($current = "", $suffix = "") + { + $o = ''; -static function sexpref_selector($current="",$suffix="") { - $o = ''; - $select = array('', t('Males'), t('Females'), t('Gay'), t('Lesbian'), t('No Preference'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Deviant'), t('Fetish'), t('Oodles'), t('Nonsexual')); + if (!get_config('system', 'profile_gender_textfield')) { + return $o; + } + + $o .= ""; + return $o; + } - call_hooks('sexpref_selector', $select); - - $o .= "'; - return $o; -} + public static function sexpref_selector($current = "", $suffix = "") + { + $o = ''; + $select = array('', t('Males'), t('Females'), t('Gay'), t('Lesbian'), t('No Preference'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Deviant'), t('Fetish'), t('Oodles'), t('Nonsexual')); -static function sexpref_selector_min($current="",$suffix="") { - $o = ''; - $select = array('', t('Males'), t('Females'), t('Other')); + call_hooks('sexpref_selector', $select); - call_hooks('sexpref_selector_min', $select); - - $o .= "'; - return $o; -} + $o .= "'; + return $o; + } + public static function sexpref_selector_min($current = "", $suffix = "") + { + $o = ''; + $select = array('', t('Males'), t('Females'), t('Other')); -static function marital_selector($current="",$suffix="") { - $o = ''; - $select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me') ); + call_hooks('sexpref_selector_min', $select); - call_hooks('marital_selector', $select); - - $o .= "'; - return $o; -} - -static function marital_selector_min($current="",$suffix="") { - $o = ''; - $select = array('', t('Single'), t('Dating'), t('Cohabiting'), t('Married'), t('Separated'), t('Divorced'), t('Widowed'), t('It\'s complicated'), t('Other')); - - call_hooks('marital_selector_min', $select); - - $o .= "'; - return $o; -} + $o .= "'; + return $o; + } + public static function marital_selector($current = "", $suffix = "") + { + $o = ''; + $select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me')); - + call_hooks('marital_selector', $select); + + $o .= "'; + return $o; + } + + public static function marital_selector_min($current = "", $suffix = "") + { + $o = ''; + $select = array('', t('Single'), t('Dating'), t('Cohabiting'), t('Married'), t('Separated'), t('Divorced'), t('Widowed'), t('It\'s complicated'), t('Other')); + + call_hooks('marital_selector_min', $select); + + $o .= "'; + return $o; + } } diff --git a/Zotlabs/Module/Profperm.php b/Zotlabs/Module/Profperm.php index 51d186fc6..d4f1dc8d1 100644 --- a/Zotlabs/Module/Profperm.php +++ b/Zotlabs/Module/Profperm.php @@ -1,6 +1,6 @@ 2) && intval(argv(1)) && intval(argv(2))) { - $r = q("SELECT abook_id FROM abook WHERE abook_id = %d and abook_channel = %d limit 1", - intval(argv(2)), - intval(local_channel()) - ); - if($r) - $change = intval(argv(2)); - } - - - if((argc() > 1) && (intval(argv(1)))) { - $r = q("SELECT * FROM profile WHERE id = %d AND uid = %d AND is_default = 0 LIMIT 1", - intval(argv(1)), - intval(local_channel()) - ); - if(! $r) { - notice( t('Invalid profile identifier.') . EOL ); - return; - } - - $profile = $r[0]; - - $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = '%s'", - intval(local_channel()), - dbesc($profile['profile_guid']) - ); - - $ingroup = []; - if($r) - foreach($r as $member) - $ingroup[] = $member['abook_id']; - - $members = $r; - - if($change) { - if(in_array($change,$ingroup)) { - q("UPDATE abook SET abook_profile = '' WHERE abook_id = %d AND abook_channel = %d", - intval($change), - intval(local_channel()) - ); - } - else { - q("UPDATE abook SET abook_profile = '%s' WHERE abook_id = %d AND abook_channel = %d", - dbesc($profile['profile_guid']), - intval($change), - intval(local_channel()) - ); - - } - - $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash + public function init() + { + + if (!local_channel()) { + return; + } + + $channel = App::get_channel(); + $which = $channel['channel_address']; + + $profile = App::$argv[1]; + + Libprofile::load($which, $profile); + } + + + public function get() + { + + if (!local_channel()) { + notice(t('Permission denied') . EOL); + return; + } + + + if (argc() < 2) { + notice(t('Invalid profile identifier.') . EOL); + return; + } + + // Switch to text mod interface if we have more than 'n' contacts or group members + + $switchtotext = get_pconfig(local_channel(), 'system', 'groupedit_image_limit'); + if ($switchtotext === false) { + $switchtotext = get_config('system', 'groupedit_image_limit'); + } + if ($switchtotext === false) { + $switchtotext = 400; + } + + + if ((argc() > 2) && intval(argv(1)) && intval(argv(2))) { + $r = q( + "SELECT abook_id FROM abook WHERE abook_id = %d and abook_channel = %d limit 1", + intval(argv(2)), + intval(local_channel()) + ); + if ($r) { + $change = intval(argv(2)); + } + } + + + if ((argc() > 1) && (intval(argv(1)))) { + $r = q( + "SELECT * FROM profile WHERE id = %d AND uid = %d AND is_default = 0 LIMIT 1", + intval(argv(1)), + intval(local_channel()) + ); + if (!$r) { + notice(t('Invalid profile identifier.') . EOL); + return; + } + + $profile = $r[0]; + + $r = q( + "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = '%s'", + intval(local_channel()), + dbesc($profile['profile_guid']) + ); + + $ingroup = []; + if ($r) { + foreach ($r as $member) { + $ingroup[] = $member['abook_id']; + } + } + + $members = $r; + + if ($change) { + if (in_array($change, $ingroup)) { + q( + "UPDATE abook SET abook_profile = '' WHERE abook_id = %d AND abook_channel = %d", + intval($change), + intval(local_channel()) + ); + } else { + q( + "UPDATE abook SET abook_profile = '%s' WHERE abook_id = %d AND abook_channel = %d", + dbesc($profile['profile_guid']), + intval($change), + intval(local_channel()) + ); + } + + $r = q( + "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = '%s'", - intval(local_channel()), - dbesc($profile['profile_guid']) - ); - - $members = $r; - - $ingroup = []; - if(count($r)) - foreach($r as $member) - $ingroup[] = $member['abook_id']; - } - - $o .= '' . t('Profile Visibility Editor') . '
'; - - $o .= '' . t('Profile') . ' \'' . $profile['profile_name'] . '\'
'; - - $o .= '' . t('Click on a contact to add or remove.') . ''; - - } - - $o .= ''; - if($change) - $o = ''; - - $o .= ''; - return $o; - - } - - + intval(local_channel()), + dbesc($profile['profile_guid']) + ); + + $members = $r; + + $ingroup = []; + if (count($r)) { + foreach ($r as $member) { + $ingroup[] = $member['abook_id']; + } + } + } + + $o .= ''; - $o .= ''; - $o .= '' . t('Visible To') . '
'; - $o .= ''; - - $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false); - - foreach($members as $member) { - if($member['xchan_url']) { - $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['abook_id'] . '); return false;'; - $o .= micropro($member,true,'mpprof', $textmode); - } - } - $o .= ''; - $o .= '
'; - - $o .= ''; - $o .= ''; - $o .= '' . t("All Connections") . '
'; - $o .= ''; - - $r = abook_connections(local_channel()); - - if($r) { - $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); - foreach($r as $member) { - if(! in_array($member['abook_id'],$ingroup)) { - $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['abook_id'] . '); return false;'; - $o .= micropro($member,true,'mpprof',$textmode); - } - } - } - - $o .= ''; - - if($change) { - echo $o; - killme(); - } - $o .= '' . t('Profile Visibility Editor') . '
'; + + $o .= '' . t('Profile') . ' \'' . $profile['profile_name'] . '\'
'; + + $o .= '' . t('Click on a contact to add or remove.') . ''; + } + + $o .= ''; + if ($change) { + $o = ''; + } + + $o .= ''; + return $o; + } } diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 6796db081..1cf8ba164 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -1,4 +1,5 @@ updating)) { - - $channel = App::get_channel(); + if (local_channel() && (!$this->updating)) { + $channel = App::get_channel(); - $channel_acl = array( - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'] - ); + $channel_acl = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); - $x = array( - 'is_owner' => true, - 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), - 'default_location' => $channel['channel_location'], - 'nickname' => $channel['channel_address'], - 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl($channel_acl,true,PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), - 'permissions' => $channel_acl, - 'bang' => '', - 'visitor' => true, - 'profile_uid' => local_channel(), - 'return_path' => 'channel/' . $channel['channel_address'], - 'expanded' => true, - 'editor_autocomplete' => true, - 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true, - 'jotnets' => true, - 'reset' => t('Reset form') - ); - - $o = ''; + $o .= ''; + $o .= '' . t('Visible To') . '
'; + $o .= ''; + + $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false); + + foreach ($members as $member) { + if ($member['xchan_url']) { + $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['abook_id'] . '); return false;'; + $o .= micropro($member, true, 'mpprof', $textmode); + } + } + $o .= ''; + $o .= '
'; + + $o .= ''; + $o .= ''; + $o .= '' . t("All Connections") . '
'; + $o .= ''; + + $r = abook_connections(local_channel()); + + if ($r) { + $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); + foreach ($r as $member) { + if (!in_array($member['abook_id'], $ingroup)) { + $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['abook_id'] . '); return false;'; + $o .= micropro($member, true, 'mpprof', $textmode); + } + } + } + + $o .= ''; + + if ($change) { + echo $o; + killme(); + } + $o .= ''; - $o .= status_editor($x); - $o .= ''; - } - - if(! $this->updating && !$this->loading) { + $x = array( + 'is_owner' => true, + 'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''), + 'default_location' => $channel['channel_location'], + 'nickname' => $channel['channel_address'], + 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'acl' => populate_acl($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), + 'permissions' => $channel_acl, + 'bang' => '', + 'visitor' => true, + 'profile_uid' => local_channel(), + 'return_path' => 'channel/' . $channel['channel_address'], + 'expanded' => true, + 'editor_autocomplete' => true, + 'bbco_autocomplete' => 'bbcode', + 'bbcode' => true, + 'jotnets' => true, + 'reset' => t('Reset form') + ); - nav_set_selected(t('Public Stream')); + $o = ''; + $o .= status_editor($x); + $o .= ''; + } - if (! $mid) { - $_SESSION['loadtime_pubstream'] = datetime_convert(); - if (local_channel()) { - PConfig::Set(local_channel(),'system','loadtime_pubstream',$_SESSION['loadtime_pubstream']); - } - } - - $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1); - - $maxheight = get_config('system','home_divmore_height'); - if(! $maxheight) - $maxheight = 400; - - $o .= '' . "\r\n"; - $o .= "\r\n"; - - // if we got a decoded hash we must encode it again before handing to javascript - $mid = gen_link_id($mid); + if (!$this->updating && !$this->loading) { + nav_set_selected(t('Public Stream')); - App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( - '$baseurl' => z_root(), - '$pgtype' => 'pubstream', - '$uid' => ((local_channel()) ? local_channel() : '0'), - '$gid' => '0', - '$cid' => '0', - '$cmin' => '(-1)', - '$cmax' => '(-1)', - '$star' => '0', - '$liked' => '0', - '$conv' => '0', - '$spam' => '0', - '$fh' => '1', - '$dm' => '0', - '$nouveau' => '0', - '$wall' => '0', - '$draft' => '0', - '$list' => '0', - '$static' => $static, - '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1), - '$search' => '', - '$xchan' => '', - '$order' => 'comment', - '$file' => '', - '$cats' => '', - '$tags' => (($hashtags) ? urlencode($hashtags) : ''), - '$dend' => '', - '$mid' => (($mid) ? urlencode($mid) : ''), - '$verb' => '', - '$net' => (($net) ? urlencode($net) : ''), - '$dbegin' => '' - )); - } - - if($this->updating && ! $this->loading) { - // only setup pagination on initial page view - $pager_sql = ''; - } - else { - $itemspage = ((local_channel()) ? get_pconfig(local_channel(),'system','itemspage', 20) : 20); - App::set_pager_itemspage($itemspage); - $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); - } - - require_once('include/channel.php'); - require_once('include/security.php'); - - if ($public_stream_mode === PUBLIC_STREAM_SITE) { - $uids = " and item_private = 0 and item_wall = 1 "; - } - else { - $sys = get_sys_channel(); - $uids = " and item_private = 0 and item_wall = 0 and item.uid = " . intval($sys['channel_id']) . " "; - $sql_extra = item_permissions_sql($sys['channel_id']); - App::$data['firehose'] = intval($sys['channel_id']); - } - - if(get_config('system','public_list_mode')) - $page_mode = 'list'; - else - $page_mode = 'client'; + if (!$mid) { + $_SESSION['loadtime_pubstream'] = datetime_convert(); + if (local_channel()) { + PConfig::Set(local_channel(), 'system', 'loadtime_pubstream', $_SESSION['loadtime_pubstream']); + } + } + + $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1); + + $maxheight = get_config('system', 'home_divmore_height'); + if (!$maxheight) { + $maxheight = 400; + } + + $o .= '' . "\r\n"; + $o .= "\r\n"; + + // if we got a decoded hash we must encode it again before handing to javascript + $mid = gen_link_id($mid); + + App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"), array( + '$baseurl' => z_root(), + '$pgtype' => 'pubstream', + '$uid' => ((local_channel()) ? local_channel() : '0'), + '$gid' => '0', + '$cid' => '0', + '$cmin' => '(-1)', + '$cmax' => '(-1)', + '$star' => '0', + '$liked' => '0', + '$conv' => '0', + '$spam' => '0', + '$fh' => '1', + '$dm' => '0', + '$nouveau' => '0', + '$wall' => '0', + '$draft' => '0', + '$list' => '0', + '$static' => $static, + '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1), + '$search' => '', + '$xchan' => '', + '$order' => 'comment', + '$file' => '', + '$cats' => '', + '$tags' => (($hashtags) ? urlencode($hashtags) : ''), + '$dend' => '', + '$mid' => (($mid) ? urlencode($mid) : ''), + '$verb' => '', + '$net' => (($net) ? urlencode($net) : ''), + '$dbegin' => '' + )); + } + + if ($this->updating && !$this->loading) { + // only setup pagination on initial page view + $pager_sql = ''; + } else { + $itemspage = ((local_channel()) ? get_pconfig(local_channel(), 'system', 'itemspage', 20) : 20); + App::set_pager_itemspage($itemspage); + $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); + } + + require_once('include/channel.php'); + require_once('include/security.php'); + + if ($public_stream_mode === PUBLIC_STREAM_SITE) { + $uids = " and item_private = 0 and item_wall = 1 "; + } else { + $sys = get_sys_channel(); + $uids = " and item_private = 0 and item_wall = 0 and item.uid = " . intval($sys['channel_id']) . " "; + $sql_extra = item_permissions_sql($sys['channel_id']); + App::$data['firehose'] = intval($sys['channel_id']); + } + + if (get_config('system', 'public_list_mode')) { + $page_mode = 'list'; + } else { + $page_mode = 'client'; + } - if(x($hashtags)) { - $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG)); - } + if (x($hashtags)) { + $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG)); + } - $net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : ''); - $net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : ''); + $net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : ''); + $net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : ''); - if (isset(App::$profile) && isset(App::$profile['profile_uid'])) { - $abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " "; - } - - $simple_update = ((isset($_SESSION['loadtime_pubstream']) && $_SESSION['loadtime_pubstream']) ? " AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime_pubstream']) . "' " : ''); - - if ($this->loading) { - $simple_update = ''; - } + if (isset(App::$profile) && isset(App::$profile['profile_uid'])) { + $abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " "; + } - if($static && $simple_update) - $simple_update .= " and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; + $simple_update = ((isset($_SESSION['loadtime_pubstream']) && $_SESSION['loadtime_pubstream']) ? " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_pubstream']) . "' " : ''); - //logger('update: ' . $this->updating . ' load: ' . $this->loading); + if ($this->loading) { + $simple_update = ''; + } - if($this->updating) { - - $ordering = "commented"; - - if($this->loading) { - if($mid) { - $r = q("SELECT parent AS item_id FROM item + if ($static && $simple_update) { + $simple_update .= " and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; + } + + //logger('update: ' . $this->updating . ' load: ' . $this->loading); + + if ($this->updating) { + $ordering = "commented"; + + if ($this->loading) { + if ($mid) { + $r = q( + "SELECT parent AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan $net_query WHERE mid like '%s' $uids $item_normal and (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra $net_query2 LIMIT 1", - dbesc($mid . '%') - ); - } - else { - // Fetch a page full of parent items for this page - $r = q("SELECT item.id AS item_id FROM item + dbesc($mid . '%') + ); + } else { + // Fetch a page full of parent items for this page + $r = q("SELECT item.id AS item_id FROM item left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids ) $net_query WHERE true $uids and item.item_thread_top = 1 $item_normal and (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra $net_query2 - ORDER BY $ordering DESC $pager_sql " - ); - } - } - elseif($this->updating) { - if($mid) { - $r = q("SELECT parent AS item_id FROM item + ORDER BY $ordering DESC $pager_sql "); + } + } elseif ($this->updating) { + if ($mid) { + $r = q( + "SELECT parent AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan $net_query WHERE mid like '%s' $uids $item_normal_update $simple_update and (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra $net_query2 LIMIT 1", - dbesc($mid . '%') - ); - - - } - else { - $r = q("SELECT parent AS item_id FROM item + dbesc($mid . '%') + ); + } else { + $r = q("SELECT parent AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan $net_query WHERE true $uids $item_normal_update $simple_update and (abook.abook_blocked = 0 or abook.abook_flags is null) - $sql_extra $net_query2" - ); - } - } + $sql_extra $net_query2"); + } + } - // Then fetch all the children of the parents that are on this page - $parents_str = ''; - $update_unseen = ''; - - if($r) { - - $parents_str = ids_to_querystr($r,'item_id'); - - $items = q("SELECT item.*, item.id AS item_id FROM item + // Then fetch all the children of the parents that are on this page + $parents_str = ''; + $update_unseen = ''; + + if ($r) { + $parents_str = ids_to_querystr($r, 'item_id'); + + $items = q( + "SELECT item.*, item.id AS item_id FROM item WHERE true $uids $item_normal AND item.parent IN ( %s ) $sql_extra ", - dbesc($parents_str) - ); - - // use effective_uid param of xchan_query to help sort out comment permission - // for sys_channel owned items. + dbesc($parents_str) + ); - xchan_query($items,true,(($sys) ? local_channel() : 0)); - $items = fetch_post_tags($items,true); - $items = conv_sort($items,$ordering); - } - else { - $items = []; - } - - } + // use effective_uid param of xchan_query to help sort out comment permission + // for sys_channel owned items. - if ($mid && local_channel()) { - $ids = ids_to_array($items,'item_id'); - $seen = PConfig::Get(local_channel(),'system','seen_items',[]); - if (! $seen) { - $seen = []; - } - $seen = array_merge($ids,$seen); - PConfig::Set(local_channel(),'system','seen_items',$seen); - } + xchan_query($items, true, (($sys) ? local_channel() : 0)); + $items = fetch_post_tags($items, true); + $items = conv_sort($items, $ordering); + } else { + $items = []; + } + } - // fake it - $mode = ('pubstream'); - - $o .= conversation($items,$mode,$this->updating,$page_mode); + if ($mid && local_channel()) { + $ids = ids_to_array($items, 'item_id'); + $seen = PConfig::Get(local_channel(), 'system', 'seen_items', []); + if (!$seen) { + $seen = []; + } + $seen = array_merge($ids, $seen); + PConfig::Set(local_channel(), 'system', 'seen_items', $seen); + } - if($mid) - $o .= ''; - - if(($items) && (! $this->updating)) - $o .= alt_pager(count($items)); + // fake it + $mode = ('pubstream'); - return $o; - - } + $o .= conversation($items, $mode, $this->updating, $page_mode); + + if ($mid) { + $o .= ''; + } + + if (($items) && (!$this->updating)) { + $o .= alt_pager(count($items)); + } + + return $o; + } } diff --git a/Zotlabs/Module/Q.php b/Zotlabs/Module/Q.php index f58f9afc5..3daedeaf0 100644 --- a/Zotlabs/Module/Q.php +++ b/Zotlabs/Module/Q.php @@ -1,32 +1,30 @@ false]; - function init() { + $h = argv(1); + if (!$h) { + json_return_and_die($ret); + } - $ret = [ 'success' => false ]; - - $h = argv(1); - if(! $h) { - json_return_and_die($ret); - } - - $r = q("select * from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and site_dead = 0", - dbesc($h) - ); - if($r) { - $ret['success'] = true; - $ret['results'] = ids_to_array($r,'hubloc_id_url'); - } - json_return_and_die($ret); - } - -} \ No newline at end of file + $r = q( + "select * from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and site_dead = 0", + dbesc($h) + ); + if ($r) { + $ret['success'] = true; + $ret['results'] = ids_to_array($r, 'hubloc_id_url'); + } + json_return_and_die($ret); + } +} diff --git a/Zotlabs/Module/Randprof.php b/Zotlabs/Module/Randprof.php index 94ec095cb..0f102b024 100644 --- a/Zotlabs/Module/Randprof.php +++ b/Zotlabs/Module/Randprof.php @@ -1,17 +1,20 @@ $item['mid']]); + $n['obj_type'] = ((array_path_exists('obj/type', $n)) ? $n['obj']['type'] : EMPTY_STR); + $n['tgt_type'] = 'Image'; - if($emoji) { + $n['target'] = [ + 'type' => 'Image', + 'name' => $emoji, + 'url' => z_root() . '/images/emoji/' . $emoji . '.png' + ]; - $i = q("select * from item where id = %d and uid = %d", - intval($postid), - intval(local_channel()) - ); + $x = item_store($n); - if(! $i) { - // try the global public stream - $i = q("select * from item where id = %d and uid = %d", - intval($postid), - intval($sys['channel_id']) - ); - // try the local public stream - if (! $i) { - $i = q("select * from item where id = %d and item_wall = 1 and item_private = 0", - intval($postid) - ); - } - - if($i && local_channel() && (! is_sys_channel(local_channel()))) { - $i = [ copy_of_pubitem($channel, $i[0]['mid']) ]; - $postid = (($i) ? $i[0]['id'] : 0); - } - } + retain_item($postid); - if(! $i) { - return; - } - - $item = array_shift($i); - - $n = [] ; - $n['aid'] = $channel['channel_account_id']; - $n['uid'] = $channel['channel_id']; - $n['item_origin'] = true; - $n['item_type'] = $item['item_type']; - $n['parent'] = $postid; - $n['parent_mid'] = $item['mid']; - $n['uuid'] = new_uuid(); - $n['mid'] = z_root() . '/item/' . $n['uuid']; - $n['verb'] = 'emojiReaction'; - $n['body'] = "\n\n" . '[img=32x32]' . z_root() . '/images/emoji/' . $emoji . '.png[/img]' . "\n\n"; - $n['author_xchan'] = $channel['channel_hash']; - - $n['obj'] = Activity::fetch_item( [ 'id' => $item['mid'] ] ); - $n['obj_type'] = ((array_path_exists('obj/type',$n)) ? $n['obj']['type'] : EMPTY_STR); - - $n['tgt_type'] = 'Image'; - - $n['target'] = [ - 'type' => 'Image', - 'name' => $emoji, - 'url' => z_root() . '/images/emoji/' . $emoji . '.png' - ]; - - $x = item_store($n); - - retain_item($postid); - - if($x['success']) { - $nid = $x['item_id']; - Run::Summon( [ 'Notifier', 'like', $nid ] ); - } - - } - - } - -} \ No newline at end of file + if ($x['success']) { + $nid = $x['item_id']; + Run::Summon(['Notifier', 'like', $nid]); + } + } + } +} diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 9b835d45b..8e0ca2be5 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -1,4 +1,5 @@ 1) ? argv(1) : ''); - - // Provide a stored request for somebody desiring a connection - // when they first need to register someplace. Once they've - // created a channel, we'll try to revive the connection request - // and process it. - - if ($_REQUEST['connect']) { - $_SESSION['connect'] = $_REQUEST['connect']; - } - - switch ($cmd) { - case 'invite_check.json': - $result = check_account_invite($_REQUEST['invite_code']); - break; - case 'email_check.json': - $result = check_account_email($_REQUEST['email']); - break; - case 'password_check.json': - $result = check_account_password($_REQUEST['password1']); - break; - default: - break; - } - if ($result) { - json_return_and_die($result); - } - } - - - function post() { + public function init() + { - check_form_security_token_redirectOnErr('/register', 'register'); + $result = null; + $cmd = ((argc() > 1) ? argv(1) : ''); - $max_dailies = intval(get_config('system','max_daily_registrations')); - if ($max_dailies) { - $r = q("select count(account_id) as total from account where account_created > %s - INTERVAL %s", - db_utcnow(), db_quoteinterval('1 day') - ); - if ($r && intval($r[0]['total']) >= $max_dailies) { - notice( t('Maximum daily site registrations exceeded. Please try again tomorrow.') . EOL); - return; - } - } - - if (! (isset($_POST['tos']) && intval($_POST['tos']))) { - notice( t('Please indicate acceptance of the Terms of Service. Registration failed.') . EOL); - return; - } - - $policy = get_config('system','register_policy'); - - $email_verify = get_config('system','verify_email'); - - - switch ($policy) { - - case REGISTER_OPEN: - $flags = ACCOUNT_OK; - break; - - case REGISTER_APPROVE: - $flags = ACCOUNT_BLOCKED | ACCOUNT_PENDING; - break; - - default: - case REGISTER_CLOSED: - if (! is_site_admin()) { - notice( t('Permission denied.') . EOL ); - return; - } - $flags = ACCOUNT_BLOCKED; - break; - } - - if ($email_verify && $policy == REGISTER_OPEN) { - $flags = $flags | ACCOUNT_UNVERIFIED; - } - - - if ((! $_POST['password']) || ($_POST['password'] !== $_POST['password2'])) { - notice( t('Passwords do not match.') . EOL); - return; - } - - $arr = $_POST; - $arr['account_flags'] = $flags; - - $result = create_account($arr); - - if (! $result['success']) { - notice($result['message']); - return; - } + // Provide a stored request for somebody desiring a connection + // when they first need to register someplace. Once they've + // created a channel, we'll try to revive the connection request + // and process it. - require_once('include/security.php'); - - - if ($_REQUEST['name']) { - set_aconfig($result['account']['account_id'],'register','channel_name',$_REQUEST['name']); - } - if ($_REQUEST['nickname']) { - set_aconfig($result['account']['account_id'],'register','channel_address',$_REQUEST['nickname']); - } - if ($_REQUEST['permissions_role']) { - set_aconfig($result['account']['account_id'],'register','permissions_role',$_REQUEST['permissions_role']); - } + if ($_REQUEST['connect']) { + $_SESSION['connect'] = $_REQUEST['connect']; + } - // At this point the account has been created without error. Purge any error messages from prior failed registration - // attempts which haven't yet been delivered to the browser and start fresh. If you're willing to figure out why they - // weren't delivered to the browser please adopt zap issue 34. - - $_SESSION['sysmsg'] = []; - - $using_invites = intval(get_config('system','invitation_only')); - $num_invites = intval(get_config('system','number_invites')); - $invite_code = ((x($_POST,'invite_code')) ? notags(trim($_POST['invite_code'])) : ''); - - if ($using_invites && $invite_code && defined('INVITE_WORKING')) { - q("delete from register where hash = '%s'", dbesc($invite_code)); - // @FIXME - this also needs to be considered when using 'invites_remaining' in mod/invite.php - set_aconfig($result['account']['account_id'],'system','invites_remaining',$num_invites); - } - - if ($policy == REGISTER_OPEN ) { - if ($email_verify) { - $res = verify_email_address($result); - } - else { - $res = send_register_success_email($result['email'],$result['password']); - } - if ($res) { - if ($invite_code) { - info( t('Registration successful. Continue to create your first channel...') . EOL ) ; - } - else { - info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ; - } - } - } - elseif ($policy == REGISTER_APPROVE) { - $res = send_reg_approval_email($result); - if ($res) { - info( t('Your registration is pending approval by the site owner.') . EOL ) ; - } - else { - notice( t('Your registration can not be processed.') . EOL); - } - goaway(z_root()); - } - - if ($email_verify) { - goaway(z_root() . '/email_validation/' . bin2hex($result['email'])); - } - - // fall through and authenticate if no approvals or verifications were required. - - authenticate_success($result['account'],null,true,false,true); - - $new_channel = false; - $next_page = 'new_channel'; - - if (get_config('system','auto_channel_create')) { - $new_channel = auto_channel_create($result['account']['account_id']); - if ($new_channel['success']) { - $channel_id = $new_channel['channel']['channel_id']; - change_channel($channel_id); - $next_page = '~'; - } - else { - $new_channel = false; - } - } - - $x = get_config('system','workflow_register_next'); - if ($x) { - $next_page = $x; - $_SESSION['workflow'] = true; - } - - unset($_SESSION['login_return_url']); - goaway(z_root() . '/' . $next_page); - - } - - - - function get() { - - $registration_is = EMPTY_STR; - $other_sites = false; - - if (intval(get_config('system','register_policy')) === REGISTER_CLOSED) { - notice( t('Registration on this website is disabled.') . EOL); - if (intval(get_config('system','directory_mode')) === DIRECTORY_MODE_STANDALONE) { - return EMPTY_STR; - } - else { - $other_sites = true; - } - } - - if (intval(get_config('system','register_policy')) == REGISTER_APPROVE) { - $registration_is = t('Registration on this website is by approval only.'); - $other_sites = true; - } - - $invitations = false; - - if (intval(get_config('system','invitation_only')) && defined('INVITE_WORKING')) { - $invitations = true; - $registration_is = t('Registration on this site is by invitation only.'); - $other_sites = true; - } - - $max_dailies = intval(get_config('system','max_daily_registrations')); - if ($max_dailies) { - $r = q("select count(account_id) as total from account where account_created > %s - INTERVAL %s", - db_utcnow(), db_quoteinterval('1 day') - ); - if ($r && $r[0]['total'] >= $max_dailies) { - logger('max daily registrations exceeded.'); - notice( t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL); - return; - } - } - - $privacy_role = ((x($_REQUEST,'permissions_role')) ? $_REQUEST['permissions_role'] : ""); - - $perm_roles = PermissionRoles::roles(); - - // Configurable terms of service link - - $tosurl = get_config('system','tos_url'); - if (! $tosurl) { - $tosurl = z_root() . '/help/TermsOfService'; - } - - $toslink = '' . t('Terms of Service') . ''; - - // Configurable whether to restrict age or not - default is based on international legal requirements - // This can be relaxed if you are on a restricted server that does not share with public servers - - if (get_config('system','no_age_restriction')) { - $label_tos = sprintf( t('I accept the %s for this website'), $toslink); - } - else { - $age = get_config('system','minimum_age'); - if (! $age) { - $age = 13; - } - $label_tos = sprintf( t('I am over %s years of age and accept the %s for this website'), $age, $toslink); - } - - $enable_tos = 1 - intval(get_config('system','no_termsofservice')); - - $email = [ 'email', t('Your email address'), ((x($_REQUEST,'email')) ? strip_tags(trim($_REQUEST['email'])) : ""), '' , '',' required ']; - $password = [ 'password', t('Choose a password'), '', '', '', ' required ' ]; - $password2 = [ 'password2', t('Please re-enter your password'), '', '', '', ' required ' ]; - $invite_code = [ 'invite_code', t('Please enter your invitation code'), ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "")]; - $name = [ 'name', t('Your Name'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Real names are preferred.') ]; - $nickhub = '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl')); - $nickname = [ 'nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), sprintf( t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'), $nickhub)]; - $role = ['permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role for your usage needs and privacy requirements.'),$perm_roles]; - $tos = [ 'tos', $label_tos, '', '', [ t('no'), t('yes') ], ' required ' ]; + switch ($cmd) { + case 'invite_check.json': + $result = check_account_invite($_REQUEST['invite_code']); + break; + case 'email_check.json': + $result = check_account_email($_REQUEST['email']); + break; + case 'password_check.json': + $result = check_account_password($_REQUEST['password1']); + break; + default: + break; + } + if ($result) { + json_return_and_die($result); + } + } - $auto_create = (get_config('system','auto_channel_create') ? true : false); - $default_role = get_config('system','default_permissions_role'); - $email_verify = get_config('system','verify_email'); - - - $o = replace_macros(get_markup_template('register.tpl'), [ - '$form_security_token' => get_form_security_token("register"), - '$title' => t('Registration'), - '$reg_is' => $registration_is, - '$registertext' => bbcode(get_config('system','register_text')), - '$other_sites' => (($other_sites) ? t('Show affiliated sites - some of which may allow registration.') : EMPTY_STR), - '$invitations' => $invitations, - '$invite_code' => $invite_code, - '$auto_create' => $auto_create, - '$name' => $name, - '$role' => $role, - '$default_role' => $default_role, - '$nickname' => $nickname, - '$enable_tos' => $enable_tos, - '$tos' => $tos, - '$email' => $email, - '$pass1' => $password, - '$pass2' => $password2, - '$submit' => t('Register'), - '$verify_note' => (($email_verify) ? t('This site requires email verification. After completing this form, please check your email for further instructions.') : ''), - ] ); - - return $o; - - } - - + public function post() + { + + check_form_security_token_redirectOnErr('/register', 'register'); + + $max_dailies = intval(get_config('system', 'max_daily_registrations')); + if ($max_dailies) { + $r = q( + "select count(account_id) as total from account where account_created > %s - INTERVAL %s", + db_utcnow(), + db_quoteinterval('1 day') + ); + if ($r && intval($r[0]['total']) >= $max_dailies) { + notice(t('Maximum daily site registrations exceeded. Please try again tomorrow.') . EOL); + return; + } + } + + if (!(isset($_POST['tos']) && intval($_POST['tos']))) { + notice(t('Please indicate acceptance of the Terms of Service. Registration failed.') . EOL); + return; + } + + $policy = get_config('system', 'register_policy'); + + $email_verify = get_config('system', 'verify_email'); + + + switch ($policy) { + case REGISTER_OPEN: + $flags = ACCOUNT_OK; + break; + + case REGISTER_APPROVE: + $flags = ACCOUNT_BLOCKED | ACCOUNT_PENDING; + break; + + default: + case REGISTER_CLOSED: + if (!is_site_admin()) { + notice(t('Permission denied.') . EOL); + return; + } + $flags = ACCOUNT_BLOCKED; + break; + } + + if ($email_verify && $policy == REGISTER_OPEN) { + $flags = $flags | ACCOUNT_UNVERIFIED; + } + + + if ((!$_POST['password']) || ($_POST['password'] !== $_POST['password2'])) { + notice(t('Passwords do not match.') . EOL); + return; + } + + $arr = $_POST; + $arr['account_flags'] = $flags; + + $result = create_account($arr); + + if (!$result['success']) { + notice($result['message']); + return; + } + + require_once('include/security.php'); + + + if ($_REQUEST['name']) { + set_aconfig($result['account']['account_id'], 'register', 'channel_name', $_REQUEST['name']); + } + if ($_REQUEST['nickname']) { + set_aconfig($result['account']['account_id'], 'register', 'channel_address', $_REQUEST['nickname']); + } + if ($_REQUEST['permissions_role']) { + set_aconfig($result['account']['account_id'], 'register', 'permissions_role', $_REQUEST['permissions_role']); + } + + // At this point the account has been created without error. Purge any error messages from prior failed registration + // attempts which haven't yet been delivered to the browser and start fresh. If you're willing to figure out why they + // weren't delivered to the browser please adopt zap issue 34. + + $_SESSION['sysmsg'] = []; + + $using_invites = intval(get_config('system', 'invitation_only')); + $num_invites = intval(get_config('system', 'number_invites')); + $invite_code = ((x($_POST, 'invite_code')) ? notags(trim($_POST['invite_code'])) : ''); + + if ($using_invites && $invite_code && defined('INVITE_WORKING')) { + q("delete from register where hash = '%s'", dbesc($invite_code)); + // @FIXME - this also needs to be considered when using 'invites_remaining' in mod/invite.php + set_aconfig($result['account']['account_id'], 'system', 'invites_remaining', $num_invites); + } + + if ($policy == REGISTER_OPEN) { + if ($email_verify) { + $res = verify_email_address($result); + } else { + $res = send_register_success_email($result['email'], $result['password']); + } + if ($res) { + if ($invite_code) { + info(t('Registration successful. Continue to create your first channel...') . EOL); + } else { + info(t('Registration successful. Please check your email for validation instructions.') . EOL); + } + } + } elseif ($policy == REGISTER_APPROVE) { + $res = send_reg_approval_email($result); + if ($res) { + info(t('Your registration is pending approval by the site owner.') . EOL); + } else { + notice(t('Your registration can not be processed.') . EOL); + } + goaway(z_root()); + } + + if ($email_verify) { + goaway(z_root() . '/email_validation/' . bin2hex($result['email'])); + } + + // fall through and authenticate if no approvals or verifications were required. + + authenticate_success($result['account'], null, true, false, true); + + $new_channel = false; + $next_page = 'new_channel'; + + if (get_config('system', 'auto_channel_create')) { + $new_channel = auto_channel_create($result['account']['account_id']); + if ($new_channel['success']) { + $channel_id = $new_channel['channel']['channel_id']; + change_channel($channel_id); + $next_page = '~'; + } else { + $new_channel = false; + } + } + + $x = get_config('system', 'workflow_register_next'); + if ($x) { + $next_page = $x; + $_SESSION['workflow'] = true; + } + + unset($_SESSION['login_return_url']); + goaway(z_root() . '/' . $next_page); + } + + + public function get() + { + + $registration_is = EMPTY_STR; + $other_sites = false; + + if (intval(get_config('system', 'register_policy')) === REGISTER_CLOSED) { + notice(t('Registration on this website is disabled.') . EOL); + if (intval(get_config('system', 'directory_mode')) === DIRECTORY_MODE_STANDALONE) { + return EMPTY_STR; + } else { + $other_sites = true; + } + } + + if (intval(get_config('system', 'register_policy')) == REGISTER_APPROVE) { + $registration_is = t('Registration on this website is by approval only.'); + $other_sites = true; + } + + $invitations = false; + + if (intval(get_config('system', 'invitation_only')) && defined('INVITE_WORKING')) { + $invitations = true; + $registration_is = t('Registration on this site is by invitation only.'); + $other_sites = true; + } + + $max_dailies = intval(get_config('system', 'max_daily_registrations')); + if ($max_dailies) { + $r = q( + "select count(account_id) as total from account where account_created > %s - INTERVAL %s", + db_utcnow(), + db_quoteinterval('1 day') + ); + if ($r && $r[0]['total'] >= $max_dailies) { + logger('max daily registrations exceeded.'); + notice(t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL); + return; + } + } + + $privacy_role = ((x($_REQUEST, 'permissions_role')) ? $_REQUEST['permissions_role'] : ""); + + $perm_roles = PermissionRoles::roles(); + + // Configurable terms of service link + + $tosurl = get_config('system', 'tos_url'); + if (!$tosurl) { + $tosurl = z_root() . '/help/TermsOfService'; + } + + $toslink = '' . t('Terms of Service') . ''; + + // Configurable whether to restrict age or not - default is based on international legal requirements + // This can be relaxed if you are on a restricted server that does not share with public servers + + if (get_config('system', 'no_age_restriction')) { + $label_tos = sprintf(t('I accept the %s for this website'), $toslink); + } else { + $age = get_config('system', 'minimum_age'); + if (!$age) { + $age = 13; + } + $label_tos = sprintf(t('I am over %s years of age and accept the %s for this website'), $age, $toslink); + } + + $enable_tos = 1 - intval(get_config('system', 'no_termsofservice')); + + $email = ['email', t('Your email address'), ((x($_REQUEST, 'email')) ? strip_tags(trim($_REQUEST['email'])) : ""), '', '', ' required ']; + $password = ['password', t('Choose a password'), '', '', '', ' required ']; + $password2 = ['password2', t('Please re-enter your password'), '', '', '', ' required ']; + $invite_code = ['invite_code', t('Please enter your invitation code'), ((x($_REQUEST, 'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "")]; + $name = ['name', t('Your Name'), ((x($_REQUEST, 'name')) ? $_REQUEST['name'] : ''), t('Real names are preferred.')]; + $nickhub = '@' . str_replace(array('http://', 'https://', '/'), '', get_config('system', 'baseurl')); + $nickname = ['nickname', t('Choose a short nickname'), ((x($_REQUEST, 'nickname')) ? $_REQUEST['nickname'] : ''), sprintf(t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'), $nickhub)]; + $role = ['permissions_role', t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role for your usage needs and privacy requirements.'), $perm_roles]; + $tos = ['tos', $label_tos, '', '', [t('no'), t('yes')], ' required ']; + + + $auto_create = (get_config('system', 'auto_channel_create') ? true : false); + $default_role = get_config('system', 'default_permissions_role'); + $email_verify = get_config('system', 'verify_email'); + + + $o = replace_macros(get_markup_template('register.tpl'), [ + '$form_security_token' => get_form_security_token("register"), + '$title' => t('Registration'), + '$reg_is' => $registration_is, + '$registertext' => bbcode(get_config('system', 'register_text')), + '$other_sites' => (($other_sites) ? t('Show affiliated sites - some of which may allow registration.') : EMPTY_STR), + '$invitations' => $invitations, + '$invite_code' => $invite_code, + '$auto_create' => $auto_create, + '$name' => $name, + '$role' => $role, + '$default_role' => $default_role, + '$nickname' => $nickname, + '$enable_tos' => $enable_tos, + '$tos' => $tos, + '$email' => $email, + '$pass1' => $password, + '$pass2' => $password2, + '$submit' => t('Register'), + '$verify_note' => (($email_verify) ? t('This site requires email verification. After completing this form, please check your email for further instructions.') : ''), + ]); + + return $o; + } } diff --git a/Zotlabs/Module/Regmod.php b/Zotlabs/Module/Regmod.php index 6fe89ca90..cada8e25c 100644 --- a/Zotlabs/Module/Regmod.php +++ b/Zotlabs/Module/Regmod.php @@ -1,41 +1,49 @@ NULL_DATE) { - $d1 = datetime_convert('UTC','UTC','now - 48 hours'); - if ($account['account_password_changed'] > d1) { - notice( t('Account removals are not allowed within 48 hours of changing the account password.') . EOL); - return; - } - } + if ($_SESSION['delegate']) { + return; + } - account_remove($account_id); - } - - function get() { - - if (! local_channel()) { - goaway(z_root()); - } - - $hash = random_string(); - - $_SESSION['remove_account_verify'] = $hash; + if ((!x($_POST, 'qxz_password')) || (!strlen(trim($_POST['qxz_password'])))) { + return; + } - $o .= replace_macros(get_markup_template('removeaccount.tpl'), [ - '$basedir' => z_root(), - '$hash' => $hash, - '$title' => t('Remove This Account'), - '$desc' => [ t('WARNING: '), t('This account and all its channels will be completely removed from this server. '), t('This action is permanent and can not be undone!') ], - '$passwd' => t('Please enter your password for verification:'), - '$submit' => t('Remove Account') - ]); - - return $o; - } - + if ((!x($_POST, 'verify')) || (!strlen(trim($_POST['verify'])))) { + return; + } + + if ($_POST['verify'] !== $_SESSION['remove_account_verify']) { + return; + } + + $account = App::get_account(); + $account_id = get_account_id(); + + if (!($account && $account_id)) { + return; + } + + $x = account_verify_password($account['account_email'], $_POST['qxz_password']); + if (!($x && $x['account'])) { + return; + } + + if ($account['account_password_changed'] > NULL_DATE) { + $d1 = datetime_convert('UTC', 'UTC', 'now - 48 hours'); + if ($account['account_password_changed'] > d1) { + notice(t('Account removals are not allowed within 48 hours of changing the account password.') . EOL); + return; + } + } + + account_remove($account_id); + } + + public function get() + { + + if (!local_channel()) { + goaway(z_root()); + } + + $hash = random_string(); + + $_SESSION['remove_account_verify'] = $hash; + + $o .= replace_macros(get_markup_template('removeaccount.tpl'), [ + '$basedir' => z_root(), + '$hash' => $hash, + '$title' => t('Remove This Account'), + '$desc' => [t('WARNING: '), t('This account and all its channels will be completely removed from this server. '), t('This action is permanent and can not be undone!')], + '$passwd' => t('Please enter your password for verification:'), + '$submit' => t('Remove Account') + ]); + + return $o; + } } diff --git a/Zotlabs/Module/Removeme.php b/Zotlabs/Module/Removeme.php index 11affb82a..5264415da 100644 --- a/Zotlabs/Module/Removeme.php +++ b/Zotlabs/Module/Removeme.php @@ -1,76 +1,79 @@ NULL_DATE) { - $d1 = datetime_convert('UTC','UTC','now - 48 hours'); - if($account['account_password_changed'] > $d1) { - notice( t('Channel removals are not allowed within 48 hours of changing the account password.') . EOL); - return; - } - } - - channel_remove(local_channel(),true,true); - } - - - function get() { - - if (! local_channel()) { - goaway(z_root()); - } - - $hash = random_string(); - - $_SESSION['remove_channel_verify'] = $hash; - - $o .= replace_macros(get_markup_template('removeme.tpl'), [ - '$basedir' => z_root(), - '$hash' => $hash, - '$title' => t('Remove This Channel'), - '$desc' => [ t('WARNING: '), t('This channel will be completely removed from this server. '), t('This action is permanent and can not be undone!') ], - '$passwd' => t('Please enter your password for verification:'), - '$submit' => t('Remove Channel') - ]); - - return $o; - } - + if (!local_channel()) { + return; + } + + if ($_SESSION['delegate']) { + return; + } + + if ((!x($_POST, 'qxz_password')) || (!strlen(trim($_POST['qxz_password'])))) { + return; + } + + if ((!x($_POST, 'verify')) || (!strlen(trim($_POST['verify'])))) { + return; + } + + if ($_POST['verify'] !== $_SESSION['remove_channel_verify']) { + return; + } + + $account = App::get_account(); + + if (!$account) { + return; + } + + $x = account_verify_password($account['account_email'], $_POST['qxz_password']); + if (!($x && $x['account'])) { + return; + } + + if ($account['account_password_changed'] > NULL_DATE) { + $d1 = datetime_convert('UTC', 'UTC', 'now - 48 hours'); + if ($account['account_password_changed'] > $d1) { + notice(t('Channel removals are not allowed within 48 hours of changing the account password.') . EOL); + return; + } + } + + channel_remove(local_channel(), true, true); + } + + + public function get() + { + + if (!local_channel()) { + goaway(z_root()); + } + + $hash = random_string(); + + $_SESSION['remove_channel_verify'] = $hash; + + $o .= replace_macros(get_markup_template('removeme.tpl'), [ + '$basedir' => z_root(), + '$hash' => $hash, + '$title' => t('Remove This Channel'), + '$desc' => [t('WARNING: '), t('This channel will be completely removed from this server. '), t('This action is permanent and can not be undone!')], + '$passwd' => t('Please enter your password for verification:'), + '$submit' => t('Remove Channel') + ]); + + return $o; + } } diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php index a1697ce46..9d441c41b 100644 --- a/Zotlabs/Module/Rmagic.php +++ b/Zotlabs/Module/Rmagic.php @@ -1,88 +1,92 @@ $address ]; - call_hooks('reverse_magic_auth', $arr); - - // if they're still here... - notice( t('Authentication failed.') . EOL); - return; - } - else { - - // Presumed Red identity. Perform reverse magic auth - - if (strpos($address,'@') === false) { - notice('Invalid address.'); - return; - } - - $r = null; - if ($address) { - $r = q("select hubloc_url from hubloc where hubloc_addr = '%s' limit 1", - dbesc($address) - ); - } - if ($r) { - $url = $r[0]['hubloc_url']; - } - else { - $url = 'https://' . substr($address,strpos($address,'@')+1); - } - - if ($url) { - if ($_SESSION['return_url']) { - $dest = bin2hex(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url'])); - } - else { - $dest = bin2hex(z_root() . '/' . str_replace([ 'rmagic', 'zid=' ] ,[ '', 'zid_='],App::$query_string)); - } - goaway($url . '/magic' . '?f=&owa=1&bdest=' . $dest); - } - } - } - - - function get() { - return replace_macros(get_markup_template('rmagic.tpl'), - [ - '$title' => t('Remote Authentication'), - '$address' => [ 'address', t('Enter your channel address (e.g. channel@example.com)'), '', '' ], - '$action' => 'rmagic', - '$method' => 'post', - '$submit' => t('Authenticate') - ] - ); - } + public function init() + { + + if (local_channel()) { + goaway(z_root()); + } + + $me = get_my_address(); + if ($me) { + $r = q( + "select hubloc_url from hubloc where hubloc_addr = '%s' limit 1", + dbesc($me) + ); + if ($r) { + if ($r[0]['hubloc_url'] === z_root()) { + goaway(z_root() . '/login'); + } + $dest = bin2hex(z_root() . '/' . str_replace(['rmagic', 'zid='], ['', 'zid_='], App::$query_string)); + goaway($r[0]['hubloc_url'] . '/magic' . '?f=&owa=1&bdest=' . $dest); + } + } + } + + public function post() + { + + $address = trim($_REQUEST['address']); + + if (strpos($address, '@') === false) { + $arr = ['address' => $address]; + call_hooks('reverse_magic_auth', $arr); + + // if they're still here... + notice(t('Authentication failed.') . EOL); + return; + } else { + // Presumed Red identity. Perform reverse magic auth + + if (strpos($address, '@') === false) { + notice('Invalid address.'); + return; + } + + $r = null; + if ($address) { + $r = q( + "select hubloc_url from hubloc where hubloc_addr = '%s' limit 1", + dbesc($address) + ); + } + if ($r) { + $url = $r[0]['hubloc_url']; + } else { + $url = 'https://' . substr($address, strpos($address, '@') + 1); + } + + if ($url) { + if ($_SESSION['return_url']) { + $dest = bin2hex(z_root() . '/' . str_replace('zid=', 'zid_=', $_SESSION['return_url'])); + } else { + $dest = bin2hex(z_root() . '/' . str_replace(['rmagic', 'zid='], ['', 'zid_='], App::$query_string)); + } + goaway($url . '/magic' . '?f=&owa=1&bdest=' . $dest); + } + } + } + + + public function get() + { + return replace_macros( + get_markup_template('rmagic.tpl'), + [ + '$title' => t('Remote Authentication'), + '$address' => ['address', t('Enter your channel address (e.g. channel@example.com)'), '', ''], + '$action' => 'rmagic', + '$method' => 'post', + '$submit' => t('Authenticate') + ] + ); + } } diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index c4d2471d1..9052c23f0 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -1,6 +1,6 @@ $arg) { - if ($key === 'req') - continue; - $url .= '&' . $key . '=' . $arg; - } - goaway($url); - } - } - - // The login procedure is going to bugger our $_REQUEST variables - // so save them in the session. - - if (array_key_exists('body',$_REQUEST)) { - $_SESSION['rpost'] = $_REQUEST; - } - return login(); - } + if (!local_channel()) { + if (remote_channel()) { + // redirect to your own site. + // We can only do this with a GET request so you'll need to keep the text short or risk getting truncated + // by the wretched beast called 'suhosin'. All the browsers now allow long GET requests, but suhosin + // blocks them. - nav_set_selected('Post'); + $url = Libzot::get_rpost_path(App::get_observer()); + // make sure we're not looping to our own hub + if (($url) && (!stristr($url, App::get_hostname()))) { + foreach ($_GET as $key => $arg) { + if ($key === 'req') { + continue; + } + $url .= '&' . $key . '=' . $arg; + } + goaway($url); + } + } - if (local_channel() && array_key_exists('userfile',$_FILES)) { - - $channel = App::get_channel(); - $observer = App::get_observer(); + // The login procedure is going to bugger our $_REQUEST variables + // so save them in the session. - $def_album = get_pconfig($channel['channel_id'],'system','photo_path'); - $def_attach = get_pconfig($channel['channel_id'],'system','attach_path'); - - $r = attach_store($channel, (($observer) ? $observer['xchan_hash'] : ''), '', [ - 'source' => 'editor', - 'visible' => 0, - 'album' => $def_album, - 'directory' => $def_attach, - 'flags' => 1, // indicates temporary permissions are created - 'allow_cid' => '<' . $channel['channel_hash'] . '>' - ]); + if (array_key_exists('body', $_REQUEST)) { + $_SESSION['rpost'] = $_REQUEST; + } + return login(); + } - if (! $r['success']) { - notice( $r['message'] . EOL); - } + nav_set_selected('Post'); - $s = EMPTY_STR; - - if (intval($r['data']['is_photo'])) { - $s .= "\n\n" . $r['body'] . "\n\n"; - } + if (local_channel() && array_key_exists('userfile', $_FILES)) { + $channel = App::get_channel(); + $observer = App::get_observer(); - $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']; + $def_album = get_pconfig($channel['channel_id'], 'system', 'photo_path'); + $def_attach = get_pconfig($channel['channel_id'], 'system', 'attach_path'); - if (strpos($r['data']['filetype'],'video') === 0) { - for ($n = 0; $n < 15; $n ++) { - $thumb = Linkinfo::get_video_poster($url); - if ($thumb) { - break; - } - sleep(1); - continue; - } + $r = attach_store($channel, (($observer) ? $observer['xchan_hash'] : ''), '', [ + 'source' => 'editor', + 'visible' => 0, + 'album' => $def_album, + 'directory' => $def_attach, + 'flags' => 1, // indicates temporary permissions are created + 'allow_cid' => '<' . $channel['channel_hash'] . '>' + ]); - if ($thumb) { - $s .= "\n\n" . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . "\n\n"; - } - else { - $s .= "\n\n" . '[zvideo]' . $url . '[/zvideo]' . "\n\n"; - } - } - if (strpos($r['data']['filetype'],'audio') === 0) { - $s .= "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n"; - } - if ($r['data']['filetype'] === 'image/svg+xml') { - $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); - if ($x) { - $bb = svg2bb($x); - if ($bb) { - $s .= "\n\n" . $bb; - } - else { - logger('empty return from svgbb'); - } - } - else { - logger('unable to read svg data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); - } - } - if ($r['data']['filetype'] === 'text/vnd.abc' && addon_is_installed('abc')) { - $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); - if ($x) { - $s .= "\n\n" . '[abc]' . $x . '[/abc]'; - } - else { - logger('unable to read ABC data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); - } - } - if ($r['data']['filetype'] === 'text/calendar') { - $content = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); - if ($content) { - $ev = ical_to_ev($content); - if ($ev) { - $s .= "\n\n" . format_event_bbcode($ev[0]) . "\n\n"; - } - } - } + if (!$r['success']) { + notice($r['message'] . EOL); + } - $s .= "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n"; - $_REQUEST['body'] = ((array_key_exists('body',$_REQUEST)) ? $_REQUEST['body'] . $s : $s); - } + $s = EMPTY_STR; - // If we have saved rpost session variables, but nothing in the current $_REQUEST, recover the saved variables - - if ((! array_key_exists('body',$_REQUEST)) && (array_key_exists('rpost',$_SESSION))) { - $_REQUEST = $_SESSION['rpost']; - unset($_SESSION['rpost']); - } - - if (array_key_exists('channel',$_REQUEST)) { - $r = q("select channel_id from channel where channel_account_id = %d and channel_address = '%s' limit 1", - intval(get_account_id()), - dbesc($_REQUEST['channel']) - ); - if ($r) { - require_once('include/security.php'); - $change = change_channel($r[0]['channel_id']); - } - } - - if ($_REQUEST['remote_return']) { - $_SESSION['remote_return'] = $_REQUEST['remote_return']; - } - - if (argc() > 1 && argv(1) === 'return') { - if($_SESSION['remote_return']) { - goaway($_SESSION['remote_return']); - } - goaway(z_root() . '/stream'); - } - - $plaintext = true; - - if (array_key_exists('type', $_REQUEST) && $_REQUEST['type'] === 'html' && isset($_REQUEST['body'])) { - require_once('include/html2bbcode.php'); - $_REQUEST['body'] = html2bbcode($_REQUEST['body']); - } - - $channel = App::get_channel(); + if (intval($r['data']['is_photo'])) { + $s .= "\n\n" . $r['body'] . "\n\n"; + } - $acl = new AccessControl($channel); - - if (array_key_exists('to',$_REQUEST) && $_REQUEST['to']) { - $acl->set([ 'allow_cid' => '<' . $_REQUEST['to'] . '>', - 'allow_gid' => EMPTY_STR, - 'deny_cid' => EMPTY_STR, - 'deny_gid' => EMPTY_STR ] - ); - } + $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']; - $channel_acl = $acl->get(); - - if ($_REQUEST['url']) { - $x = z_fetch_url(z_root() . '/linkinfo?f=&url=' . urlencode($_REQUEST['url']) . '&oembed=1&zotobj=1'); - if ($x['success']) { - $_REQUEST['body'] = $_REQUEST['body'] . $x['body']; - } - } + if (strpos($r['data']['filetype'], 'video') === 0) { + for ($n = 0; $n < 15; $n++) { + $thumb = Linkinfo::get_video_poster($url); + if ($thumb) { + break; + } + sleep(1); + continue; + } - if ($_REQUEST['post_id']) { - $_REQUEST['body'] .= '[share=' . intval($_REQUEST['post_id']) . '][/share]'; - } - - $x = [ - 'is_owner' => true, - 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), - 'default_location' => $channel['channel_location'], - 'nickname' => $channel['channel_address'], - 'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'), - 'acl' => populate_acl($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), - 'permissions' => $channel_acl, - 'bang' => '', - 'visitor' => true, - 'profile_uid' => local_channel(), - 'title' => $_REQUEST['title'], - 'body' => $_REQUEST['body'], - 'attachment' => $_REQUEST['attachment'], - 'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''), - 'return_path' => 'rpost/return', - 'bbco_autocomplete' => 'bbcode', - 'editor_autocomplete' => true, - 'bbcode' => true, - 'jotnets' => true, - 'reset' => t('Reset form') - ]; - - $editor = status_editor($x); - - $o .= replace_macros(get_markup_template('edpost_head.tpl'), [ - '$title' => t('Edit post'), - '$cancel' => '', - '$editor' => $editor - ]); + if ($thumb) { + $s .= "\n\n" . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . "\n\n"; + } else { + $s .= "\n\n" . '[zvideo]' . $url . '[/zvideo]' . "\n\n"; + } + } + if (strpos($r['data']['filetype'], 'audio') === 0) { + $s .= "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n"; + } + if ($r['data']['filetype'] === 'image/svg+xml') { + $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); + if ($x) { + $bb = svg2bb($x); + if ($bb) { + $s .= "\n\n" . $bb; + } else { + logger('empty return from svgbb'); + } + } else { + logger('unable to read svg data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); + } + } + if ($r['data']['filetype'] === 'text/vnd.abc' && addon_is_installed('abc')) { + $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); + if ($x) { + $s .= "\n\n" . '[abc]' . $x . '[/abc]'; + } else { + logger('unable to read ABC data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); + } + } + if ($r['data']['filetype'] === 'text/calendar') { + $content = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); + if ($content) { + $ev = ical_to_ev($content); + if ($ev) { + $s .= "\n\n" . format_event_bbcode($ev[0]) . "\n\n"; + } + } + } - return $o; - } + $s .= "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n"; + $_REQUEST['body'] = ((array_key_exists('body', $_REQUEST)) ? $_REQUEST['body'] . $s : $s); + } + + // If we have saved rpost session variables, but nothing in the current $_REQUEST, recover the saved variables + + if ((!array_key_exists('body', $_REQUEST)) && (array_key_exists('rpost', $_SESSION))) { + $_REQUEST = $_SESSION['rpost']; + unset($_SESSION['rpost']); + } + + if (array_key_exists('channel', $_REQUEST)) { + $r = q( + "select channel_id from channel where channel_account_id = %d and channel_address = '%s' limit 1", + intval(get_account_id()), + dbesc($_REQUEST['channel']) + ); + if ($r) { + require_once('include/security.php'); + $change = change_channel($r[0]['channel_id']); + } + } + + if ($_REQUEST['remote_return']) { + $_SESSION['remote_return'] = $_REQUEST['remote_return']; + } + + if (argc() > 1 && argv(1) === 'return') { + if ($_SESSION['remote_return']) { + goaway($_SESSION['remote_return']); + } + goaway(z_root() . '/stream'); + } + + $plaintext = true; + + if (array_key_exists('type', $_REQUEST) && $_REQUEST['type'] === 'html' && isset($_REQUEST['body'])) { + require_once('include/html2bbcode.php'); + $_REQUEST['body'] = html2bbcode($_REQUEST['body']); + } + + $channel = App::get_channel(); + + $acl = new AccessControl($channel); + + if (array_key_exists('to', $_REQUEST) && $_REQUEST['to']) { + $acl->set(['allow_cid' => '<' . $_REQUEST['to'] . '>', + 'allow_gid' => EMPTY_STR, + 'deny_cid' => EMPTY_STR, + 'deny_gid' => EMPTY_STR]); + } + + $channel_acl = $acl->get(); + + if ($_REQUEST['url']) { + $x = z_fetch_url(z_root() . '/linkinfo?f=&url=' . urlencode($_REQUEST['url']) . '&oembed=1&zotobj=1'); + if ($x['success']) { + $_REQUEST['body'] = $_REQUEST['body'] . $x['body']; + } + } + + if ($_REQUEST['post_id']) { + $_REQUEST['body'] .= '[share=' . intval($_REQUEST['post_id']) . '][/share]'; + } + + $x = [ + 'is_owner' => true, + 'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''), + 'default_location' => $channel['channel_location'], + 'nickname' => $channel['channel_address'], + 'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'), + 'acl' => populate_acl($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), + 'permissions' => $channel_acl, + 'bang' => '', + 'visitor' => true, + 'profile_uid' => local_channel(), + 'title' => $_REQUEST['title'], + 'body' => $_REQUEST['body'], + 'attachment' => $_REQUEST['attachment'], + 'source' => ((x($_REQUEST, 'source')) ? strip_tags($_REQUEST['source']) : ''), + 'return_path' => 'rpost/return', + 'bbco_autocomplete' => 'bbcode', + 'editor_autocomplete' => true, + 'bbcode' => true, + 'jotnets' => true, + 'reset' => t('Reset form') + ]; + + $editor = status_editor($x); + + $o .= replace_macros(get_markup_template('edpost_head.tpl'), [ + '$title' => t('Edit post'), + '$cancel' => '', + '$editor' => $editor + ]); + + return $o; + } } diff --git a/Zotlabs/Module/Safe.php b/Zotlabs/Module/Safe.php index 586e79275..d7ecd4b1f 100644 --- a/Zotlabs/Module/Safe.php +++ b/Zotlabs/Module/Safe.php @@ -4,20 +4,18 @@ namespace Zotlabs\Module; use Zotlabs\Web\Controller; -class Safe extends Controller { +class Safe extends Controller +{ - function init() { + public function init() + { - $x = get_safemode(); - if ($x) { - $_SESSION['safemode'] = 0; - } - else { - $_SESSION['safemode'] = 1; - } - goaway(z_root()); - } - - - -} \ No newline at end of file + $x = get_safemode(); + if ($x) { + $_SESSION['safemode'] = 0; + } else { + $_SESSION['safemode'] = 1; + } + goaway(z_root()); + } +} diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 83200af07..5b42c2637 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -1,4 +1,5 @@ loading) { - $_SESSION['loadtime'] = datetime_convert(); - } - nav_set_selected('Search'); - - $format = (($_REQUEST['format']) ? $_REQUEST['format'] : ''); - if ($format !== '') { - $this->updating = $this->loading = 1; - } - - $observer = App::get_observer(); - $observer_hash = (($observer) ? $observer['xchan_hash'] : ''); - - $o = '' . "\r\n"; - $o .= '' . "\r\n"; - $o .= ''; + + return $o; + } } diff --git a/Zotlabs/Module/Search_ac.php b/Zotlabs/Module/Search_ac.php index c548d6e47..37c050313 100644 --- a/Zotlabs/Module/Search_ac.php +++ b/Zotlabs/Module/Search_ac.php @@ -1,100 +1,101 @@ $g['xchan_photo_s'], - 'name' => '@' . $g['xchan_name'], - 'id' => $g['abook_id'], - 'link' => $g['xchan_url'], - 'label' => '', - 'nick' => '', - ]; - } - } - } + intval(local_channel()) + ); - if ($do_tags) { - $r = q("select distinct term, tid, url from term + if ($r) { + foreach ($r as $g) { + $results[] = [ + 'photo' => $g['xchan_photo_s'], + 'name' => '@' . $g['xchan_name'], + 'id' => $g['abook_id'], + 'link' => $g['xchan_url'], + 'label' => '', + 'nick' => '', + ]; + } + } + } + + if ($do_tags) { + $r = q( + "select distinct term, tid, url from term where ttype in ( %d, %d ) $tag_sql_extra group by term order by term asc", - intval(TERM_HASHTAG), - intval(TERM_COMMUNITYTAG) - ); - - if ($r) { - foreach ($r as $g) { - $results[] = [ - 'photo' => z_root() . '/images/hashtag.png', - 'name' => '#' . $g['term'], - 'id' => $g['tid'], - 'link' => $g['url'], - 'label' => '', - 'nick' => '', - ]; - } - } - } + intval(TERM_HASHTAG), + intval(TERM_COMMUNITYTAG) + ); - json_return_and_die( [ - 'start' => $start, - 'count' => $count, - 'items' => $results, - ]); - - } - + if ($r) { + foreach ($r as $g) { + $results[] = [ + 'photo' => z_root() . '/images/hashtag.png', + 'name' => '#' . $g['term'], + 'id' => $g['tid'], + 'link' => $g['url'], + 'label' => '', + 'nick' => '', + ]; + } + } + } + + json_return_and_die([ + 'start' => $start, + 'count' => $count, + 'items' => $results, + ]); + } } diff --git a/Zotlabs/Module/Secrets.php b/Zotlabs/Module/Secrets.php index b6f77270a..e720d81fd 100644 --- a/Zotlabs/Module/Secrets.php +++ b/Zotlabs/Module/Secrets.php @@ -6,23 +6,24 @@ use Zotlabs\Lib\Apps; use Zotlabs\Lib\Libsync; use Zotlabs\Web\Controller; -class Secrets extends Controller { +class Secrets extends Controller +{ - function get() { + public function get() + { $desc = t('This app allows you to protect messages with a secret passphrase. This only works across selected platforms.'); $text = '' . t('Search') . '
'; - - if (x(App::$data,'search')) { - $search = trim(App::$data['search']); - } - else { - $search = ((x($_GET,'search')) ? trim(escape_tags(rawurldecode($_GET['search']))) : ''); - } - $tag = false; - if (x($_GET,'tag')) { - $tag = true; - $search = ((x($_GET,'tag')) ? trim(escape_tags(rawurldecode($_GET['tag']))) : ''); - } - - $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); - - $o .= search($search,'search-box','/search',((local_channel()) ? true : false)); - - // ActivityStreams object fetches from the navbar - - if (local_channel() && strpos($search,'https://') === 0 && (! $this->updating) && (! $this->loading)) { - logger('searching for ActivityPub'); - $channel = App::get_channel(); - $hash = EMPTY_STR; - $j = Activity::fetch($search,$channel); - if ($j) { - if (isset($j['type']) && ActivityStreams::is_an_actor($j['type'])) { - Activity::actor_store($j['id'],$j); - goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search); - } - $AS = new ActivityStreams($j, null, true); - if ($AS->is_valid() && isset($AS->data['type'])) { - if (is_array($AS->obj)) { - // matches Collection and orderedCollection - if (isset($AS->obj['type']) && strpos($AS->obj['type'],'Collection') !== false) { - - // Collections are awkward to process because they can be huge. - // Our strategy is to limit a navbar search to 100 Collection items - // and only fetch the first 10 conversations in the foreground. - // We'll queue the rest, and then send you to a page where - // you can see something we've imported. - // In theory you'll start to see notifications as other conversations - // are fetched in the background while you're looking at the first ones. - - $max = intval(get_config('system','max_imported_search_collection',100)); - - if (intval($max)) { - $obj = new ASCollection($search, $channel, 0, $max); - $messages = $obj->get(); - // logger('received: ' . print_r($messages,true)); - $author = null; - if ($messages) { - logger('received ' . count($messages) . ' items from collection.', LOGGER_DEBUG); - $processed = 0; - foreach ($messages as $message) { - $processed ++; - // only process the first several items in the foreground and - // queue the remainder. - if ($processed > 10) { - - $fetch_url = ((is_string($message)) ? $message : EMPTY_STR); - $fetch_url = ((is_array($message) && array_key_exists('id',$message)) ? $message['id'] : $fetch_url); - - if (! $fetch_url) { - continue; - } - - $hash = new_uuid(); - Queue::insert( - [ - 'hash' => $hash, - 'account_id' => $channel['channel_account_id'], - 'channel_id' => $channel['channel_id'], - 'posturl' => $fetch_url, - 'notify' => EMPTY_STR, - 'msg' => EMPTY_STR, - 'driver' => 'asfetch' - ] - ); - continue; - } - - if (is_string($message)) { - $message = Activity::fetch($message,App::get_channel()); - } - $AS = new ActivityStreams($message,null,true); - if ($AS->is_valid() && is_array($AS->obj)) { - $item = Activity::decode_note($AS,true); - } - if ($item) { - if (! $author) { - $author = $item['author_xchan']; - } - Activity::store(App::get_channel(),get_observer_hash(),$AS,$item, true, true); - } - } - if ($hash) { - Run::Summon( [ 'Deliver', $hash ] ); - } - } - - // This will go to the right place most but not all of the time. - // It will go to a relevant place all of the time, so we'll use it. - - if ($author) { - goaway(z_root() . '/stream/?xchan=' . urlencode($author)); - } - goaway(z_root() . '/stream'); - } - } - else { - - // It wasn't a Collection object and wasn't an Actor object, - // so let's see if it decodes. The boolean flag enables html - // cache of the item - - $item = Activity::decode_note($AS,true); - if ($item) { - Activity::store(App::get_channel(),get_observer_hash(),$AS,$item, true, true); - goaway(z_root() . '/display/' . gen_link_id($item['mid'])); - } - } - } - } - } - } - - if (strpos($search,'#') === 0) { - $tag = true; - $search = substr($search,1); - } - if (strpos($search,'@') === 0) { - $search = substr($search,1); - goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search); - } - if (strpos($search,'!') === 0) { - $search = substr($search,1); - goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search); - } - if (strpos($search,'?') === 0) { - $search = substr($search,1); - goaway(z_root() . '/help' . '?f=1&navsearch=1&search=' . $search); - } - - // look for a naked webbie - if (strpos($search,'@') !== false && strpos($search,'http') !== 0) { - goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search); - } - - if (! $search) { - return $o; - } - - if ($tag) { - $wildtag = str_replace('*','%',$search); - $sql_extra = sprintf(" AND item.id IN (select oid from term where otype = %d and ttype in ( %d , %d) and term like '%s') ", - intval(TERM_OBJ_POST), - intval(TERM_HASHTAG), - intval(TERM_COMMUNITYTAG), - dbesc(protect_sprintf($wildtag)) - ); - } - else { - $regstr = db_getfunc('REGEXP'); - $sql_extra = sprintf(" AND (item.title $regstr '%s' OR item.body $regstr '%s') ", dbesc(protect_sprintf(preg_quote($search))), dbesc(protect_sprintf(preg_quote($search)))); - } - - // Here is the way permissions work in the search module... - // Only public posts can be shown - // OR your own posts if you are a logged in member - // No items will be shown if the member has a blocked profile wall. - - - if ((! $this->updating) && (! $this->loading)) { - - $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 0); + public function init() + { + if (x($_REQUEST, 'search')) { + App::$data['search'] = escape_tags($_REQUEST['search']); + } + } - // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, - // because browser prefetching might change it on us. We have to deliver it with the page. - - $o .= '' . "\r\n"; - $o .= "\r\n"; - - App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"), [ - '$baseurl' => z_root(), - '$pgtype' => 'search', - '$uid' => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'), - '$gid' => '0', - '$cid' => '0', - '$cmin' => '(-1)', - '$cmax' => '(-1)', - '$star' => '0', - '$liked' => '0', - '$conv' => '0', - '$spam' => '0', - '$fh' => '0', - '$dm' => '0', - '$nouveau' => '0', - '$wall' => '0', - '$draft' => '0', - '$static' => $static, - '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), - '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1), - '$search' => (($tag) ? urlencode('#') : '') . $search, - '$xchan' => '', - '$order' => '', - '$file' => '', - '$cats' => '', - '$tags' => '', - '$mid' => '', - '$verb' => '', - '$net' => '', - '$dend' => '', - '$dbegin' => '' - ]); - - - } - - $item_normal = item_normal_search(); - $pub_sql = item_permissions_sql(0,$observer_hash); - - $sys = get_sys_channel(); - - if (($this->updating) && ($this->loading)) { - $itemspage = get_pconfig(local_channel(),'system','itemspage'); - App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); - $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); - - if ($this->loading) { - $r = null; + public function get() + { - // if logged in locally, first look in the items you own - // and if this returns zero results, resort to searching elsewhere on the site. - // Ideally these results would be merged but this can be difficult - // and results in lots of duplicated content and/or messed up pagination - - if (local_channel()) { - $r = q("SELECT mid, MAX(id) as item_id from item where uid = %d + if ((get_config('system', 'block_public')) || (get_config('system', 'block_public_search', 1))) { + if ((!local_channel()) && (!remote_channel())) { + notice(t('Public access denied.') . EOL); + return; + } + } + + if ($this->loading) { + $_SESSION['loadtime'] = datetime_convert(); + } + nav_set_selected('Search'); + + $format = (($_REQUEST['format']) ? $_REQUEST['format'] : ''); + if ($format !== '') { + $this->updating = $this->loading = 1; + } + + $observer = App::get_observer(); + $observer_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $o = '' . "\r\n"; + $o .= '' . "\r\n"; + $o .= ''; - - return $o; - } - + if ($r) { + xchan_query($r); + $items = fetch_post_tags($r, true); + } else { + $items = []; + } + + if ($format == 'json') { + $result = []; + require_once('include/conversation.php'); + foreach ($items as $item) { + $item['html'] = zidify_links(bbcode($item['body'])); + $x = encode_item($item); + $x['html'] = prepare_text($item['body'], $item['mimetype']); + $result[] = $x; + } + json_return_and_die(array('success' => true, 'messages' => $result)); + } + + if ($tag) { + $o .= '' . t('Search') . '
'; + + if (x(App::$data, 'search')) { + $search = trim(App::$data['search']); + } else { + $search = ((x($_GET, 'search')) ? trim(escape_tags(rawurldecode($_GET['search']))) : ''); + } + $tag = false; + if (x($_GET, 'tag')) { + $tag = true; + $search = ((x($_GET, 'tag')) ? trim(escape_tags(rawurldecode($_GET['tag']))) : ''); + } + + $static = ((array_key_exists('static', $_REQUEST)) ? intval($_REQUEST['static']) : 0); + + $o .= search($search, 'search-box', '/search', ((local_channel()) ? true : false)); + + // ActivityStreams object fetches from the navbar + + if (local_channel() && strpos($search, 'https://') === 0 && (!$this->updating) && (!$this->loading)) { + logger('searching for ActivityPub'); + $channel = App::get_channel(); + $hash = EMPTY_STR; + $j = Activity::fetch($search, $channel); + if ($j) { + if (isset($j['type']) && ActivityStreams::is_an_actor($j['type'])) { + Activity::actor_store($j['id'], $j); + goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search); + } + $AS = new ActivityStreams($j, null, true); + if ($AS->is_valid() && isset($AS->data['type'])) { + if (is_array($AS->obj)) { + // matches Collection and orderedCollection + if (isset($AS->obj['type']) && strpos($AS->obj['type'], 'Collection') !== false) { + // Collections are awkward to process because they can be huge. + // Our strategy is to limit a navbar search to 100 Collection items + // and only fetch the first 10 conversations in the foreground. + // We'll queue the rest, and then send you to a page where + // you can see something we've imported. + // In theory you'll start to see notifications as other conversations + // are fetched in the background while you're looking at the first ones. + + $max = intval(get_config('system', 'max_imported_search_collection', 100)); + + if (intval($max)) { + $obj = new ASCollection($search, $channel, 0, $max); + $messages = $obj->get(); + // logger('received: ' . print_r($messages,true)); + $author = null; + if ($messages) { + logger('received ' . count($messages) . ' items from collection.', LOGGER_DEBUG); + $processed = 0; + foreach ($messages as $message) { + $processed++; + // only process the first several items in the foreground and + // queue the remainder. + if ($processed > 10) { + $fetch_url = ((is_string($message)) ? $message : EMPTY_STR); + $fetch_url = ((is_array($message) && array_key_exists('id', $message)) ? $message['id'] : $fetch_url); + + if (!$fetch_url) { + continue; + } + + $hash = new_uuid(); + Queue::insert( + [ + 'hash' => $hash, + 'account_id' => $channel['channel_account_id'], + 'channel_id' => $channel['channel_id'], + 'posturl' => $fetch_url, + 'notify' => EMPTY_STR, + 'msg' => EMPTY_STR, + 'driver' => 'asfetch' + ] + ); + continue; + } + + if (is_string($message)) { + $message = Activity::fetch($message, App::get_channel()); + } + $AS = new ActivityStreams($message, null, true); + if ($AS->is_valid() && is_array($AS->obj)) { + $item = Activity::decode_note($AS, true); + } + if ($item) { + if (!$author) { + $author = $item['author_xchan']; + } + Activity::store(App::get_channel(), get_observer_hash(), $AS, $item, true, true); + } + } + if ($hash) { + Run::Summon(['Deliver', $hash]); + } + } + + // This will go to the right place most but not all of the time. + // It will go to a relevant place all of the time, so we'll use it. + + if ($author) { + goaway(z_root() . '/stream/?xchan=' . urlencode($author)); + } + goaway(z_root() . '/stream'); + } + } else { + // It wasn't a Collection object and wasn't an Actor object, + // so let's see if it decodes. The boolean flag enables html + // cache of the item + + $item = Activity::decode_note($AS, true); + if ($item) { + Activity::store(App::get_channel(), get_observer_hash(), $AS, $item, true, true); + goaway(z_root() . '/display/' . gen_link_id($item['mid'])); + } + } + } + } + } + } + + if (strpos($search, '#') === 0) { + $tag = true; + $search = substr($search, 1); + } + if (strpos($search, '@') === 0) { + $search = substr($search, 1); + goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search); + } + if (strpos($search, '!') === 0) { + $search = substr($search, 1); + goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search); + } + if (strpos($search, '?') === 0) { + $search = substr($search, 1); + goaway(z_root() . '/help' . '?f=1&navsearch=1&search=' . $search); + } + + // look for a naked webbie + if (strpos($search, '@') !== false && strpos($search, 'http') !== 0) { + goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search); + } + + if (!$search) { + return $o; + } + + if ($tag) { + $wildtag = str_replace('*', '%', $search); + $sql_extra = sprintf( + " AND item.id IN (select oid from term where otype = %d and ttype in ( %d , %d) and term like '%s') ", + intval(TERM_OBJ_POST), + intval(TERM_HASHTAG), + intval(TERM_COMMUNITYTAG), + dbesc(protect_sprintf($wildtag)) + ); + } else { + $regstr = db_getfunc('REGEXP'); + $sql_extra = sprintf(" AND (item.title $regstr '%s' OR item.body $regstr '%s') ", dbesc(protect_sprintf(preg_quote($search))), dbesc(protect_sprintf(preg_quote($search)))); + } + + // Here is the way permissions work in the search module... + // Only public posts can be shown + // OR your own posts if you are a logged in member + // No items will be shown if the member has a blocked profile wall. + + + if ((!$this->updating) && (!$this->loading)) { + $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 0); + + + // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, + // because browser prefetching might change it on us. We have to deliver it with the page. + + $o .= '' . "\r\n"; + $o .= "\r\n"; + + App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"), [ + '$baseurl' => z_root(), + '$pgtype' => 'search', + '$uid' => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'), + '$gid' => '0', + '$cid' => '0', + '$cmin' => '(-1)', + '$cmax' => '(-1)', + '$star' => '0', + '$liked' => '0', + '$conv' => '0', + '$spam' => '0', + '$fh' => '0', + '$dm' => '0', + '$nouveau' => '0', + '$wall' => '0', + '$draft' => '0', + '$static' => $static, + '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0), + '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1), + '$search' => (($tag) ? urlencode('#') : '') . $search, + '$xchan' => '', + '$order' => '', + '$file' => '', + '$cats' => '', + '$tags' => '', + '$mid' => '', + '$verb' => '', + '$net' => '', + '$dend' => '', + '$dbegin' => '' + ]); + } + + $item_normal = item_normal_search(); + $pub_sql = item_permissions_sql(0, $observer_hash); + + $sys = get_sys_channel(); + + if (($this->updating) && ($this->loading)) { + $itemspage = get_pconfig(local_channel(), 'system', 'itemspage'); + App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); + $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); + + if ($this->loading) { + $r = null; + + // if logged in locally, first look in the items you own + // and if this returns zero results, resort to searching elsewhere on the site. + // Ideally these results would be merged but this can be difficult + // and results in lots of duplicated content and/or messed up pagination + + if (local_channel()) { + $r = q( + "SELECT mid, MAX(id) as item_id from item where uid = %d $item_normal $sql_extra group by mid, created order by created desc $pager_sql ", - intval(local_channel()) - ); - } - if (! $r) { - $r = q("SELECT mid, MAX(id) as item_id from item WHERE true $pub_sql + intval(local_channel()) + ); + } + if (!$r) { + $r = q("SELECT mid, MAX(id) as item_id from item WHERE true $pub_sql $item_normal $sql_extra - group by mid, created order by created desc $pager_sql" - ); - } - if ($r) { - $str = ids_to_querystr($r,'item_id'); - $r = q("select *, id as item_id from item where id in ( " . $str . ") order by created desc "); - } - } - else { - $r = []; - } - - } - - if ($r) { - xchan_query($r); - $items = fetch_post_tags($r,true); - } else { - $items = []; - } + group by mid, created order by created desc $pager_sql"); + } + if ($r) { + $str = ids_to_querystr($r, 'item_id'); + $r = q("select *, id as item_id from item where id in ( " . $str . ") order by created desc "); + } + } else { + $r = []; + } + } - if ($format == 'json') { - $result = []; - require_once('include/conversation.php'); - foreach ($items as $item) { - $item['html'] = zidify_links(bbcode($item['body'])); - $x = encode_item($item); - $x['html'] = prepare_text($item['body'],$item['mimetype']); - $result[] = $x; - } - json_return_and_die(array('success' => true,'messages' => $result)); - } - - if ($tag) - $o .= '' . sprintf( t('Items tagged with: %s'), $search) . '
'; - else - $o .= '' . sprintf( t('Search results for: %s'), $search) . '
'; - - $o .= conversation($items,'search',$this->updating,'client'); - - $o .= '' . sprintf(t('Items tagged with: %s'), $search) . '
'; + } else { + $o .= '' . sprintf(t('Search results for: %s'), $search) . '
'; + } + + $o .= conversation($items, 'search', $this->updating, 'client'); + + $o .= '' . $desc . ''; - if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Secrets'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Secrets'))) { return $text; } - $desc = t('This app is installed. A button to encrypt content may be found in the post editor.'); + $desc = t('This app is installed. A button to encrypt content may be found in the post editor.'); - $text = '' . $desc . ''; + $text = '' . $desc . ''; - return $text; - - } + return $text; + } } diff --git a/Zotlabs/Module/Service_limits.php b/Zotlabs/Module/Service_limits.php index 2a1f78054..05ca54322 100644 --- a/Zotlabs/Module/Service_limits.php +++ b/Zotlabs/Module/Service_limits.php @@ -1,28 +1,30 @@ sm = new SubModule(); - } - - - function post() { - - if (! local_channel()) { - return; - } - - if ($_SESSION['delegate']) { - return; - } - - // logger('mod_settings: ' . print_r($_REQUEST,true)); - - if (argc() > 1) { - if ($this->sm->call('post') !== false) { - return; - } - } - - goaway(z_root() . '/settings' ); - } - - - - function get() { - - nav_set_selected('Settings'); - - if ((! local_channel()) || ($_SESSION['delegate'])) { - notice( t('Permission denied.') . EOL ); - return login(); - } - - - $channel = App::get_channel(); - if ($channel) { - head_set_icon($channel['xchan_photo_s']); - } - - $o = $this->sm->call('get'); - if ($o !== false) { - return $o; - } + if ($_SESSION['delegate']) { + return; + } - $o = EMPTY_STR; - } + App::$profile_uid = local_channel(); + + // default is channel settings in the absence of other arguments + + if (argc() == 1) { + // We are setting these values - don't use the argc(), argv() functions here + App::$argc = 2; + App::$argv[] = 'channel'; + } + + $this->sm = new SubModule(); + } + + + public function post() + { + + if (!local_channel()) { + return; + } + + if ($_SESSION['delegate']) { + return; + } + + // logger('mod_settings: ' . print_r($_REQUEST,true)); + + if (argc() > 1) { + if ($this->sm->call('post') !== false) { + return; + } + } + + goaway(z_root() . '/settings'); + } + + + public function get() + { + + nav_set_selected('Settings'); + + if ((!local_channel()) || ($_SESSION['delegate'])) { + notice(t('Permission denied.') . EOL); + return login(); + } + + + $channel = App::get_channel(); + if ($channel) { + head_set_icon($channel['xchan_photo_s']); + } + + $o = $this->sm->call('get'); + if ($o !== false) { + return $o; + } + + $o = EMPTY_STR; + } } - - diff --git a/Zotlabs/Module/Settings/Account.php b/Zotlabs/Module/Settings/Account.php index 29418c621..59999f0a1 100644 --- a/Zotlabs/Module/Settings/Account.php +++ b/Zotlabs/Module/Settings/Account.php @@ -2,112 +2,121 @@ namespace Zotlabs\Module\Settings; -class Account { +use App; - function post() { - check_form_security_token_redirectOnErr('/settings/account', 'settings_account'); - - call_hooks('account_settings_post', $_POST); - - $errs = []; - - $email = ((x($_POST,'email')) ? trim(notags($_POST['email'])) : ''); +class Account +{ - $account = \App::get_account(); - if($email != $account['account_email']) { - if(! validate_email($email)) - $errs[] = t('Not valid email.'); - $adm = trim(get_config('system','admin_email')); - if(($adm) && (strcasecmp($email,$adm) == 0)) { - $errs[] = t('Protected email address. Cannot change to that email.'); - $email = \App::$account['account_email']; - } - if(! $errs) { - $r = q("update account set account_email = '%s' where account_id = %d", - dbesc($email), - intval($account['account_id']) - ); - if(! $r) - $errs[] = t('System failure storing new email. Please try again.'); - } - } - - if($errs) { - foreach($errs as $err) - notice($err . EOL); - $errs = []; - } - - - if((x($_POST,'npassword')) || (x($_POST,'confirm'))) { - - $origpass = trim($_POST['origpass']); - - require_once('include/auth.php'); - if(! account_verify_password($email,$origpass)) { - $errs[] = t('Password verification failed.'); - } - - $newpass = trim($_POST['npassword']); - $confirm = trim($_POST['confirm']); - - if($newpass != $confirm ) { - $errs[] = t('Passwords do not match. Password unchanged.'); - } - - if((! x($newpass)) || (! x($confirm))) { - $errs[] = t('Empty passwords are not allowed. Password unchanged.'); - } - - if(! $errs) { - $salt = random_string(32); - $password_encoded = hash('whirlpool', $salt . $newpass); - $r = q("update account set account_salt = '%s', account_password = '%s', account_password_changed = '%s' + public function post() + { + check_form_security_token_redirectOnErr('/settings/account', 'settings_account'); + + call_hooks('account_settings_post', $_POST); + + $errs = []; + + $email = ((x($_POST, 'email')) ? trim(notags($_POST['email'])) : ''); + + $account = App::get_account(); + if ($email != $account['account_email']) { + if (!validate_email($email)) { + $errs[] = t('Not valid email.'); + } + $adm = trim(get_config('system', 'admin_email')); + if (($adm) && (strcasecmp($email, $adm) == 0)) { + $errs[] = t('Protected email address. Cannot change to that email.'); + $email = App::$account['account_email']; + } + if (!$errs) { + $r = q( + "update account set account_email = '%s' where account_id = %d", + dbesc($email), + intval($account['account_id']) + ); + if (!$r) { + $errs[] = t('System failure storing new email. Please try again.'); + } + } + } + + if ($errs) { + foreach ($errs as $err) { + notice($err . EOL); + } + $errs = []; + } + + + if ((x($_POST, 'npassword')) || (x($_POST, 'confirm'))) { + $origpass = trim($_POST['origpass']); + + require_once('include/auth.php'); + if (!account_verify_password($email, $origpass)) { + $errs[] = t('Password verification failed.'); + } + + $newpass = trim($_POST['npassword']); + $confirm = trim($_POST['confirm']); + + if ($newpass != $confirm) { + $errs[] = t('Passwords do not match. Password unchanged.'); + } + + if ((!x($newpass)) || (!x($confirm))) { + $errs[] = t('Empty passwords are not allowed. Password unchanged.'); + } + + if (!$errs) { + $salt = random_string(32); + $password_encoded = hash('whirlpool', $salt . $newpass); + $r = q( + "update account set account_salt = '%s', account_password = '%s', account_password_changed = '%s' where account_id = %d", - dbesc($salt), - dbesc($password_encoded), - dbesc(datetime_convert()), - intval(get_account_id()) - ); - if($r) - info( t('Password changed.') . EOL); - else - $errs[] = t('Password update failed. Please try again.'); - } - } - - - if($errs) { - foreach($errs as $err) - notice($err . EOL); - } - goaway(z_root() . '/settings/account' ); - } - - - - function get() { - $account_settings = ""; - - call_hooks('account_settings', $account_settings); - - $email = \App::$account['account_email']; + dbesc($salt), + dbesc($password_encoded), + dbesc(datetime_convert()), + intval(get_account_id()) + ); + if ($r) { + info(t('Password changed.') . EOL); + } else { + $errs[] = t('Password update failed. Please try again.'); + } + } + } - $tpl = get_markup_template("settings_account.tpl"); - $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_account"), - '$title' => t('Account Settings'), - '$origpass' => array('origpass', t('Current Password'), ' ',''), - '$password1'=> array('npassword', t('Enter New Password'), '', ''), - '$password2'=> array('confirm', t('Confirm New Password'), '', t('Leave password fields blank unless changing')), - '$submit' => t('Submit'), - '$email' => array('email', t('Email Address:'), $email, ''), - '$removeme' => t('Remove Account'), - '$removeaccount' => t('Remove this account including all its channels'), - '$account_settings' => $account_settings - )); - return $o; - } + if ($errs) { + foreach ($errs as $err) { + notice($err . EOL); + } + } + goaway(z_root() . '/settings/account'); + } + + public function get() + { + $account_settings = ""; + + call_hooks('account_settings', $account_settings); + + $email = App::$account['account_email']; + + + $tpl = get_markup_template("settings_account.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("settings_account"), + '$title' => t('Account Settings'), + '$origpass' => array('origpass', t('Current Password'), ' ', ''), + '$password1' => array('npassword', t('Enter New Password'), '', ''), + '$password2' => array('confirm', t('Confirm New Password'), '', t('Leave password fields blank unless changing')), + '$submit' => t('Submit'), + '$email' => array('email', t('Email Address:'), $email, ''), + '$removeme' => t('Remove Account'), + '$removeaccount' => t('Remove this account including all its channels'), + '$account_settings' => $account_settings + )); + return $o; + } } diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 5cdc15418..8c9d83145 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -13,723 +13,756 @@ use Zotlabs\Access\AccessControl; use Zotlabs\Daemon\Run; use Zotlabs\Lib\Permcat; -class Channel { +class Channel +{ - function post() { + public function post() + { - $channel = App::get_channel(); + $channel = App::get_channel(); - check_form_security_token_redirectOnErr('/settings', 'settings'); - - call_hooks('settings_post', $_POST); - - $set_perms = ''; - - $role = ((x($_POST,'permissions_role')) ? notags(trim($_POST['permissions_role'])) : ''); - $oldrole = get_pconfig(local_channel(),'system','permissions_role'); + check_form_security_token_redirectOnErr('/settings', 'settings'); - $forbidden_roles = [ 'collection', 'collection_restricted' ]; - if (in_array($role,$forbidden_roles) || in_array($oldrole,$forbidden_roles)) { - $role = $oldrole; - } + call_hooks('settings_post', $_POST); - if(($role != $oldrole) || ($role === 'custom')) { - - if($role === 'custom') { - $hide_presence = (((x($_POST,'hide_presence')) && (intval($_POST['hide_presence']) == 1)) ? 1: 0); - $def_group = ((x($_POST,'group-selection')) ? notags(trim($_POST['group-selection'])) : ''); - $r = q("update channel set channel_default_group = '%s' where channel_id = %d", - dbesc($def_group), - intval(local_channel()) - ); - - $global_perms = Permissions::Perms(); - - foreach($global_perms as $k => $v) { - PermissionLimits::Set(local_channel(),$k,intval($_POST[$k])); - } - $acl = new AccessControl($channel); - $acl->set_from_array($_POST); - $x = $acl->get(); - - $r = q("update channel set channel_allow_cid = '%s', channel_allow_gid = '%s', + $set_perms = ''; + + $role = ((x($_POST, 'permissions_role')) ? notags(trim($_POST['permissions_role'])) : ''); + $oldrole = get_pconfig(local_channel(), 'system', 'permissions_role'); + + $forbidden_roles = ['collection', 'collection_restricted']; + if (in_array($role, $forbidden_roles) || in_array($oldrole, $forbidden_roles)) { + $role = $oldrole; + } + + if (($role != $oldrole) || ($role === 'custom')) { + if ($role === 'custom') { + $hide_presence = (((x($_POST, 'hide_presence')) && (intval($_POST['hide_presence']) == 1)) ? 1 : 0); + $def_group = ((x($_POST, 'group-selection')) ? notags(trim($_POST['group-selection'])) : ''); + $r = q( + "update channel set channel_default_group = '%s' where channel_id = %d", + dbesc($def_group), + intval(local_channel()) + ); + + $global_perms = Permissions::Perms(); + + foreach ($global_perms as $k => $v) { + PermissionLimits::Set(local_channel(), $k, intval($_POST[$k])); + } + $acl = new AccessControl($channel); + $acl->set_from_array($_POST); + $x = $acl->get(); + + $r = q( + "update channel set channel_allow_cid = '%s', channel_allow_gid = '%s', channel_deny_cid = '%s', channel_deny_gid = '%s' where channel_id = %d", - dbesc($x['allow_cid']), - dbesc($x['allow_gid']), - dbesc($x['deny_cid']), - dbesc($x['deny_gid']), - intval(local_channel()) - ); - } - else { - $role_permissions = PermissionRoles::role_perms($_POST['permissions_role']); - if(! $role_permissions) { - notice('Permissions category could not be found.'); - return; - } - $hide_presence = 1 - (intval($role_permissions['online'])); - if($role_permissions['default_collection']) { - $r = q("select hash from pgrp where uid = %d and gname = '%s' limit 1", - intval(local_channel()), - dbesc( t('Friends') ) - ); - if(! $r) { - - AccessList::add(local_channel(), t('Friends')); - AccessList::member_add(local_channel(),t('Friends'),$channel['channel_hash']); - $r = q("select hash from pgrp where uid = %d and gname = '%s' limit 1", - intval(local_channel()), - dbesc( t('Friends') ) - ); - } - if($r) { - q("update channel set channel_default_group = '%s', channel_allow_gid = '%s', channel_allow_cid = '', channel_deny_gid = '', channel_deny_cid = '' where channel_id = %d", - dbesc($r[0]['hash']), - dbesc('<' . $r[0]['hash'] . '>'), - intval(local_channel()) - ); - } - else { - notice( sprintf('Default access list \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL); - return; - } - } - // no default permissions - else { - q("update channel set channel_default_group = '', channel_allow_gid = '', channel_allow_cid = '', channel_deny_gid = '', + dbesc($x['allow_cid']), + dbesc($x['allow_gid']), + dbesc($x['deny_cid']), + dbesc($x['deny_gid']), + intval(local_channel()) + ); + } else { + $role_permissions = PermissionRoles::role_perms($_POST['permissions_role']); + if (!$role_permissions) { + notice('Permissions category could not be found.'); + return; + } + $hide_presence = 1 - (intval($role_permissions['online'])); + if ($role_permissions['default_collection']) { + $r = q( + "select hash from pgrp where uid = %d and gname = '%s' limit 1", + intval(local_channel()), + dbesc(t('Friends')) + ); + if (!$r) { + AccessList::add(local_channel(), t('Friends')); + AccessList::member_add(local_channel(), t('Friends'), $channel['channel_hash']); + $r = q( + "select hash from pgrp where uid = %d and gname = '%s' limit 1", + intval(local_channel()), + dbesc(t('Friends')) + ); + } + if ($r) { + q( + "update channel set channel_default_group = '%s', channel_allow_gid = '%s', channel_allow_cid = '', channel_deny_gid = '', channel_deny_cid = '' where channel_id = %d", + dbesc($r[0]['hash']), + dbesc('<' . $r[0]['hash'] . '>'), + intval(local_channel()) + ); + } else { + notice(sprintf('Default access list \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL); + return; + } + } // no default permissions + else { + q( + "update channel set channel_default_group = '', channel_allow_gid = '', channel_allow_cid = '', channel_deny_gid = '', channel_deny_cid = '' where channel_id = %d", - intval(local_channel()) - ); - } + intval(local_channel()) + ); + } - if($role_permissions['perms_connect']) { - $x = Permissions::FilledPerms($role_permissions['perms_connect']); - $str = Permissions::serialise($x); - set_abconfig(local_channel(),$channel['channel_hash'],'system','my_perms',$str); + if ($role_permissions['perms_connect']) { + $x = Permissions::FilledPerms($role_permissions['perms_connect']); + $str = Permissions::serialise($x); + set_abconfig(local_channel(), $channel['channel_hash'], 'system', 'my_perms', $str); - $autoperms = intval($role_permissions['perms_auto']); - } + $autoperms = intval($role_permissions['perms_auto']); + } - if($role_permissions['limits']) { - foreach($role_permissions['limits'] as $k => $v) { - PermissionLimits::Set(local_channel(),$k,$v); - } - } - if(array_key_exists('directory_publish',$role_permissions)) { - $publish = intval($role_permissions['directory_publish']); - } - } - - set_pconfig(local_channel(),'system','hide_online_status',$hide_presence); - set_pconfig(local_channel(),'system','permissions_role',$role); - } + if ($role_permissions['limits']) { + foreach ($role_permissions['limits'] as $k => $v) { + PermissionLimits::Set(local_channel(), $k, $v); + } + } + if (array_key_exists('directory_publish', $role_permissions)) { + $publish = intval($role_permissions['directory_publish']); + } + } - // The post_comments permission is critical to privacy so we always allow you to set it, no matter what - // permission role is in place. - - $post_comments = array_key_exists('post_comments',$_POST) ? intval($_POST['post_comments']) : PERMS_SPECIFIC; - PermissionLimits::Set(local_channel(),'post_comments',$post_comments); + set_pconfig(local_channel(), 'system', 'hide_online_status', $hide_presence); + set_pconfig(local_channel(), 'system', 'permissions_role', $role); + } - $post_mail = array_key_exists('post_mail',$_POST) ? intval($_POST['post_mail']) : PERMS_SPECIFIC; - PermissionLimits::Set(local_channel(),'post_mail',$post_mail); + // The post_comments permission is critical to privacy so we always allow you to set it, no matter what + // permission role is in place. + + $post_comments = array_key_exists('post_comments', $_POST) ? intval($_POST['post_comments']) : PERMS_SPECIFIC; + PermissionLimits::Set(local_channel(), 'post_comments', $post_comments); + + $post_mail = array_key_exists('post_mail', $_POST) ? intval($_POST['post_mail']) : PERMS_SPECIFIC; + PermissionLimits::Set(local_channel(), 'post_mail', $post_mail); + $publish = (((x($_POST, 'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1 : 0); + $username = ((x($_POST, 'username')) ? escape_tags(trim($_POST['username'])) : ''); + $timezone = ((x($_POST, 'timezone_select')) ? notags(trim($_POST['timezone_select'])) : ''); + $defloc = ((x($_POST, 'defloc')) ? notags(trim($_POST['defloc'])) : ''); + $openid = ((x($_POST, 'openid_url')) ? notags(trim($_POST['openid_url'])) : ''); + $maxreq = ((x($_POST, 'maxreq')) ? intval($_POST['maxreq']) : 0); + $expire = ((x($_POST, 'expire')) ? intval($_POST['expire']) : 0); + $evdays = ((x($_POST, 'evdays')) ? intval($_POST['evdays']) : 3); + $photo_path = ((x($_POST, 'photo_path')) ? escape_tags(trim($_POST['photo_path'])) : ''); + $attach_path = ((x($_POST, 'attach_path')) ? escape_tags(trim($_POST['attach_path'])) : ''); + $noindex = ((x($_POST, 'noindex')) ? intval($_POST['noindex']) : 0); + $channel_menu = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu']), ENT_QUOTES) : ''); - $publish = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0); - $username = ((x($_POST,'username')) ? escape_tags(trim($_POST['username'])) : ''); - $timezone = ((x($_POST,'timezone_select')) ? notags(trim($_POST['timezone_select'])) : ''); - $defloc = ((x($_POST,'defloc')) ? notags(trim($_POST['defloc'])) : ''); - $openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : ''); - $maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0); - $expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0); - $evdays = ((x($_POST,'evdays')) ? intval($_POST['evdays']) : 3); - $photo_path = ((x($_POST,'photo_path')) ? escape_tags(trim($_POST['photo_path'])) : ''); - $attach_path = ((x($_POST,'attach_path')) ? escape_tags(trim($_POST['attach_path'])) : ''); - $noindex = ((x($_POST,'noindex')) ? intval($_POST['noindex']) : 0); - $channel_menu = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu']),ENT_QUOTES) : ''); - - $expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0); - $expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0); - $expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0); - $expire_network_only = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only']) : 0); - - $allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0); - - $blocktags = (((x($_POST,'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted! - $unkmail = (((x($_POST,'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0); - $cntunkmail = ((x($_POST,'cntunkmail')) ? intval($_POST['cntunkmail']) : 0); - $suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0); -// $anymention = ((x($_POST,'anymention')) ? intval($_POST['anymention']) : 0); - $hyperdrive = ((x($_POST,'hyperdrive')) ? intval($_POST['hyperdrive']) : 0); - $activitypub = ((x($_POST,'activitypub')) ? intval($_POST['activitypub']) : 0); - $tag_username = ((x($_POST,'tag_username')) ? intval($_POST['tag_username']) : 0); - $post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0); - $post_joingroup = (($_POST['post_joingroup'] == 1) ? 1: 0); - $post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0); - $adult = (($_POST['adult'] == 1) ? 1 : 0); - $defpermcat = ((x($_POST,'defpermcat')) ? notags(trim($_POST['defpermcat'])) : 'default'); + $expire_items = ((x($_POST, 'expire_items')) ? intval($_POST['expire_items']) : 0); + $expire_starred = ((x($_POST, 'expire_starred')) ? intval($_POST['expire_starred']) : 0); + $expire_photos = ((x($_POST, 'expire_photos')) ? intval($_POST['expire_photos']) : 0); + $expire_network_only = ((x($_POST, 'expire_network_only')) ? intval($_POST['expire_network_only']) : 0); - $hide_friends = 1 - intval($_POST['hide_friends']); + $allow_location = (((x($_POST, 'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1 : 0); - $cal_first_day = (((x($_POST,'first_day')) && intval($_POST['first_day']) >= 0 && intval($_POST['first_day']) < 7) ? intval($_POST['first_day']) : 0); - $mailhost = ((array_key_exists('mailhost',$_POST)) ? notags(trim($_POST['mailhost'])) : ''); - $profile_assign = ((x($_POST,'profile_assign')) ? notags(trim($_POST['profile_assign'])) : ''); - $permit_all_mentions = (($_POST['permit_all_mentions'] == 1) ? 1: 0); - $close_comment_days = (($_POST['close_comments']) ? intval($_POST['close_comments']) : 0); - if ($close_comment_days) { - set_pconfig(local_channel(),'system','close_comments', $close_comment_days . ' days'); - } - else { - set_pconfig(local_channel(),'system','close_comments', EMPTY_STR); - } - // allow a permission change to over-ride the autoperms setting from the form + $blocktags = (((x($_POST, 'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0 : 1); // this setting is inverted! + $unkmail = (((x($_POST, 'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1 : 0); + $cntunkmail = ((x($_POST, 'cntunkmail')) ? intval($_POST['cntunkmail']) : 0); + $suggestme = ((x($_POST, 'suggestme')) ? intval($_POST['suggestme']) : 0); +// $anymention = ((x($_POST,'anymention')) ? intval($_POST['anymention']) : 0); + $hyperdrive = ((x($_POST, 'hyperdrive')) ? intval($_POST['hyperdrive']) : 0); + $activitypub = ((x($_POST, 'activitypub')) ? intval($_POST['activitypub']) : 0); + $tag_username = ((x($_POST, 'tag_username')) ? intval($_POST['tag_username']) : 0); + $post_newfriend = (($_POST['post_newfriend'] == 1) ? 1 : 0); + $post_joingroup = (($_POST['post_joingroup'] == 1) ? 1 : 0); + $post_profilechange = (($_POST['post_profilechange'] == 1) ? 1 : 0); + $adult = (($_POST['adult'] == 1) ? 1 : 0); + $defpermcat = ((x($_POST, 'defpermcat')) ? notags(trim($_POST['defpermcat'])) : 'default'); - if(! isset($autoperms)) { - $autoperms = ((x($_POST,'autoperms')) ? intval($_POST['autoperms']) : 0); - } + $hide_friends = 1 - intval($_POST['hide_friends']); + + $cal_first_day = (((x($_POST, 'first_day')) && intval($_POST['first_day']) >= 0 && intval($_POST['first_day']) < 7) ? intval($_POST['first_day']) : 0); + $mailhost = ((array_key_exists('mailhost', $_POST)) ? notags(trim($_POST['mailhost'])) : ''); + $profile_assign = ((x($_POST, 'profile_assign')) ? notags(trim($_POST['profile_assign'])) : ''); + $permit_all_mentions = (($_POST['permit_all_mentions'] == 1) ? 1 : 0); + $close_comment_days = (($_POST['close_comments']) ? intval($_POST['close_comments']) : 0); + if ($close_comment_days) { + set_pconfig(local_channel(), 'system', 'close_comments', $close_comment_days . ' days'); + } else { + set_pconfig(local_channel(), 'system', 'close_comments', EMPTY_STR); + } + // allow a permission change to over-ride the autoperms setting from the form + + if (!isset($autoperms)) { + $autoperms = ((x($_POST, 'autoperms')) ? intval($_POST['autoperms']) : 0); + } - $pageflags = $channel['channel_pageflags']; - $existing_adult = (($pageflags & PAGE_ADULT) ? 1 : 0); - if($adult != $existing_adult) - $pageflags = ($pageflags ^ PAGE_ADULT); - - - $notify = 0; - - if(x($_POST,'notify1')) - $notify += intval($_POST['notify1']); - if(x($_POST,'notify2')) - $notify += intval($_POST['notify2']); - if(x($_POST,'notify3')) - $notify += intval($_POST['notify3']); - if(x($_POST,'notify4')) - $notify += intval($_POST['notify4']); - if(x($_POST,'notify5')) - $notify += intval($_POST['notify5']); - if(x($_POST,'notify6')) - $notify += intval($_POST['notify6']); - if(x($_POST,'notify7')) - $notify += intval($_POST['notify7']); - if(x($_POST,'notify8')) - $notify += intval($_POST['notify8']); - if(x($_POST,'notify10')) - $notify += intval($_POST['notify10']); - - - $vnotify = 0; - - if(x($_POST,'vnotify1')) - $vnotify += intval($_POST['vnotify1']); - if(x($_POST,'vnotify2')) - $vnotify += intval($_POST['vnotify2']); - if(x($_POST,'vnotify3')) - $vnotify += intval($_POST['vnotify3']); - if(x($_POST,'vnotify4')) - $vnotify += intval($_POST['vnotify4']); - if(x($_POST,'vnotify5')) - $vnotify += intval($_POST['vnotify5']); - if(x($_POST,'vnotify6')) - $vnotify += intval($_POST['vnotify6']); - if(x($_POST,'vnotify7')) - $vnotify += intval($_POST['vnotify7']); - if(x($_POST,'vnotify8')) - $vnotify += intval($_POST['vnotify8']); - if(x($_POST,'vnotify9')) - $vnotify += intval($_POST['vnotify9']); - if(x($_POST,'vnotify10')) - $vnotify += intval($_POST['vnotify10']); - if(x($_POST,'vnotify11') && is_site_admin()) - $vnotify += intval($_POST['vnotify11']); - if(x($_POST,'vnotify12')) - $vnotify += intval($_POST['vnotify12']); - if(x($_POST,'vnotify13')) - $vnotify += intval($_POST['vnotify13']); - if(x($_POST,'vnotify14')) - $vnotify += intval($_POST['vnotify14']); - if(x($_POST,'vnotify15')) - $vnotify += intval($_POST['vnotify15']); - if(x($_POST,'vnotify16')) - $vnotify += intval($_POST['vnotify16']); - - $always_show_in_notices = x($_POST,'always_show_in_notices') ? 1 : 0; - - $err = ''; - - $name_change = false; - - if($username != $channel['channel_name']) { - $name_change = true; - require_once('include/channel.php'); - $err = validate_channelname($username); - if($err) { - notice($err); - return; - } - } - - if($timezone != $channel['channel_timezone']) { - if(strlen($timezone)) - date_default_timezone_set($timezone); - } + $pageflags = $channel['channel_pageflags']; + $existing_adult = (($pageflags & PAGE_ADULT) ? 1 : 0); + if ($adult != $existing_adult) { + $pageflags = ($pageflags ^ PAGE_ADULT); + } - $followed_tags = $_POST['followed_tags']; - $ntags = []; - if ($followed_tags) { - $tags = explode(',', $followed_tags); - foreach ($tags as $t) { - $t = trim($t); - if ($t) { - $ntags[] = $t; - } - } - } + $notify = 0; - set_pconfig(local_channel(),'system','followed_tags',($ntags) ? $ntags : EMPTY_STR); - set_pconfig(local_channel(),'system','use_browser_location',$allow_location); - set_pconfig(local_channel(),'system','suggestme', $suggestme); - set_pconfig(local_channel(),'system','post_newfriend', $post_newfriend); - set_pconfig(local_channel(),'system','post_joingroup', $post_joingroup); - set_pconfig(local_channel(),'system','post_profilechange', $post_profilechange); - set_pconfig(local_channel(),'system','blocktags',$blocktags); - set_pconfig(local_channel(),'system','channel_menu',$channel_menu); - set_pconfig(local_channel(),'system','vnotify',$vnotify); - set_pconfig(local_channel(),'system','always_show_in_notices',$always_show_in_notices); - set_pconfig(local_channel(),'system','evdays',$evdays); - set_pconfig(local_channel(),'system','photo_path',$photo_path); - set_pconfig(local_channel(),'system','attach_path',$attach_path); - set_pconfig(local_channel(),'system','cal_first_day',$cal_first_day); - set_pconfig(local_channel(),'system','default_permcat',$defpermcat); - set_pconfig(local_channel(),'system','email_notify_host',$mailhost); - set_pconfig(local_channel(),'system','profile_assign',$profile_assign); -// set_pconfig(local_channel(),'system','anymention',$anymention); - set_pconfig(local_channel(),'system','hyperdrive',$hyperdrive); - set_pconfig(local_channel(),'system','activitypub',$activitypub); - set_pconfig(local_channel(),'system','autoperms',$autoperms); - set_pconfig(local_channel(),'system','tag_username',$tag_username); - set_pconfig(local_channel(),'system','permit_all_mentions',$permit_all_mentions); - set_pconfig(local_channel(),'system','noindex',$noindex); - - - $r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d", - dbesc($username), - intval($pageflags), - dbesc($timezone), - dbesc($defloc), - intval($notify), - intval($unkmail), - intval($maxreq), - intval($expire), - intval(local_channel()) - ); - if($r) - info( t('Settings updated.') . EOL); - - - $r = q("UPDATE profile SET publish = %d, hide_friends = %d WHERE is_default = 1 AND uid = %d", - intval($publish), - intval($hide_friends), - intval(local_channel()) - ); - $r = q("UPDATE xchan SET xchan_hidden = %d WHERE xchan_hash = '%s'", - intval(1 - $publish), - intval($channel['channel_hash']) - ); - - if ($name_change) { - // catch xchans for all protocols by matching the url - $r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s' where xchan_url = '%s'", - dbesc($username), - dbesc(datetime_convert()), - dbesc(z_root() . '/channel/' . $channel['channel_address']) - ); - $r = q("update profile set fullname = '%s' where uid = %d and is_default = 1", - dbesc($username), - intval($channel['channel_id']) - ); - if (is_sys_channel($channel['channel_id'])) { - set_config('system','sitename', $username); - } - } - - Run::Summon( [ 'Directory', local_channel() ] ); - - Libsync::build_sync_packet(); - - - if($email_changed && App::$config['system']['register_policy'] == REGISTER_VERIFY) { - - // FIXME - set to un-verified, blocked and redirect to logout - // Q: Why? Are we verifying people or email addresses? - // A: the policy is to verify email addresses - } - - goaway(z_root() . '/settings' ); - return; // NOTREACHED - } - - function get() { - - require_once('include/acl_selectors.php'); - require_once('include/permissions.php'); + if (x($_POST, 'notify1')) { + $notify += intval($_POST['notify1']); + } + if (x($_POST, 'notify2')) { + $notify += intval($_POST['notify2']); + } + if (x($_POST, 'notify3')) { + $notify += intval($_POST['notify3']); + } + if (x($_POST, 'notify4')) { + $notify += intval($_POST['notify4']); + } + if (x($_POST, 'notify5')) { + $notify += intval($_POST['notify5']); + } + if (x($_POST, 'notify6')) { + $notify += intval($_POST['notify6']); + } + if (x($_POST, 'notify7')) { + $notify += intval($_POST['notify7']); + } + if (x($_POST, 'notify8')) { + $notify += intval($_POST['notify8']); + } + if (x($_POST, 'notify10')) { + $notify += intval($_POST['notify10']); + } - $yes_no = [ t('No'), t('Yes') ]; - - - $p = q("SELECT * FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1", - intval(local_channel()) - ); - if(count($p)) - $profile = $p[0]; - - load_pconfig(local_channel(),'expire'); - - $channel = App::get_channel(); - - $global_perms = Permissions::Perms(); + $vnotify = 0; - $permiss = []; - - $perm_opts = [ - [ t('Restricted - from connections only'), PERMS_SPECIFIC ], - [ t('Semi-public - from anybody that can be identified'), PERMS_AUTHED ], - [ t('Public - from anybody on the internet'), PERMS_PUBLIC ] - ]; - - $limits = PermissionLimits::Get(local_channel()); - $anon_comments = get_config('system','anonymous_comments'); - - foreach($global_perms as $k => $perm) { - $options = []; - $can_be_public = ((strstr($k,'view') || ($k === 'post_comments' && $anon_comments)) ? true : false); - foreach($perm_opts as $opt) { - if($opt[1] == PERMS_PUBLIC && (! $can_be_public)) - continue; - $options[$opt[1]] = $opt[0]; - } - if($k === 'post_comments') { - $comment_perms = [ $k, $perm, $limits[$k],'',$options ]; - } - elseif ($k === 'post_mail') { - $mail_perms = [ $k, $perm, $limits[$k],'',$options ]; - } - else { - $permiss[] = array($k,$perm,$limits[$k],'',$options); - } - } - - // logger('permiss: ' . print_r($permiss,true)); - - $username = $channel['channel_name']; - $nickname = $channel['channel_address']; - $timezone = $channel['channel_timezone']; - $notify = $channel['channel_notifyflags']; - $defloc = $channel['channel_location']; - - $maxreq = $channel['channel_max_friend_req']; - $expire = $channel['channel_expire_days']; - $adult_flag = intval($channel['channel_pageflags'] & PAGE_ADULT); - $sys_expire = get_config('system','default_expire_days'); - - $hide_presence = intval(get_pconfig(local_channel(), 'system','hide_online_status')); + if (x($_POST, 'vnotify1')) { + $vnotify += intval($_POST['vnotify1']); + } + if (x($_POST, 'vnotify2')) { + $vnotify += intval($_POST['vnotify2']); + } + if (x($_POST, 'vnotify3')) { + $vnotify += intval($_POST['vnotify3']); + } + if (x($_POST, 'vnotify4')) { + $vnotify += intval($_POST['vnotify4']); + } + if (x($_POST, 'vnotify5')) { + $vnotify += intval($_POST['vnotify5']); + } + if (x($_POST, 'vnotify6')) { + $vnotify += intval($_POST['vnotify6']); + } + if (x($_POST, 'vnotify7')) { + $vnotify += intval($_POST['vnotify7']); + } + if (x($_POST, 'vnotify8')) { + $vnotify += intval($_POST['vnotify8']); + } + if (x($_POST, 'vnotify9')) { + $vnotify += intval($_POST['vnotify9']); + } + if (x($_POST, 'vnotify10')) { + $vnotify += intval($_POST['vnotify10']); + } + if (x($_POST, 'vnotify11') && is_site_admin()) { + $vnotify += intval($_POST['vnotify11']); + } + if (x($_POST, 'vnotify12')) { + $vnotify += intval($_POST['vnotify12']); + } + if (x($_POST, 'vnotify13')) { + $vnotify += intval($_POST['vnotify13']); + } + if (x($_POST, 'vnotify14')) { + $vnotify += intval($_POST['vnotify14']); + } + if (x($_POST, 'vnotify15')) { + $vnotify += intval($_POST['vnotify15']); + } + if (x($_POST, 'vnotify16')) { + $vnotify += intval($_POST['vnotify16']); + } - $expire_items = get_pconfig(local_channel(), 'expire','items'); - $expire_items = (($expire_items===false)? '1' : $expire_items); // default if not set: 1 - - $expire_notes = get_pconfig(local_channel(), 'expire','notes'); - $expire_notes = (($expire_notes===false)? '1' : $expire_notes); // default if not set: 1 - - $expire_starred = get_pconfig(local_channel(), 'expire','starred'); - $expire_starred = (($expire_starred===false)? '1' : $expire_starred); // default if not set: 1 + $always_show_in_notices = x($_POST, 'always_show_in_notices') ? 1 : 0; - - $expire_photos = get_pconfig(local_channel(), 'expire','photos'); - $expire_photos = (($expire_photos===false)? '0' : $expire_photos); // default if not set: 0 - - $expire_network_only = get_pconfig(local_channel(), 'expire','network_only'); - $expire_network_only = (($expire_network_only===false)? '0' : $expire_network_only); // default if not set: 0 - - - $suggestme = get_pconfig(local_channel(), 'system','suggestme'); - $suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0 - - $post_newfriend = get_pconfig(local_channel(), 'system','post_newfriend'); - $post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0 - - $post_joingroup = get_pconfig(local_channel(), 'system','post_joingroup'); - $post_joingroup = (($post_joingroup===false)? '0': $post_joingroup); // default if not set: 0 - - $post_profilechange = get_pconfig(local_channel(), 'system','post_profilechange'); - $post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0 - - $blocktags = get_pconfig(local_channel(),'system','blocktags'); - $blocktags = (($blocktags===false) ? '0' : $blocktags); - - $timezone = date_default_timezone_get(); - - $opt_tpl = get_markup_template("field_checkbox.tpl"); - if(get_config('system','publish_all')) { - $profile_in_dir = ''; - } - else { - $profile_in_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_directory', t('Publish your profile in the network directory'), $profile['publish'], '', $yes_no), - )); - } + $err = ''; - $suggestme = replace_macros($opt_tpl,array( - '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', $yes_no), - - )); - - $subdir = ((strlen(App::get_path())) ? '
' . t('or') . ' ' . z_root() . '/channel/' . $nickname : ''); + $name_change = false; - $webbie = $nickname . '@' . App::get_hostname(); - $intl_nickname = unpunify($nickname) . '@' . unpunify(App::get_hostname()); - - $prof_addr = replace_macros(get_markup_template('channel_settings_header.tpl'),array( - '$desc' => t('Your channel address is'), - '$nickname' => (($intl_nickname === $webbie) ? $webbie : $intl_nickname . ' (' . $webbie . ')'), - '$compat' => t('Friends using compatible applications can use this address to connect with you.'), - '$subdir' => $subdir, - '$davdesc' => t('Your files/photos are accessible as a network drive at'), - '$davpath' => z_root() . '/dav/' . $nickname, - '$windows' => t('(Windows)'), - '$other' => t('(other platforms)'), - '$or' => t('or'), - '$davspath' => 'davs://' . App::get_hostname() . '/dav/' . $nickname, - '$basepath' => App::get_hostname() - )); + if ($username != $channel['channel_name']) { + $name_change = true; + require_once('include/channel.php'); + $err = validate_channelname($username); + if ($err) { + notice($err); + return; + } + } + + if ($timezone != $channel['channel_timezone']) { + if (strlen($timezone)) { + date_default_timezone_set($timezone); + } + } - $pcat = new Permcat(local_channel()); - $pcatlist = $pcat->listing(); - $permcats = []; - if($pcatlist) { - foreach($pcatlist as $pc) { - $permcats[$pc['name']] = $pc['localname']; - } - } + $followed_tags = $_POST['followed_tags']; + $ntags = []; + if ($followed_tags) { + $tags = explode(',', $followed_tags); + foreach ($tags as $t) { + $t = trim($t); + if ($t) { + $ntags[] = $t; + } + } + } - $default_permcat = get_pconfig(local_channel(),'system','default_permcat','default'); - - - $acl = new AccessControl($channel); - $perm_defaults = $acl->get(); - - $group_select = AccessList::select(local_channel(),$channel['channel_default_group']); - - require_once('include/menu.php'); - $m1 = menu_list(local_channel()); - $menu = false; - if($m1) { - $menu = []; - $current = get_pconfig(local_channel(),'system','channel_menu'); - $menu[] = array('name' => '', 'selected' => ((! $current) ? true : false)); - foreach($m1 as $m) { - $menu[] = array('name' => htmlspecialchars($m['menu_name'],ENT_COMPAT,'UTF-8'), 'selected' => (($m['menu_name'] === $current) ? ' selected="selected" ' : false)); - } - } - - $evdays = get_pconfig(local_channel(),'system','evdays'); - if(! $evdays) - $evdays = 3; - - $permissions_role = get_pconfig(local_channel(),'system','permissions_role'); - if(! $permissions_role) - $permissions_role = 'custom'; - - if(in_array($permissions_role,['forum','repository'])) { - $autoperms = replace_macros(get_markup_template('field_checkbox.tpl'), [ - '$field' => [ 'autoperms',t('Automatic membership approval'), ((get_pconfig(local_channel(),'system','autoperms',0)) ? 1 : 0), t('If enabled, connection requests will be approved without your interaction'), $yes_no ]]); - } - else { - $autoperms = ''; - } - - $hyperdrive = [ 'hyperdrive', t('Friend-of-friend conversations'), ((get_pconfig(local_channel(),'system','hyperdrive',true)) ? 1 : 0), t('Import public third-party conversations in which your connections participate.'), $yes_no ]; - - if (get_config('system','activitypub', ACTIVITYPUB_ENABLED)) { - $apconfig = true; - $activitypub = replace_macros(get_markup_template('field_checkbox.tpl'), [ '$field' => [ 'activitypub', t('Enable ActivityPub protocol'), ((get_pconfig(local_channel(),'system','activitypub', ACTIVITYPUB_ENABLED)) ? 1 : 0), t('ActivityPub is an emerging internet standard for social communications'), $yes_no ]]); - } - else { - $apconfig = false; - $activitypub = '' . EOL; - } - - $permissions_set = (($permissions_role != 'custom') ? true : false); - - $perm_roles = PermissionRoles::roles(); - // Don't permit changing to a collection (@TODO unless there is a mechanism to select the channel_parent) - unset($perm_roles['Collection']); - - - $vnotify = get_pconfig(local_channel(),'system','vnotify'); - $always_show_in_notices = get_pconfig(local_channel(),'system','always_show_in_notices'); - if($vnotify === false) - $vnotify = (-1); - - $plugin = [ 'basic' => '', 'security' => '', 'notify' => '', 'misc' => '' ]; - call_hooks('channel_settings',$plugin); - - $public_stream_mode = intval(get_config('system','public_stream_mode', PUBLIC_STREAM_NONE)); - - $ft = get_pconfig(local_channel(),'system','followed_tags',''); - if ($ft && is_array($ft)) { - $followed = implode(',', $ft); - } - else { - $followed = EMPTY_STR; - } + set_pconfig(local_channel(), 'system', 'followed_tags', ($ntags) ? $ntags : EMPTY_STR); + set_pconfig(local_channel(), 'system', 'use_browser_location', $allow_location); + set_pconfig(local_channel(), 'system', 'suggestme', $suggestme); + set_pconfig(local_channel(), 'system', 'post_newfriend', $post_newfriend); + set_pconfig(local_channel(), 'system', 'post_joingroup', $post_joingroup); + set_pconfig(local_channel(), 'system', 'post_profilechange', $post_profilechange); + set_pconfig(local_channel(), 'system', 'blocktags', $blocktags); + set_pconfig(local_channel(), 'system', 'channel_menu', $channel_menu); + set_pconfig(local_channel(), 'system', 'vnotify', $vnotify); + set_pconfig(local_channel(), 'system', 'always_show_in_notices', $always_show_in_notices); + set_pconfig(local_channel(), 'system', 'evdays', $evdays); + set_pconfig(local_channel(), 'system', 'photo_path', $photo_path); + set_pconfig(local_channel(), 'system', 'attach_path', $attach_path); + set_pconfig(local_channel(), 'system', 'cal_first_day', $cal_first_day); + set_pconfig(local_channel(), 'system', 'default_permcat', $defpermcat); + set_pconfig(local_channel(), 'system', 'email_notify_host', $mailhost); + set_pconfig(local_channel(), 'system', 'profile_assign', $profile_assign); +// set_pconfig(local_channel(),'system','anymention',$anymention); + set_pconfig(local_channel(), 'system', 'hyperdrive', $hyperdrive); + set_pconfig(local_channel(), 'system', 'activitypub', $activitypub); + set_pconfig(local_channel(), 'system', 'autoperms', $autoperms); + set_pconfig(local_channel(), 'system', 'tag_username', $tag_username); + set_pconfig(local_channel(), 'system', 'permit_all_mentions', $permit_all_mentions); + set_pconfig(local_channel(), 'system', 'noindex', $noindex); + $r = q( + "update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d", + dbesc($username), + intval($pageflags), + dbesc($timezone), + dbesc($defloc), + intval($notify), + intval($unkmail), + intval($maxreq), + intval($expire), + intval(local_channel()) + ); + if ($r) { + info(t('Settings updated.') . EOL); + } - $o .= replace_macros(get_markup_template('settings.tpl'), [ - '$ptitle' => t('Channel Settings'), - '$submit' => t('Submit'), - '$baseurl' => z_root(), - '$uid' => local_channel(), - '$form_security_token' => get_form_security_token("settings"), - '$nickname_block' => $prof_addr, - '$h_basic' => t('Basic Settings'), - '$username' => array('username', t('Full name'), $username,''), - '$email' => array('email', t('Email Address'), $email, ''), - '$timezone' => array('timezone_select' , t('Your timezone'), $timezone, t('This is important for showing the correct time on shared events'), get_timezones()), - '$defloc' => array('defloc', t('Default post location'), $defloc, t('Optional geographical location to display on your posts')), - '$allowloc' => array('allow_location', t('Obtain post location from your web browser or device'), ((get_pconfig(local_channel(),'system','use_browser_location')) ? 1 : ''), '', $yes_no), - - '$adult' => array('adult', t('Adult content'), $adult_flag, t('Enable to indicate if this channel frequently or regularly publishes adult content. (Please also tag any adult material and/or nudity with #NSFW)'), $yes_no), - - '$h_prv' => t('Security and Privacy'), - '$permissions_set' => $permissions_set, - '$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'), - - '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no), - '$hidefriends' => array('hide_friends', t('Allow others to view your friends and connections'), 1 - intval($profile['hide_friends']), '', $yes_no ), - '$permiss_arr' => $permiss, - '$comment_perms' => $comment_perms, - '$mail_perms' => $mail_perms, - '$noindex' => [ 'noindex', t('Forbid indexing of your channel content by search engines'), get_pconfig($channel['channel_id'],'system','noindex'), '', $yes_no], - '$close_comments' => [ 'close_comments', t('Disable acceptance of comments on my posts after this many days'), ((intval(get_pconfig(local_channel(),'system','close_comments'))) ? intval(get_pconfig(local_channel(),'system','close_comments')) : EMPTY_STR), t('Leave unset or enter 0 to allow comments indefinitely') ], - '$blocktags' => array('blocktags',t('Allow others to tag your posts'), 1-$blocktags, t('Often used by the community to retro-actively flag inappropriate content'), $yes_no), - - '$lbl_p2macro' => t('Channel Permission Limits'), - - '$expire' => array('expire',t('Expire conversations you have not participated in after this many days'),$expire, t('0 or blank to use the website limit.') . ' ' . ((intval($sys_expire)) ? sprintf( t('This website expires after %d days.'),intval($sys_expire)) : t('This website does not provide an expiration policy.')) . ' ' . t('The website limit takes precedence if lower than your limit.')), - '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), - '$permissions' => t('Default Access List'), - '$permdesc' => t("(click to open/close)"), - '$aclselect' => populate_acl($perm_defaults, false, PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))), - '$profseltxt' => t('Profile to assign new connections'), - '$profselect' => ((feature_enabled(local_channel(),'multi_profiles')) ? contact_profile_assign(get_pconfig(local_channel(),'system','profile_assign','')) : ''), - '$allow_cid' => acl2json($perm_defaults['allow_cid']), - '$allow_gid' => acl2json($perm_defaults['allow_gid']), - '$deny_cid' => acl2json($perm_defaults['deny_cid']), - '$deny_gid' => acl2json($perm_defaults['deny_gid']), - '$suggestme' => $suggestme, - '$group_select' => $group_select, - '$can_change_role' => ((in_array($permissions_role, [ 'collection', 'collection_restricted'] )) ? false : true), - '$permissions_role' => $permissions_role, - '$role' => array('permissions_role' , t('Channel type and privacy'), $permissions_role, '', $perm_roles, ' onchange="update_role_text(); return false;"'), - '$defpermcat' => [ 'defpermcat', t('Default Permissions Group'), $default_permcat, '', $permcats ], - '$permcat_enable' => feature_enabled(local_channel(),'permcats'), - '$profile_in_dir' => $profile_in_dir, - '$hide_friends' => $hide_friends, - '$hide_wall' => $hide_wall, - '$unkmail' => $unkmail, - '$cntunkmail' => array('cntunkmail', t('Maximum direct messages per day from unknown people:'), intval($channel['channel_max_anon_mail']) ,t("Useful to reduce spamming if you allow direct messages from unknown people")), - - '$autoperms' => $autoperms, -// '$anymention' => $anymention, - '$hyperdrive' => $hyperdrive, - '$activitypub' => $activitypub, - '$apconfig' => $apconfig, - '$close' => t('Close'), - '$h_not' => t('Notifications'), - '$activity_options' => t('By default post a status message when:'), - '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, '', $yes_no), - '$post_joingroup' => array('post_joingroup', t('joining a forum/community'), $post_joingroup, '', $yes_no), - '$post_profilechange' => array('post_profilechange', t('making an interesting profile change'), $post_profilechange, '', $yes_no), - '$lbl_not' => t('Send a notification email when:'), - '$notify1' => array('notify1', t('You receive a connection request'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, '', $yes_no), -// '$notify2' => array('notify2', t('Your connections are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, '', $yes_no), - '$notify3' => array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, '', $yes_no), - '$notify4' => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, '', $yes_no), - '$notify10' => array('notify10', t('Someone shares a followed conversation'), ($notify & NOTIFY_RESHARE), NOTIFY_RESHARE, '', $yes_no), - '$notify5' => array('notify5', t('You receive a direct (private) message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, '', $yes_no), -// '$notify6' => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, '', $yes_no), - '$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, '', $yes_no), -// '$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, '', $yes_no), - - '$notify9' => array('notify9', t('Someone likes your post/comment'), ($notify & NOTIFY_LIKE), NOTIFY_LIKE, '', $yes_no), - - - '$lbl_vnot' => t('Show visual notifications including:'), - - '$vnotify1' => array('vnotify1', t('Unseen stream activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, '', $yes_no), - '$vnotify2' => array('vnotify2', t('Unseen channel activity'), ($vnotify & VNOTIFY_CHANNEL), VNOTIFY_CHANNEL, '', $yes_no), - '$vnotify3' => array('vnotify3', t('Unseen direct messages'), ($vnotify & VNOTIFY_MAIL), VNOTIFY_MAIL, t('Recommended'), $yes_no), - '$vnotify4' => array('vnotify4', t('Upcoming events'), ($vnotify & VNOTIFY_EVENT), VNOTIFY_EVENT, '', $yes_no), - '$vnotify5' => array('vnotify5', t('Events today'), ($vnotify & VNOTIFY_EVENTTODAY), VNOTIFY_EVENTTODAY, '', $yes_no), - '$vnotify6' => array('vnotify6', t('Upcoming birthdays'), ($vnotify & VNOTIFY_BIRTHDAY), VNOTIFY_BIRTHDAY, t('Not available in all themes'), $yes_no), - '$vnotify7' => array('vnotify7', t('System (personal) notifications'), ($vnotify & VNOTIFY_SYSTEM), VNOTIFY_SYSTEM, '', $yes_no), - '$vnotify8' => array('vnotify8', t('System info messages'), ($vnotify & VNOTIFY_INFO), VNOTIFY_INFO, t('Recommended'), $yes_no), - '$vnotify9' => array('vnotify9', t('System critical alerts'), ($vnotify & VNOTIFY_ALERT), VNOTIFY_ALERT, t('Recommended'), $yes_no), - '$vnotify10' => array('vnotify10', t('New connections'), ($vnotify & VNOTIFY_INTRO), VNOTIFY_INTRO, t('Recommended'), $yes_no), - '$vnotify11' => ((is_site_admin()) ? array('vnotify11', t('System Registrations'), ($vnotify & VNOTIFY_REGISTER), VNOTIFY_REGISTER, '', $yes_no) : []), -// '$vnotify12' => array('vnotify12', t('Unseen shared files'), ($vnotify & VNOTIFY_FILES), VNOTIFY_FILES, '', $yes_no), - '$vnotify13' => (($public_stream_mode) ? [ 'vnotify13', t('Unseen public stream activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no] : []), - '$vnotify14' => array('vnotify14', t('Unseen likes and dislikes'), ($vnotify & VNOTIFY_LIKE), VNOTIFY_LIKE, '', $yes_no), - '$vnotify15' => array('vnotify15', t('Unseen forum posts'), ($vnotify & VNOTIFY_FORUMS), VNOTIFY_FORUMS, '', $yes_no), - '$vnotify16' => ((is_site_admin()) ? array('vnotify16', t('Reported content'), ($vnotify & VNOTIFY_REPORTS), VNOTIFY_REPORTS, '', $yes_no) : [] ), - '$desktop_notifications_info' => t('Desktop notifications are unavailable because the required browser permission has not been granted'), - '$desktop_notifications_request' => t('Grant permission'), - '$mailhost' => [ 'mailhost', t('Email notifications sent from (hostname)'), get_pconfig(local_channel(),'system','email_notify_host',App::get_hostname()), sprintf( t('If your channel is mirrored to multiple locations, set this to your preferred location. This will prevent duplicate email notifications. Example: %s'),App::get_hostname()) ], - '$always_show_in_notices' => array('always_show_in_notices', t('Show new wall posts, private messages and connections under Notices'), $always_show_in_notices, 1, '', $yes_no), - '$permit_all_mentions' => [ 'permit_all_mentions', t('Accept messages from strangers which mention me'), get_pconfig(local_channel(),'system','permit_all_mentions'), t('This setting bypasses normal permissions'), $yes_no ], - '$followed_tags' => [ 'followed_tags', t('Accept messages from strangers which include any of the following hashtags'), $followed, t('comma separated, do not include the #') ], - '$evdays' => array('evdays', t('Notify me of events this many days in advance'), $evdays, t('Must be greater than 0')), - '$basic_addon' => $plugin['basic'], - '$sec_addon' => $plugin['security'], - '$notify_addon' => $plugin['notify'], - '$misc_addon' => $plugin['misc'], - '$lbl_time' => t('Date and time'), - '$miscdoc' => t('This section is reserved for use by optional addons and apps to provide additional settings.'), - '$h_advn' => t('Advanced Account/Page Type Settings'), - '$h_descadvn' => t('Change the behaviour of this account for special situations'), - '$pagetype' => $pagetype, - '$lbl_misc' => t('Miscellaneous'), - '$photo_path' => array('photo_path', t('Default photo upload folder name'), get_pconfig(local_channel(),'system','photo_path'), t('%Y - current year, %m - current month')), - '$attach_path' => array('attach_path', t('Default file upload folder name'), get_pconfig(local_channel(),'system','attach_path'), t('%Y - current year, %m - current month')), - '$menus' => $menu, - '$menu_desc' => t('Personal menu to display in your channel pages'), - '$removeme' => t('Remove Channel'), - '$removechannel' => t('Remove this channel.'), - '$tag_username' => [ 'tag_username', t('Mentions should display'), intval(get_pconfig(local_channel(),'system','tag_username',get_config('system','tag_username',false))), t('Changes to this setting are applied to new posts/comments only. It is not retroactive.'), - [ - 0 => t('the channel display name [example: @Barbara Jenkins]'), - 1 => t('the channel nickname [example: @barbara1976]'), - 2 => t('combined [example: @Barbara Jenkins (barbara1976)]'), - 127 => t('no preference, use the system default'), - ]], - - '$cal_first_day' => array('first_day', t('Calendar week begins on'), intval(get_pconfig(local_channel(),'system','cal_first_day')), t('This varies by country/culture'), - [ 0 => t('Sunday'), - 1 => t('Monday'), - 2 => t('Tuesday'), - 3 => t('Wednesday'), - 4 => t('Thursday'), - 5 => t('Friday'), - 6 => t('Saturday') - ]), - ]); - - call_hooks('settings_form',$o); - return $o; - } + $r = q( + "UPDATE profile SET publish = %d, hide_friends = %d WHERE is_default = 1 AND uid = %d", + intval($publish), + intval($hide_friends), + intval(local_channel()) + ); + $r = q( + "UPDATE xchan SET xchan_hidden = %d WHERE xchan_hash = '%s'", + intval(1 - $publish), + intval($channel['channel_hash']) + ); + + if ($name_change) { + // catch xchans for all protocols by matching the url + $r = q( + "update xchan set xchan_name = '%s', xchan_name_date = '%s' where xchan_url = '%s'", + dbesc($username), + dbesc(datetime_convert()), + dbesc(z_root() . '/channel/' . $channel['channel_address']) + ); + $r = q( + "update profile set fullname = '%s' where uid = %d and is_default = 1", + dbesc($username), + intval($channel['channel_id']) + ); + if (is_sys_channel($channel['channel_id'])) { + set_config('system', 'sitename', $username); + } + } + + Run::Summon(['Directory', local_channel()]); + + Libsync::build_sync_packet(); + + + if ($email_changed && App::$config['system']['register_policy'] == REGISTER_VERIFY) { + // FIXME - set to un-verified, blocked and redirect to logout + // Q: Why? Are we verifying people or email addresses? + // A: the policy is to verify email addresses + } + + goaway(z_root() . '/settings'); + return; // NOTREACHED + } + + public function get() + { + + require_once('include/acl_selectors.php'); + require_once('include/permissions.php'); + + + $yes_no = [t('No'), t('Yes')]; + + + $p = q( + "SELECT * FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1", + intval(local_channel()) + ); + if (count($p)) { + $profile = $p[0]; + } + + load_pconfig(local_channel(), 'expire'); + + $channel = App::get_channel(); + + $global_perms = Permissions::Perms(); + + $permiss = []; + + $perm_opts = [ + [t('Restricted - from connections only'), PERMS_SPECIFIC], + [t('Semi-public - from anybody that can be identified'), PERMS_AUTHED], + [t('Public - from anybody on the internet'), PERMS_PUBLIC] + ]; + + $limits = PermissionLimits::Get(local_channel()); + $anon_comments = get_config('system', 'anonymous_comments'); + + foreach ($global_perms as $k => $perm) { + $options = []; + $can_be_public = ((strstr($k, 'view') || ($k === 'post_comments' && $anon_comments)) ? true : false); + foreach ($perm_opts as $opt) { + if ($opt[1] == PERMS_PUBLIC && (!$can_be_public)) { + continue; + } + $options[$opt[1]] = $opt[0]; + } + if ($k === 'post_comments') { + $comment_perms = [$k, $perm, $limits[$k], '', $options]; + } elseif ($k === 'post_mail') { + $mail_perms = [$k, $perm, $limits[$k], '', $options]; + } else { + $permiss[] = array($k, $perm, $limits[$k], '', $options); + } + } + + // logger('permiss: ' . print_r($permiss,true)); + + $username = $channel['channel_name']; + $nickname = $channel['channel_address']; + $timezone = $channel['channel_timezone']; + $notify = $channel['channel_notifyflags']; + $defloc = $channel['channel_location']; + + $maxreq = $channel['channel_max_friend_req']; + $expire = $channel['channel_expire_days']; + $adult_flag = intval($channel['channel_pageflags'] & PAGE_ADULT); + $sys_expire = get_config('system', 'default_expire_days'); + + $hide_presence = intval(get_pconfig(local_channel(), 'system', 'hide_online_status')); + + $expire_items = get_pconfig(local_channel(), 'expire', 'items'); + $expire_items = (($expire_items === false) ? '1' : $expire_items); // default if not set: 1 + + $expire_notes = get_pconfig(local_channel(), 'expire', 'notes'); + $expire_notes = (($expire_notes === false) ? '1' : $expire_notes); // default if not set: 1 + + $expire_starred = get_pconfig(local_channel(), 'expire', 'starred'); + $expire_starred = (($expire_starred === false) ? '1' : $expire_starred); // default if not set: 1 + + + $expire_photos = get_pconfig(local_channel(), 'expire', 'photos'); + $expire_photos = (($expire_photos === false) ? '0' : $expire_photos); // default if not set: 0 + + $expire_network_only = get_pconfig(local_channel(), 'expire', 'network_only'); + $expire_network_only = (($expire_network_only === false) ? '0' : $expire_network_only); // default if not set: 0 + + + $suggestme = get_pconfig(local_channel(), 'system', 'suggestme'); + $suggestme = (($suggestme === false) ? '0' : $suggestme); // default if not set: 0 + + $post_newfriend = get_pconfig(local_channel(), 'system', 'post_newfriend'); + $post_newfriend = (($post_newfriend === false) ? '0' : $post_newfriend); // default if not set: 0 + + $post_joingroup = get_pconfig(local_channel(), 'system', 'post_joingroup'); + $post_joingroup = (($post_joingroup === false) ? '0' : $post_joingroup); // default if not set: 0 + + $post_profilechange = get_pconfig(local_channel(), 'system', 'post_profilechange'); + $post_profilechange = (($post_profilechange === false) ? '0' : $post_profilechange); // default if not set: 0 + + $blocktags = get_pconfig(local_channel(), 'system', 'blocktags'); + $blocktags = (($blocktags === false) ? '0' : $blocktags); + + $timezone = date_default_timezone_get(); + + $opt_tpl = get_markup_template("field_checkbox.tpl"); + if (get_config('system', 'publish_all')) { + $profile_in_dir = ''; + } else { + $profile_in_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_directory', t('Publish your profile in the network directory'), $profile['publish'], '', $yes_no), + )); + } + + $suggestme = replace_macros($opt_tpl, array( + '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', $yes_no), + + )); + + $subdir = ((strlen(App::get_path())) ? '
' . t('or') . ' ' . z_root() . '/channel/' . $nickname : ''); + + $webbie = $nickname . '@' . App::get_hostname(); + $intl_nickname = unpunify($nickname) . '@' . unpunify(App::get_hostname()); + + $prof_addr = replace_macros(get_markup_template('channel_settings_header.tpl'), array( + '$desc' => t('Your channel address is'), + '$nickname' => (($intl_nickname === $webbie) ? $webbie : $intl_nickname . ' (' . $webbie . ')'), + '$compat' => t('Friends using compatible applications can use this address to connect with you.'), + '$subdir' => $subdir, + '$davdesc' => t('Your files/photos are accessible as a network drive at'), + '$davpath' => z_root() . '/dav/' . $nickname, + '$windows' => t('(Windows)'), + '$other' => t('(other platforms)'), + '$or' => t('or'), + '$davspath' => 'davs://' . App::get_hostname() . '/dav/' . $nickname, + '$basepath' => App::get_hostname() + )); + + + $pcat = new Permcat(local_channel()); + $pcatlist = $pcat->listing(); + $permcats = []; + if ($pcatlist) { + foreach ($pcatlist as $pc) { + $permcats[$pc['name']] = $pc['localname']; + } + } + + $default_permcat = get_pconfig(local_channel(), 'system', 'default_permcat', 'default'); + + + $acl = new AccessControl($channel); + $perm_defaults = $acl->get(); + + $group_select = AccessList::select(local_channel(), $channel['channel_default_group']); + + require_once('include/menu.php'); + $m1 = menu_list(local_channel()); + $menu = false; + if ($m1) { + $menu = []; + $current = get_pconfig(local_channel(), 'system', 'channel_menu'); + $menu[] = array('name' => '', 'selected' => ((!$current) ? true : false)); + foreach ($m1 as $m) { + $menu[] = array('name' => htmlspecialchars($m['menu_name'], ENT_COMPAT, 'UTF-8'), 'selected' => (($m['menu_name'] === $current) ? ' selected="selected" ' : false)); + } + } + + $evdays = get_pconfig(local_channel(), 'system', 'evdays'); + if (!$evdays) { + $evdays = 3; + } + + $permissions_role = get_pconfig(local_channel(), 'system', 'permissions_role'); + if (!$permissions_role) { + $permissions_role = 'custom'; + } + + if (in_array($permissions_role, ['forum', 'repository'])) { + $autoperms = replace_macros(get_markup_template('field_checkbox.tpl'), [ + '$field' => ['autoperms', t('Automatic membership approval'), ((get_pconfig(local_channel(), 'system', 'autoperms', 0)) ? 1 : 0), t('If enabled, connection requests will be approved without your interaction'), $yes_no]]); + } else { + $autoperms = ''; + } + + $hyperdrive = ['hyperdrive', t('Friend-of-friend conversations'), ((get_pconfig(local_channel(), 'system', 'hyperdrive', true)) ? 1 : 0), t('Import public third-party conversations in which your connections participate.'), $yes_no]; + + if (get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) { + $apconfig = true; + $activitypub = replace_macros(get_markup_template('field_checkbox.tpl'), ['$field' => ['activitypub', t('Enable ActivityPub protocol'), ((get_pconfig(local_channel(), 'system', 'activitypub', ACTIVITYPUB_ENABLED)) ? 1 : 0), t('ActivityPub is an emerging internet standard for social communications'), $yes_no]]); + } else { + $apconfig = false; + $activitypub = '' . EOL; + } + + $permissions_set = (($permissions_role != 'custom') ? true : false); + + $perm_roles = PermissionRoles::roles(); + // Don't permit changing to a collection (@TODO unless there is a mechanism to select the channel_parent) + unset($perm_roles['Collection']); + + + $vnotify = get_pconfig(local_channel(), 'system', 'vnotify'); + $always_show_in_notices = get_pconfig(local_channel(), 'system', 'always_show_in_notices'); + if ($vnotify === false) { + $vnotify = (-1); + } + + $plugin = ['basic' => '', 'security' => '', 'notify' => '', 'misc' => '']; + call_hooks('channel_settings', $plugin); + + $public_stream_mode = intval(get_config('system', 'public_stream_mode', PUBLIC_STREAM_NONE)); + + $ft = get_pconfig(local_channel(), 'system', 'followed_tags', ''); + if ($ft && is_array($ft)) { + $followed = implode(',', $ft); + } else { + $followed = EMPTY_STR; + } + + + $o .= replace_macros(get_markup_template('settings.tpl'), [ + '$ptitle' => t('Channel Settings'), + '$submit' => t('Submit'), + '$baseurl' => z_root(), + '$uid' => local_channel(), + '$form_security_token' => get_form_security_token("settings"), + '$nickname_block' => $prof_addr, + '$h_basic' => t('Basic Settings'), + '$username' => array('username', t('Full name'), $username, ''), + '$email' => array('email', t('Email Address'), $email, ''), + '$timezone' => array('timezone_select', t('Your timezone'), $timezone, t('This is important for showing the correct time on shared events'), get_timezones()), + '$defloc' => array('defloc', t('Default post location'), $defloc, t('Optional geographical location to display on your posts')), + '$allowloc' => array('allow_location', t('Obtain post location from your web browser or device'), ((get_pconfig(local_channel(), 'system', 'use_browser_location')) ? 1 : ''), '', $yes_no), + + '$adult' => array('adult', t('Adult content'), $adult_flag, t('Enable to indicate if this channel frequently or regularly publishes adult content. (Please also tag any adult material and/or nudity with #NSFW)'), $yes_no), + + '$h_prv' => t('Security and Privacy'), + '$permissions_set' => $permissions_set, + '$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'), + + '$hide_presence' => array('hide_presence', t('Hide my online presence'), $hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no), + '$hidefriends' => array('hide_friends', t('Allow others to view your friends and connections'), 1 - intval($profile['hide_friends']), '', $yes_no), + '$permiss_arr' => $permiss, + '$comment_perms' => $comment_perms, + '$mail_perms' => $mail_perms, + '$noindex' => ['noindex', t('Forbid indexing of your channel content by search engines'), get_pconfig($channel['channel_id'], 'system', 'noindex'), '', $yes_no], + '$close_comments' => ['close_comments', t('Disable acceptance of comments on my posts after this many days'), ((intval(get_pconfig(local_channel(), 'system', 'close_comments'))) ? intval(get_pconfig(local_channel(), 'system', 'close_comments')) : EMPTY_STR), t('Leave unset or enter 0 to allow comments indefinitely')], + '$blocktags' => array('blocktags', t('Allow others to tag your posts'), 1 - $blocktags, t('Often used by the community to retro-actively flag inappropriate content'), $yes_no), + + '$lbl_p2macro' => t('Channel Permission Limits'), + + '$expire' => array('expire', t('Expire conversations you have not participated in after this many days'), $expire, t('0 or blank to use the website limit.') . ' ' . ((intval($sys_expire)) ? sprintf(t('This website expires after %d days.'), intval($sys_expire)) : t('This website does not provide an expiration policy.')) . ' ' . t('The website limit takes precedence if lower than your limit.')), + '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']), t('May reduce spam activity')), + '$permissions' => t('Default Access List'), + '$permdesc' => t("(click to open/close)"), + '$aclselect' => populate_acl($perm_defaults, false, PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))), + '$profseltxt' => t('Profile to assign new connections'), + '$profselect' => ((feature_enabled(local_channel(), 'multi_profiles')) ? contact_profile_assign(get_pconfig(local_channel(), 'system', 'profile_assign', '')) : ''), + + '$allow_cid' => acl2json($perm_defaults['allow_cid']), + '$allow_gid' => acl2json($perm_defaults['allow_gid']), + '$deny_cid' => acl2json($perm_defaults['deny_cid']), + '$deny_gid' => acl2json($perm_defaults['deny_gid']), + '$suggestme' => $suggestme, + '$group_select' => $group_select, + '$can_change_role' => ((in_array($permissions_role, ['collection', 'collection_restricted'])) ? false : true), + '$permissions_role' => $permissions_role, + '$role' => array('permissions_role', t('Channel type and privacy'), $permissions_role, '', $perm_roles, ' onchange="update_role_text(); return false;"'), + '$defpermcat' => ['defpermcat', t('Default Permissions Group'), $default_permcat, '', $permcats], + '$permcat_enable' => feature_enabled(local_channel(), 'permcats'), + '$profile_in_dir' => $profile_in_dir, + '$hide_friends' => $hide_friends, + '$hide_wall' => $hide_wall, + '$unkmail' => $unkmail, + '$cntunkmail' => array('cntunkmail', t('Maximum direct messages per day from unknown people:'), intval($channel['channel_max_anon_mail']), t("Useful to reduce spamming if you allow direct messages from unknown people")), + + '$autoperms' => $autoperms, +// '$anymention' => $anymention, + '$hyperdrive' => $hyperdrive, + '$activitypub' => $activitypub, + '$apconfig' => $apconfig, + '$close' => t('Close'), + '$h_not' => t('Notifications'), + '$activity_options' => t('By default post a status message when:'), + '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, '', $yes_no), + '$post_joingroup' => array('post_joingroup', t('joining a forum/community'), $post_joingroup, '', $yes_no), + '$post_profilechange' => array('post_profilechange', t('making an interesting profile change'), $post_profilechange, '', $yes_no), + '$lbl_not' => t('Send a notification email when:'), + '$notify1' => array('notify1', t('You receive a connection request'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, '', $yes_no), +// '$notify2' => array('notify2', t('Your connections are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, '', $yes_no), + '$notify3' => array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, '', $yes_no), + '$notify4' => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, '', $yes_no), + '$notify10' => array('notify10', t('Someone shares a followed conversation'), ($notify & NOTIFY_RESHARE), NOTIFY_RESHARE, '', $yes_no), + '$notify5' => array('notify5', t('You receive a direct (private) message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, '', $yes_no), +// '$notify6' => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, '', $yes_no), + '$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, '', $yes_no), +// '$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, '', $yes_no), + + '$notify9' => array('notify9', t('Someone likes your post/comment'), ($notify & NOTIFY_LIKE), NOTIFY_LIKE, '', $yes_no), + + + '$lbl_vnot' => t('Show visual notifications including:'), + + '$vnotify1' => array('vnotify1', t('Unseen stream activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, '', $yes_no), + '$vnotify2' => array('vnotify2', t('Unseen channel activity'), ($vnotify & VNOTIFY_CHANNEL), VNOTIFY_CHANNEL, '', $yes_no), + '$vnotify3' => array('vnotify3', t('Unseen direct messages'), ($vnotify & VNOTIFY_MAIL), VNOTIFY_MAIL, t('Recommended'), $yes_no), + '$vnotify4' => array('vnotify4', t('Upcoming events'), ($vnotify & VNOTIFY_EVENT), VNOTIFY_EVENT, '', $yes_no), + '$vnotify5' => array('vnotify5', t('Events today'), ($vnotify & VNOTIFY_EVENTTODAY), VNOTIFY_EVENTTODAY, '', $yes_no), + '$vnotify6' => array('vnotify6', t('Upcoming birthdays'), ($vnotify & VNOTIFY_BIRTHDAY), VNOTIFY_BIRTHDAY, t('Not available in all themes'), $yes_no), + '$vnotify7' => array('vnotify7', t('System (personal) notifications'), ($vnotify & VNOTIFY_SYSTEM), VNOTIFY_SYSTEM, '', $yes_no), + '$vnotify8' => array('vnotify8', t('System info messages'), ($vnotify & VNOTIFY_INFO), VNOTIFY_INFO, t('Recommended'), $yes_no), + '$vnotify9' => array('vnotify9', t('System critical alerts'), ($vnotify & VNOTIFY_ALERT), VNOTIFY_ALERT, t('Recommended'), $yes_no), + '$vnotify10' => array('vnotify10', t('New connections'), ($vnotify & VNOTIFY_INTRO), VNOTIFY_INTRO, t('Recommended'), $yes_no), + '$vnotify11' => ((is_site_admin()) ? array('vnotify11', t('System Registrations'), ($vnotify & VNOTIFY_REGISTER), VNOTIFY_REGISTER, '', $yes_no) : []), +// '$vnotify12' => array('vnotify12', t('Unseen shared files'), ($vnotify & VNOTIFY_FILES), VNOTIFY_FILES, '', $yes_no), + '$vnotify13' => (($public_stream_mode) ? ['vnotify13', t('Unseen public stream activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no] : []), + '$vnotify14' => array('vnotify14', t('Unseen likes and dislikes'), ($vnotify & VNOTIFY_LIKE), VNOTIFY_LIKE, '', $yes_no), + '$vnotify15' => array('vnotify15', t('Unseen forum posts'), ($vnotify & VNOTIFY_FORUMS), VNOTIFY_FORUMS, '', $yes_no), + '$vnotify16' => ((is_site_admin()) ? array('vnotify16', t('Reported content'), ($vnotify & VNOTIFY_REPORTS), VNOTIFY_REPORTS, '', $yes_no) : []), + '$desktop_notifications_info' => t('Desktop notifications are unavailable because the required browser permission has not been granted'), + '$desktop_notifications_request' => t('Grant permission'), + '$mailhost' => ['mailhost', t('Email notifications sent from (hostname)'), get_pconfig(local_channel(), 'system', 'email_notify_host', App::get_hostname()), sprintf(t('If your channel is mirrored to multiple locations, set this to your preferred location. This will prevent duplicate email notifications. Example: %s'), App::get_hostname())], + '$always_show_in_notices' => array('always_show_in_notices', t('Show new wall posts, private messages and connections under Notices'), $always_show_in_notices, 1, '', $yes_no), + '$permit_all_mentions' => ['permit_all_mentions', t('Accept messages from strangers which mention you'), get_pconfig(local_channel(), 'system', 'permit_all_mentions'), t('This setting bypasses normal permissions'), $yes_no], + '$followed_tags' => ['followed_tags', t('Accept messages from strangers which include any of the following hashtags'), $followed, t('comma separated, do not include the #')], + '$evdays' => array('evdays', t('Notify me of events this many days in advance'), $evdays, t('Must be greater than 0')), + '$basic_addon' => $plugin['basic'], + '$sec_addon' => $plugin['security'], + '$notify_addon' => $plugin['notify'], + '$misc_addon' => $plugin['misc'], + '$lbl_time' => t('Date and time'), + '$miscdoc' => t('This section is reserved for use by optional addons and apps to provide additional settings.'), + '$h_advn' => t('Advanced Account/Page Type Settings'), + '$h_descadvn' => t('Change the behaviour of this account for special situations'), + '$pagetype' => $pagetype, + '$lbl_misc' => t('Miscellaneous'), + '$photo_path' => array('photo_path', t('Default photo upload folder name'), get_pconfig(local_channel(), 'system', 'photo_path'), t('%Y - current year, %m - current month')), + '$attach_path' => array('attach_path', t('Default file upload folder name'), get_pconfig(local_channel(), 'system', 'attach_path'), t('%Y - current year, %m - current month')), + '$menus' => $menu, + '$menu_desc' => t('Personal menu to display in your channel pages'), + '$removeme' => t('Remove Channel'), + '$removechannel' => t('Remove this channel.'), + '$tag_username' => ['tag_username', t('Mentions should display'), intval(get_pconfig(local_channel(), 'system', 'tag_username', get_config('system', 'tag_username', false))), t('Changes to this setting are applied to new posts/comments only. It is not retroactive.'), + [ + 0 => t('the channel display name [example: @Barbara Jenkins]'), + 1 => t('the channel nickname [example: @barbara1976]'), + 2 => t('combined [example: @Barbara Jenkins (barbara1976)]'), + 127 => t('no preference, use the system default'), + ]], + + '$cal_first_day' => array('first_day', t('Calendar week begins on'), intval(get_pconfig(local_channel(), 'system', 'cal_first_day')), t('This varies by country/culture'), + [0 => t('Sunday'), + 1 => t('Monday'), + 2 => t('Tuesday'), + 3 => t('Wednesday'), + 4 => t('Thursday'), + 5 => t('Friday'), + 6 => t('Saturday') + ]), + ]); + + call_hooks('settings_form', $o); + return $o; + } } diff --git a/Zotlabs/Module/Settings/Display.php b/Zotlabs/Module/Settings/Display.php index 47c7f9b4a..e11677564 100644 --- a/Zotlabs/Module/Settings/Display.php +++ b/Zotlabs/Module/Settings/Display.php @@ -5,229 +5,240 @@ namespace Zotlabs\Module\Settings; use App; use Zotlabs\Lib\Libsync; +class Display +{ -class Display { + /* + * DISPLAY SETTINGS + */ - /* - * DISPLAY SETTINGS - */ + public function post() + { + check_form_security_token_redirectOnErr('/settings/display', 'settings_display'); - function post() { - check_form_security_token_redirectOnErr('/settings/display', 'settings_display'); + $themespec = explode(':', App::$channel['channel_theme']); + $existing_theme = $themespec[0]; + $existing_schema = $themespec[1]; - $themespec = explode(':', App::$channel['channel_theme']); - $existing_theme = $themespec[0]; - $existing_schema = $themespec[1]; + $theme = ((x($_POST, 'theme')) ? notags(trim($_POST['theme'])) : $existing_theme); - $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : $existing_theme); - - if(! $theme) - $theme = 'redbasic'; + if (!$theme) { + $theme = 'redbasic'; + } - $preload_images = ((x($_POST,'preload_images')) ? intval($_POST['preload_images']) : 0); - $channel_menu = ((x($_POST,'channel_menu')) ? intval($_POST['channel_menu']) : 0); - $user_scalable = ((x($_POST,'user_scalable')) ? intval($_POST['user_scalable']) : 0); - $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0); - $indentpx = ((x($_POST,'indentpx')) ? intval($_POST['indentpx']) : 0); + $preload_images = ((x($_POST, 'preload_images')) ? intval($_POST['preload_images']) : 0); + $channel_menu = ((x($_POST, 'channel_menu')) ? intval($_POST['channel_menu']) : 0); + $user_scalable = ((x($_POST, 'user_scalable')) ? intval($_POST['user_scalable']) : 0); + $nosmile = ((x($_POST, 'nosmile')) ? intval($_POST['nosmile']) : 0); + $indentpx = ((x($_POST, 'indentpx')) ? intval($_POST['indentpx']) : 0); - $channel_divmore_height = ((x($_POST,'channel_divmore_height')) ? intval($_POST['channel_divmore_height']) : 400); - if($channel_divmore_height < 50) - $channel_divmore_height = 50; - $stream_divmore_height = ((x($_POST,'stream_divmore_height')) ? intval($_POST['stream_divmore_height']) : 400); - if($stream_divmore_height < 50) - $stream_divmore_height = 50; + $channel_divmore_height = ((x($_POST, 'channel_divmore_height')) ? intval($_POST['channel_divmore_height']) : 400); + if ($channel_divmore_height < 50) { + $channel_divmore_height = 50; + } + $stream_divmore_height = ((x($_POST, 'stream_divmore_height')) ? intval($_POST['stream_divmore_height']) : 400); + if ($stream_divmore_height < 50) { + $stream_divmore_height = 50; + } - $browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0); - $browser_update = $browser_update * 1000; - if($browser_update < 15000) - $browser_update = 15000; + $browser_update = ((x($_POST, 'browser_update')) ? intval($_POST['browser_update']) : 0); + $browser_update = $browser_update * 1000; + if ($browser_update < 15000) { + $browser_update = 15000; + } - $itemspage = ((x($_POST,'itemspage')) ? intval($_POST['itemspage']) : 20); - if($itemspage > 100) - $itemspage = 100; + $itemspage = ((x($_POST, 'itemspage')) ? intval($_POST['itemspage']) : 20); + if ($itemspage > 100) { + $itemspage = 100; + } - if ($indentpx < 0) { - $indentpx = 0; - } - if ($indentpx > 20) { - $indentpx = 20; - } + if ($indentpx < 0) { + $indentpx = 0; + } + if ($indentpx > 20) { + $indentpx = 20; + } - set_pconfig(local_channel(),'system','preload_images',$preload_images); - set_pconfig(local_channel(),'system','user_scalable',$user_scalable); - set_pconfig(local_channel(),'system','update_interval', $browser_update); - set_pconfig(local_channel(),'system','itemspage', $itemspage); - set_pconfig(local_channel(),'system','no_smilies',1-intval($nosmile)); - set_pconfig(local_channel(),'system','channel_divmore_height', $channel_divmore_height); - set_pconfig(local_channel(),'system','stream_divmore_height', $stream_divmore_height); - set_pconfig(local_channel(),'system','channel_menu', $channel_menu); - set_pconfig(local_channel(),'system','thread_indent_px',$indentpx); + set_pconfig(local_channel(), 'system', 'preload_images', $preload_images); + set_pconfig(local_channel(), 'system', 'user_scalable', $user_scalable); + set_pconfig(local_channel(), 'system', 'update_interval', $browser_update); + set_pconfig(local_channel(), 'system', 'itemspage', $itemspage); + set_pconfig(local_channel(), 'system', 'no_smilies', 1 - intval($nosmile)); + set_pconfig(local_channel(), 'system', 'channel_divmore_height', $channel_divmore_height); + set_pconfig(local_channel(), 'system', 'stream_divmore_height', $stream_divmore_height); + set_pconfig(local_channel(), 'system', 'channel_menu', $channel_menu); + set_pconfig(local_channel(), 'system', 'thread_indent_px', $indentpx); - $newschema = ''; - if($theme){ - // call theme_post only if theme has not been changed - if( ($themeconfigfile = $this->get_theme_config_file($theme)) != null){ - require_once($themeconfigfile); - if(class_exists('\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config')) { - $clsname = '\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config'; - $theme_config = new $clsname(); - $schemas = $theme_config->get_schemas(); - if(array_key_exists($_POST['schema'],$schemas)) - $newschema = $_POST['schema']; - if($newschema === '---') - $newschema = ''; - $theme_config->post(); - } - } - } + $newschema = ''; + if ($theme) { + // call theme_post only if theme has not been changed + if (($themeconfigfile = $this->get_theme_config_file($theme)) != null) { + require_once($themeconfigfile); + if (class_exists('\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config')) { + $clsname = '\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config'; + $theme_config = new $clsname(); + $schemas = $theme_config->get_schemas(); + if (array_key_exists($_POST['schema'], $schemas)) { + $newschema = $_POST['schema']; + } + if ($newschema === '---') { + $newschema = ''; + } + $theme_config->post(); + } + } + } - logger('theme: ' . $theme . (($newschema) ? ':' . $newschema : '')); + logger('theme: ' . $theme . (($newschema) ? ':' . $newschema : '')); - $_SESSION['theme'] = $theme . (($newschema) ? ':' . $newschema : ''); + $_SESSION['theme'] = $theme . (($newschema) ? ':' . $newschema : ''); - $r = q("UPDATE channel SET channel_theme = '%s' WHERE channel_id = %d", - dbesc($theme . (($newschema) ? ':' . $newschema : '')), - intval(local_channel()) - ); + $r = q( + "UPDATE channel SET channel_theme = '%s' WHERE channel_id = %d", + dbesc($theme . (($newschema) ? ':' . $newschema : '')), + intval(local_channel()) + ); - call_hooks('display_settings_post', $_POST); - Libsync::build_sync_packet(); - goaway(z_root() . '/settings/display' ); - return; // NOTREACHED - } + call_hooks('display_settings_post', $_POST); + Libsync::build_sync_packet(); + goaway(z_root() . '/settings/display'); + return; // NOTREACHED + } - function get() { + public function get() + { - $yes_no = array(t('No'),t('Yes')); + $yes_no = array(t('No'), t('Yes')); - $default_theme = get_config('system','theme'); - if(! $default_theme) - $default_theme = 'redbasic'; + $default_theme = get_config('system', 'theme'); + if (!$default_theme) { + $default_theme = 'redbasic'; + } - $themespec = explode(':', App::$channel['channel_theme']); - $existing_theme = $themespec[0]; - $existing_schema = $themespec[1]; + $themespec = explode(':', App::$channel['channel_theme']); + $existing_theme = $themespec[0]; + $existing_schema = $themespec[1]; - $theme = (($existing_theme) ? $existing_theme : $default_theme); + $theme = (($existing_theme) ? $existing_theme : $default_theme); - $allowed_themes_str = get_config('system','allowed_themes'); - $allowed_themes_raw = explode(',',$allowed_themes_str); - $allowed_themes = []; - if(count($allowed_themes_raw)) - foreach($allowed_themes_raw as $x) - if(strlen(trim($x)) && is_dir("view/theme/$x")) - $allowed_themes[] = trim($x); + $allowed_themes_str = get_config('system', 'allowed_themes'); + $allowed_themes_raw = explode(',', $allowed_themes_str); + $allowed_themes = []; + if (count($allowed_themes_raw)) { + foreach ($allowed_themes_raw as $x) { + if (strlen(trim($x)) && is_dir("view/theme/$x")) { + $allowed_themes[] = trim($x); + } + } + } - $themes = []; - $files = glob('view/theme/*'); - if($allowed_themes) { - foreach($allowed_themes as $th) { - $f = $th; + $themes = []; + $files = glob('view/theme/*'); + if ($allowed_themes) { + foreach ($allowed_themes as $th) { + $f = $th; - $info = get_theme_info($th); - $compatible = check_plugin_versions($info); - if(! $compatible) { - $themes[$f] = sprintf(t('%s - (Incompatible)'), $f); - continue; - } + $info = get_theme_info($th); + $compatible = check_plugin_versions($info); + if (!$compatible) { + $themes[$f] = sprintf(t('%s - (Incompatible)'), $f); + continue; + } - $is_experimental = file_exists('view/theme/' . $th . '/experimental'); - $unsupported = file_exists('view/theme/' . $th . '/unsupported'); - $is_library = file_exists('view/theme/'. $th . '/library'); + $is_experimental = file_exists('view/theme/' . $th . '/experimental'); + $unsupported = file_exists('view/theme/' . $th . '/unsupported'); + $is_library = file_exists('view/theme/' . $th . '/library'); - if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ - $theme_name = (($is_experimental) ? sprintf(t('%s - (Experimental)'), $f) : $f); - if (! $is_library) { - $themes[$f] = $theme_name; - } - } - } - } + if (!$is_experimental or ($is_experimental && (get_config('experimentals', 'exp_themes') == 1 or get_config('experimentals', 'exp_themes') === false))) { + $theme_name = (($is_experimental) ? sprintf(t('%s - (Experimental)'), $f) : $f); + if (!$is_library) { + $themes[$f] = $theme_name; + } + } + } + } - $theme_selected = ((array_key_exists('theme',$_SESSION) && $_SESSION['theme']) ? $_SESSION['theme'] : $theme); + $theme_selected = ((array_key_exists('theme', $_SESSION) && $_SESSION['theme']) ? $_SESSION['theme'] : $theme); - if (strpos($theme_selected, ':')) { - $theme_selected = explode(':', $theme_selected)[0]; - } + if (strpos($theme_selected, ':')) { + $theme_selected = explode(':', $theme_selected)[0]; + } - $preload_images = get_pconfig(local_channel(),'system','preload_images'); + $preload_images = get_pconfig(local_channel(), 'system', 'preload_images'); - $user_scalable = get_pconfig(local_channel(),'system','user_scalable', '0'); + $user_scalable = get_pconfig(local_channel(), 'system', 'user_scalable', '0'); - $browser_update = intval(get_pconfig(local_channel(), 'system','update_interval',30000)); // default if not set: 30 seconds - $browser_update = (($browser_update < 15000) ? 15 : $browser_update / 1000); // minimum 15 seconds + $browser_update = intval(get_pconfig(local_channel(), 'system', 'update_interval', 30000)); // default if not set: 30 seconds + $browser_update = (($browser_update < 15000) ? 15 : $browser_update / 1000); // minimum 15 seconds - $itemspage = intval(get_pconfig(local_channel(), 'system','itemspage')); - $itemspage = (($itemspage > 0 && $itemspage < 101) ? $itemspage : 20); // default if not set: 20 items + $itemspage = intval(get_pconfig(local_channel(), 'system', 'itemspage')); + $itemspage = (($itemspage > 0 && $itemspage < 101) ? $itemspage : 20); // default if not set: 20 items - $nosmile = get_pconfig(local_channel(),'system','no_smilies'); - $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0 + $nosmile = get_pconfig(local_channel(), 'system', 'no_smilies'); + $nosmile = (($nosmile === false) ? '0' : $nosmile); // default if not set: 0 - $theme_config = ""; - if(($themeconfigfile = $this->get_theme_config_file($theme)) != null){ - require_once($themeconfigfile); - if(class_exists('\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config')) { - $clsname = '\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config'; - $thm_config = new $clsname(); - $schemas = $thm_config->get_schemas(); - $theme_config = $thm_config->get(); - } - } + $theme_config = ""; + if (($themeconfigfile = $this->get_theme_config_file($theme)) != null) { + require_once($themeconfigfile); + if (class_exists('\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config')) { + $clsname = '\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config'; + $thm_config = new $clsname(); + $schemas = $thm_config->get_schemas(); + $theme_config = $thm_config->get(); + } + } - // logger('schemas: ' . print_r($schemas,true)); + // logger('schemas: ' . print_r($schemas,true)); - $tpl = get_markup_template("settings_display.tpl"); - $o = replace_macros($tpl, array( - '$ptitle' => t('Display Settings'), - '$d_tset' => t('Theme Settings'), - '$d_ctset' => t('Custom Theme Settings'), - '$d_cset' => t('Content Settings'), - '$form_security_token' => get_form_security_token("settings_display"), - '$submit' => t('Submit'), - '$baseurl' => z_root(), - '$uid' => local_channel(), + $tpl = get_markup_template("settings_display.tpl"); + $o = replace_macros($tpl, array( + '$ptitle' => t('Display Settings'), + '$d_tset' => t('Theme Settings'), + '$d_ctset' => t('Custom Theme Settings'), + '$d_cset' => t('Content Settings'), + '$form_security_token' => get_form_security_token("settings_display"), + '$submit' => t('Submit'), + '$baseurl' => z_root(), + '$uid' => local_channel(), - '$theme' => (($themes) ? array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview') : false), - '$schema' => array('schema', t('Select scheme'), $existing_schema, '' , $schemas), + '$theme' => (($themes) ? array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview') : false), + '$schema' => array('schema', t('Select scheme'), $existing_schema, '', $schemas), - '$preload_images' => array('preload_images', t("Preload images before rendering the page"), $preload_images, t("The subjective page load time will be longer but the page will be ready when displayed"), $yes_no), - '$user_scalable' => array('user_scalable', t("Enable user zoom on mobile devices"), $user_scalable, '', $yes_no), - '$ajaxint' => array('browser_update', t("Update notifications every xx seconds"), $browser_update, t('Minimum of 15 seconds, no maximum')), - '$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')), - '$nosmile' => array('nosmile', t("Show emoticons (smilies) as images"), 1-intval($nosmile), '', $yes_no), - '$channel_menu' => [ 'channel_menu', t('Provide channel menu in navigation bar'), get_pconfig(local_channel(),'system','channel_menu',get_config('system','channel_menu',0)), t('Default: channel menu located in app menu'),$yes_no ], - '$layout_editor' => t('System Page Layout Editor - (advanced)'), - '$theme_config' => $theme_config, - '$expert' => feature_enabled(local_channel(),'advanced_theming'), - '$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','channel_divmore_height')) ? get_pconfig(local_channel(),'system','channel_divmore_height') : 400), t('click to expand content exceeding this height')), - '$stream_divmore_height' => array('stream_divmore_height', t('Stream page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','stream_divmore_height')) ? get_pconfig(local_channel(),'system','stream_divmore_height') : 400) , t('click to expand content exceeding this height')), - '$indentpx' => [ 'indentpx', t('Indent threaded comments this many pixels from the parent'), intval(get_pconfig(local_channel(),'system','thread_indent_px', get_config('system','thread_indent_px',0))), t('0-20') ], + '$preload_images' => array('preload_images', t("Preload images before rendering the page"), $preload_images, t("The subjective page load time will be longer but the page will be ready when displayed"), $yes_no), + '$user_scalable' => array('user_scalable', t("Enable user zoom on mobile devices"), $user_scalable, '', $yes_no), + '$ajaxint' => array('browser_update', t("Update notifications every xx seconds"), $browser_update, t('Minimum of 15 seconds, no maximum')), + '$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')), + '$nosmile' => array('nosmile', t("Show emoticons (smilies) as images"), 1 - intval($nosmile), '', $yes_no), + '$channel_menu' => ['channel_menu', t('Provide channel menu in navigation bar'), get_pconfig(local_channel(), 'system', 'channel_menu', get_config('system', 'channel_menu', 0)), t('Default: channel menu located in app menu'), $yes_no], + '$layout_editor' => t('System Page Layout Editor - (advanced)'), + '$theme_config' => $theme_config, + '$expert' => feature_enabled(local_channel(), 'advanced_theming'), + '$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_channel(), 'system', 'channel_divmore_height')) ? get_pconfig(local_channel(), 'system', 'channel_divmore_height') : 400), t('click to expand content exceeding this height')), + '$stream_divmore_height' => array('stream_divmore_height', t('Stream page max height of content (in pixels)'), ((get_pconfig(local_channel(), 'system', 'stream_divmore_height')) ? get_pconfig(local_channel(), 'system', 'stream_divmore_height') : 400), t('click to expand content exceeding this height')), + '$indentpx' => ['indentpx', t('Indent threaded comments this many pixels from the parent'), intval(get_pconfig(local_channel(), 'system', 'thread_indent_px', get_config('system', 'thread_indent_px', 0))), t('0-20')], - )); + )); - call_hooks('display_settings',$o); - return $o; - } - - - function get_theme_config_file($theme){ - - $base_theme = App::$theme_info['extends']; - - if (file_exists("view/theme/$theme/php/config.php")){ - return "view/theme/$theme/php/config.php"; - } - if (file_exists("view/theme/$base_theme/php/config.php")){ - return "view/theme/$base_theme/php/config.php"; - } - return null; - } + call_hooks('display_settings', $o); + return $o; + } + public function get_theme_config_file($theme) + { + $base_theme = App::$theme_info['extends']; + if (file_exists("view/theme/$theme/php/config.php")) { + return "view/theme/$theme/php/config.php"; + } + if (file_exists("view/theme/$base_theme/php/config.php")) { + return "view/theme/$base_theme/php/config.php"; + } + return null; + } } diff --git a/Zotlabs/Module/Settings/Featured.php b/Zotlabs/Module/Settings/Featured.php index 83148d648..6405b0113 100644 --- a/Zotlabs/Module/Settings/Featured.php +++ b/Zotlabs/Module/Settings/Featured.php @@ -4,83 +4,84 @@ namespace Zotlabs\Module\Settings; use Zotlabs\Lib\Libsync; +class Featured +{ -class Featured { - - function post() { - check_form_security_token_redirectOnErr('/settings/featured', 'settings_featured'); - - call_hooks('feature_settings_post', $_POST); - - if($_POST['affinity_slider-submit']) { - $cmax = intval($_POST['affinity_cmax']); - if($cmax < 0 || $cmax > 99) - $cmax = 99; - $cmin = intval($_POST['affinity_cmin']); - if($cmin < 0 || $cmin > 99) - $cmin = 0; - set_pconfig(local_channel(),'affinity','cmin',$cmin); - set_pconfig(local_channel(),'affinity','cmax',$cmax); + public function post() + { + check_form_security_token_redirectOnErr('/settings/featured', 'settings_featured'); - info( t('Affinity Slider settings updated.') . EOL); + call_hooks('feature_settings_post', $_POST); - } - - Libsync::build_sync_packet(); - return; - } + if ($_POST['affinity_slider-submit']) { + $cmax = intval($_POST['affinity_cmax']); + if ($cmax < 0 || $cmax > 99) { + $cmax = 99; + } + $cmin = intval($_POST['affinity_cmin']); + if ($cmin < 0 || $cmin > 99) { + $cmin = 0; + } + set_pconfig(local_channel(), 'affinity', 'cmin', $cmin); + set_pconfig(local_channel(), 'affinity', 'cmax', $cmax); - function get() { - $settings_addons = ""; - - $o = ''; - - $r = q("SELECT * FROM hook WHERE hook = 'feature_settings' "); - if(! $r) - $settings_addons = t('No feature settings configured'); - - if(feature_enabled(local_channel(),'affinity')) { - - $cmax = intval(get_pconfig(local_channel(),'affinity','cmax')); - $cmax = (($cmax) ? $cmax : 99); - $setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array( - '$field' => array('affinity_cmax', t('Default maximum affinity level'), $cmax, t('0-99 default 99')) - )); - $cmin = intval(get_pconfig(local_channel(),'affinity','cmin')); - $cmin = (($cmin) ? $cmin : 0); - $setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array( - '$field' => array('affinity_cmin', t('Default minimum affinity level'), $cmin, t('0-99 - default 0')) - )); + info(t('Affinity Slider settings updated.') . EOL); + } - $settings_addons .= replace_macros(get_markup_template('generic_addon_settings.tpl'), array( - '$addon' => array('affinity_slider', '' . t('Affinity Slider Settings'), '', t('Submit')), - '$content' => $setting_fields - )); - } + Libsync::build_sync_packet(); + return; + } - call_hooks('feature_settings', $settings_addons); - - $this->sortpanels($settings_addons); + public function get() + { + $settings_addons = ""; - - $tpl = get_markup_template("settings_addons.tpl"); - $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_featured"), - '$title' => t('Addon Settings'), - '$descrip' => t('Please save/submit changes to any panel before opening another.'), - '$settings_addons' => $settings_addons - )); - return $o; - } + $o = ''; - function sortpanels(&$s) { - $a = explode('',$s); - if($a) { - usort($a,'featured_sort'); - $s = implode('',$a); - } - } + $r = q("SELECT * FROM hook WHERE hook = 'feature_settings' "); + if (!$r) { + $settings_addons = t('No feature settings configured'); + } + if (feature_enabled(local_channel(), 'affinity')) { + $cmax = intval(get_pconfig(local_channel(), 'affinity', 'cmax')); + $cmax = (($cmax) ? $cmax : 99); + $setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array( + '$field' => array('affinity_cmax', t('Default maximum affinity level'), $cmax, t('0-99 default 99')) + )); + $cmin = intval(get_pconfig(local_channel(), 'affinity', 'cmin')); + $cmin = (($cmin) ? $cmin : 0); + $setting_fields .= replace_macros(get_markup_template('field_input.tpl'), array( + '$field' => array('affinity_cmin', t('Default minimum affinity level'), $cmin, t('0-99 - default 0')) + )); + + $settings_addons .= replace_macros(get_markup_template('generic_addon_settings.tpl'), array( + '$addon' => array('affinity_slider', '' . t('Affinity Slider Settings'), '', t('Submit')), + '$content' => $setting_fields + )); + } + + call_hooks('feature_settings', $settings_addons); + + $this->sortpanels($settings_addons); + + + $tpl = get_markup_template("settings_addons.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("settings_featured"), + '$title' => t('Addon Settings'), + '$descrip' => t('Please save/submit changes to any panel before opening another.'), + '$settings_addons' => $settings_addons + )); + return $o; + } + + public function sortpanels(&$s) + { + $a = explode('', $s); + if ($a) { + usort($a, 'featured_sort'); + $s = implode('', $a); + } + } } - - diff --git a/Zotlabs/Module/Settings/Features.php b/Zotlabs/Module/Settings/Features.php index aa46e92e4..a2d88e0ca 100644 --- a/Zotlabs/Module/Settings/Features.php +++ b/Zotlabs/Module/Settings/Features.php @@ -4,62 +4,65 @@ namespace Zotlabs\Module\Settings; use Zotlabs\Lib\Libsync; -class Features { +class Features +{ - function post() { - check_form_security_token_redirectOnErr('/settings/features', 'settings_features'); - - $features = get_features(false); + public function post() + { + check_form_security_token_redirectOnErr('/settings/features', 'settings_features'); - foreach($features as $fname => $fdata) { - foreach(array_slice($fdata,1) as $f) { - $k = $f[0]; - if(array_key_exists("feature_$k",$_POST)) - set_pconfig(local_channel(),'feature',$k, (string) $_POST["feature_$k"]); - else - set_pconfig(local_channel(),'feature', $k, ''); - } - } - Libsync::build_sync_packet(); - return; - } + $features = get_features(false); - function get() { - - $arr = []; - $harr = []; + foreach ($features as $fname => $fdata) { + foreach (array_slice($fdata, 1) as $f) { + $k = $f[0]; + if (array_key_exists("feature_$k", $_POST)) { + set_pconfig(local_channel(), 'feature', $k, (string)$_POST["feature_$k"]); + } else { + set_pconfig(local_channel(), 'feature', $k, ''); + } + } + } + Libsync::build_sync_packet(); + return; + } + + public function get() + { + + $arr = []; + $harr = []; - $all_features_raw = get_features(false); + $all_features_raw = get_features(false); - foreach($all_features_raw as $fname => $fdata) { - foreach(array_slice($fdata,1) as $f) { - $harr[$f[0]] = ((intval(feature_enabled(local_channel(),$f[0]))) ? "1" : ''); - } - } + foreach ($all_features_raw as $fname => $fdata) { + foreach (array_slice($fdata, 1) as $f) { + $harr[$f[0]] = ((intval(feature_enabled(local_channel(), $f[0]))) ? "1" : ''); + } + } - $features = get_features(true); + $features = get_features(true); - foreach($features as $fname => $fdata) { - $arr[$fname] = []; - $arr[$fname][0] = $fdata[0]; - foreach(array_slice($fdata,1) as $f) { - $arr[$fname][1][] = array('feature_' . $f[0],$f[1],((intval(feature_enabled(local_channel(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); - unset($harr[$f[0]]); - } - } - - $tpl = get_markup_template("settings_features.tpl"); - $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_features"), - '$title' => t('Additional Features'), - '$features' => $arr, - '$hiddens' => $harr, - '$baseurl' => z_root(), - '$submit' => t('Submit'), - )); - - return $o; - } + foreach ($features as $fname => $fdata) { + $arr[$fname] = []; + $arr[$fname][0] = $fdata[0]; + foreach (array_slice($fdata, 1) as $f) { + $arr[$fname][1][] = array('feature_' . $f[0], $f[1], ((intval(feature_enabled(local_channel(), $f[0]))) ? "1" : ''), $f[2], array(t('Off'), t('On'))); + unset($harr[$f[0]]); + } + } + $tpl = get_markup_template("settings_features.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("settings_features"), + '$title' => t('Additional Features'), + '$features' => $arr, + '$hiddens' => $harr, + '$baseurl' => z_root(), + '$submit' => t('Submit'), + )); + + return $o; + } } diff --git a/Zotlabs/Module/Settings/Network.php b/Zotlabs/Module/Settings/Network.php index 14a118f2c..8c902df9c 100644 --- a/Zotlabs/Module/Settings/Network.php +++ b/Zotlabs/Module/Settings/Network.php @@ -2,127 +2,129 @@ namespace Zotlabs\Module\Settings; +class Network +{ -class Network { + public function post() + { + check_form_security_token_redirectOnErr('/settings/network', 'settings_network'); - function post() { - check_form_security_token_redirectOnErr('/settings/network', 'settings_network'); - - $features = self::get_features(); + $features = self::get_features(); - foreach($features as $f) { - $k = $f[0]; - if(array_key_exists("feature_$k",$_POST)) - set_pconfig(local_channel(),'feature',$k, (string) $_POST["feature_$k"]); - else - set_pconfig(local_channel(),'feature', $k, ''); - } - - build_sync_packet(); - return; - } + foreach ($features as $f) { + $k = $f[0]; + if (array_key_exists("feature_$k", $_POST)) { + set_pconfig(local_channel(), 'feature', $k, (string)$_POST["feature_$k"]); + } else { + set_pconfig(local_channel(), 'feature', $k, ''); + } + } - function get() { - - $features = self::get_features(); + build_sync_packet(); + return; + } - foreach($features as $f) { - $arr[] = array('feature_' . $f[0],$f[1],((intval(feature_enabled(local_channel(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); - } + public function get() + { - $tpl = get_markup_template("settings_module.tpl"); + $features = self::get_features(); - $o .= replace_macros($tpl, array( - '$action_url' => 'settings/network', - '$form_security_token' => get_form_security_token("settings_network"), - '$title' => t('Activity Settings'), - '$features' => $arr, - '$baseurl' => z_root(), - '$submit' => t('Submit'), - )); - - return $o; - } + foreach ($features as $f) { + $arr[] = array('feature_' . $f[0], $f[1], ((intval(feature_enabled(local_channel(), $f[0]))) ? "1" : ''), $f[2], array(t('Off'), t('On'))); + } - function get_features() { - $arr = [ + $tpl = get_markup_template("settings_module.tpl"); - [ - 'archives', - t('Search by Date'), - t('Ability to select posts by date ranges'), - false, - get_config('feature_lock','archives') - ], + $o .= replace_macros($tpl, array( + '$action_url' => 'settings/network', + '$form_security_token' => get_form_security_token("settings_network"), + '$title' => t('Activity Settings'), + '$features' => $arr, + '$baseurl' => z_root(), + '$submit' => t('Submit'), + )); - [ - 'savedsearch', - t('Saved Searches'), - t('Save search terms for re-use'), - false, - get_config('feature_lock','savedsearch') - ], + return $o; + } - [ - 'order_tab', - t('Alternate Stream Order'), - t('Ability to order the stream by last post date, last comment date or unthreaded activities'), - false, - get_config('feature_lock','order_tab') - ], + public function get_features() + { + $arr = [ - [ - 'name_tab', - t('Contact Filter'), - t('Ability to display only posts of a selected contact'), - false, - get_config('feature_lock','name_tab') - ], + [ + 'archives', + t('Search by Date'), + t('Ability to select posts by date ranges'), + false, + get_config('feature_lock', 'archives') + ], - [ - 'forums_tab', - t('Forum Filter'), - t('Ability to display only posts of a specific forum'), - false, - get_config('feature_lock','forums_tab') - ], + [ + 'savedsearch', + t('Saved Searches'), + t('Save search terms for re-use'), + false, + get_config('feature_lock', 'savedsearch') + ], - [ - 'personal_tab', - t('Personal Posts Filter'), - t('Ability to display only posts that you\'ve interacted on'), - false, - get_config('feature_lock','personal_tab') - ], + [ + 'order_tab', + t('Alternate Stream Order'), + t('Ability to order the stream by last post date, last comment date or unthreaded activities'), + false, + get_config('feature_lock', 'order_tab') + ], - [ - 'affinity', - t('Affinity Tool'), - t('Filter stream activity by depth of relationships'), - false, - get_config('feature_lock','affinity') - ], + [ + 'name_tab', + t('Contact Filter'), + t('Ability to display only posts of a selected contact'), + false, + get_config('feature_lock', 'name_tab') + ], - [ - 'suggest', - t('Suggest Channels'), - t('Show friend and connection suggestions'), - false, - get_config('feature_lock','suggest') - ], + [ + 'forums_tab', + t('Forum Filter'), + t('Ability to display only posts of a specific forum'), + false, + get_config('feature_lock', 'forums_tab') + ], - [ - 'connfilter', - t('Connection Filtering'), - t('Filter incoming posts from connections based on keywords/content'), - false, - get_config('feature_lock','connfilter') - ] + [ + 'personal_tab', + t('Personal Posts Filter'), + t('Ability to display only posts that you\'ve interacted on'), + false, + get_config('feature_lock', 'personal_tab') + ], - ]; + [ + 'affinity', + t('Affinity Tool'), + t('Filter stream activity by depth of relationships'), + false, + get_config('feature_lock', 'affinity') + ], - return $arr; + [ + 'suggest', + t('Suggest Channels'), + t('Show friend and connection suggestions'), + false, + get_config('feature_lock', 'suggest') + ], - } + [ + 'connfilter', + t('Connection Filtering'), + t('Filter incoming posts from connections based on keywords/content'), + false, + get_config('feature_lock', 'connfilter') + ] + ]; + + return $arr; + } } diff --git a/Zotlabs/Module/Settings/Oauth.php b/Zotlabs/Module/Settings/Oauth.php index d6576c6de..62434dcf2 100644 --- a/Zotlabs/Module/Settings/Oauth.php +++ b/Zotlabs/Module/Settings/Oauth.php @@ -2,46 +2,49 @@ namespace Zotlabs\Module\Settings; - -class Oauth { +class Oauth +{ - function post() { - - if(x($_POST,'remove')){ - check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); - - $key = $_POST['remove']; - q("DELETE FROM tokens WHERE id='%s' AND uid=%d", - dbesc($key), - local_channel()); - goaway(z_root()."/settings/oauth/"); - return; - } - - if((argc() > 2) && (argv(2) === 'edit' || argv(2) === 'add') && x($_POST,'submit')) { - - check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); - - $name = ((x($_POST,'name')) ? escape_tags($_POST['name']) : ''); - $key = ((x($_POST,'key')) ? escape_tags($_POST['key']) : ''); - $secret = ((x($_POST,'secret')) ? escape_tags($_POST['secret']) : ''); - $redirect = ((x($_POST,'redirect')) ? escape_tags($_POST['redirect']) : ''); - $icon = ((x($_POST,'icon')) ? escape_tags($_POST['icon']) : ''); - $oauth2 = ((x($_POST,'oauth2')) ? intval($_POST['oauth2']) : 0); - $ok = true; - if($name == '') { - $ok = false; - notice( t('Name is required') . EOL); - } - if($key == '' || $secret == '') { - $ok = false; - notice( t('Key and Secret are required') . EOL); - } - - if($ok) { - if ($_POST['submit']==t("Update")){ - $r = q("UPDATE clients SET + public function post() + { + + if (x($_POST, 'remove')) { + check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); + + $key = $_POST['remove']; + q( + "DELETE FROM tokens WHERE id='%s' AND uid=%d", + dbesc($key), + local_channel() + ); + goaway(z_root() . "/settings/oauth/"); + return; + } + + if ((argc() > 2) && (argv(2) === 'edit' || argv(2) === 'add') && x($_POST, 'submit')) { + check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); + + $name = ((x($_POST, 'name')) ? escape_tags($_POST['name']) : ''); + $key = ((x($_POST, 'key')) ? escape_tags($_POST['key']) : ''); + $secret = ((x($_POST, 'secret')) ? escape_tags($_POST['secret']) : ''); + $redirect = ((x($_POST, 'redirect')) ? escape_tags($_POST['redirect']) : ''); + $icon = ((x($_POST, 'icon')) ? escape_tags($_POST['icon']) : ''); + $oauth2 = ((x($_POST, 'oauth2')) ? intval($_POST['oauth2']) : 0); + $ok = true; + if ($name == '') { + $ok = false; + notice(t('Name is required') . EOL); + } + if ($key == '' || $secret == '') { + $ok = false; + notice(t('Key and Secret are required') . EOL); + } + + if ($ok) { + if ($_POST['submit'] == t("Update")) { + $r = q( + "UPDATE clients SET client_id='%s', pw='%s', clname='%s', @@ -49,113 +52,121 @@ class Oauth { icon='%s', uid=%d WHERE client_id='%s'", - dbesc($key), - dbesc($secret), - dbesc($name), - dbesc($redirect), - dbesc($icon), - intval(local_channel()), - dbesc($key)); - } else { - $r = q("INSERT INTO clients (client_id, pw, clname, redirect_uri, icon, uid) + dbesc($key), + dbesc($secret), + dbesc($name), + dbesc($redirect), + dbesc($icon), + intval(local_channel()), + dbesc($key) + ); + } else { + $r = q( + "INSERT INTO clients (client_id, pw, clname, redirect_uri, icon, uid) VALUES ('%s','%s','%s','%s','%s',%d)", - dbesc($key), - dbesc($secret), - dbesc($name), - dbesc($redirect), - dbesc($icon), - intval(local_channel()) - ); - $r = q("INSERT INTO xperm (xp_client, xp_channel, xp_perm) VALUES ('%s', %d, '%s') ", - dbesc($key), - intval(local_channel()), - dbesc('all') - ); - } - } - goaway(z_root()."/settings/oauth/"); - return; - } - } + dbesc($key), + dbesc($secret), + dbesc($name), + dbesc($redirect), + dbesc($icon), + intval(local_channel()) + ); + $r = q( + "INSERT INTO xperm (xp_client, xp_channel, xp_perm) VALUES ('%s', %d, '%s') ", + dbesc($key), + intval(local_channel()), + dbesc('all') + ); + } + } + goaway(z_root() . "/settings/oauth/"); + return; + } + } - function get() { - - if((argc() > 2) && (argv(2) === 'add')) { - $tpl = get_markup_template("settings_oauth_edit.tpl"); - $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_oauth"), - '$title' => t('Add application'), - '$submit' => t('Submit'), - '$cancel' => t('Cancel'), - '$name' => array('name', t('Name'), '', t('Name of application')), - '$key' => array('key', t('Consumer Key'), random_string(16), t('Automatically generated - change if desired. Max length 20')), - '$secret' => array('secret', t('Consumer Secret'), random_string(16), t('Automatically generated - change if desired. Max length 20')), - '$redirect' => array('redirect', t('Redirect'), '', t('Redirect URI - leave blank unless your application specifically requires this')), - '$icon' => array('icon', t('Icon url'), '', t('Optional')), - )); - return $o; - } - - if((argc() > 3) && (argv(2) === 'edit')) { - $r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d", - dbesc(argv(3)), - local_channel()); - - if (!count($r)){ - notice(t('Application not found.')); - return; - } - $app = $r[0]; - - $tpl = get_markup_template("settings_oauth_edit.tpl"); - $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_oauth"), - '$title' => t('Add application'), - '$submit' => t('Update'), - '$cancel' => t('Cancel'), - '$name' => array('name', t('Name'), $app['clname'] , ''), - '$key' => array('key', t('Consumer Key'), $app['client_id'], ''), - '$secret' => array('secret', t('Consumer Secret'), $app['pw'], ''), - '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], ''), - '$icon' => array('icon', t('Icon url'), $app['icon'], ''), - )); - return $o; - } - - if((argc() > 3) && (argv(2) === 'delete')) { - check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't'); - - $r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d", - dbesc(argv(3)), - local_channel()); - goaway(z_root()."/settings/oauth/"); - return; - } - - - $r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my + public function get() + { + + if ((argc() > 2) && (argv(2) === 'add')) { + $tpl = get_markup_template("settings_oauth_edit.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("settings_oauth"), + '$title' => t('Add application'), + '$submit' => t('Submit'), + '$cancel' => t('Cancel'), + '$name' => array('name', t('Name'), '', t('Name of application')), + '$key' => array('key', t('Consumer Key'), random_string(16), t('Automatically generated - change if desired. Max length 20')), + '$secret' => array('secret', t('Consumer Secret'), random_string(16), t('Automatically generated - change if desired. Max length 20')), + '$redirect' => array('redirect', t('Redirect'), '', t('Redirect URI - leave blank unless your application specifically requires this')), + '$icon' => array('icon', t('Icon url'), '', t('Optional')), + )); + return $o; + } + + if ((argc() > 3) && (argv(2) === 'edit')) { + $r = q( + "SELECT * FROM clients WHERE client_id='%s' AND uid=%d", + dbesc(argv(3)), + local_channel() + ); + + if (!count($r)) { + notice(t('Application not found.')); + return; + } + $app = $r[0]; + + $tpl = get_markup_template("settings_oauth_edit.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("settings_oauth"), + '$title' => t('Add application'), + '$submit' => t('Update'), + '$cancel' => t('Cancel'), + '$name' => array('name', t('Name'), $app['clname'], ''), + '$key' => array('key', t('Consumer Key'), $app['client_id'], ''), + '$secret' => array('secret', t('Consumer Secret'), $app['pw'], ''), + '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], ''), + '$icon' => array('icon', t('Icon url'), $app['icon'], ''), + )); + return $o; + } + + if ((argc() > 3) && (argv(2) === 'delete')) { + check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't'); + + $r = q( + "DELETE FROM clients WHERE client_id='%s' AND uid=%d", + dbesc(argv(3)), + local_channel() + ); + goaway(z_root() . "/settings/oauth/"); + return; + } + + + $r = q( + "SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my FROM clients LEFT JOIN tokens ON clients.client_id=tokens.client_id WHERE clients.uid IN (%d,0)", - local_channel(), - local_channel()); - - - $tpl = get_markup_template("settings_oauth.tpl"); - $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_oauth"), - '$baseurl' => z_root(), - '$title' => t('Connected Apps'), - '$add' => t('Add application'), - '$edit' => t('Edit'), - '$delete' => t('Delete'), - '$consumerkey' => t('Client key starts with'), - '$noname' => t('No name'), - '$remove' => t('Remove authorization'), - '$apps' => $r, - )); - return $o; - - } + local_channel(), + local_channel() + ); -} \ No newline at end of file + + $tpl = get_markup_template("settings_oauth.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("settings_oauth"), + '$baseurl' => z_root(), + '$title' => t('Connected Apps'), + '$add' => t('Add application'), + '$edit' => t('Edit'), + '$delete' => t('Delete'), + '$consumerkey' => t('Client key starts with'), + '$noname' => t('No name'), + '$remove' => t('Remove authorization'), + '$apps' => $r, + )); + return $o; + } +} diff --git a/Zotlabs/Module/Settings/Oauth2.php b/Zotlabs/Module/Settings/Oauth2.php index 55dd6a548..a934fe7f7 100644 --- a/Zotlabs/Module/Settings/Oauth2.php +++ b/Zotlabs/Module/Settings/Oauth2.php @@ -4,53 +4,57 @@ namespace Zotlabs\Module\Settings; use Zotlabs\Lib\Apps; - -class Oauth2 { +class Oauth2 +{ - function post() { - - if(x($_POST,'remove')){ - check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2'); - $name = ((x($_POST,'name')) ? escape_tags(trim($_POST['name'])) : ''); - logger("REMOVE! ".$name." uid: ".local_channel()); - $key = $_POST['remove']; - q("DELETE FROM oauth_authorization_codes WHERE client_id='%s' AND user_id=%d", - dbesc($name), - intval(local_channel()) - ); - q("DELETE FROM oauth_access_tokens WHERE client_id='%s' AND user_id=%d", - dbesc($name), - intval(local_channel()) - ); - q("DELETE FROM oauth_refresh_tokens WHERE client_id='%s' AND user_id=%d", - dbesc($name), - intval(local_channel()) - ); - goaway(z_root()."/settings/oauth2/"); - return; - } - - if((argc() > 2) && (argv(2) === 'edit' || argv(2) === 'add') && x($_POST,'submit')) { - - check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2'); - - $name = ((x($_POST,'name')) ? escape_tags(trim($_POST['name'])) : ''); - $clid = ((x($_POST,'clid')) ? escape_tags(trim($_POST['clid'])) : ''); - $secret = ((x($_POST,'secret')) ? escape_tags(trim($_POST['secret'])) : ''); - $redirect = ((x($_POST,'redirect')) ? escape_tags(trim($_POST['redirect'])) : ''); - $grant = ((x($_POST,'grant')) ? escape_tags(trim($_POST['grant'])) : ''); - $scope = ((x($_POST,'scope')) ? escape_tags(trim($_POST['scope'])) : ''); -logger('redirect: ' . $redirect); - $ok = true; - if($clid == '' || $secret == '') { - $ok = false; - notice( t('ID and Secret are required') . EOL); - } - - if($ok) { - if ($_POST['submit']==t("Update")){ - $r = q("UPDATE oauth_clients SET + public function post() + { + + if (x($_POST, 'remove')) { + check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2'); + $name = ((x($_POST, 'name')) ? escape_tags(trim($_POST['name'])) : ''); + logger("REMOVE! " . $name . " uid: " . local_channel()); + $key = $_POST['remove']; + q( + "DELETE FROM oauth_authorization_codes WHERE client_id='%s' AND user_id=%d", + dbesc($name), + intval(local_channel()) + ); + q( + "DELETE FROM oauth_access_tokens WHERE client_id='%s' AND user_id=%d", + dbesc($name), + intval(local_channel()) + ); + q( + "DELETE FROM oauth_refresh_tokens WHERE client_id='%s' AND user_id=%d", + dbesc($name), + intval(local_channel()) + ); + goaway(z_root() . "/settings/oauth2/"); + return; + } + + if ((argc() > 2) && (argv(2) === 'edit' || argv(2) === 'add') && x($_POST, 'submit')) { + check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2'); + + $name = ((x($_POST, 'name')) ? escape_tags(trim($_POST['name'])) : ''); + $clid = ((x($_POST, 'clid')) ? escape_tags(trim($_POST['clid'])) : ''); + $secret = ((x($_POST, 'secret')) ? escape_tags(trim($_POST['secret'])) : ''); + $redirect = ((x($_POST, 'redirect')) ? escape_tags(trim($_POST['redirect'])) : ''); + $grant = ((x($_POST, 'grant')) ? escape_tags(trim($_POST['grant'])) : ''); + $scope = ((x($_POST, 'scope')) ? escape_tags(trim($_POST['scope'])) : ''); + logger('redirect: ' . $redirect); + $ok = true; + if ($clid == '' || $secret == '') { + $ok = false; + notice(t('ID and Secret are required') . EOL); + } + + if ($ok) { + if ($_POST['submit'] == t("Update")) { + $r = q( + "UPDATE oauth_clients SET client_name = '%s', client_id = '%s', client_secret = '%s', @@ -59,149 +63,158 @@ logger('redirect: ' . $redirect); scope = '%s', user_id = %d WHERE client_id='%s' and user_id = %s", - dbesc($name), - dbesc($clid), - dbesc($secret), - dbesc($redirect), - dbesc($grant), - dbesc($scope), - intval(local_channel()), - dbesc($clid), - intval(local_channel())); - } else { - $r = q("INSERT INTO oauth_clients (client_name, client_id, client_secret, redirect_uri, grant_types, scope, user_id) + dbesc($name), + dbesc($clid), + dbesc($secret), + dbesc($redirect), + dbesc($grant), + dbesc($scope), + intval(local_channel()), + dbesc($clid), + intval(local_channel()) + ); + } else { + $r = q( + "INSERT INTO oauth_clients (client_name, client_id, client_secret, redirect_uri, grant_types, scope, user_id) VALUES ('%s','%s','%s','%s','%s','%s',%d)", - dbesc($name), - dbesc($clid), - dbesc($secret), - dbesc($redirect), - dbesc($grant), - dbesc($scope), - intval(local_channel()) - ); - $r = q("INSERT INTO xperm (xp_client, xp_channel, xp_perm) VALUES ('%s', %d, '%s') ", - dbesc($name), - intval(local_channel()), - dbesc('all') - ); - } - } - goaway(z_root()."/settings/oauth2/"); - return; - } - } + dbesc($name), + dbesc($clid), + dbesc($secret), + dbesc($redirect), + dbesc($grant), + dbesc($scope), + intval(local_channel()) + ); + $r = q( + "INSERT INTO xperm (xp_client, xp_channel, xp_perm) VALUES ('%s', %d, '%s') ", + dbesc($name), + intval(local_channel()), + dbesc('all') + ); + } + } + goaway(z_root() . "/settings/oauth2/"); + return; + } + } - function get() { + public function get() + { - if(! Apps::system_app_installed(local_channel(),'Clients')) { - return; - } + if (!Apps::system_app_installed(local_channel(), 'Clients')) { + return; + } - if((argc() > 2) && (argv(2) === 'add')) { - $tpl = get_markup_template("settings_oauth2_edit.tpl"); - $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_oauth2"), - '$title' => t('Add OAuth2 application'), - '$submit' => t('Submit'), - '$cancel' => t('Cancel'), - '$name' => array('name', t('Name'), '', t('Name of application')), - '$clid' => array('clid', t('Consumer ID'), random_string(16), t('Automatically generated - change if desired. Max length 20')), - '$secret' => array('secret', t('Consumer Secret'), random_string(16), t('Automatically generated - change if desired. Max length 20')), - '$redirect' => array('redirect', t('Redirect'), '', t('Redirect URI - leave blank unless your application specifically requires this')), - '$grant' => array('grant', t('Grant Types'), '', t('leave blank unless your application specifically requires this')), - '$scope' => array('scope', t('Authorization scope'), '', t('leave blank unless your application specifically requires this')), - )); - return $o; - } - - if((argc() > 3) && (argv(2) === 'edit')) { - $r = q("SELECT * FROM oauth_clients WHERE client_id='%s' AND user_id= %d", - dbesc(argv(3)), - intval(local_channel()) - ); - - if (! $r){ - notice(t('OAuth2 Application not found.')); - return; - } + if ((argc() > 2) && (argv(2) === 'add')) { + $tpl = get_markup_template("settings_oauth2_edit.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("settings_oauth2"), + '$title' => t('Add OAuth2 application'), + '$submit' => t('Submit'), + '$cancel' => t('Cancel'), + '$name' => array('name', t('Name'), '', t('Name of application')), + '$clid' => array('clid', t('Consumer ID'), random_string(16), t('Automatically generated - change if desired. Max length 20')), + '$secret' => array('secret', t('Consumer Secret'), random_string(16), t('Automatically generated - change if desired. Max length 20')), + '$redirect' => array('redirect', t('Redirect'), '', t('Redirect URI - leave blank unless your application specifically requires this')), + '$grant' => array('grant', t('Grant Types'), '', t('leave blank unless your application specifically requires this')), + '$scope' => array('scope', t('Authorization scope'), '', t('leave blank unless your application specifically requires this')), + )); + return $o; + } - $app = $r[0]; - - $tpl = get_markup_template("settings_oauth2_edit.tpl"); - $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_oauth2"), - '$title' => t('Add application'), - '$submit' => t('Update'), - '$cancel' => t('Cancel'), - '$name' => array('name', t('Name'), $app['client_name'], t('Name of application')), - '$clid' => array('clid', t('Consumer ID'), $app['client_id'], t('Automatically generated - change if desired. Max length 20')), - '$secret' => array('secret', t('Consumer Secret'), $app['client_secret'], t('Automatically generated - change if desired. Max length 20')), - '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], t('Redirect URI - leave blank unless your application specifically requires this')), - '$grant' => array('grant', t('Grant Types'), $app['grant_types'], t('leave blank unless your application specifically requires this')), - '$scope' => array('scope', t('Authorization scope'), $app['scope'], t('leave blank unless your application specifically requires this')), - )); - return $o; - } - - if((argc() > 3) && (argv(2) === 'delete')) { - check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2', 't'); - - $r = q("DELETE FROM oauth_clients WHERE client_id = '%s' AND user_id = %d", - dbesc(argv(3)), - intval(local_channel()) - ); - $r = q("DELETE FROM oauth_access_tokens WHERE client_id = '%s' AND user_id = %d", - dbesc(argv(3)), - intval(local_channel()) - ); - $r = q("DELETE FROM oauth_authorization_codes WHERE client_id = '%s' AND user_id = %d", - dbesc(argv(3)), - intval(local_channel()) - ); - $r = q("DELETE FROM oauth_refresh_tokens WHERE client_id = '%s' AND user_id = %d", - dbesc(argv(3)), - intval(local_channel()) - ); - goaway(z_root()."/settings/oauth2/"); - return; - } - + if ((argc() > 3) && (argv(2) === 'edit')) { + $r = q( + "SELECT * FROM oauth_clients WHERE client_id='%s' AND user_id= %d", + dbesc(argv(3)), + intval(local_channel()) + ); - $r = q("SELECT * FROM oauth_clients WHERE user_id = %d ", - intval(local_channel()) - ); + if (!$r) { + notice(t('OAuth2 Application not found.')); + return; + } - $c = q("select client_id, access_token from oauth_access_tokens where user_id = %d", - intval(local_channel()) - ); - if ($r && $c) { - foreach($c as $cv) { - for($x = 0; $x < count($r); $x ++) { - if($r[$x]['client_id'] === $cv['client_id']) { - if(! array_key_exists('tokens',$r[$x])) { - $r[$x]['tokens'] = []; - } - $r[$x]['tokens'][] = $cv['access_token']; - } - } - } - } + $app = $r[0]; - $tpl = get_markup_template("settings_oauth2.tpl"); - $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_oauth2"), - '$baseurl' => z_root(), - '$title' => t('Connected OAuth2 Apps'), - '$add' => t('Add application'), - '$edit' => t('Edit'), - '$delete' => t('Delete'), - '$consumerkey' => t('Client key starts with'), - '$noname' => t('No name'), - '$remove' => t('Remove authorization'), - '$apps' => $r, - )); - return $o; - - } + $tpl = get_markup_template("settings_oauth2_edit.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("settings_oauth2"), + '$title' => t('Add application'), + '$submit' => t('Update'), + '$cancel' => t('Cancel'), + '$name' => array('name', t('Name'), $app['client_name'], t('Name of application')), + '$clid' => array('clid', t('Consumer ID'), $app['client_id'], t('Automatically generated - change if desired. Max length 20')), + '$secret' => array('secret', t('Consumer Secret'), $app['client_secret'], t('Automatically generated - change if desired. Max length 20')), + '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], t('Redirect URI - leave blank unless your application specifically requires this')), + '$grant' => array('grant', t('Grant Types'), $app['grant_types'], t('leave blank unless your application specifically requires this')), + '$scope' => array('scope', t('Authorization scope'), $app['scope'], t('leave blank unless your application specifically requires this')), + )); + return $o; + } + if ((argc() > 3) && (argv(2) === 'delete')) { + check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2', 't'); + + $r = q( + "DELETE FROM oauth_clients WHERE client_id = '%s' AND user_id = %d", + dbesc(argv(3)), + intval(local_channel()) + ); + $r = q( + "DELETE FROM oauth_access_tokens WHERE client_id = '%s' AND user_id = %d", + dbesc(argv(3)), + intval(local_channel()) + ); + $r = q( + "DELETE FROM oauth_authorization_codes WHERE client_id = '%s' AND user_id = %d", + dbesc(argv(3)), + intval(local_channel()) + ); + $r = q( + "DELETE FROM oauth_refresh_tokens WHERE client_id = '%s' AND user_id = %d", + dbesc(argv(3)), + intval(local_channel()) + ); + goaway(z_root() . "/settings/oauth2/"); + return; + } + + + $r = q( + "SELECT * FROM oauth_clients WHERE user_id = %d ", + intval(local_channel()) + ); + + $c = q( + "select client_id, access_token from oauth_access_tokens where user_id = %d", + intval(local_channel()) + ); + if ($r && $c) { + foreach ($c as $cv) { + for ($x = 0; $x < count($r); $x++) { + if ($r[$x]['client_id'] === $cv['client_id']) { + if (!array_key_exists('tokens', $r[$x])) { + $r[$x]['tokens'] = []; + } + $r[$x]['tokens'][] = $cv['access_token']; + } + } + } + } + + $tpl = get_markup_template("settings_oauth2.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("settings_oauth2"), + '$baseurl' => z_root(), + '$title' => t('Connected OAuth2 Apps'), + '$add' => t('Add application'), + '$edit' => t('Edit'), + '$delete' => t('Delete'), + '$consumerkey' => t('Client key starts with'), + '$noname' => t('No name'), + '$remove' => t('Remove authorization'), + '$apps' => $r, + )); + return $o; + } } diff --git a/Zotlabs/Module/Settings/Permcats.php b/Zotlabs/Module/Settings/Permcats.php index 1f3e23b53..a4294db31 100644 --- a/Zotlabs/Module/Settings/Permcats.php +++ b/Zotlabs/Module/Settings/Permcats.php @@ -2,120 +2,130 @@ namespace Zotlabs\Module\Settings; +use App; +use Zotlabs\Access\PermissionLimits; +use Zotlabs\Access\Permissions; use Zotlabs\Lib\Libsync; +use Zotlabs\Lib\Permcat; + +class Permcats +{ + + public function post() + { + + if (!local_channel()) { + return; + } + + $channel = App::get_channel(); + + check_form_security_token_redirectOnErr('/settings/permcats', 'settings_permcats'); -class Permcats { + $all_perms = Permissions::Perms(); - function post() { - - if(! local_channel()) - return; - - $channel = \App::get_channel(); - - check_form_security_token_redirectOnErr('/settings/permcats', 'settings_permcats'); + $name = escape_tags(trim($_POST['name'])); + if (!$name) { + notice(t('Permission Name is required.') . EOL); + return; + } - $all_perms = \Zotlabs\Access\Permissions::Perms(); + $pcarr = []; - $name = escape_tags(trim($_POST['name'])); - if(! $name) { - notice( t('Permission Name is required.') . EOL); - return; - } + if ($all_perms) { + foreach ($all_perms as $perm => $desc) { + if (array_key_exists('perms_' . $perm, $_POST)) { + $pcarr[] = $perm; + } + } + } + + Permcat::update(local_channel(), $name, $pcarr); + + Libsync::build_sync_packet(); + + info(t('Permission category saved.') . EOL); + + return; + } - $pcarr = []; + public function get() + { - if($all_perms) { - foreach($all_perms as $perm => $desc) { - if(array_key_exists('perms_' . $perm, $_POST)) { - $pcarr[] = $perm; - } - } - } - - \Zotlabs\Lib\Permcat::update(local_channel(),$name,$pcarr); + if (!local_channel()) { + return; + } - Libsync::build_sync_packet(); - - info( t('Permission category saved.') . EOL); - - return; - } - - - function get() { - - if(! local_channel()) - return; - - $channel = \App::get_channel(); + $channel = App::get_channel(); - if(argc() > 2) - $name = hex2bin(argv(2)); + if (argc() > 2) { + $name = hex2bin(argv(2)); + } - if(argc() > 3 && argv(3) === 'drop') { - \Zotlabs\Lib\Permcat::delete(local_channel(),$name); - Libsync::build_sync_packet(); - json_return_and_die([ 'success' => true ]); - } + if (argc() > 3 && argv(3) === 'drop') { + Permcat::delete(local_channel(), $name); + Libsync::build_sync_packet(); + json_return_and_die(['success' => true]); + } - $desc = t('Use this form to create permission rules for various classes of people or connections.'); + $desc = t('Use this form to create permission rules for various classes of people or connections.'); - $existing = []; + $existing = []; - $pcat = new \Zotlabs\Lib\Permcat(local_channel()); - $pcatlist = $pcat->listing(); - $permcats = []; - if($pcatlist) { - foreach($pcatlist as $pc) { - if(($pc['name']) && ($name) && ($pc['name'] == $name)) - $existing = $pc['perms']; - if(! $pc['system']) - $permcats[bin2hex($pc['name'])] = $pc['localname']; - } - } + $pcat = new Permcat(local_channel()); + $pcatlist = $pcat->listing(); + $permcats = []; + if ($pcatlist) { + foreach ($pcatlist as $pc) { + if (($pc['name']) && ($name) && ($pc['name'] == $name)) { + $existing = $pc['perms']; + } + if (!$pc['system']) { + $permcats[bin2hex($pc['name'])] = $pc['localname']; + } + } + } - $global_perms = \Zotlabs\Access\Permissions::Perms(); + $global_perms = Permissions::Perms(); - foreach($global_perms as $k => $v) { - $thisperm = \Zotlabs\Lib\Permcat::find_permcat($existing,$k); - $checkinherited = \Zotlabs\Access\PermissionLimits::Get(local_channel(),$k); + foreach ($global_perms as $k => $v) { + $thisperm = Permcat::find_permcat($existing, $k); + $checkinherited = PermissionLimits::Get(local_channel(), $k); - if($existing[$k]) - $thisperm = "1"; + if ($existing[$k]) { + $thisperm = "1"; + } - $perms[] = array('perms_' . $k, $v, '',$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited); - } + $perms[] = array('perms_' . $k, $v, '', $thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited); + } - - $tpl = get_markup_template("settings_permcats.tpl"); - $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_permcats"), - '$title' => t('Permission Categories'), - '$desc' => $desc, - '$desc2' => $desc2, - '$tokens' => $t, - '$permcats' => $permcats, - '$atoken' => $atoken, - '$url1' => z_root() . '/channel/' . $channel['channel_address'], - '$url2' => z_root() . '/photos/' . $channel['channel_address'], - '$name' => array('name', t('Permission Name') . ' *', (($name) ? $name : ''), ''), - '$me' => t('My Settings'), - '$perms' => $perms, - '$inherited' => t('inherited'), - '$notself' => 0, - '$self' => 1, - '$permlbl' => t('Individual Permissions'), - '$permnote' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can not change those settings here.'), - '$submit' => t('Submit') - )); - return $o; - } - + $tpl = get_markup_template("settings_permcats.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("settings_permcats"), + '$title' => t('Permission Categories'), + '$desc' => $desc, + '$desc2' => $desc2, + '$tokens' => $t, + '$permcats' => $permcats, + '$atoken' => $atoken, + '$url1' => z_root() . '/channel/' . $channel['channel_address'], + '$url2' => z_root() . '/photos/' . $channel['channel_address'], + '$name' => array('name', t('Permission Name') . ' *', (($name) ? $name : ''), ''), + '$me' => t('My Settings'), + '$perms' => $perms, + '$inherited' => t('inherited'), + '$notself' => 0, + '$self' => 1, + '$permlbl' => t('Individual Permissions'), + '$permnote' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can not change those settings here.'), + '$submit' => t('Submit') + )); + return $o; + } } diff --git a/Zotlabs/Module/Settings/Tokens.php b/Zotlabs/Module/Settings/Tokens.php index 9ce89c20a..64b74fb84 100644 --- a/Zotlabs/Module/Settings/Tokens.php +++ b/Zotlabs/Module/Settings/Tokens.php @@ -10,292 +10,309 @@ use Zotlabs\Lib\Libsync; require_once('include/security.php'); -class Tokens { +class Tokens +{ - function post() { + public function post() + { - $channel = App::get_channel(); + $channel = App::get_channel(); - check_form_security_token_redirectOnErr('/settings/tokens', 'settings_tokens'); - $token_errs = 0; - if(array_key_exists('token',$_POST)) { - $atoken_id = (($_POST['atoken_id']) ? intval($_POST['atoken_id']) : 0); - if (! $atoken_id) { - $atoken_guid = new_uuid(); - } - $name = trim(escape_tags($_POST['name'])); - $token = trim($_POST['token']); - if((! $name) || (! $token)) - $token_errs ++; - if(trim($_POST['expires'])) - $expires = datetime_convert(date_default_timezone_get(),'UTC',$_POST['expires']); - else - $expires = NULL_DATE; - $max_atokens = service_class_fetch(local_channel(),'access_tokens'); - if($max_atokens) { - $r = q("select count(atoken_id) as total where atoken_uid = %d", - intval(local_channel()) - ); - if($r && intval($r[0]['total']) >= $max_tokens) { - notice( sprintf( t('This channel is limited to %d tokens'), $max_tokens) . EOL); - return; - } - } - } - if($token_errs) { - notice( t('Name and Password are required.') . EOL); - return; - } + check_form_security_token_redirectOnErr('/settings/tokens', 'settings_tokens'); + $token_errs = 0; + if (array_key_exists('token', $_POST)) { + $atoken_id = (($_POST['atoken_id']) ? intval($_POST['atoken_id']) : 0); + if (!$atoken_id) { + $atoken_guid = new_uuid(); + } + $name = trim(escape_tags($_POST['name'])); + $token = trim($_POST['token']); + if ((!$name) || (!$token)) { + $token_errs++; + } + if (trim($_POST['expires'])) { + $expires = datetime_convert(date_default_timezone_get(), 'UTC', $_POST['expires']); + } else { + $expires = NULL_DATE; + } + $max_atokens = service_class_fetch(local_channel(), 'access_tokens'); + if ($max_atokens) { + $r = q( + "select count(atoken_id) as total where atoken_uid = %d", + intval(local_channel()) + ); + if ($r && intval($r[0]['total']) >= $max_tokens) { + notice(sprintf(t('This channel is limited to %d tokens'), $max_tokens) . EOL); + return; + } + } + } + if ($token_errs) { + notice(t('Name and Password are required.') . EOL); + return; + } - $old_atok = q("select * from atoken where atoken_uid = %d and atoken_name = '%s'", - intval($channel['channel_id']), - dbesc($name) - ); - if ($old_atok) { - $old_atok = array_shift($old_atok); - $old_xchan = atoken_xchan($old_atok); - } - - if($atoken_id) { - $r = q("update atoken set atoken_name = '%s', atoken_token = '%s', atoken_expires = '%s' + $old_atok = q( + "select * from atoken where atoken_uid = %d and atoken_name = '%s'", + intval($channel['channel_id']), + dbesc($name) + ); + if ($old_atok) { + $old_atok = array_shift($old_atok); + $old_xchan = atoken_xchan($old_atok); + } + + if ($atoken_id) { + $r = q( + "update atoken set atoken_name = '%s', atoken_token = '%s', atoken_expires = '%s' where atoken_id = %d and atoken_uid = %d", - dbesc($name), - dbesc($token), - dbesc($expires), - intval($atoken_id), - intval($channel['channel_id']) - ); - } - else { - $r = q("insert into atoken ( atoken_guid, atoken_aid, atoken_uid, atoken_name, atoken_token, atoken_expires ) + dbesc($name), + dbesc($token), + dbesc($expires), + intval($atoken_id), + intval($channel['channel_id']) + ); + } else { + $r = q( + "insert into atoken ( atoken_guid, atoken_aid, atoken_uid, atoken_name, atoken_token, atoken_expires ) values ( '%s', %d, %d, '%s', '%s', '%s' ) ", - dbesc($atoken_guid), - intval($channel['channel_account_id']), - intval($channel['channel_id']), - dbesc($name), - dbesc($token), - dbesc($expires) - ); - } - $atok = q("select * from atoken where atoken_uid = %d and atoken_name = '%s'", - intval($channel['channel_id']), - dbesc($name) - ); - if ($atok) { - $xchan = atoken_xchan($atok[0]); - atoken_create_xchan($xchan); - $atoken_xchan = $xchan['xchan_hash']; - if ($old_atok && $old_xchan) { - $r = q("update xchan set xchan_name = '%s' where xchan_hash = '%s'", - dbesc($xchan['xchan_name']), - dbesc($old_xchan['xchan_hash']) - ); - } - } + dbesc($atoken_guid), + intval($channel['channel_account_id']), + intval($channel['channel_id']), + dbesc($name), + dbesc($token), + dbesc($expires) + ); + } + $atok = q( + "select * from atoken where atoken_uid = %d and atoken_name = '%s'", + intval($channel['channel_id']), + dbesc($name) + ); + if ($atok) { + $xchan = atoken_xchan($atok[0]); + atoken_create_xchan($xchan); + $atoken_xchan = $xchan['xchan_hash']; + if ($old_atok && $old_xchan) { + $r = q( + "update xchan set xchan_name = '%s' where xchan_hash = '%s'", + dbesc($xchan['xchan_name']), + dbesc($old_xchan['xchan_hash']) + ); + } + } - $all_perms = Permissions::Perms(); + $all_perms = Permissions::Perms(); - $p = EMPTY_STR; + $p = EMPTY_STR; - if($all_perms) { - foreach($all_perms as $perm => $desc) { - if(array_key_exists('perms_' . $perm, $_POST)) { - if($p) - $p .= ','; - $p .= $perm; - } - } - set_abconfig(local_channel(),$atoken_xchan,'system','my_perms',$p); - if ($old_atok) { + if ($all_perms) { + foreach ($all_perms as $perm => $desc) { + if (array_key_exists('perms_' . $perm, $_POST)) { + if ($p) { + $p .= ','; + } + $p .= $perm; + } + } + set_abconfig(local_channel(), $atoken_xchan, 'system', 'my_perms', $p); + if ($old_atok) { + } + } + if (!$atoken_id) { + // If this is a new token, create a new abook record - } - } - - if (! $atoken_id) { - - // If this is a new token, create a new abook record + $closeness = get_pconfig($uid, 'system', 'new_abook_closeness', 80); + $profile_assign = get_pconfig($uid, 'system', 'profile_assign', ''); - $closeness = get_pconfig($uid,'system','new_abook_closeness',80); - $profile_assign = get_pconfig($uid,'system','profile_assign',''); + $r = abook_store_lowlevel( + [ + 'abook_account' => $channel['channel_account_id'], + 'abook_channel' => $channel['channel_id'], + 'abook_closeness' => intval($closeness), + 'abook_xchan' => $atoken_xchan, + 'abook_profile' => $profile_assign, + 'abook_feed' => 0, + 'abook_created' => datetime_convert(), + 'abook_updated' => datetime_convert(), + 'abook_instance' => z_root() + ] + ); - $r = abook_store_lowlevel( - [ - 'abook_account' => $channel['channel_account_id'], - 'abook_channel' => $channel['channel_id'], - 'abook_closeness' => intval($closeness), - 'abook_xchan' => $atoken_xchan, - 'abook_profile' => $profile_assign, - 'abook_feed' => 0, - 'abook_created' => datetime_convert(), - 'abook_updated' => datetime_convert(), - 'abook_instance' => z_root() - ] - ); + if (!$r) { + logger('abook creation failed'); + } - if (! $r) { - logger('abook creation failed'); - } + /** If there is a default group for this channel, add this connection to it */ - /** If there is a default group for this channel, add this connection to it */ + if ($channel['channel_default_group']) { + $g = AccessList::rec_byhash($uid, $channel['channel_default_group']); + if ($g) { + AccessList::member_add($uid, '', $atoken_xchan, $g['id']); + } + } - if ($channel['channel_default_group']) { - $g = AccessList::rec_byhash($uid,$channel['channel_default_group']); - if ($g) { - AccessList::member_add($uid,'',$atoken_xchan,$g['id']); - } - } - - $r = q("SELECT abook.*, xchan.* + $r = q( + "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1", - intval($channel['channel_id']), - dbesc($atoken_xchan) - ); + intval($channel['channel_id']), + dbesc($atoken_xchan) + ); - if (! $r) { - logger('abook or xchan record not saved correctly'); - return; - } + if (!$r) { + logger('abook or xchan record not saved correctly'); + return; + } - $clone = array_shift($r); - - unset($clone['abook_id']); - unset($clone['abook_account']); - unset($clone['abook_channel']); - - $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); - if ($abconfig) { - $clone['abconfig'] = $abconfig; - } - - Libsync::build_sync_packet($channel['channel_id'], - [ 'abook' => [ $clone ], 'atoken' => $atok ], - true); - } + $clone = array_shift($r); - info( t('Token saved.') . EOL); - return; - } - + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); - function get() { + $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']); + if ($abconfig) { + $clone['abconfig'] = $abconfig; + } - $channel = App::get_channel(); + Libsync::build_sync_packet( + $channel['channel_id'], + ['abook' => [$clone], 'atoken' => $atok], + true + ); + } - $atoken = null; - $atoken_xchan = ''; + info(t('Token saved.') . EOL); + return; + } - if(argc() > 2) { - $id = argv(2); - $atoken = q("select * from atoken where atoken_id = %d and atoken_uid = %d", - intval($id), - intval(local_channel()) - ); + public function get() + { - if($atoken) { - $atoken = $atoken[0]; - $atoken_xchan = substr($channel['channel_hash'],0,16) . '.' . $atoken['atoken_guid']; - } + $channel = App::get_channel(); - if($atoken && argc() > 3 && argv(3) === 'drop') { - $atoken['deleted'] = true; - - $r = q("SELECT abook.*, xchan.* + $atoken = null; + $atoken_xchan = ''; + + if (argc() > 2) { + $id = argv(2); + + $atoken = q( + "select * from atoken where atoken_id = %d and atoken_uid = %d", + intval($id), + intval(local_channel()) + ); + + if ($atoken) { + $atoken = $atoken[0]; + $atoken_xchan = substr($channel['channel_hash'], 0, 16) . '.' . $atoken['atoken_guid']; + } + + if ($atoken && argc() > 3 && argv(3) === 'drop') { + $atoken['deleted'] = true; + + $r = q( + "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1", - intval($channel['channel_id']), - dbesc($atoken_xchan) - ); - if (! $r) { - return; - } + intval($channel['channel_id']), + dbesc($atoken_xchan) + ); + if (!$r) { + return; + } - $clone = array_shift($r); - - unset($clone['abook_id']); - unset($clone['abook_account']); - unset($clone['abook_channel']); + $clone = array_shift($r); - $clone['entry_deleted'] = true; - - $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); - if ($abconfig) { - $clone['abconfig'] = $abconfig; - } + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); - atoken_delete($id); - Libsync::build_sync_packet($channel['channel_id'], - [ 'abook' => [ $clone ], 'atoken' => [ $atoken ] ], - true); + $clone['entry_deleted'] = true; - $atoken = null; - $atoken_xchan = ''; - } - } + $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']); + if ($abconfig) { + $clone['abconfig'] = $abconfig; + } - $t = q("select * from atoken where atoken_uid = %d", - intval(local_channel()) - ); + atoken_delete($id); + Libsync::build_sync_packet( + $channel['channel_id'], + ['abook' => [$clone], 'atoken' => [$atoken]], + true + ); - $desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content.'); + $atoken = null; + $atoken_xchan = ''; + } + } - $desc2 = t('You may also provide dropbox style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:'); + $t = q( + "select * from atoken where atoken_uid = %d", + intval(local_channel()) + ); + + $desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content.'); + + $desc2 = t('You may also provide dropbox style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:'); - $global_perms = Permissions::Perms(); - $existing = get_all_perms(local_channel(),(($atoken_xchan) ? $atoken_xchan : EMPTY_STR)); + $global_perms = Permissions::Perms(); + $existing = get_all_perms(local_channel(), (($atoken_xchan) ? $atoken_xchan : EMPTY_STR)); - $theirs = get_abconfig(local_channel(),$atoken_xchan,'system','their_perms',EMPTY_STR); + $theirs = get_abconfig(local_channel(), $atoken_xchan, 'system', 'their_perms', EMPTY_STR); - $their_perms = Permissions::FilledPerms(explode(',',$theirs)); - foreach($global_perms as $k => $v) { - if(! array_key_exists($k,$their_perms)) - $their_perms[$k] = 1; - } + $their_perms = Permissions::FilledPerms(explode(',', $theirs)); + foreach ($global_perms as $k => $v) { + if (!array_key_exists($k, $their_perms)) { + $their_perms[$k] = 1; + } + } - $my_perms = explode(',',get_abconfig(local_channel(),$atoken_xchan,'system','my_perms',EMPTY_STR)); + $my_perms = explode(',', get_abconfig(local_channel(), $atoken_xchan, 'system', 'my_perms', EMPTY_STR)); - foreach($global_perms as $k => $v) { - $thisperm = ((in_array($k,$my_perms)) ? 1 : 0); - - $checkinherited = PermissionLimits::Get(local_channel(),$k); - - // For auto permissions (when $self is true) we don't want to look at existing - // permissions because they are enabled for the channel owner - if((! $self) && ($existing[$k])) - $thisperm = "1"; + foreach ($global_perms as $k => $v) { + $thisperm = ((in_array($k, $my_perms)) ? 1 : 0); - $perms[] = array('perms_' . $k, $v, ((array_key_exists($k,$their_perms)) ? intval($their_perms[$k]) : ''),$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited); - } + $checkinherited = PermissionLimits::Get(local_channel(), $k); + + // For auto permissions (when $self is true) we don't want to look at existing + // permissions because they are enabled for the channel owner + if ((!$self) && ($existing[$k])) { + $thisperm = "1"; + } + + $perms[] = array('perms_' . $k, $v, ((array_key_exists($k, $their_perms)) ? intval($their_perms[$k]) : ''), $thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited); + } - $tpl = get_markup_template("settings_tokens.tpl"); - $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_tokens"), - '$title' => t('Guest Access Tokens'), - '$desc' => $desc, - '$desc2' => $desc2, - '$tokens' => $t, - '$atoken' => $atoken, - '$atoken_xchan' => $atoken_chan, - '$url1' => z_root() . '/channel/' . $channel['channel_address'], - '$url2' => z_root() . '/photos/' . $channel['channel_address'], - '$name' => array('name', t('Login Name') . ' *', (($atoken) ? $atoken['atoken_name'] : ''),''), - '$token'=> array('token', t('Login Password') . ' *',(($atoken) ? $atoken['atoken_token'] : new_token()), ''), - '$expires'=> array('expires', t('Expires (yyyy-mm-dd)'), (($atoken['atoken_expires'] && $atoken['atoken_expires'] > NULL_DATE) ? datetime_convert('UTC',date_default_timezone_get(),$atoken['atoken_expires']) : ''), ''), - '$them' => t('Their Settings'), - '$me' => t('My Settings'), - '$perms' => $perms, - '$inherited' => t('inherited'), - '$notself' => 1, - '$self' => 0, - '$permlbl' => t('Individual Permissions'), - '$permnote' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can not change those settings here.'), - '$submit' => t('Submit') - )); - return $o; - } - + $tpl = get_markup_template("settings_tokens.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("settings_tokens"), + '$title' => t('Guest Access Tokens'), + '$desc' => $desc, + '$desc2' => $desc2, + '$tokens' => $t, + '$atoken' => $atoken, + '$atoken_xchan' => $atoken_chan, + '$url1' => z_root() . '/channel/' . $channel['channel_address'], + '$url2' => z_root() . '/photos/' . $channel['channel_address'], + '$name' => array('name', t('Login Name') . ' *', (($atoken) ? $atoken['atoken_name'] : ''), ''), + '$token' => array('token', t('Login Password') . ' *', (($atoken) ? $atoken['atoken_token'] : new_token()), ''), + '$expires' => array('expires', t('Expires (yyyy-mm-dd)'), (($atoken['atoken_expires'] && $atoken['atoken_expires'] > NULL_DATE) ? datetime_convert('UTC', date_default_timezone_get(), $atoken['atoken_expires']) : ''), ''), + '$them' => t('Their Settings'), + '$me' => t('My Settings'), + '$perms' => $perms, + '$inherited' => t('inherited'), + '$notself' => 1, + '$self' => 0, + '$permlbl' => t('Individual Permissions'), + '$permnote' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can not change those settings here.'), + '$submit' => t('Submit') + )); + return $o; + } } diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index b54eac66f..71bf40056 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -12,6 +12,7 @@ namespace Zotlabs\Module; use App; use DBA; +use PDO; use Zotlabs\Lib\System; use Zotlabs\Web\Controller; @@ -19,869 +20,881 @@ use Zotlabs\Web\Controller; * @brief Initialisation for the setup module. * */ +class Setup extends Controller +{ -class Setup extends Controller { + private static $install_wizard_pass = 1; - private static $install_wizard_pass = 1; + /** + * {@inheritDoc} + * @see \\Zotlabs\\Web\\Controller::init() + */ - /** - * {@inheritDoc} - * @see \\Zotlabs\\Web\\Controller::init() - */ + public function init() + { - function init() { + // Ensure that if somebody hasn't read the install documentation and doesn't have all + // the required modules or has a totally borked shared hosting provider and they can't + // figure out what the hell is going on - that we at least spit out an error message which + // we can inquire about when they write to tell us that our software doesn't work. - // Ensure that if somebody hasn't read the install documentation and doesn't have all - // the required modules or has a totally borked shared hosting provider and they can't - // figure out what the hell is going on - that we at least spit out an error message which - // we can inquire about when they write to tell us that our software doesn't work. + // The worst thing we can do at this point is throw a white screen of death and rely on + // them knowing about servers and php modules and logfiles enough so that we can guess + // at the source of the problem. As ugly as it may be, we need to throw a technically worded + // PHP error message in their face. Once installation is complete application errors will + // throw a white screen because these error messages divulge information which can + // potentially be useful to hackers. - // The worst thing we can do at this point is throw a white screen of death and rely on - // them knowing about servers and php modules and logfiles enough so that we can guess - // at the source of the problem. As ugly as it may be, we need to throw a technically worded - // PHP error message in their face. Once installation is complete application errors will - // throw a white screen because these error messages divulge information which can - // potentially be useful to hackers. + // We can only set E_WARNING once the code has been thoroughly cleansed of referencing + // undeclared or unset variables which were once legal or accepted in PHP. - // We can only set E_WARNING once the code has been thoroughly cleansed of referencing - // undeclared or unset variables which were once legal or accepted in PHP. - - error_reporting(E_ERROR | E_PARSE ); - ini_set('log_errors', '0'); - ini_set('display_errors', '1'); + error_reporting(E_ERROR | E_PARSE); + ini_set('log_errors', '0'); + ini_set('display_errors', '1'); - // $baseurl/setup/testrewrite to test if rewrite in .htaccess is working - - if (argc() == 2 && argv(1) == "testrewrite") { - echo 'ok'; - killme(); - } + // $baseurl/setup/testrewrite to test if rewrite in .htaccess is working - if (x($_POST, 'pass')) { - $this->install_wizard_pass = intval($_POST['pass']); - } - else { - $this->install_wizard_pass = 1; - } - } - - /** - * @brief Handle the actions of the different setup steps. - * - */ - function post() { - - switch ($this->install_wizard_pass) { - case 1: - case 2: - return; - // implied break; - case 3: - $urlpath = App::get_path(); - $dbhost = trim($_POST['dbhost']); - $dbport = intval(trim($_POST['dbport'])); - $dbuser = trim($_POST['dbuser']); - $dbpass = trim($_POST['dbpass']); - $dbdata = trim($_POST['dbdata']); - $dbtype = intval(trim($_POST['dbtype'])); - $servertype = intval(trim($_POST['servertype'])); - $phpath = trim($_POST['phpath']); - $adminmail = trim($_POST['adminmail']); - $siteurl = trim($_POST['siteurl']); - - // $siteurl should not have a trailing slash - - $siteurl = rtrim($siteurl,'/'); - - require_once('include/dba/dba_driver.php'); - - $db = DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true); - - if (! DBA::$dba->connected) { - echo 'Database Connect failed: ' . DBA::$dba->error; - killme(); - } - return; - // implied break; - case 4: - $urlpath = App::get_path(); - $dbhost = trim($_POST['dbhost']); - $dbport = intval(trim($_POST['dbport'])); - $dbuser = trim($_POST['dbuser']); - $dbpass = trim($_POST['dbpass']); - $dbdata = trim($_POST['dbdata']); - $dbtype = intval(trim($_POST['dbtype'])); - $servertype = intval(trim($_POST['servertype'])); - $phpath = trim($_POST['phpath']); - $timezone = trim($_POST['timezone']); - $adminmail = trim($_POST['adminmail']); - $siteurl = trim($_POST['siteurl']); - - if ($siteurl != z_root()) { - $test = z_fetch_url($siteurl . '/setup/testrewrite'); - if ((! $test['success']) || ($test['body'] !== 'ok')) { - App::$data['url_fail'] = true; - App::$data['url_error'] = $test['error']; - return; - } - } - - if (! DBA::$dba->connected) { - // connect to db - $db = DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true); - } - - if (! DBA::$dba->connected) { - echo 'CRITICAL: DB not connected.'; - killme(); - } - - $txt = replace_macros(get_intltext_template('htconfig.tpl'), [ - '$dbhost' => $dbhost, - '$dbport' => $dbport, - '$dbuser' => $dbuser, - '$dbpass' => $dbpass, - '$dbdata' => $dbdata, - '$dbtype' => $dbtype, - '$servertype' => '', - '$server_role' => 'pro', - '$timezone' => $timezone, - '$platform' => ucfirst(PLATFORM_NAME), - '$siteurl' => $siteurl, - '$site_id' => random_string(), - '$phpath' => $phpath, - '$adminmail' => $adminmail - ]); - - $result = file_put_contents('.htconfig.php', $txt); - if (! $result) { - App::$data['txt'] = $txt; - } - - $errors = $this->load_database($db); - - if ($errors) { - App::$data['db_failed'] = $errors; - } - else { - App::$data['db_installed'] = true; - } - - return; - // implied break; - default: - break; - } - } - - /** - * @brief Get output for the setup page. - * - * Depending on the state we are currently in it returns different content. - * - * @return string parsed HTML output - */ - - function get() { - - $o = EMPTY_STR; - $wizard_status = EMPTY_STR; - $db_return_text = EMPTY_STR; - $install_title = t('$Projectname Server - Setup'); - - if (x(App::$data, 'db_conn_failed')) { - $this->install_wizard_pass = 2; - $wizard_status = t('Could not connect to database.'); - } - if (x(App::$data, 'url_fail')) { - $this->install_wizard_pass = 3; - $wizard_status = t('Could not connect to specified site URL. Possible SSL certificate or DNS issue.'); - if (App::$data['url_error']) { - $wizard_status .= ' ' . App::$data['url_error']; - } - } - - if (x(App::$data, 'db_create_failed')) { - $this->install_wizard_pass = 2; - $wizard_status = t('Could not create table.'); - } - if (x(App::$data, 'db_installed')) { - $pass = t('Installation succeeded!'); - $icon = 'check'; - $txt = t('Your site database has been installed.') . EOL; - $db_return_text .= $txt; - } - if (x(App::$data, 'db_failed')) { - $pass = t('Database install failed!'); - $icon = 'exclamation-triangle'; - $txt = t('You may need to import the file "install/schema_xxx.sql" manually using a database client.') . EOL; - $txt .= t('Please see the file "install/INSTALL.txt".') . EOL . '', $l); + } + return $t; } -function upgrade_message($bbcode = false) { - $x = upgrade_link($bbcode); - return t('This action exceeds the limits set by your subscription plan.') . (($x) ? ' ' . $x : '') ; +function upgrade_message($bbcode = false) +{ + $x = upgrade_link($bbcode); + return t('This action exceeds the limits set by your subscription plan.') . (($x) ? ' ' . $x : '') ; } -function upgrade_bool_message($bbcode = false) { - $x = upgrade_link($bbcode); - return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ; +function upgrade_bool_message($bbcode = false) +{ + $x = upgrade_link($bbcode); + return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ; } - - diff --git a/include/acl_selectors.php b/include/acl_selectors.php index f084247f9..5d036244d 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -6,156 +6,156 @@ */ use Zotlabs\Lib\Apps; +use Zotlabs\Lib\PermissionDescription; -function fixacl(&$item) { - $item = str_replace( [ '<', '>' ], [ '', '' ], $item); +function fixacl(&$item) +{ + $item = str_replace([ '<', '>' ], [ '', '' ], $item); } /** * Builds a modal dialog for editing permissions, using acl_selector.tpl as the template. * * @param array $defaults Optional access control list for the initial state of the dialog. -* @param boolean $show_jotnets Whether plugins for federated networks should be included in the permissions dialog -* @param \Zotlabs\Lib\PermissionDescription $emptyACL_description - An optional description for the permission implied by selecting an empty ACL. Preferably an instance of PermissionDescription. +* @param bool $show_jotnets Whether plugins for federated networks should be included in the permissions dialog +* @param PermissionDescription $emptyACL_description - An optional description for the permission implied by selecting an empty ACL. Preferably an instance of PermissionDescription. * @param string $dialog_description Optional message to include at the top of the dialog. E.g. "Warning: Post permissions cannot be changed once sent". * @param string $context_help Allows the dialog to present a help icon. E.g. "acl_dialog_post" -* @param boolean $readonly Not implemented yet. When implemented, the dialog will use acl_readonly.tpl instead, so that permissions may be viewed for posts that can no longer have their permissions changed. +* @param bool $readonly Not implemented yet. When implemented, the dialog will use acl_readonly.tpl instead, so that permissions may be viewed for posts that can no longer have their permissions changed. * * @return string html modal dialog built from acl_selector.tpl */ -function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_description = '', $dialog_description = '', $context_help = '', $readonly = false) { +function populate_acl($defaults = null, $show_jotnets = true, $emptyACL_description = '', $dialog_description = '', $context_help = '', $readonly = false) +{ - $allow_cid = $allow_gid = $deny_cid = $deny_gid = false; - $showall_origin = ''; - $showall_icon = 'fa-globe'; - $role = get_pconfig(local_channel(), 'system', 'permissions_role'); + $allow_cid = $allow_gid = $deny_cid = $deny_gid = false; + $showall_origin = ''; + $showall_icon = 'fa-globe'; + $role = get_pconfig(local_channel(), 'system', 'permissions_role'); - if (! $emptyACL_description) { - $showall_caption = t('Visible to your default audience'); - - } - elseif (is_a($emptyACL_description, '\\Zotlabs\\Lib\\PermissionDescription')) { - $showall_caption = $emptyACL_description->get_permission_description(); - $showall_origin = (($role === 'custom') ? $emptyACL_description->get_permission_origin_description() : ''); - $showall_icon = $emptyACL_description->get_permission_icon(); - } - else { - // For backwards compatibility we still accept a string... for now! - $showall_caption = $emptyACL_description; - } + if (! $emptyACL_description) { + $showall_caption = t('Visible to your default audience'); + } elseif (is_a($emptyACL_description, '\\Zotlabs\\Lib\\PermissionDescription')) { + $showall_caption = $emptyACL_description->get_permission_description(); + $showall_origin = (($role === 'custom') ? $emptyACL_description->get_permission_origin_description() : ''); + $showall_icon = $emptyACL_description->get_permission_icon(); + } else { + // For backwards compatibility we still accept a string... for now! + $showall_caption = $emptyACL_description; + } - if (is_array($defaults)) { - $allow_cid = ((strlen($defaults['allow_cid'])) - ? explode('><', $defaults['allow_cid']) : [] ); - $allow_gid = ((strlen($defaults['allow_gid'])) - ? explode('><', $defaults['allow_gid']) : [] ); - $deny_cid = ((strlen($defaults['deny_cid'])) - ? explode('><', $defaults['deny_cid']) : [] ); - $deny_gid = ((strlen($defaults['deny_gid'])) - ? explode('><', $defaults['deny_gid']) : [] ); - array_walk($allow_cid,'fixacl'); - array_walk($allow_gid,'fixacl'); - array_walk($deny_cid,'fixacl'); - array_walk($deny_gid,'fixacl'); - } + if (is_array($defaults)) { + $allow_cid = ((strlen($defaults['allow_cid'])) + ? explode('><', $defaults['allow_cid']) : [] ); + $allow_gid = ((strlen($defaults['allow_gid'])) + ? explode('><', $defaults['allow_gid']) : [] ); + $deny_cid = ((strlen($defaults['deny_cid'])) + ? explode('><', $defaults['deny_cid']) : [] ); + $deny_gid = ((strlen($defaults['deny_gid'])) + ? explode('><', $defaults['deny_gid']) : [] ); + array_walk($allow_cid, 'fixacl'); + array_walk($allow_gid, 'fixacl'); + array_walk($deny_cid, 'fixacl'); + array_walk($deny_gid, 'fixacl'); + } - $channel = ((local_channel()) ? App::get_channel() : ''); - $has_acl = false; - $single_group = false; - $just_me = false; - $custom = false; + $channel = ((local_channel()) ? App::get_channel() : ''); + $has_acl = false; + $single_group = false; + $just_me = false; + $custom = false; - if ($allow_cid || $allow_gid || $deny_gid || $deny_cid) { - $has_acl = true; - $custom = true; - } + if ($allow_cid || $allow_gid || $deny_gid || $deny_cid) { + $has_acl = true; + $custom = true; + } - if (count($allow_gid) === 1 && (! $allow_cid) && (! $deny_gid) && (! $deny_cid)) { - $single_group = true; - $custom = false; - } + if (count($allow_gid) === 1 && (! $allow_cid) && (! $deny_gid) && (! $deny_cid)) { + $single_group = true; + $custom = false; + } - if (count($allow_cid) === 1 && $channel && $allow_cid[0] === $channel['channel_hash'] && (! $allow_gid) && (! $deny_gid) && (! $deny_cid)) { - $just_me = true; - $custom = false; - } + if (count($allow_cid) === 1 && $channel && $allow_cid[0] === $channel['channel_hash'] && (! $allow_gid) && (! $deny_gid) && (! $deny_cid)) { + $just_me = true; + $custom = false; + } - $groups = EMPTY_STR; + $groups = EMPTY_STR; - $r = q("SELECT id, hash, gname FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", - intval(local_channel()) - ); + $r = q( + "SELECT id, hash, gname FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + intval(local_channel()) + ); - if ($r) { - foreach ($r as $rr) { - $selected = (($single_group && $rr['hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); - $groups .= '' . "\r\n"; - } - } + if ($r) { + foreach ($r as $rr) { + $selected = (($single_group && $rr['hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); + $groups .= '' . "\r\n"; + } + } - if ($channel && Apps::system_app_installed($channel['channel_id'],'Virtual Lists')) { - $selected = (($single_group && 'connections:' . $channel['channel_hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); - $groups .= '' . "\r\n"; - if (get_pconfig($channel['channel_id'],'system','activitypub',get_config('system','activitypub', ACTIVITYPUB_ENABLED))) { - $selected = (($single_group && 'activitypub:' . $channel['channel_hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); - $groups .= '' . "\r\n"; - } - $selected = (($single_group && 'zot:' . $channel['channel_hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); - $groups .= '' . "\r\n"; - - } + if ($channel && Apps::system_app_installed($channel['channel_id'], 'Virtual Lists')) { + $selected = (($single_group && 'connections:' . $channel['channel_hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); + $groups .= '' . "\r\n"; + if (get_pconfig($channel['channel_id'], 'system', 'activitypub', get_config('system', 'activitypub', ACTIVITYPUB_ENABLED))) { + $selected = (($single_group && 'activitypub:' . $channel['channel_hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); + $groups .= '' . "\r\n"; + } + $selected = (($single_group && 'zot:' . $channel['channel_hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); + $groups .= '' . "\r\n"; + } - $forums = get_forum_channels(local_channel(),1); - $selected = false; - if ($forums) { - foreach ($forums as $f) { + $forums = get_forum_channels(local_channel(), 1); + $selected = false; + if ($forums) { + foreach ($forums as $f) { + $selected = (($single_group && $f['hash'] === $allow_cid[0]) ? ' selected = "selected" ' : ''); + $groups .= '' . "\r\n"; + } + } - $selected = (($single_group && $f['hash'] === $allow_cid[0]) ? ' selected = "selected" ' : ''); - $groups .= '' . "\r\n"; - } - } + // preset acl with DM to a single xchan (not a group) + if ($selected === false && count($allow_cid) === 1 && $channel && $allow_cid[0] !== $channel['channel_hash'] && (! $allow_gid) && (! $deny_gid) && (! $deny_cid)) { + $f = q( + "select * from xchan where xchan_hash = '%s'", + dbesc($allow_cid[0]) + ); + if ($f) { + $custom = false; + $selected = ' selected="selected" '; + $groups .= '' . "\r\n"; + } + } - // preset acl with DM to a single xchan (not a group) - if ($selected === false && count($allow_cid) === 1 && $channel && $allow_cid[0] !== $channel['channel_hash'] && (! $allow_gid) && (! $deny_gid) && (! $deny_cid)) { - $f = q("select * from xchan where xchan_hash = '%s'", - dbesc($allow_cid[0]) - ); - if ($f) { - $custom = false; - $selected = ' selected="selected" '; - $groups .= '' . "\r\n"; - } - } + $tpl = get_markup_template("acl_selector.tpl"); + $o = replace_macros($tpl, array( + '$showall' => $showall_caption, + '$onlyme' => t('Only me'), + '$groups' => $groups, + '$public_selected' => (($has_acl) ? false : ' selected="selected" '), + '$justme_selected' => (($just_me) ? ' selected="selected" ' : ''), + '$custom_selected' => (($custom) ? ' selected="selected" ' : ''), + '$showallOrigin' => $showall_origin, + '$showallIcon' => $showall_icon, + '$select_label' => t('Who can see this?'), + '$custom' => t('Custom selection'), + '$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'), + '$show' => t('Show'), + '$hide' => t("Don't show"), + '$search' => t('Search'), + '$allowcid' => json_encode($allow_cid), + '$allowgid' => json_encode($allow_gid), + '$denycid' => json_encode($deny_cid), + '$denygid' => json_encode($deny_gid), + '$aclModalTitle' => t('Permissions'), + '$aclModalDesc' => $dialog_description, + '$aclModalDismiss' => t('Close'), +// '$helpUrl' => (($context_help == '') ? '' : (z_root() . '/help/' . $context_help)) + )); - $tpl = get_markup_template("acl_selector.tpl"); - $o = replace_macros($tpl, array( - '$showall' => $showall_caption, - '$onlyme' => t('Only me'), - '$groups' => $groups, - '$public_selected' => (($has_acl) ? false : ' selected="selected" '), - '$justme_selected' => (($just_me) ? ' selected="selected" ' : ''), - '$custom_selected' => (($custom) ? ' selected="selected" ' : ''), - '$showallOrigin' => $showall_origin, - '$showallIcon' => $showall_icon, - '$select_label' => t('Who can see this?'), - '$custom' => t('Custom selection'), - '$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'), - '$show' => t('Show'), - '$hide' => t("Don't show"), - '$search' => t('Search'), - '$allowcid' => json_encode($allow_cid), - '$allowgid' => json_encode($allow_gid), - '$denycid' => json_encode($deny_cid), - '$denygid' => json_encode($deny_gid), - '$aclModalTitle' => t('Permissions'), - '$aclModalDesc' => $dialog_description, - '$aclModalDismiss' => t('Close'), -// '$helpUrl' => (($context_help == '') ? '' : (z_root() . '/help/' . $context_help)) - )); - - return $o; + return $o; } /** @@ -169,18 +169,19 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti * * @return string Description to present to user in modal permissions dialog */ -function get_post_aclDialogDescription() { +function get_post_aclDialogDescription() +{ - // I'm trying to make two points in this description text - warn about finality of wall - // post permissions, and try to clear up confusion that these permissions set who is - // *shown* the post, istead of who is able to see the post, i.e. make it clear that clicking - // the "Show" button on a group does not post it to the feed of people in that group, it - // mearly allows those people to view the post if they are viewing/following this channel. - $description = t('Post permissions cannot be changed after a post is shared.
' ; - $txt .= '' . App::$data['db_failed'] . '
' . EOL ; - $db_return_text .= $txt; - } - if (DBA::$dba && DBA::$dba->connected) { - $r = q("SELECT COUNT(*) as total FROM account"); - if ($r && count($r) && $r[0]['total']) { - return replace_macros(get_markup_template('install.tpl'), [ - '$title' => $install_title, - '$pass' => '', - '$status' => t('Permission denied.'), - '$text' => '', - ]); - } - } - - if (x(App::$data, 'txt') && strlen(App::$data['txt'])) { - $db_return_text .= $this->manual_config($a); - } - - if ($db_return_text !== EMPTY_STR) { - $tpl = get_markup_template('install.tpl'); - return replace_macros(get_markup_template('install.tpl'), [ - '$title' => $install_title, - '$icon' => $icon, - '$pass' => $pass, - '$text' => $db_return_text, - '$what_next' => $this->what_next() - ]); - } - - switch ($this->install_wizard_pass) { - - case 1: { - // System check - - $checks = []; - - $this->check_funcs($checks); - - $this->check_htconfig($checks); - - $this->check_store($checks); - - $this->check_smarty3($checks); - - $this->check_keys($checks); - - if (x($_POST, 'phpath')) { - $phpath = notags(trim($_POST['phpath'])); - } - - $this->check_php($phpath, $checks); - - $this->check_phpconfig($checks); - - $this->check_htaccess($checks); - - $checkspassed = array_reduce($checks, "self::check_passed", true); - - $o .= replace_macros(get_markup_template('install_checks.tpl'), [ - '$title' => $install_title, - '$pass' => t('System check'), - '$checks' => $checks, - '$passed' => $checkspassed, - '$see_install' => t('Please see the file "install/INSTALL.txt".'), - '$next' => t('Next'), - '$reload' => t('Check again'), - '$phpath' => $phpath, - '$baseurl' => z_root(), - ]); - return $o; - break; - } - - case 2: { - // Database config - - $dbhost = ((x($_POST,'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1'); - $dbuser = ((x($_POST,'dbuser')) ? trim($_POST['dbuser']): EMPTY_STR); - $dbport = ((x($_POST,'dbport')) ? intval(trim($_POST['dbport'])) : 0); - $dbpass = ((x($_POST,'dbpass')) ? trim($_POST['dbpass']): EMPTY_STR); - $dbdata = ((x($_POST,'dbdata')) ? trim($_POST['dbdata']): EMPTY_STR); - $dbtype = ((x($_POST,'dbtype')) ? intval(trim($_POST['dbtype'])) : 0); - $phpath = ((x($_POST,'phpath')) ? trim($_POST['phpath']): EMPTY_STR); - $adminmail = ((x($_POST,'adminmail')) ? trim($_POST['adminmail']): EMPTY_STR); - $siteurl = ((x($_POST,'siteurl')) ? trim($_POST['siteurl']): EMPTY_STR); - - $servertype = EMPTY_STR; - - $o .= replace_macros(get_markup_template('install_db.tpl'), [ - '$title' => $install_title, - '$pass' => t('Database connection'), - '$info_01' => t('In order to install this software we need to know how to connect to your database.'), - '$info_02' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'), - '$info_03' => t('The database you specify below should already exist. If it does not, please create it before continuing.'), - - '$status' => $wizard_status, - - '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, t('Default is 127.0.0.1')), - '$dbport' => array('dbport', t('Database Port'), $dbport, t('Communication port number - use 0 for default')), - '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, ''), - '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''), - '$dbdata' => array('dbdata', t('Database Name'), $dbdata, ''), - '$dbtype' => array('dbtype', t('Database Type'), $dbtype, '', array( 0=>'MySQL', 1=>'PostgreSQL' )), - - '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Required. Your account email address must match this in order to use the web admin panel.')), - '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Required. Please use SSL (https) URL if available.')), - '$lbl_10' => t('Please select a default timezone for your website'), - '$baseurl' => z_root(), - '$phpath' => $phpath, - '$submit' => t('Submit'), - ]); - - return $o; - break; - } - case 3: { - // Site settings - $dbhost = ((x($_POST,'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1'); - $dbuser = ((x($_POST,'dbuser')) ? trim($_POST['dbuser']): EMPTY_STR); - $dbport = ((x($_POST,'dbport')) ? intval(trim($_POST['dbport'])) : 0); - $dbpass = ((x($_POST,'dbpass')) ? trim($_POST['dbpass']): EMPTY_STR); - $dbdata = ((x($_POST,'dbdata')) ? trim($_POST['dbdata']): EMPTY_STR); - $dbtype = ((x($_POST,'dbtype')) ? intval(trim($_POST['dbtype'])) : 0); - $phpath = ((x($_POST,'phpath')) ? trim($_POST['phpath']): EMPTY_STR); - - $servertype = EMPTY_STR; - - $adminmail = ((x($_POST,'adminmail')) ? trim($_POST['adminmail']): EMPTY_STR); - $siteurl = ((x($_POST,'siteurl')) ? trim($_POST['siteurl']): EMPTY_STR); - $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); - - $o .= replace_macros(get_markup_template('install_settings.tpl'), [ - '$title' => $install_title, - '$pass' => t('Site settings'), - '$status' => $wizard_status, - - '$dbhost' => $dbhost, - '$dbport' => $dbport, - '$dbuser' => $dbuser, - '$dbpass' => $dbpass, - '$dbdata' => $dbdata, - '$phpath' => $phpath, - '$dbtype' => $dbtype, - '$servertype' => $servertype, - - '$adminmail' => [ 'adminmail', t('Site administrator email address'), $adminmail, t('Required. Your account email address must match this in order to use the web admin panel.') ], - - '$siteurl' => [ 'siteurl', t('Website URL'), z_root(), t('Required. Please use SSL (https) URL if available.')], - - '$timezone' => [ 'timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones() ], - - '$baseurl' => z_root(), - - '$submit' => t('Submit'), - ]); - return $o; - break; - } - } - } - - /** - * @brief Add a check result to the array for output. - * - * @param[in,out] array &$checks array passed to template - * @param string $title a title for the check - * @param boolean $status - * @param boolean $required - * @param string $help optional help string - */ - function check_add(&$checks, $title, $status, $required, $help = '') { - $checks[] = [ - 'title' => $title, - 'status' => $status, - 'required' => $required, - 'help' => $help - ]; - } - - /** - * @brief Checks the PHP environment. - * - * @param[in,out] string &$phpath - * @param[out] array &$checks - */ - function check_php(&$phpath, &$checks) { - $help = ''; - - if (version_compare(PHP_VERSION, '7.1') < 0) { - $help .= t('PHP version 7.1 or greater is required.'); - $this->check_add($checks, t('PHP version'), false, true, $help); - } - - if (strlen($phpath)) { - $passed = file_exists($phpath); - } - elseif (function_exists('shell_exec')) { - if (is_windows()) { - $phpath = trim(shell_exec('where php')); - } - else { - $phpath = trim(shell_exec('which php')); - } - $passed = strlen($phpath); - } - - if (!$passed) { - $help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL; - $help .= t('If you do not have a command line version of PHP installed on server, you will not be able to run background tasks - including message delivery.') . EOL; - $help .= EOL; - - $help .= replace_macros(get_markup_template('field_input.tpl'), [ - '$field' => [ 'phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable. You can leave this blank to continue the installation.')], - ]); - $phpath = ''; - } - - $this->check_add($checks, t('Command line PHP') . ($passed ? " ($phpath)" : EMPTY_STR), $passed, false, $help); - - if ($passed) { - $str = autoname(8); - $cmd = "$phpath install/testargs.php $str"; - $help = ''; - - if (function_exists('shell_exec')) { - $result = trim(shell_exec($cmd)); - } - else { - $help .= t('Unable to check command line PHP, as shell_exec() is disabled. This is required.') . EOL; - } - $passed2 = (($result === $str) ? true : false); - if (!$passed2) { - $help .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.'). EOL; - $help .= t('This is required for message delivery to work.'); - } - - $this->check_add($checks, t('PHP register_argc_argv'), $passed, true, $help); - } - } - - /** - * @brief Some PHP configuration checks. - * - * @todo Change how we display such informational text. Add more description - * how to change them. - * - * @param[out] array &$checks - */ - function check_phpconfig(&$checks) { - - $help = ''; - $mem_warning = EMPTY_STR; - - $result = self::getPhpiniUploadLimits(); - if($result['post_max_size'] < (2 * 1024 * 1024) || $result['max_upload_filesize'] < (2 * 1024 * 1024)) { - $mem_warning = '' . t('This is not sufficient to upload larger images or files. You should be able to upload at least 2MB (2097152 bytes) at once.') . ''; + if (argc() == 2 && argv(1) == "testrewrite") { + echo 'ok'; + killme(); } - $help = sprintf(t('Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once.'), - userReadableSize($result['post_max_size']), - userReadableSize($result['max_upload_filesize']), - $result['max_file_uploads'] - ); + if (x($_POST, 'pass')) { + $this->install_wizard_pass = intval($_POST['pass']); + } else { + $this->install_wizard_pass = 1; + } + } - $help .= (($mem_warning) ? $mem_warning : EMPTY_STR); - $help .= '
' . t('You can adjust these settings in the server php.ini file.'); + /** + * @brief Handle the actions of the different setup steps. + * + */ + public function post() + { - $this->check_add($checks, t('PHP upload limits'), true, false, $help); - } + switch ($this->install_wizard_pass) { + case 1: + case 2: + return; + // implied break; + case 3: + $urlpath = App::get_path(); + $dbhost = trim($_POST['dbhost']); + $dbport = intval(trim($_POST['dbport'])); + $dbuser = trim($_POST['dbuser']); + $dbpass = trim($_POST['dbpass']); + $dbdata = trim($_POST['dbdata']); + $dbtype = intval(trim($_POST['dbtype'])); + $servertype = intval(trim($_POST['servertype'])); + $phpath = trim($_POST['phpath']); + $adminmail = trim($_POST['adminmail']); + $siteurl = trim($_POST['siteurl']); - /** - * @brief Check if the openssl implementation can generate keys. - * - * @param[out] array $checks - */ - function check_keys(&$checks) { - $help = ''; - $res = false; + // $siteurl should not have a trailing slash - if (function_exists('openssl_pkey_new')) { - $res = openssl_pkey_new(array( - 'digest_alg' => 'sha1', - 'private_key_bits' => 4096, - 'encrypt_key' => false) - ); - } + $siteurl = rtrim($siteurl, '/'); - // Get private key + require_once('include/dba/dba_driver.php'); - if (! $res) { - $help .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'). EOL; - $help .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'); - } + $db = DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true); - $this->check_add($checks, t('Generate encryption keys'), $res, true, $help); - } + if (!DBA::$dba->connected) { + echo 'Database Connect failed: ' . DBA::$dba->error; + killme(); + } + return; + // implied break; + case 4: + $urlpath = App::get_path(); + $dbhost = trim($_POST['dbhost']); + $dbport = intval(trim($_POST['dbport'])); + $dbuser = trim($_POST['dbuser']); + $dbpass = trim($_POST['dbpass']); + $dbdata = trim($_POST['dbdata']); + $dbtype = intval(trim($_POST['dbtype'])); + $servertype = intval(trim($_POST['servertype'])); + $phpath = trim($_POST['phpath']); + $timezone = trim($_POST['timezone']); + $adminmail = trim($_POST['adminmail']); + $siteurl = trim($_POST['siteurl']); - /** - * @brief Check for some PHP functions and modules. - * - * @param[in,out] array &$checks - */ - function check_funcs(&$checks) { - $ck_funcs = []; + if ($siteurl != z_root()) { + $test = z_fetch_url($siteurl . '/setup/testrewrite'); + if ((!$test['success']) || ($test['body'] !== 'ok')) { + App::$data['url_fail'] = true; + App::$data['url_error'] = $test['error']; + return; + } + } - $disabled = explode(',',ini_get('disable_functions')); - if ($disabled) { - array_walk($disabled,'array_trim'); - } + if (!DBA::$dba->connected) { + // connect to db + $db = DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true); + } - // add check metadata, the real check is done bit later and return values set + if (!DBA::$dba->connected) { + echo 'CRITICAL: DB not connected.'; + killme(); + } - $this->check_add($ck_funcs, t('libCurl PHP module'), true, true); - $this->check_add($ck_funcs, t('GD graphics PHP module'), true, true); - $this->check_add($ck_funcs, t('OpenSSL PHP module'), true, true); - $this->check_add($ck_funcs, t('PDO database PHP module'), true, true); - $this->check_add($ck_funcs, t('mb_string PHP module'), true, true); - $this->check_add($ck_funcs, t('xml PHP module'), true, true); - $this->check_add($ck_funcs, t('zip PHP module'), true, true); + $txt = replace_macros(get_intltext_template('htconfig.tpl'), [ + '$dbhost' => $dbhost, + '$dbport' => $dbport, + '$dbuser' => $dbuser, + '$dbpass' => $dbpass, + '$dbdata' => $dbdata, + '$dbtype' => $dbtype, + '$servertype' => '', + '$server_role' => 'pro', + '$timezone' => $timezone, + '$platform' => ucfirst(PLATFORM_NAME), + '$siteurl' => $siteurl, + '$site_id' => random_string(), + '$phpath' => $phpath, + '$adminmail' => $adminmail + ]); - if (function_exists('apache_get_modules')){ - if (! in_array('mod_rewrite', apache_get_modules())) { - $this->check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.')); - } - else { - $this->check_add($ck_funcs, t('Apache mod_rewrite module'), true, true); - } - } - if ((! function_exists('exec')) || in_array('exec',$disabled)) { - $this->check_add($ck_funcs, t('exec'), false, true, t('Error: exec is required but is either not installed or has been disabled in php.ini')); - } - else { - $this->check_add($ck_funcs, t('exec'), true, true); - } - if ((! function_exists('shell_exec')) || in_array('shell_exec',$disabled)) { - $this->check_add($ck_funcs, t('shell_exec'), false, true, t('Error: shell_exec is required but is either not installed or has been disabled in php.ini')); - } - else { - $this->check_add($ck_funcs, t('shell_exec'), true, true); - } + $result = file_put_contents('.htconfig.php', $txt); + if (!$result) { + App::$data['txt'] = $txt; + } - if (! function_exists('curl_init')) { - $ck_funcs[0]['status'] = false; - $ck_funcs[0]['help'] = t('Error: libCURL PHP module required but not installed.'); - } - if ((! function_exists('imagecreatefromjpeg')) && (! class_exists('\\Imagick'))) { - $ck_funcs[1]['status'] = false; - $ck_funcs[1]['help'] = t('Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed.'); - } - if (! function_exists('openssl_public_encrypt')) { - $ck_funcs[2]['status'] = false; - $ck_funcs[2]['help'] = t('Error: openssl PHP module required but not installed.'); - } - if (class_exists('\\PDO')) { - $x = \PDO::getAvailableDrivers(); - if ((! in_array('mysql',$x)) && (! in_array('pgsql',$x))) { - $ck_funcs[3]['status'] = false; - $ck_funcs[3]['help'] = t('Error: PDO database PHP module missing a driver for either mysql or pgsql.'); - } - } - if (! class_exists('\\PDO')) { - $ck_funcs[3]['status'] = false; - $ck_funcs[3]['help'] = t('Error: PDO database PHP module required but not installed.'); - } - if (! function_exists('mb_strlen')) { - $ck_funcs[4]['status'] = false; - $ck_funcs[4]['help'] = t('Error: mb_string PHP module required but not installed.'); - } - if (! extension_loaded('xml')) { - $ck_funcs[5]['status'] = false; - $ck_funcs[5]['help'] = t('Error: xml PHP module required for DAV but not installed.'); - } - if (! extension_loaded('zip')) { - $ck_funcs[6]['status'] = false; - $ck_funcs[6]['help'] = t('Error: zip PHP module required but not installed.'); - } + $errors = $this->load_database($db); - $checks = array_merge($checks, $ck_funcs); - } + if ($errors) { + App::$data['db_failed'] = $errors; + } else { + App::$data['db_installed'] = true; + } - /** - * @brief Check for .htconfig requirements. - * - * @param[out] array &$checks - */ - function check_htconfig(&$checks) { - $status = true; - $help = EMPTY_STR; + return; + // implied break; + default: + break; + } + } - $fname = '.htconfig.php'; + /** + * @brief Get output for the setup page. + * + * Depending on the state we are currently in it returns different content. + * + * @return string parsed HTML output + */ - if((file_exists($fname) && is_writable($fname)) || - (! (file_exists($fname) && is_writable('.')))) { - $this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help); - return; - } + public function get() + { - $status = false; - $help .= t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') .EOL; - $help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.').EOL; - $help .= t('Please see install/INSTALL.txt for additional information.'); + $o = EMPTY_STR; + $wizard_status = EMPTY_STR; + $db_return_text = EMPTY_STR; + $install_title = t('$Projectname Server - Setup'); - $this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help); - } + if (x(App::$data, 'db_conn_failed')) { + $this->install_wizard_pass = 2; + $wizard_status = t('Could not connect to database.'); + } + if (x(App::$data, 'url_fail')) { + $this->install_wizard_pass = 3; + $wizard_status = t('Could not connect to specified site URL. Possible SSL certificate or DNS issue.'); + if (App::$data['url_error']) { + $wizard_status .= ' ' . App::$data['url_error']; + } + } - /** - * @brief Checks for our templating engine Smarty3 requirements. - * - * @param[out] array &$checks - */ - function check_smarty3(&$checks) { - $status = true; - $help = ''; + if (x(App::$data, 'db_create_failed')) { + $this->install_wizard_pass = 2; + $wizard_status = t('Could not create table.'); + } + if (x(App::$data, 'db_installed')) { + $pass = t('Installation succeeded!'); + $icon = 'check'; + $txt = t('Your site database has been installed.') . EOL; + $db_return_text .= $txt; + } + if (x(App::$data, 'db_failed')) { + $pass = t('Database install failed!'); + $icon = 'exclamation-triangle'; + $txt = t('You may need to import the file "install/schema_xxx.sql" manually using a database client.') . EOL; + $txt .= t('Please see the file "install/INSTALL.txt".') . EOL . '
'; + $txt .= '' . App::$data['db_failed'] . '
' . EOL; + $db_return_text .= $txt; + } + if (DBA::$dba && DBA::$dba->connected) { + $r = q("SELECT COUNT(*) as total FROM account"); + if ($r && count($r) && $r[0]['total']) { + return replace_macros(get_markup_template('install.tpl'), [ + '$title' => $install_title, + '$pass' => '', + '$status' => t('Permission denied.'), + '$text' => '', + ]); + } + } - @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true); + if (x(App::$data, 'txt') && strlen(App::$data['txt'])) { + $db_return_text .= $this->manual_config($a); + } - if (! is_writable(TEMPLATE_BUILD_PATH) ) { - $status = false; - $help .= t('This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL; - $help .= sprintf( t('In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder.'), TEMPLATE_BUILD_PATH) . EOL; - $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.') . EOL; - } + if ($db_return_text !== EMPTY_STR) { + $tpl = get_markup_template('install.tpl'); + return replace_macros(get_markup_template('install.tpl'), [ + '$title' => $install_title, + '$icon' => $icon, + '$pass' => $pass, + '$text' => $db_return_text, + '$what_next' => $this->what_next() + ]); + } - $this->check_add($checks, sprintf( t('%s is writable'), TEMPLATE_BUILD_PATH), $status, true, $help); - } + switch ($this->install_wizard_pass) { + case 1: + { + // System check - /** - * @brief Check for store directory. - * - * @param[out] array &$checks - */ - function check_store(&$checks) { - $status = true; - $help = ''; + $checks = []; - @os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, true); - - if (! is_writable('store')) { - $status = false; - $help = t('This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder') . EOL; - $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.').EOL; - } + $this->check_funcs($checks); - $this->check_add($checks, t('store is writable'), $status, true, $help); - } + $this->check_htconfig($checks); - /** - * @brief Check URL rewrite und SSL certificate. - * - * @param[out] array &$checks - */ - function check_htaccess(&$checks) { - $status = true; - $help = ''; - $ssl_error = false; + $this->check_store($checks); - $url = z_root() . '/setup/testrewrite'; + $this->check_smarty3($checks); - if (function_exists('curl_init')) { - $test = z_fetch_url($url); - if (! $test['success']) { - if (strstr($url,'https://')) { - $test = z_fetch_url($url,false,0, [ 'novalidate' => true ]); - if ($test['success']) { - $ssl_error = true; - } - } - else { - $test = z_fetch_url(str_replace('http://','https://',$url),false,0, [ 'novalidate' => true ]); - if ($test['success']) { - $ssl_error = true; - } - } + $this->check_keys($checks); - if ($ssl_error) { - $help .= t('SSL certificate cannot be validated. Fix certificate or disable https access to this site.') . EOL; - $help .= t('If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!') . EOL; - $help .= t('This restriction is incorporated because public posts from you may for example contain references to images on your own hub.') . EOL; - $help .= t('If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues.') . EOL; - $help .= t('This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement.') .EOL; - $help .= t('Providers are available that issue free certificates which are browser-valid.'). EOL; + if (x($_POST, 'phpath')) { + $phpath = notags(trim($_POST['phpath'])); + } - $help .= t('If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications.') . EOL; + $this->check_php($phpath, $checks); - $this->check_add($checks, t('SSL certificate validation'), false, true, $help); - } - } + $this->check_phpconfig($checks); - if ((! $test['success']) || ($test['body'] !== 'ok')) { - $status = false; - $help = t('Url rewrite in .htaccess is not working. Check your server configuration.' . 'Test: ' . var_export($test,true)); - } + $this->check_htaccess($checks); - $this->check_add($checks, t('Url rewrite is working'), $status, true, $help); - } - else { - // cannot check modrewrite if libcurl is not installed - } - } + $checkspassed = array_reduce($checks, "self::check_passed", true); - /** - * @brief - * - * @param App &$a - * @return string with paresed HTML - */ - function manual_config(&$a) { - $data = htmlspecialchars(App::$data['txt'], ENT_COMPAT, 'UTF-8'); - $o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'); - $o .= ""; + $o .= replace_macros(get_markup_template('install_checks.tpl'), [ + '$title' => $install_title, + '$pass' => t('System check'), + '$checks' => $checks, + '$passed' => $checkspassed, + '$see_install' => t('Please see the file "install/INSTALL.txt".'), + '$next' => t('Next'), + '$reload' => t('Check again'), + '$phpath' => $phpath, + '$baseurl' => z_root(), + ]); + return $o; + break; + } - return $o; - } + case 2: + { + // Database config - function load_database_rem($v, $i) { - $l = trim($i); - if (strlen($l) > 1 && ($l[0] === '-' || ($l[0] === '/' && $l[1] === '*'))) { - return $v; - } - else { - return $v . "\n" . $i; - } - } + $dbhost = ((x($_POST, 'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1'); + $dbuser = ((x($_POST, 'dbuser')) ? trim($_POST['dbuser']) : EMPTY_STR); + $dbport = ((x($_POST, 'dbport')) ? intval(trim($_POST['dbport'])) : 0); + $dbpass = ((x($_POST, 'dbpass')) ? trim($_POST['dbpass']) : EMPTY_STR); + $dbdata = ((x($_POST, 'dbdata')) ? trim($_POST['dbdata']) : EMPTY_STR); + $dbtype = ((x($_POST, 'dbtype')) ? intval(trim($_POST['dbtype'])) : 0); + $phpath = ((x($_POST, 'phpath')) ? trim($_POST['phpath']) : EMPTY_STR); + $adminmail = ((x($_POST, 'adminmail')) ? trim($_POST['adminmail']) : EMPTY_STR); + $siteurl = ((x($_POST, 'siteurl')) ? trim($_POST['siteurl']) : EMPTY_STR); + + $servertype = EMPTY_STR; + + $o .= replace_macros(get_markup_template('install_db.tpl'), [ + '$title' => $install_title, + '$pass' => t('Database connection'), + '$info_01' => t('In order to install this software we need to know how to connect to your database.'), + '$info_02' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'), + '$info_03' => t('The database you specify below should already exist. If it does not, please create it before continuing.'), + + '$status' => $wizard_status, + + '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, t('Default is 127.0.0.1')), + '$dbport' => array('dbport', t('Database Port'), $dbport, t('Communication port number - use 0 for default')), + '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, ''), + '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''), + '$dbdata' => array('dbdata', t('Database Name'), $dbdata, ''), + '$dbtype' => array('dbtype', t('Database Type'), $dbtype, '', array(0 => 'MySQL', 1 => 'PostgreSQL')), + + '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Required. Your account email address must match this in order to use the web admin panel.')), + '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Required. Please use SSL (https) URL if available.')), + '$lbl_10' => t('Please select a default timezone for your website'), + '$baseurl' => z_root(), + '$phpath' => $phpath, + '$submit' => t('Submit'), + ]); + + return $o; + break; + } + case 3: + { + // Site settings + $dbhost = ((x($_POST, 'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1'); + $dbuser = ((x($_POST, 'dbuser')) ? trim($_POST['dbuser']) : EMPTY_STR); + $dbport = ((x($_POST, 'dbport')) ? intval(trim($_POST['dbport'])) : 0); + $dbpass = ((x($_POST, 'dbpass')) ? trim($_POST['dbpass']) : EMPTY_STR); + $dbdata = ((x($_POST, 'dbdata')) ? trim($_POST['dbdata']) : EMPTY_STR); + $dbtype = ((x($_POST, 'dbtype')) ? intval(trim($_POST['dbtype'])) : 0); + $phpath = ((x($_POST, 'phpath')) ? trim($_POST['phpath']) : EMPTY_STR); + + $servertype = EMPTY_STR; + + $adminmail = ((x($_POST, 'adminmail')) ? trim($_POST['adminmail']) : EMPTY_STR); + $siteurl = ((x($_POST, 'siteurl')) ? trim($_POST['siteurl']) : EMPTY_STR); + $timezone = ((x($_POST, 'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); + + $o .= replace_macros(get_markup_template('install_settings.tpl'), [ + '$title' => $install_title, + '$pass' => t('Site settings'), + '$status' => $wizard_status, + + '$dbhost' => $dbhost, + '$dbport' => $dbport, + '$dbuser' => $dbuser, + '$dbpass' => $dbpass, + '$dbdata' => $dbdata, + '$phpath' => $phpath, + '$dbtype' => $dbtype, + '$servertype' => $servertype, + + '$adminmail' => ['adminmail', t('Site administrator email address'), $adminmail, t('Required. Your account email address must match this in order to use the web admin panel.')], + + '$siteurl' => ['siteurl', t('Website URL'), z_root(), t('Required. Please use SSL (https) URL if available.')], + + '$timezone' => ['timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones()], + + '$baseurl' => z_root(), + + '$submit' => t('Submit'), + ]); + return $o; + break; + } + } + } + + /** + * @brief Add a check result to the array for output. + * + * @param[in,out] array &$checks array passed to template + * @param string $title a title for the check + * @param bool $status + * @param bool $required + * @param string $help optional help string + */ + public function check_add(&$checks, $title, $status, $required, $help = '') + { + $checks[] = [ + 'title' => $title, + 'status' => $status, + 'required' => $required, + 'help' => $help + ]; + } + + /** + * @brief Checks the PHP environment. + * + * @param[in,out] string &$phpath + * @param[out] array &$checks + */ + public function check_php(&$phpath, &$checks) + { + $help = ''; + + if (version_compare(PHP_VERSION, '7.1') < 0) { + $help .= t('PHP version 7.1 or greater is required.'); + $this->check_add($checks, t('PHP version'), false, true, $help); + } + + if (strlen($phpath)) { + $passed = file_exists($phpath); + } elseif (function_exists('shell_exec')) { + if (is_windows()) { + $phpath = trim(shell_exec('where php')); + } else { + $phpath = trim(shell_exec('which php')); + } + $passed = strlen($phpath); + } + + if (!$passed) { + $help .= t('Could not find a command line version of PHP in the web server PATH.') . EOL; + $help .= t('If you do not have a command line version of PHP installed on server, you will not be able to run background tasks - including message delivery.') . EOL; + $help .= EOL; + + $help .= replace_macros(get_markup_template('field_input.tpl'), [ + '$field' => ['phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable. You can leave this blank to continue the installation.')], + ]); + $phpath = ''; + } + + $this->check_add($checks, t('Command line PHP') . ($passed ? " ($phpath)" : EMPTY_STR), $passed, false, $help); + + if ($passed) { + $str = autoname(8); + $cmd = "$phpath install/testargs.php $str"; + $help = ''; + + if (function_exists('shell_exec')) { + $result = trim(shell_exec($cmd)); + } else { + $help .= t('Unable to check command line PHP, as shell_exec() is disabled. This is required.') . EOL; + } + $passed2 = (($result === $str) ? true : false); + if (!$passed2) { + $help .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . EOL; + $help .= t('This is required for message delivery to work.'); + } + + $this->check_add($checks, t('PHP register_argc_argv'), $passed, true, $help); + } + } + + /** + * @brief Some PHP configuration checks. + * + * @param[out] array &$checks + * @todo Change how we display such informational text. Add more description + * how to change them. + * + */ + public function check_phpconfig(&$checks) + { + + $help = ''; + $mem_warning = EMPTY_STR; + + $result = self::getPhpiniUploadLimits(); + if ($result['post_max_size'] < (2 * 1024 * 1024) || $result['max_upload_filesize'] < (2 * 1024 * 1024)) { + $mem_warning = '' . t('This is not sufficient to upload larger images or files. You should be able to upload at least 2MB (2097152 bytes) at once.') . ''; + } + + $help = sprintf( + t('Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once.'), + userReadableSize($result['post_max_size']), + userReadableSize($result['max_upload_filesize']), + $result['max_file_uploads'] + ); + + $help .= (($mem_warning) ? $mem_warning : EMPTY_STR); + $help .= '
' . t('You can adjust these settings in the server php.ini file.'); + + $this->check_add($checks, t('PHP upload limits'), true, false, $help); + } + + /** + * @brief Check if the openssl implementation can generate keys. + * + * @param[out] array $checks + */ + public function check_keys(&$checks) + { + $help = ''; + $res = false; + + if (function_exists('openssl_pkey_new')) { + $res = openssl_pkey_new(array( + 'digest_alg' => 'sha1', + 'private_key_bits' => 4096, + 'encrypt_key' => false)); + } + + // Get private key + + if (!$res) { + $help .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL; + $help .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'); + } + + $this->check_add($checks, t('Generate encryption keys'), $res, true, $help); + } + + /** + * @brief Check for some PHP functions and modules. + * + * @param[in,out] array &$checks + */ + public function check_funcs(&$checks) + { + $ck_funcs = []; + + $disabled = explode(',', ini_get('disable_functions')); + if ($disabled) { + array_walk($disabled, 'array_trim'); + } + + // add check metadata, the real check is done bit later and return values set + + $this->check_add($ck_funcs, t('libCurl PHP module'), true, true); + $this->check_add($ck_funcs, t('GD graphics PHP module'), true, true); + $this->check_add($ck_funcs, t('OpenSSL PHP module'), true, true); + $this->check_add($ck_funcs, t('PDO database PHP module'), true, true); + $this->check_add($ck_funcs, t('mb_string PHP module'), true, true); + $this->check_add($ck_funcs, t('xml PHP module'), true, true); + $this->check_add($ck_funcs, t('zip PHP module'), true, true); + + if (function_exists('apache_get_modules')) { + if (!in_array('mod_rewrite', apache_get_modules())) { + $this->check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.')); + } else { + $this->check_add($ck_funcs, t('Apache mod_rewrite module'), true, true); + } + } + if ((!function_exists('exec')) || in_array('exec', $disabled)) { + $this->check_add($ck_funcs, t('exec'), false, true, t('Error: exec is required but is either not installed or has been disabled in php.ini')); + } else { + $this->check_add($ck_funcs, t('exec'), true, true); + } + if ((!function_exists('shell_exec')) || in_array('shell_exec', $disabled)) { + $this->check_add($ck_funcs, t('shell_exec'), false, true, t('Error: shell_exec is required but is either not installed or has been disabled in php.ini')); + } else { + $this->check_add($ck_funcs, t('shell_exec'), true, true); + } + + if (!function_exists('curl_init')) { + $ck_funcs[0]['status'] = false; + $ck_funcs[0]['help'] = t('Error: libCURL PHP module required but not installed.'); + } + if ((!function_exists('imagecreatefromjpeg')) && (!class_exists('\\Imagick'))) { + $ck_funcs[1]['status'] = false; + $ck_funcs[1]['help'] = t('Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed.'); + } + if (!function_exists('openssl_public_encrypt')) { + $ck_funcs[2]['status'] = false; + $ck_funcs[2]['help'] = t('Error: openssl PHP module required but not installed.'); + } + if (class_exists('\\PDO')) { + $x = PDO::getAvailableDrivers(); + if ((!in_array('mysql', $x)) && (!in_array('pgsql', $x))) { + $ck_funcs[3]['status'] = false; + $ck_funcs[3]['help'] = t('Error: PDO database PHP module missing a driver for either mysql or pgsql.'); + } + } + if (!class_exists('\\PDO')) { + $ck_funcs[3]['status'] = false; + $ck_funcs[3]['help'] = t('Error: PDO database PHP module required but not installed.'); + } + if (!function_exists('mb_strlen')) { + $ck_funcs[4]['status'] = false; + $ck_funcs[4]['help'] = t('Error: mb_string PHP module required but not installed.'); + } + if (!extension_loaded('xml')) { + $ck_funcs[5]['status'] = false; + $ck_funcs[5]['help'] = t('Error: xml PHP module required for DAV but not installed.'); + } + if (!extension_loaded('zip')) { + $ck_funcs[6]['status'] = false; + $ck_funcs[6]['help'] = t('Error: zip PHP module required but not installed.'); + } + + $checks = array_merge($checks, $ck_funcs); + } + + /** + * @brief Check for .htconfig requirements. + * + * @param[out] array &$checks + */ + public function check_htconfig(&$checks) + { + $status = true; + $help = EMPTY_STR; + + $fname = '.htconfig.php'; + + if ( + (file_exists($fname) && is_writable($fname)) || + (!(file_exists($fname) && is_writable('.'))) + ) { + $this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help); + return; + } + + $status = false; + $help .= t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') . EOL; + $help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.') . EOL; + $help .= t('Please see install/INSTALL.txt for additional information.'); + + $this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help); + } + + /** + * @brief Checks for our templating engine Smarty3 requirements. + * + * @param[out] array &$checks + */ + public function check_smarty3(&$checks) + { + $status = true; + $help = ''; + + @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true); + + if (!is_writable(TEMPLATE_BUILD_PATH)) { + $status = false; + $help .= t('This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') . EOL; + $help .= sprintf(t('In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder.'), TEMPLATE_BUILD_PATH) . EOL; + $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.') . EOL; + } + + $this->check_add($checks, sprintf(t('%s is writable'), TEMPLATE_BUILD_PATH), $status, true, $help); + } + + /** + * @brief Check for store directory. + * + * @param[out] array &$checks + */ + public function check_store(&$checks) + { + $status = true; + $help = ''; + + @os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, true); + + if (!is_writable('store')) { + $status = false; + $help = t('This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder') . EOL; + $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.') . EOL; + } + + $this->check_add($checks, t('store is writable'), $status, true, $help); + } + + /** + * @brief Check URL rewrite und SSL certificate. + * + * @param[out] array &$checks + */ + public function check_htaccess(&$checks) + { + $status = true; + $help = ''; + $ssl_error = false; + + $url = z_root() . '/setup/testrewrite'; + + if (function_exists('curl_init')) { + $test = z_fetch_url($url); + if (!$test['success']) { + if (strstr($url, 'https://')) { + $test = z_fetch_url($url, false, 0, ['novalidate' => true]); + if ($test['success']) { + $ssl_error = true; + } + } else { + $test = z_fetch_url(str_replace('http://', 'https://', $url), false, 0, ['novalidate' => true]); + if ($test['success']) { + $ssl_error = true; + } + } + + if ($ssl_error) { + $help .= t('SSL certificate cannot be validated. Fix certificate or disable https access to this site.') . EOL; + $help .= t('If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!') . EOL; + $help .= t('This restriction is incorporated because public posts from you may for example contain references to images on your own hub.') . EOL; + $help .= t('If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues.') . EOL; + $help .= t('This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement.') . EOL; + $help .= t('Providers are available that issue free certificates which are browser-valid.') . EOL; + + $help .= t('If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications.') . EOL; + + $this->check_add($checks, t('SSL certificate validation'), false, true, $help); + } + } + + if ((!$test['success']) || ($test['body'] !== 'ok')) { + $status = false; + $help = t('Url rewrite in .htaccess is not working. Check your server configuration.' . 'Test: ' . var_export($test, true)); + } + + $this->check_add($checks, t('Url rewrite is working'), $status, true, $help); + } else { + // cannot check modrewrite if libcurl is not installed + } + } + + /** + * @brief + * + * @param App &$a + * @return string with paresed HTML + */ + public function manual_config(&$a) + { + $data = htmlspecialchars(App::$data['txt'], ENT_COMPAT, 'UTF-8'); + $o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'); + $o .= ""; + + return $o; + } + + public function load_database_rem($v, $i) + { + $l = trim($i); + if (strlen($l) > 1 && ($l[0] === '-' || ($l[0] === '/' && $l[1] === '*'))) { + return $v; + } else { + return $v . "\n" . $i; + } + } - function load_database($db) { - $str = file_get_contents(DBA::$dba->get_install_script()); - $arr = explode(';', $str); - $errors = false; - foreach ($arr as $a) { - if (strlen(trim($a))) { - $r = dbq(trim($a)); - if (! $r) { - $errors .= t('Errors encountered creating database tables.') . $a . EOL; - } - } - } + public function load_database($db) + { + $str = file_get_contents(DBA::$dba->get_install_script()); + $arr = explode(';', $str); + $errors = false; + foreach ($arr as $a) { + if (strlen(trim($a))) { + $r = dbq(trim($a)); + if (!$r) { + $errors .= t('Errors encountered creating database tables.') . $a . EOL; + } + } + } - return $errors; - } + return $errors; + } - /** - * @brief - * - * @return string with parsed HTML - */ - function what_next() { - // install the standard theme - set_config('system', 'allowed_themes', 'redbasic'); + /** + * @brief + * + * @return string with parsed HTML + */ + public function what_next() + { + // install the standard theme + set_config('system', 'allowed_themes', 'redbasic'); - // if imagick converter is installed, use it - if (@is_executable('/usr/bin/convert')) { - set_config('system','imagick_convert_path','/usr/bin/convert'); - } + // if imagick converter is installed, use it + if (@is_executable('/usr/bin/convert')) { + set_config('system', 'imagick_convert_path', '/usr/bin/convert'); + } - // Set a lenient list of ciphers if using openssl. Other ssl engines - // (e.g. NSS used in RedHat) require different syntax, so hopefully - // the default curl cipher list will work for most sites. If not, - // this can set via config. Many distros are now disabling RC4, - // but many existing sites still use it and are unable to change it. - // We do not use SSL for encryption, only to protect session cookies. - // z_fetch_url() is also used to import shared links and other content - // so in theory most any cipher could show up and we should do our best - // to make the content available rather than tell folks that there's a - // weird SSL error which they can't do anything about. This does not affect - // the SSL server, but is only a client negotiation to find something workable. - // Hence it will not make your system susceptible to POODL or other nasties. + // Set a lenient list of ciphers if using openssl. Other ssl engines + // (e.g. NSS used in RedHat) require different syntax, so hopefully + // the default curl cipher list will work for most sites. If not, + // this can set via config. Many distros are now disabling RC4, + // but many existing sites still use it and are unable to change it. + // We do not use SSL for encryption, only to protect session cookies. + // z_fetch_url() is also used to import shared links and other content + // so in theory most any cipher could show up and we should do our best + // to make the content available rather than tell folks that there's a + // weird SSL error which they can't do anything about. This does not affect + // the SSL server, but is only a client negotiation to find something workable. + // Hence it will not make your system susceptible to POODL or other nasties. - $x = curl_version(); - if(stristr($x['ssl_version'],'openssl')) - set_config('system','curl_ssl_ciphers','ALL:!eNULL'); + $x = curl_version(); + if (stristr($x['ssl_version'], 'openssl')) { + set_config('system', 'curl_ssl_ciphers', 'ALL:!eNULL'); + } - // Create a system channel - - create_sys_channel(); + // Create a system channel - $register_link = '' . t('registration page') . '' ; - - return - t('What next?
') - . '' - . t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') - . EOL - . t('Please see the file "install/INSTALL.txt" for more information and instructions.') - . '' - . sprintf( t('Go to your new hub %s and register as new member. Please use the same email address that you entered for the administrator email as this will allow your new account to enter the site admin panel.'), $register_link ) - .''; - } + create_sys_channel(); - /** - * @brief - * - * @param unknown $v - * @param array $c - * @return array - */ - static private function check_passed($v, $c) { - if ($c['required']) { - $v = $v && $c['status']; - } - return $v; - } + $register_link = '' . t('registration page') . ''; - /** - * @brief Get some upload related limits from php.ini. - * - * This function returns values from php.ini like \b post_max_size, - * \b max_file_uploads, \b upload_max_filesize. - * - * @return array associative array - * * \e int \b post_max_size the maximum size of a complete POST in bytes - * * \e int \b upload_max_filesize the maximum size of one file in bytes - * * \e int \b max_file_uploads maximum number of files in one POST - * * \e int \b max_upload_filesize min(post_max_size, upload_max_filesize) - */ + return + t('What next?
') + . '' + . t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') + . EOL + . t('Please see the file "install/INSTALL.txt" for more information and instructions.') + . '' + . sprintf(t('Go to your new hub %s and register as new member. Please use the same email address that you entered for the administrator email as this will allow your new account to enter the site admin panel.'), $register_link) + . ''; + } - static private function getPhpiniUploadLimits() { - $ret = []; + /** + * @brief + * + * @param unknown $v + * @param array $c + * @return array + */ + private static function check_passed($v, $c) + { + if ($c['required']) { + $v = $v && $c['status']; + } + return $v; + } - // max size of the complete POST - $ret['post_max_size'] = self::phpiniSizeToBytes(ini_get('post_max_size')); - // max size of one file - $ret['upload_max_filesize'] = self::phpiniSizeToBytes(ini_get('upload_max_filesize')); - // catch a configuration error where post_max_size < upload_max_filesize - $ret['max_upload_filesize'] = min( - $ret['post_max_size'], - $ret['upload_max_filesize'] - ); - // maximum number of files in one POST - $ret['max_file_uploads'] = intval(ini_get('max_file_uploads')); + /** + * @brief Get some upload related limits from php.ini. + * + * This function returns values from php.ini like \b post_max_size, + * \b max_file_uploads, \b upload_max_filesize. + * + * @return array associative array + * * \e int \b post_max_size the maximum size of a complete POST in bytes + * * \e int \b upload_max_filesize the maximum size of one file in bytes + * * \e int \b max_file_uploads maximum number of files in one POST + * * \e int \b max_upload_filesize min(post_max_size, upload_max_filesize) + */ - return $ret; - } + private static function getPhpiniUploadLimits() + { + $ret = []; - /** - * @brief Parses php_ini size settings to bytes. - * - * This function parses common size setting from php.ini files to bytes. - * e.g. post_max_size = 8M ==> 8388608 - * - * \note This method does not recognise other human readable formats like - * 8MB, etc. - * - * @todo Make this function more universal useable. MB, T, etc. - * - * @param string $val value from php.ini e.g. 2M, 8M - * @return int size in bytes - */ - static private function phpiniSizeToBytes($val) { - $val = trim($val); - $unit = strtolower($val[strlen($val)-1]); - // strip off any non-numeric portion - $val = intval($val); - switch($unit) { - case 'g': - $val *= 1024; - case 'm': - $val *= 1024; - case 'k': - $val *= 1024; - default: - break; - } + // max size of the complete POST + $ret['post_max_size'] = self::phpiniSizeToBytes(ini_get('post_max_size')); + // max size of one file + $ret['upload_max_filesize'] = self::phpiniSizeToBytes(ini_get('upload_max_filesize')); + // catch a configuration error where post_max_size < upload_max_filesize + $ret['max_upload_filesize'] = min( + $ret['post_max_size'], + $ret['upload_max_filesize'] + ); + // maximum number of files in one POST + $ret['max_file_uploads'] = intval(ini_get('max_file_uploads')); - return (int)$val; - } + return $ret; + } + /** + * @brief Parses php_ini size settings to bytes. + * + * This function parses common size setting from php.ini files to bytes. + * e.g. post_max_size = 8M ==> 8388608 + * + * \note This method does not recognise other human readable formats like + * 8MB, etc. + * + * @param string $val value from php.ini e.g. 2M, 8M + * @return int size in bytes + * @todo Make this function more universal useable. MB, T, etc. + * + */ + private static function phpiniSizeToBytes($val) + { + $val = trim($val); + $unit = strtolower($val[strlen($val) - 1]); + // strip off any non-numeric portion + $val = intval($val); + switch ($unit) { + case 'g': + $val *= 1024; + case 'm': + $val *= 1024; + case 'k': + $val *= 1024; + default: + break; + } + + return (int)$val; + } } diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php index 5c6cb7d3b..fcadc26d9 100644 --- a/Zotlabs/Module/Share.php +++ b/Zotlabs/Module/Share.php @@ -1,136 +1,150 @@ 1) ? intval(argv(1)) : 0); - - if(! $post_id) - killme(); - - if(! local_channel()) { - killme(); - } + public function init() + { - $observer = App::get_observer(); + $post_id = ((argc() > 1) ? intval(argv(1)) : 0); - $channel = App::get_channel(); + if (!$post_id) { + killme(); + } + + if (!local_channel()) { + killme(); + } + + $observer = App::get_observer(); + + $channel = App::get_channel(); - $r = q("SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d LIMIT 1", - intval($post_id) - ); - if(! $r) - killme(); + $r = q( + "SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d LIMIT 1", + intval($post_id) + ); + if (!$r) { + killme(); + } - if(($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss')) - killme(); - - $sql_extra = item_permissions_sql($r[0]['uid']); - - $r = q("select * from item where id = %d $sql_extra", - intval($post_id) - ); - if(! $r) - killme(); - - /** @FIXME we only share bbcode */ - - if (! in_array($r[0]['mimetype'], [ 'text/bbcode', 'text/x-multicode' ])) { - killme(); - } - - - xchan_query($r); - - $arr = []; + if (($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss')) { + killme(); + } - $item = $r[0]; + $sql_extra = item_permissions_sql($r[0]['uid']); - $owner_uid = $r[0]['uid']; - $owner_aid = $r[0]['aid']; + $r = q( + "select * from item where id = %d $sql_extra", + intval($post_id) + ); + if (!$r) { + killme(); + } - $can_comment = false; - if((array_key_exists('owner',$item)) && intval($item['owner']['abook_self'])) - $can_comment = perm_is_allowed($item['uid'],$observer['xchan_hash'],'post_comments'); - else - $can_comment = can_comment_on_post($observer['xchan_hash'],$item); + /** @FIXME we only share bbcode */ - if(! $can_comment) { - notice( t('Permission denied') . EOL); - killme(); - } + if (!in_array($r[0]['mimetype'], ['text/bbcode', 'text/x-multicode'])) { + killme(); + } - $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($item['owner_xchan']) - ); - if($r) - $thread_owner = $r[0]; - else - killme(); - - $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($item['author_xchan']) - ); - if($r) - $item_author = $r[0]; - else - killme(); - + xchan_query($r); - $arr['aid'] = $owner_aid; - $arr['uid'] = $owner_uid; + $arr = []; - $arr['item_origin'] = 1; - $arr['item_wall'] = $item['item_wall']; - $arr['uuid'] = new_uuid(); - $arr['mid'] = z_root() . '/item/' . $arr['uuid']; - $arr['mid'] = str_replace('/item/','/activity/',$arr['mid']); - $arr['parent_mid'] = $item['mid']; + $item = $r[0]; - $mention = '@[zrl=' . $item['author']['xchan_url'] . ']' . $item['author']['xchan_name'] . '[/zrl]'; - $arr['body'] = sprintf( t('🔁 Repeated %1$s\'s %2$s'), $mention, $item['obj_type']); + $owner_uid = $r[0]['uid']; + $owner_aid = $r[0]['aid']; - $arr['author_xchan'] = $channel['channel_hash']; - $arr['owner_xchan'] = $item['author_xchan']; - $arr['obj'] = $item['obj']; - $arr['obj_type'] = $item['obj_type']; - $arr['verb'] = 'Announce'; + $can_comment = false; + if ((array_key_exists('owner', $item)) && intval($item['owner']['abook_self'])) { + $can_comment = perm_is_allowed($item['uid'], $observer['xchan_hash'], 'post_comments'); + } else { + $can_comment = can_comment_on_post($observer['xchan_hash'], $item); + } - $post = item_store($arr); + if (!$can_comment) { + notice(t('Permission denied') . EOL); + killme(); + } - $post_id = $post['item_id']; + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['owner_xchan']) + ); - $arr['id'] = $post_id; - - call_hooks('post_local_end', $arr); + if ($r) { + $thread_owner = $r[0]; + } else { + killme(); + } - info( t('Post repeated') . EOL); + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['author_xchan']) + ); + if ($r) { + $item_author = $r[0]; + } else { + killme(); + } - $r = q("select * from item where id = %d", - intval($post_id) - ); - if($r) { - xchan_query($r); - $sync_item = fetch_post_tags($r); - Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0],true) ] ]); - } - Run::Summon([ 'Notifier','like',$post_id ]); - - killme(); - - } - + $arr['aid'] = $owner_aid; + $arr['uid'] = $owner_uid; + + $arr['item_origin'] = 1; + $arr['item_wall'] = $item['item_wall']; + $arr['uuid'] = new_uuid(); + $arr['mid'] = z_root() . '/item/' . $arr['uuid']; + $arr['mid'] = str_replace('/item/', '/activity/', $arr['mid']); + $arr['parent_mid'] = $item['mid']; + + $mention = '@[zrl=' . $item['author']['xchan_url'] . ']' . $item['author']['xchan_name'] . '[/zrl]'; + $arr['body'] = sprintf(t('🔁 Repeated %1$s\'s %2$s'), $mention, $item['obj_type']); + + $arr['author_xchan'] = $channel['channel_hash']; + $arr['owner_xchan'] = $item['author_xchan']; + $arr['obj'] = $item['obj']; + $arr['obj_type'] = $item['obj_type']; + $arr['verb'] = 'Announce'; + + $post = item_store($arr); + + $post_id = $post['item_id']; + + $arr['id'] = $post_id; + + call_hooks('post_local_end', $arr); + + info(t('Post repeated') . EOL); + + $r = q( + "select * from item where id = %d", + intval($post_id) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + Libsync::build_sync_packet($channel['channel_id'], ['item' => [encode_item($sync_item[0], true)]]); + } + + Run::Summon(['Notifier', 'like', $post_id]); + + killme(); + } } diff --git a/Zotlabs/Module/Sharedwithme.php b/Zotlabs/Module/Sharedwithme.php index ea996ac7e..6fac0ad42 100644 --- a/Zotlabs/Module/Sharedwithme.php +++ b/Zotlabs/Module/Sharedwithme.php @@ -1,6 +1,6 @@ 2) && (argv(2) === 'drop')) { - - $id = intval(argv(1)); - - q("DELETE FROM item WHERE id = %d AND uid = %d", - intval($id), - intval(local_channel()) - ); - - goaway(z_root() . '/sharedwithme'); - } - - //drop all files - localuser - if((argc() > 1) && (argv(1) === 'dropall')) { - - q("DELETE FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d", - dbesc(ACTIVITY_POST), - dbesc(ACTIVITY_OBJ_FILE), - intval(local_channel()) - ); - - goaway(z_root() . '/sharedwithme'); - } - - //list files - $r = q("SELECT id, uid, obj, item_unseen FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'", - dbesc(ACTIVITY_POST), - dbesc(ACTIVITY_OBJ_FILE), - intval(local_channel()), - dbesc($channel['channel_hash']) - ); - - $items =[]; - $ids = ''; - - if($r) { - - foreach($r as $rr) { - $object = json_decode($rr['obj'],true); - - $item = []; - $item['id'] = $rr['id']; - $item['objfiletype'] = $object['filetype']; - $item['objfiletypeclass'] = getIconFromType($object['filetype']); - $item['objurl'] = rawurldecode(get_rel_link($object['link'],'alternate')) . '?f=&zid=' . $channel['xchan_addr']; - $item['objfilename'] = $object['filename']; - $item['objfilesize'] = userReadableSize($object['filesize']); - $item['objedited'] = $object['edited']; - $item['unseen'] = $rr['item_unseen']; - - $items[] = $item; - - if($item['unseen'] > 0) { - $ids .= " '" . $rr['id'] . "',"; - } - - } - - } - - if($ids) { - - //remove trailing , - $ids = rtrim($ids, ","); - - q("UPDATE item SET item_unseen = 0 WHERE id IN ( $ids ) AND uid = %d", - intval(local_channel()) - ); - - } - - $o = ''; - - $o .= replace_macros(get_markup_template('sharedwithme.tpl'), array( - '$header' => t('Files: shared with me'), - '$name' => t('Name'), - '$label_new' => t('NEW'), - '$size' => t('Size'), - '$lastmod' => t('Last Modified'), - '$dropall' => t('Remove all files'), - '$drop' => t('Remove this file'), - '$items' => $items - )); - - return $o; - - } - - + $channel = App::get_channel(); + + $is_owner = (local_channel() && (local_channel() == $channel['channel_id'])); + + //check for updated items and remove them + require_once('include/sharedwithme.php'); + apply_updates(); + + //drop single file - localuser + if ((argc() > 2) && (argv(2) === 'drop')) { + $id = intval(argv(1)); + + q( + "DELETE FROM item WHERE id = %d AND uid = %d", + intval($id), + intval(local_channel()) + ); + + goaway(z_root() . '/sharedwithme'); + } + + //drop all files - localuser + if ((argc() > 1) && (argv(1) === 'dropall')) { + q( + "DELETE FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d", + dbesc(ACTIVITY_POST), + dbesc(ACTIVITY_OBJ_FILE), + intval(local_channel()) + ); + + goaway(z_root() . '/sharedwithme'); + } + + //list files + $r = q( + "SELECT id, uid, obj, item_unseen FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'", + dbesc(ACTIVITY_POST), + dbesc(ACTIVITY_OBJ_FILE), + intval(local_channel()), + dbesc($channel['channel_hash']) + ); + + $items = []; + $ids = ''; + + if ($r) { + foreach ($r as $rr) { + $object = json_decode($rr['obj'], true); + + $item = []; + $item['id'] = $rr['id']; + $item['objfiletype'] = $object['filetype']; + $item['objfiletypeclass'] = getIconFromType($object['filetype']); + $item['objurl'] = rawurldecode(get_rel_link($object['link'], 'alternate')) . '?f=&zid=' . $channel['xchan_addr']; + $item['objfilename'] = $object['filename']; + $item['objfilesize'] = userReadableSize($object['filesize']); + $item['objedited'] = $object['edited']; + $item['unseen'] = $rr['item_unseen']; + + $items[] = $item; + + if ($item['unseen'] > 0) { + $ids .= " '" . $rr['id'] . "',"; + } + } + } + + if ($ids) { + //remove trailing , + $ids = rtrim($ids, ","); + + q( + "UPDATE item SET item_unseen = 0 WHERE id IN ( $ids ) AND uid = %d", + intval(local_channel()) + ); + } + + $o = ''; + + $o .= replace_macros(get_markup_template('sharedwithme.tpl'), array( + '$header' => t('Files: shared with me'), + '$name' => t('Name'), + '$label_new' => t('NEW'), + '$size' => t('Size'), + '$lastmod' => t('Last Modified'), + '$dropall' => t('Remove all files'), + '$drop' => t('Remove this file'), + '$items' => $items + )); + + return $o; + } } diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php index 70d3bfa54..061f7df2f 100644 --- a/Zotlabs/Module/Siteinfo.php +++ b/Zotlabs/Module/Siteinfo.php @@ -1,62 +1,64 @@ t('About this site'), - '$url' => z_root(), - '$sitenametxt' => t('Site Name'), - '$sitename' => System::get_site_name(), - '$headline' => t('Site Information'), - '$site_about' => bbcode(get_config('system','siteinfo')), - '$admin_headline' => t('Administrator'), - '$admin_about' => bbcode(get_config('system','admininfo')), - '$terms' => t('Terms of Service'), - '$prj_header' => t('Software and Project information'), - '$prj_name' => t('This site is powered by $Projectname'), - '$prj_transport' => t('Federated and decentralised networking and identity services provided by Nomad'), - '$transport_link' => 'https://zotlabs.com', + call_hooks('federated_transports', $federated); - '$ebs' => System::ebs(), - '$additional_text' => t('Protocols:'), - '$additional_fed' => $federated, - '$prj_version' => ((get_config('system','hidden_version_siteinfo')) ? '' : sprintf( t('Version %s'), System::get_project_version())), - '$prj_linktxt' => t('Project homepage'), - '$prj_srctxt' => t('Developer homepage'), - '$prj_link' => System::get_project_link(), - '$prj_src' => System::get_project_srclink(), - '$prj_icon' => System::get_site_icon(), - ] - ); + $siteinfo = replace_macros( + get_markup_template('siteinfo.tpl'), + [ + '$title' => t('About this site'), + '$url' => z_root(), + '$sitenametxt' => t('Site Name'), + '$sitename' => System::get_site_name(), + '$headline' => t('Site Information'), + '$site_about' => bbcode(get_config('system', 'siteinfo')), + '$admin_headline' => t('Administrator'), + '$admin_about' => bbcode(get_config('system', 'admininfo')), + '$terms' => t('Terms of Service'), + '$prj_header' => t('Software and Project information'), + '$prj_name' => t('This site is powered by $Projectname'), + '$prj_transport' => t('Federated and decentralised networking and identity services provided by Nomad'), + '$transport_link' => 'https://zotlabs.com', - call_hooks('about_hook', $siteinfo); + '$ebs' => System::ebs(), + '$additional_text' => t('Protocols:'), + '$additional_fed' => $federated, + '$prj_version' => ((get_config('system', 'hidden_version_siteinfo')) ? '' : sprintf(t('Version %s'), System::get_project_version())), + '$prj_linktxt' => t('Project homepage'), + '$prj_srctxt' => t('Developer homepage'), + '$prj_link' => System::get_project_link(), + '$prj_src' => System::get_project_srclink(), + '$prj_icon' => System::get_site_icon(), + ] + ); - return $siteinfo; + call_hooks('about_hook', $siteinfo); - } - - + return $siteinfo; + } } diff --git a/Zotlabs/Module/Sites.php b/Zotlabs/Module/Sites.php index f644f2024..d687984b6 100644 --- a/Zotlabs/Module/Sites.php +++ b/Zotlabs/Module/Sites.php @@ -1,145 +1,148 @@ $rr['site_url'], - 'name' => $sitename, - 'access' => $access, - 'register' => $register_link, - 'sellpage' => $rr['site_sellpage'], - 'location_label' => t('Location'), - 'location' => $rr['site_location'], - 'project' => $rr['site_project'], - 'version' => $rr['site_version'], - 'photo' => $logo, - 'about' => bbcode($about), - 'hash' => substr(hash('sha256', $rr['site_url']), 0, 16), - 'network_label' => t('Project'), - 'network' => $rr['site_project'], - 'version_label' => t('Version'), - 'version' => $rr['site_version'], - 'private' => $disabled, - 'connect' => (($disabled) ? '' : $register_link), - 'connect_label' => $register, - 'access' => (($access === 'private') ? '' : $access), - 'access_label' => t('Access type'), - ]; - } - } + $j[] = [ + 'profile_link' => $rr['site_url'], + 'name' => $sitename, + 'access' => $access, + 'register' => $register_link, + 'sellpage' => $rr['site_sellpage'], + 'location_label' => t('Location'), + 'location' => $rr['site_location'], + 'project' => $rr['site_project'], + 'version' => $rr['site_version'], + 'photo' => $logo, + 'about' => bbcode($about), + 'hash' => substr(hash('sha256', $rr['site_url']), 0, 16), + 'network_label' => t('Project'), + 'network' => $rr['site_project'], + 'version_label' => t('Version'), + 'version' => $rr['site_version'], + 'private' => $disabled, + 'connect' => (($disabled) ? '' : $register_link), + 'connect_label' => $register, + 'access' => (($access === 'private') ? '' : $access), + 'access_label' => t('Access type'), + ]; + } + } - $o = replace_macros(get_markup_template('sitentry_header.tpl'), [ - '$dirlbl' => t('Affiliated Sites'), - '$desc' => $desc, - '$entries' => $j, - ]); + $o = replace_macros(get_markup_template('sitentry_header.tpl'), [ + '$dirlbl' => t('Affiliated Sites'), + '$desc' => $desc, + '$entries' => $j, + ]); + return $o; + } + public function sort_sites($a) + { + $ret = []; + if ($a) { + foreach ($a as $e) { + $projectname = explode(' ', $e['project']); + $ret[$projectname[0]][] = $e; + } + } + $projects = array_keys($ret); + rsort($projects); - return $o; - } + $newret = []; + foreach ($projects as $p) { + $newret[$p] = $ret[$p]; + } - function sort_sites($a) { - $ret = []; - if($a) { - foreach($a as $e) { - $projectname = explode(' ',$e['project']); - $ret[$projectname[0]][] = $e; - } - } - $projects = array_keys($ret); - rsort($projects); - - $newret = []; - foreach($projects as $p) { - $newret[$p] = $ret[$p]; - } + return $newret; + } - return $newret; - } - - function sort_versions($a,$b) { - return version_compare($b['version'],$a['version']); - } + public function sort_versions($a, $b) + { + return version_compare($b['version'], $a['version']); + } } diff --git a/Zotlabs/Module/Smilies.php b/Zotlabs/Module/Smilies.php index f9233cd40..523efe1f4 100644 --- a/Zotlabs/Module/Smilies.php +++ b/Zotlabs/Module/Smilies.php @@ -1,21 +1,24 @@ $tmp['texts'][$i], 'icon' => $tmp['icons'][$i]); - } - json_return_and_die($results); - } - else { - return smilies('',true); - } - } - + public function get() + { + if (App::$argv[1] === "json") { + $tmp = list_smilies(); + $results = []; + for ($i = 0; $i < count($tmp['texts']); $i++) { + $results[] = array('text' => $tmp['texts'][$i], 'icon' => $tmp['icons'][$i]); + } + json_return_and_die($results); + } else { + return smilies('', true); + } + } } diff --git a/Zotlabs/Module/Sources.php b/Zotlabs/Module/Sources.php index cae4b0bcd..c82cad12c 100644 --- a/Zotlabs/Module/Sources.php +++ b/Zotlabs/Module/Sources.php @@ -1,191 +1,199 @@ t('Channel Sources'), - '$desc' => t('Manage remote sources of content for your channel.'), - '$new' => t('New Source'), - '$sources' => $r - ]); - return $o; - } - - if (argc() == 2 && argv(1) === 'new') { - // TODO add the words 'or RSS feed' and corresponding code to manage feeds and frequency - - $o = replace_macros(get_markup_template('sources_new.tpl'), [ - '$title' => t('New Source'), - '$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'), - '$words' => [ 'words', t('Only import content with these words (one per line)'),'',t('Leave blank to import all public content')], - '$name' => [ 'name', t('Channel Name'), '', '', '', 'autocomplete="off"'], - '$tags' => [ 'tags', t('Add the following categories to posts imported from this source (comma separated)'),'',t('Optional')], - '$resend' => [ 'resend', t('Resend posts with this channel as author'), 0, t('Copyrights may apply'), [ t('No'), t('Yes') ]], - '$submit' => t('Submit') - ]); - return $o; - - } - - if (argc() == 2 && intval(argv(1))) { - // edit source - $r = q("select source.*, xchan.* from source left join xchan on src_xchan = xchan_hash where src_id = %d and src_channel_id = %d limit 1", - intval(argv(1)), - intval(local_channel()) - ); - if ($r) { - $x = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1", - dbesc($r[0]['src_xchan']), - intval(local_channel()) - ); - } - if (! $r) { - notice( t('Source not found.') . EOL); - return ''; - } - - $r[0]['src_patt'] = htmlspecialchars($r[0]['src_patt'], ENT_QUOTES,'UTF-8'); - - $o = replace_macros(get_markup_template('sources_edit.tpl'), array( - '$title' => t('Edit Source'), - '$drop' => t('Delete Source'), - '$id' => $r[0]['src_id'], - '$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'), - '$words' => array( 'words', t('Only import content with these words (one per line)'),$r[0]['src_patt'],t('Leave blank to import all public content')), - '$xchan' => $r[0]['src_xchan'], - '$abook' => $x[0]['abook_id'], - '$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'),$r[0]['src_tag'],t('Optional')), - '$resend' => [ 'resend', t('Resend posts with this channel as author'), get_abconfig(local_channel(), $r[0]['xchan_hash'],'system','rself'), t('Copyrights may apply'), [ t('No'), t('Yes') ]], - '$name' => array( 'name', t('Channel Name'), $r[0]['xchan_name'], ''), - '$submit' => t('Submit') - )); - return $o; - - } - - if(argc() == 3 && intval(argv(1)) && argv(2) === 'drop') { - $r = q("select * from source where src_id = %d and src_channel_id = %d limit 1", - intval(argv(1)), - intval(local_channel()) - ); - if(! $r) { - notice( t('Source not found.') . EOL); - return ''; - } - $r = q("delete from source where src_id = %d and src_channel_id = %d", - intval(argv(1)), - intval(local_channel()) - ); - if($r) - info( t('Source removed') . EOL); - else - notice( t('Unable to remove source.') . EOL); - - goaway(z_root() . '/sources'); - - } - - // shouldn't get here. - - } + public function get() + { + + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return EMPTY_STR; + } + + if (!feature_enabled(local_channel(), 'channel_sources')) { + return EMPTY_STR; + } + + // list sources + if (argc() == 1) { + $r = q( + "select source.*, xchan.* from source left join xchan on src_xchan = xchan_hash where src_channel_id = %d", + intval(local_channel()) + ); + if ($r) { + for ($x = 0; $x < count($r); $x++) { + if ($r[$x]['src_xchan'] == '*') { + $r[$x]['xchan_name'] = t('*'); + } + $r[$x]['src_patt'] = htmlspecialchars($r[$x]['src_patt'], ENT_COMPAT, 'UTF-8'); + } + } + $o = replace_macros(get_markup_template('sources_list.tpl'), [ + '$title' => t('Channel Sources'), + '$desc' => t('Manage remote sources of content for your channel.'), + '$new' => t('New Source'), + '$sources' => $r + ]); + return $o; + } + + if (argc() == 2 && argv(1) === 'new') { + // TODO add the words 'or RSS feed' and corresponding code to manage feeds and frequency + + $o = replace_macros(get_markup_template('sources_new.tpl'), [ + '$title' => t('New Source'), + '$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'), + '$words' => ['words', t('Only import content with these words (one per line)'), '', t('Leave blank to import all public content')], + '$name' => ['name', t('Channel Name'), '', '', '', 'autocomplete="off"'], + '$tags' => ['tags', t('Add the following categories to posts imported from this source (comma separated)'), '', t('Optional')], + '$resend' => ['resend', t('Resend posts with this channel as author'), 0, t('Copyrights may apply'), [t('No'), t('Yes')]], + '$submit' => t('Submit') + ]); + return $o; + } + + if (argc() == 2 && intval(argv(1))) { + // edit source + $r = q( + "select source.*, xchan.* from source left join xchan on src_xchan = xchan_hash where src_id = %d and src_channel_id = %d limit 1", + intval(argv(1)), + intval(local_channel()) + ); + if ($r) { + $x = q( + "select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($r[0]['src_xchan']), + intval(local_channel()) + ); + } + if (!$r) { + notice(t('Source not found.') . EOL); + return ''; + } + + $r[0]['src_patt'] = htmlspecialchars($r[0]['src_patt'], ENT_QUOTES, 'UTF-8'); + + $o = replace_macros(get_markup_template('sources_edit.tpl'), array( + '$title' => t('Edit Source'), + '$drop' => t('Delete Source'), + '$id' => $r[0]['src_id'], + '$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'), + '$words' => array('words', t('Only import content with these words (one per line)'), $r[0]['src_patt'], t('Leave blank to import all public content')), + '$xchan' => $r[0]['src_xchan'], + '$abook' => $x[0]['abook_id'], + '$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'), $r[0]['src_tag'], t('Optional')), + '$resend' => ['resend', t('Resend posts with this channel as author'), get_abconfig(local_channel(), $r[0]['xchan_hash'], 'system', 'rself'), t('Copyrights may apply'), [t('No'), t('Yes')]], + + '$name' => array('name', t('Channel Name'), $r[0]['xchan_name'], ''), + '$submit' => t('Submit') + )); + return $o; + } + + if (argc() == 3 && intval(argv(1)) && argv(2) === 'drop') { + $r = q( + "select * from source where src_id = %d and src_channel_id = %d limit 1", + intval(argv(1)), + intval(local_channel()) + ); + if (!$r) { + notice(t('Source not found.') . EOL); + return ''; + } + $r = q( + "delete from source where src_id = %d and src_channel_id = %d", + intval(argv(1)), + intval(local_channel()) + ); + if ($r) { + info(t('Source removed') . EOL); + } else { + notice(t('Unable to remove source.') . EOL); + } + + goaway(z_root() . '/sources'); + } + + // shouldn't get here. + } } diff --git a/Zotlabs/Module/Sslify.php b/Zotlabs/Module/Sslify.php index 2891f3691..c27ec888d 100644 --- a/Zotlabs/Module/Sslify.php +++ b/Zotlabs/Module/Sslify.php @@ -1,25 +1,29 @@ 1) - $message_id = intval(argv(1)); - if(! $message_id) - killme(); - - $r = q("SELECT item_starred FROM item WHERE uid = %d AND id = %d LIMIT 1", - intval(local_channel()), - intval($message_id) - ); - if(! count($r)) - killme(); - - $item_starred = (intval($r[0]['item_starred']) ? 0 : 1); - - $r = q("UPDATE item SET item_starred = %d WHERE uid = %d and id = %d", - intval($item_starred), - intval(local_channel()), - intval($message_id) - ); + if (!local_channel()) { + killme(); + } + $message_id = ((argc() > 1) ? intval(argv(1)) : 0); + if (!$message_id) { + killme(); + } - $r = q("select * from item where id = %d", - intval($message_id) - ); - if($r) { - xchan_query($r); - $sync_item = fetch_post_tags($r); - Libsync::build_sync_packet(local_channel(),[ - 'item' => [ - encode_item($sync_item[0],true) - ] - ]); - } + $r = q( + "SELECT * FROM item WHERE id = %d + and item_type in (0,6,7) and item_deleted = 0 and item_unpublished = 0 + and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1", + intval($message_id) + ); - header('Content-type: application/json'); - echo json_encode(array('result' => $item_starred)); - killme(); - } - + // if interacting with a pubstream item, + // create a copy of the parent in your stream. + + + if ($r) { + if (! is_sys_channel(local_channel())) { + $r = [ copy_of_pubitem(App::get_channel(), $r[0]['mid']) ]; + } + } + + if (! $r) { + killme(); + } + + // reset $message_id to the fetched copy of message if applicable + $message_id = $r[0]['id']; + $item_starred = (intval($r[0]['item_starred']) ? 0 : 1); + + $r = q( + "UPDATE item SET item_starred = %d WHERE uid = %d and id = %d", + intval($item_starred), + intval(local_channel()), + intval($message_id) + ); + + $r = q( + "select * from item where id = %d", + intval($message_id) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + Libsync::build_sync_packet(local_channel(), [ + 'item' => [ + encode_item($sync_item[0], true) + ] + ]); + } + + header('Content-type: application/json'); + echo json_encode(array('result' => $item_starred)); + killme(); + } } diff --git a/Zotlabs/Module/Stream.php b/Zotlabs/Module/Stream.php index 3cb0c38c4..02f3db8b5 100644 --- a/Zotlabs/Module/Stream.php +++ b/Zotlabs/Module/Stream.php @@ -1,4 +1,5 @@ loading) { - $_SESSION['loadtime_stream'] = datetime_convert(); - PConfig::Set(local_channel(),'system','loadtime_stream',$_SESSION['loadtime_stream']); - // stream is a superset of channel when it comes to notifications - $_SESSION['loadtime_channel'] = datetime_convert(); - PConfig::Set(local_channel(),'system','loadtime_channel',$_SESSION['loadtime_channel']); - } - - $arr = [ 'query' => App::$query_string ]; - call_hooks('stream_content_init', $arr); - - $channel = ((isset(App::$data['channel'])) ? App::$data['channel'] : null); - - // if called from liveUpdate() we will not have called Stream->init() on this request and $channel will not be set - - if (! $channel) { - $channel = App::get_channel(); - } + // setup identity information for page + $channel = App::get_channel(); + App::$profile_uid = local_channel(); + App::$data['channel'] = $channel; + head_set_icon($channel['xchan_photo_s']); + } - $item_normal = item_normal(); - $item_normal_update = item_normal_update(); - - $datequery = $datequery2 = ''; - - $group = 0; - - $nouveau = false; - - $datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : ''); - $datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : ''); - $static = ((x($_GET,'static')) ? intval($_GET['static']) : 0); - $gid = ((x($_GET,'gid')) ? $_REQUEST['gid'] : 0); - $category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : ''); - $hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : ''); - $verb = ((x($_REQUEST,'verb')) ? $_REQUEST['verb'] : ''); - $dm = ((x($_REQUEST,'dm')) ? $_REQUEST['dm'] : 0); + public function get() + { - $c_order = get_pconfig(local_channel(), 'mod_stream', 'order', 0); - switch ($c_order) { - case 0: - $order = 'comment'; - break; - case 1: - $order = 'post'; - break; - case 2: - $nouveau = true; - break; - } + if (!local_channel()) { + $_SESSION['return_url'] = App::$query_string; + return login(false); + } - $search = (isset($_GET['search']) ? $_GET['search'] : ''); - if ($search) { - $_GET['netsearch'] = escape_tags($search); - if (strpos($search,'@') === 0) { - $r = q("select abook_id from abook left join xchan on abook_xchan = xchan_hash where xchan_name = '%s' and abook_channel = %d limit 1", - dbesc(substr($search,1)), - intval(local_channel()) - ); - if ($r) { - $_GET['cid'] = $r[0]['abook_id']; - $search = $_GET['search'] = ''; - } - } - elseif (strpos($search,'#') === 0) { - $hashtags = substr($search,1); - $search = $_GET['search'] = ''; - } - } - - if ($datequery) { - $order = 'post'; - } - - // filter by collection (e.g. group) + $o = ''; - $vg = false; - - if ($gid) { - if (strpos($gid,':') === 0) { - $g = substr($gid,1); - switch ($g) { - case '1': - $r = [[ 'hash' => 'connections:' . $channel['channel_hash'] ]]; - $vg = t('Connections'); - break; - case '2': - $r = [[ 'hash' => 'zot:' . $channel['channel_hash'] ]]; - $vg = t('Nomad'); - break; - case '3': - $r = [[ 'hash' => 'activitypub:' . $channel['channel_hash'] ]]; - $vg = t('ActivityPub'); - break; - default: - break; - } - } - else { - $r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1", - intval($gid), - intval(local_channel()) - ); - if (! $r) { - if ($this->updating) { - killme(); - } - notice( t('Access list not found') . EOL ); - goaway(z_root() . '/stream'); - } - } + if ($this->loading) { + $_SESSION['loadtime_stream'] = datetime_convert(); + PConfig::Set(local_channel(), 'system', 'loadtime_stream', $_SESSION['loadtime_stream']); + // stream is a superset of channel when it comes to notifications + $_SESSION['loadtime_channel'] = datetime_convert(); + PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']); + } + + $arr = ['query' => App::$query_string]; + call_hooks('stream_content_init', $arr); + + $channel = ((isset(App::$data['channel'])) ? App::$data['channel'] : null); + + // if called from liveUpdate() we will not have called Stream->init() on this request and $channel will not be set + + if (!$channel) { + $channel = App::get_channel(); + } + $item_normal = item_normal(); + $item_normal_update = item_normal_update(); - $group = $gid; - $group_hash = $r[0]['hash']; + $datequery = $datequery2 = ''; - } - - $default_cmin = ((Apps::system_app_installed(local_channel(),'Friend Zoom')) ? get_pconfig(local_channel(),'affinity','cmin',0) : (-1)); - $default_cmax = ((Apps::system_app_installed(local_channel(),'Friend Zoom')) ? get_pconfig(local_channel(),'affinity','cmax',99) : (-1)); + $group = 0; - $cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0); - $draft = ((x($_GET,'draft')) ? intval($_GET['draft']) : 0); - $star = ((x($_GET,'star')) ? intval($_GET['star']) : 0); - $liked = ((x($_GET,'liked')) ? intval($_GET['liked']) : 0); - $conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0); - $spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0); - $cmin = ((array_key_exists('cmin',$_GET)) ? intval($_GET['cmin']) : $default_cmin); - $cmax = ((array_key_exists('cmax',$_GET)) ? intval($_GET['cmax']) : $default_cmax); - $file = ((x($_GET,'file')) ? $_GET['file'] : ''); - $xchan = ((x($_GET,'xchan')) ? $_GET['xchan'] : ''); - $net = ((x($_GET,'net')) ? $_GET['net'] : ''); - $pf = ((x($_GET,'pf')) ? $_GET['pf'] : ''); - - $deftag = ''; - + $nouveau = false; - - if (x($_GET,'search') || $file || (!$pf && $cid)) { - $nouveau = true; - } + $datequery = ((x($_GET, 'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : ''); + $datequery2 = ((x($_GET, 'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : ''); + $static = ((x($_GET, 'static')) ? intval($_GET['static']) : 0); + $gid = ((x($_GET, 'gid')) ? $_REQUEST['gid'] : 0); + $category = ((x($_REQUEST, 'cat')) ? $_REQUEST['cat'] : ''); + $hashtags = ((x($_REQUEST, 'tag')) ? $_REQUEST['tag'] : ''); + $verb = ((x($_REQUEST, 'verb')) ? $_REQUEST['verb'] : ''); + $dm = ((x($_REQUEST, 'dm')) ? $_REQUEST['dm'] : 0); - if ($cid) { - $cid_r = q("SELECT abook.abook_xchan, xchan.xchan_addr, xchan.xchan_name, xchan.xchan_url, xchan.xchan_photo_s, xchan.xchan_type from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d and abook_blocked = 0 limit 1", - intval($cid), - intval(local_channel()) - ); + $c_order = get_pconfig(local_channel(), 'mod_stream', 'order', 0); + switch ($c_order) { + case 0: + $order = 'comment'; + break; + case 1: + $order = 'post'; + break; + case 2: + $nouveau = true; + break; + } - if (! $cid_r) { - if ($this->updating) { - killme(); - } - notice( t('No such channel') . EOL ); - goaway(z_root() . '/stream'); - } - - } - - if (! $this->updating) { - - // search terms header - - // hide the terms we use to search for videos from - // the activity_filter widget because it doesn't look very good - if ($search && $search !== 'video]') { - $o .= replace_macros(get_markup_template("section_title.tpl"), - [ '$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8') ] - ); - } + $search = (isset($_GET['search']) ? $_GET['search'] : ''); + if ($search) { + $_GET['netsearch'] = escape_tags($search); + if (strpos($search, '@') === 0) { + $r = q( + "select abook_id from abook left join xchan on abook_xchan = xchan_hash where xchan_name = '%s' and abook_channel = %d limit 1", + dbesc(substr($search, 1)), + intval(local_channel()) + ); + if ($r) { + $_GET['cid'] = $r[0]['abook_id']; + $search = $_GET['search'] = ''; + } + } elseif (strpos($search, '#') === 0) { + $hashtags = substr($search, 1); + $search = $_GET['search'] = ''; + } + } - $body = EMPTY_STR; + if ($datequery) { + $order = 'post'; + } - nav_set_selected('Stream'); + // filter by collection (e.g. group) - $channel_acl = [ - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'] - ]; + $vg = false; - $x = [ - 'is_owner' => true, - 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), - 'default_location' => $channel['channel_location'], - 'nickname' => $channel['channel_address'], - 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), - 'permissions' => $channel_acl, - 'bang' => EMPTY_STR, - 'body' => $body, - 'visitor' => true, - 'profile_uid' => local_channel(), - 'editor_autocomplete' => true, - 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true, - 'jotnets' => true, - 'reset' => t('Reset form') - ]; - - if ($deftag) { - $x['pretext'] = $deftag; - } - - $status_editor = status_editor($x); - $o .= $status_editor; - - $static = channel_manual_conv_update(local_channel()); - - } - - - // We don't have to deal with ACL's on this page. You're looking at everything - // that belongs to you, hence you can see all of it. We will filter by group if - // desired. - - - $sql_options = (($star) - ? " and item_starred = 1 " - : ''); - - $sql_nets = ''; - - $item_thread_top = ' AND item_thread_top = 1 '; - - $sql_extra = ''; - - if ($draft) { - $item_normal = item_normal_draft(); - $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE item_unpublished = 1 and item_deleted = 0 ) "; - } - - if ($group) { - $contact_str = ''; - $contacts = AccessList::members(local_channel(),$group); - if ($contacts) { - $contact_str = ids_to_querystr($contacts,'xchan',true); - } - else { - $contact_str = " '0' "; - if (! $this->updating) { - info( t('Access list is empty')); - } - } - $item_thread_top = ''; - - $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) "; - - - if (! $vg) { - $x = AccessList::rec_byhash(local_channel(), $group_hash); - } - - if ($x || $vg) { - $title = replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => sprintf( t('Access list: %s'), (($vg) ? $vg : $x['gname'])) - )); - } - - $o = $title . $status_editor; - - } - elseif (isset($cid_r) && $cid_r) { - $item_thread_top = EMPTY_STR; - - if ($this->loading || $this->updating) { - if (!$pf && $nouveau) { - $sql_extra = " AND author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' "; - } - else { - $ttype = (($pf) ? TERM_FORUM : TERM_MENTION); - - $p1 = q("SELECT DISTINCT parent FROM item WHERE uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ) $item_normal "); - $p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'"); - - $p_str = ids_to_querystr(array_merge($p1,$p2),'parent'); - $sql_extra = " AND item.parent IN ( $p_str ) "; - } - } - - $title = replace_macros(get_markup_template('section_title.tpl'), [ - '$title' => '' . $cid_r[0]['xchan_name'] . '' - ]); - - $o = $title; - $o .= $status_editor; - } - elseif ($xchan) { - $r = q("select * from xchan where xchan_hash = '%s'", - dbesc($xchan) - ); - if ($r) { - $item_thread_top = ''; - $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($xchan) . "' or owner_xchan = '" . dbesc($xchan) . "' ) $item_normal ) "; - $title = replace_macros(get_markup_template('section_title.tpl'), [ - '$title' => '
' . $r[0]['xchan_name'] . '' - ]); - - $o = $title; - $o .= $status_editor; - - } - else { - notice( t('Invalid channel.') . EOL); - goaway(z_root() . '/stream'); - } - - } - - if (x($category)) { - $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY)); - } - if (x($hashtags)) { - $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG)); - } - - if (! $this->updating) { - // The special div is needed for liveUpdate to kick in for this page. - // We only launch liveUpdate if you aren't filtering in some incompatible - // way and also you aren't writing a comment (discovered in javascript). - - $maxheight = get_pconfig(local_channel(),'system','stream_divmore_height'); - if(! $maxheight) - $maxheight = 400; - - - $o .= '' . "\r\n"; - $o .= "\r\n"; - - App::$page['htmlhead'] .= replace_macros(get_markup_template('build_query.tpl'), [ - '$baseurl' => z_root(), - '$pgtype' => 'stream', - '$uid' => ((local_channel()) ? local_channel() : '0'), - '$gid' => (($gid) ? $gid : '0'), - '$cid' => (($cid) ? $cid : '0'), - '$cmin' => (($cmin) ? $cmin : '(-1)'), - '$cmax' => (($cmax) ? $cmax : '(-1)'), - '$star' => (($star) ? $star : '0'), - '$liked' => (($liked) ? $liked : '0'), - '$conv' => (($conv) ? $conv : '0'), - '$spam' => (($spam) ? $spam : '0'), - '$fh' => '0', - '$dm' => (($dm) ? $dm : '0'), - '$nouveau' => (($nouveau) ? $nouveau : '0'), - '$wall' => '0', - '$draft' => (($draft) ? $draft : '0'), - '$static' => $static, - '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), - '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1), - '$search' => (($search) ? urlencode($search) : ''), - '$xchan' => (($xchan) ? urlencode($xchan) : ''), - '$order' => (($order) ? urlencode($order) : ''), - '$file' => (($file) ? urlencode($file) : ''), - '$cats' => (($category) ? urlencode($category) : ''), - '$tags' => (($hashtags) ? urlencode($hashtags) : ''), - '$dend' => $datequery, - '$mid' => '', - '$verb' => (($verb) ? urlencode($verb) : ''), - '$net' => (($net) ? urlencode($net) : ''), - '$dbegin' => $datequery2, - '$pf' => (($pf) ? intval($pf) : '0'), - ]); - } - - $sql_extra3 = ''; - - if ($datequery) { - $sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery)))); - } - if ($datequery2) { - $sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); - } - - $sql_extra2 = (($nouveau) ? '' : " AND item.parent = item.id "); - $sql_extra3 = (($nouveau) ? '' : $sql_extra3); - - if (x($_GET,'search')) { - $search = escape_tags($_GET['search']); - if (strpos($search,'#') === 0) { - $sql_extra .= term_query('item',substr($search,1),TERM_HASHTAG,TERM_COMMUNITYTAG); - } - else { - $sql_extra .= sprintf(" AND (item.body like '%s' OR item.title like '%s') ", - dbesc(protect_sprintf('%' . $search . '%')), - dbesc(protect_sprintf('%' . $search . '%')) - ); - } - } - - if ($verb) { - - // the presence of a leading dot in the verb determines - // whether to match the type of activity or the child object. - // The name 'verb' is a holdover from the earlier XML - // ActivityStreams specification. - - if (substr($verb,0,1) === '.') { - $verb = substr($verb,1); - $sql_extra .= sprintf(" AND item.obj_type like '%s' ", - dbesc(protect_sprintf('%' . $verb . '%')) - ); - } - else { - $sql_extra .= sprintf(" AND item.verb like '%s' ", - dbesc(protect_sprintf('%' . $verb . '%')) - ); - } - } - - if (strlen($file)) { - $sql_extra .= term_query('item',$file,TERM_FILE); - } - - if ($dm) { - $sql_extra .= " and item_private = 2 "; - } - - if ($conv) { - - $item_thread_top = ''; - - if ($nouveau) { - $sql_extra .= " AND author_xchan = '" . dbesc($channel['channel_hash']) . "' "; - } - else { - $sql_extra .= sprintf(" AND parent IN (SELECT distinct(parent) from item where ( author_xchan = '%s' or item_mentionsme = 1 ) and item_deleted = 0 ) ", - dbesc(protect_sprintf($channel['channel_hash'])) - ); - } - } - - if ($this->updating && ! $this->loading) { - - // only setup pagination on initial page view - $pager_sql = ''; - - } - else { - $itemspage = get_pconfig(local_channel(),'system','itemspage'); - App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); - $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); - } - - // cmin and cmax are both -1 when the affinity tool is disabled - - if (($cmin != (-1)) || ($cmax != (-1))) { - - // Not everybody who shows up in the network stream will be in your address book. - // By default those that aren't are assumed to have closeness = 99; but this isn't - // recorded anywhere. So if cmax is 99, we'll open the search up to anybody in - // the stream with a NULL address book entry. - - $sql_nets .= " AND "; - - if ($cmax == 99) - $sql_nets .= " ( "; - - $sql_nets .= "( abook.abook_closeness >= " . intval($cmin) . " "; - $sql_nets .= " AND abook.abook_closeness <= " . intval($cmax) . " ) "; - - if ($cmax == 99) - $sql_nets .= " OR abook.abook_closeness IS NULL ) "; - - } - - $net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : ''); - $net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : ''); - - $abook_uids = " and abook.abook_channel = " . local_channel() . " "; - $uids = " and item.uid = " . local_channel() . " "; - - if (get_pconfig(local_channel(),'system','stream_list_mode')) - $page_mode = 'list'; - else - $page_mode = 'client'; - - $simple_update = (($this->updating) ? " and item_changed > = '" . $_SESSION['loadtime_stream'] . "' " : ''); - - $parents_str = ''; - $update_unseen = ''; - $items = []; - - // This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day - // or three and look at your stream page - after opening up your browser. The first page loads just as it - // should. All of a sudden a few seconds later, page 2 will get inserted at the beginning of the page - // (before the page 1 content). The update code is actually doing just what it's supposed - // to, it's fetching posts that have the ITEM_UNSEEN bit set. But the reason that page 2 content is being - // returned in an UPDATE is because you hadn't gotten that far yet - you're still on page 1 and everything - // that we loaded for page 1 is now marked as seen. But the stuff on page 2 hasn't been. So... it's being - // treated as "new fresh" content because it is unseen. We need to distinguish it somehow from content - // which "arrived as you were reading page 1". We're going to do this - // by storing in your session the current UTC time whenever you LOAD a network page, and only UPDATE items - // which are both ITEM_UNSEEN and have "changed" since that time. Cross fingers... - - if ($this->updating && $_SESSION['loadtime_stream']) - $simple_update = " AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime_stream']) . "' "; - if ($this->loading) - $simple_update = ''; - - if ($static && $simple_update) - $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; + if ($gid) { + if (strpos($gid, ':') === 0) { + $g = substr($gid, 1); + switch ($g) { + case '1': + $r = [['hash' => 'connections:' . $channel['channel_hash']]]; + $vg = t('Connections'); + break; + case '2': + $r = [['hash' => 'zot:' . $channel['channel_hash']]]; + $vg = t('Nomad'); + break; + case '3': + $r = [['hash' => 'activitypub:' . $channel['channel_hash']]]; + $vg = t('ActivityPub'); + break; + default: + break; + } + } else { + $r = q( + "SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1", + intval($gid), + intval(local_channel()) + ); + if (!$r) { + if ($this->updating) { + killme(); + } + notice(t('Access list not found') . EOL); + goaway(z_root() . '/stream'); + } + } - // we are not yet using this in updates because the content may have just been marked seen - // and this might prevent us from loading the update. Will need to test further. - - $seenstr = EMPTY_STR; - if (local_channel()) { - $seen = PConfig::Get(local_channel(),'system','seen_items',[]); - if ($seen) { - $seenstr = " and not item.id in (" . implode(',',$seen) . ") "; - } - } + $group = $gid; + $group_hash = $r[0]['hash']; + } - if ($nouveau && $this->loading) { - // "New Item View" - show all items unthreaded in reverse created date order - - $items = q("SELECT item.*, item.id AS item_id, created FROM item + $default_cmin = ((Apps::system_app_installed(local_channel(), 'Friend Zoom')) ? get_pconfig(local_channel(), 'affinity', 'cmin', 0) : (-1)); + $default_cmax = ((Apps::system_app_installed(local_channel(), 'Friend Zoom')) ? get_pconfig(local_channel(), 'affinity', 'cmax', 99) : (-1)); + + $cid = ((x($_GET, 'cid')) ? intval($_GET['cid']) : 0); + $draft = ((x($_GET, 'draft')) ? intval($_GET['draft']) : 0); + $star = ((x($_GET, 'star')) ? intval($_GET['star']) : 0); + $liked = ((x($_GET, 'liked')) ? intval($_GET['liked']) : 0); + $conv = ((x($_GET, 'conv')) ? intval($_GET['conv']) : 0); + $spam = ((x($_GET, 'spam')) ? intval($_GET['spam']) : 0); + $cmin = ((array_key_exists('cmin', $_GET)) ? intval($_GET['cmin']) : $default_cmin); + $cmax = ((array_key_exists('cmax', $_GET)) ? intval($_GET['cmax']) : $default_cmax); + $file = ((x($_GET, 'file')) ? $_GET['file'] : ''); + $xchan = ((x($_GET, 'xchan')) ? $_GET['xchan'] : ''); + $net = ((x($_GET, 'net')) ? $_GET['net'] : ''); + $pf = ((x($_GET, 'pf')) ? $_GET['pf'] : ''); + + $deftag = ''; + + + if (x($_GET, 'search') || $file || (!$pf && $cid)) { + $nouveau = true; + } + + if ($cid) { + $cid_r = q( + "SELECT abook.abook_xchan, xchan.xchan_addr, xchan.xchan_name, xchan.xchan_url, xchan.xchan_photo_s, xchan.xchan_type from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d and abook_blocked = 0 limit 1", + intval($cid), + intval(local_channel()) + ); + + if (!$cid_r) { + if ($this->updating) { + killme(); + } + notice(t('No such channel') . EOL); + goaway(z_root() . '/stream'); + } + } + + if (!$this->updating) { + // search terms header + + // hide the terms we use to search for videos from + // the activity_filter widget because it doesn't look very good + if ($search && $search !== 'video]') { + $o .= replace_macros( + get_markup_template("section_title.tpl"), + ['$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT, 'UTF-8')] + ); + } + + $body = EMPTY_STR; + + nav_set_selected('Stream'); + + $channel_acl = [ + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ]; + + $x = [ + 'is_owner' => true, + 'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''), + 'default_location' => $channel['channel_location'], + 'nickname' => $channel['channel_address'], + 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'acl' => populate_acl($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), + 'permissions' => $channel_acl, + 'bang' => EMPTY_STR, + 'body' => $body, + 'visitor' => true, + 'profile_uid' => local_channel(), + 'editor_autocomplete' => true, + 'bbco_autocomplete' => 'bbcode', + 'bbcode' => true, + 'jotnets' => true, + 'reset' => t('Reset form') + ]; + + if ($deftag) { + $x['pretext'] = $deftag; + } + + $status_editor = status_editor($x); + $o .= $status_editor; + + $static = channel_manual_conv_update(local_channel()); + } + + + // We don't have to deal with ACL's on this page. You're looking at everything + // that belongs to you, hence you can see all of it. We will filter by group if + // desired. + + + $sql_options = (($star) + ? " and item_starred = 1 " + : ''); + + $sql_nets = ''; + + $item_thread_top = ' AND item_thread_top = 1 '; + + $sql_extra = ''; + + if ($draft) { + $item_normal = item_normal_draft(); + $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE item_unpublished = 1 and item_deleted = 0 ) "; + } + + if ($group) { + $contact_str = ''; + $contacts = AccessList::members(local_channel(), $group); + if ($contacts) { + $contact_str = ids_to_querystr($contacts, 'xchan', true); + } else { + $contact_str = " '0' "; + if (!$this->updating) { + info(t('Access list is empty')); + } + } + $item_thread_top = ''; + + $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) "; + + + if (!$vg) { + $x = AccessList::rec_byhash(local_channel(), $group_hash); + } + + if ($x || $vg) { + $title = replace_macros(get_markup_template("section_title.tpl"), array( + '$title' => sprintf(t('Access list: %s'), (($vg) ? $vg : $x['gname'])) + )); + } + + $o = $title . $status_editor; + } elseif (isset($cid_r) && $cid_r) { + $item_thread_top = EMPTY_STR; + + if ($this->loading || $this->updating) { + if (!$pf && $nouveau) { + $sql_extra = " AND author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' "; + } else { + $ttype = (($pf) ? TERM_FORUM : TERM_MENTION); + + $p1 = q("SELECT DISTINCT parent FROM item WHERE uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ) $item_normal "); + $p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'"); + + $p_str = ids_to_querystr(array_merge($p1, $p2), 'parent'); + $sql_extra = " AND item.parent IN ( $p_str ) "; + } + } + + $title = replace_macros(get_markup_template('section_title.tpl'), [ + '$title' => '
' . $cid_r[0]['xchan_name'] . '' + ]); + + $o = $title; + $o .= $status_editor; + } elseif ($xchan) { + $r = q( + "select * from xchan where xchan_hash = '%s'", + dbesc($xchan) + ); + if ($r) { + $item_thread_top = ''; + $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($xchan) . "' or owner_xchan = '" . dbesc($xchan) . "' ) $item_normal ) "; + $title = replace_macros(get_markup_template('section_title.tpl'), [ + '$title' => '
' . $r[0]['xchan_name'] . '' + ]); + + $o = $title; + $o .= $status_editor; + } else { + notice(t('Invalid channel.') . EOL); + goaway(z_root() . '/stream'); + } + } + + if (x($category)) { + $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY)); + } + if (x($hashtags)) { + $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG)); + } + + if (!$this->updating) { + // The special div is needed for liveUpdate to kick in for this page. + // We only launch liveUpdate if you aren't filtering in some incompatible + // way and also you aren't writing a comment (discovered in javascript). + + $maxheight = get_pconfig(local_channel(), 'system', 'stream_divmore_height'); + if (!$maxheight) { + $maxheight = 400; + } + + + $o .= '' . "\r\n"; + $o .= "\r\n"; + + App::$page['htmlhead'] .= replace_macros(get_markup_template('build_query.tpl'), [ + '$baseurl' => z_root(), + '$pgtype' => 'stream', + '$uid' => ((local_channel()) ? local_channel() : '0'), + '$gid' => (($gid) ? $gid : '0'), + '$cid' => (($cid) ? $cid : '0'), + '$cmin' => (($cmin) ? $cmin : '(-1)'), + '$cmax' => (($cmax) ? $cmax : '(-1)'), + '$star' => (($star) ? $star : '0'), + '$liked' => (($liked) ? $liked : '0'), + '$conv' => (($conv) ? $conv : '0'), + '$spam' => (($spam) ? $spam : '0'), + '$fh' => '0', + '$dm' => (($dm) ? $dm : '0'), + '$nouveau' => (($nouveau) ? $nouveau : '0'), + '$wall' => '0', + '$draft' => (($draft) ? $draft : '0'), + '$static' => $static, + '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0), + '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1), + '$search' => (($search) ? urlencode($search) : ''), + '$xchan' => (($xchan) ? urlencode($xchan) : ''), + '$order' => (($order) ? urlencode($order) : ''), + '$file' => (($file) ? urlencode($file) : ''), + '$cats' => (($category) ? urlencode($category) : ''), + '$tags' => (($hashtags) ? urlencode($hashtags) : ''), + '$dend' => $datequery, + '$mid' => '', + '$verb' => (($verb) ? urlencode($verb) : ''), + '$net' => (($net) ? urlencode($net) : ''), + '$dbegin' => $datequery2, + '$pf' => (($pf) ? intval($pf) : '0'), + ]); + } + + $sql_extra3 = ''; + + if ($datequery) { + $sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery)))); + } + if ($datequery2) { + $sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery2)))); + } + + $sql_extra2 = (($nouveau) ? '' : " AND item.parent = item.id "); + $sql_extra3 = (($nouveau) ? '' : $sql_extra3); + + if (x($_GET, 'search')) { + $search = escape_tags($_GET['search']); + if (strpos($search, '#') === 0) { + $sql_extra .= term_query('item', substr($search, 1), TERM_HASHTAG, TERM_COMMUNITYTAG); + } else { + $sql_extra .= sprintf( + " AND (item.body like '%s' OR item.title like '%s') ", + dbesc(protect_sprintf('%' . $search . '%')), + dbesc(protect_sprintf('%' . $search . '%')) + ); + } + } + + if ($verb) { + // the presence of a leading dot in the verb determines + // whether to match the type of activity or the child object. + // The name 'verb' is a holdover from the earlier XML + // ActivityStreams specification. + + if (substr($verb, 0, 1) === '.') { + $verb = substr($verb, 1); + $sql_extra .= sprintf( + " AND item.obj_type like '%s' ", + dbesc(protect_sprintf('%' . $verb . '%')) + ); + } else { + $sql_extra .= sprintf( + " AND item.verb like '%s' ", + dbesc(protect_sprintf('%' . $verb . '%')) + ); + } + } + + if (strlen($file)) { + $sql_extra .= term_query('item', $file, TERM_FILE); + } + + if ($dm) { + $sql_extra .= " and item_private = 2 "; + } + + if ($conv) { + $item_thread_top = ''; + + if ($nouveau) { + $sql_extra .= " AND author_xchan = '" . dbesc($channel['channel_hash']) . "' "; + } else { + $sql_extra .= sprintf( + " AND parent IN (SELECT distinct(parent) from item where ( author_xchan = '%s' or item_mentionsme = 1 ) and item_deleted = 0 ) ", + dbesc(protect_sprintf($channel['channel_hash'])) + ); + } + } + + if ($this->updating && !$this->loading) { + // only setup pagination on initial page view + $pager_sql = ''; + } else { + $itemspage = get_pconfig(local_channel(), 'system', 'itemspage'); + App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); + $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); + } + + // cmin and cmax are both -1 when the affinity tool is disabled + + if (($cmin != (-1)) || ($cmax != (-1))) { + // Not everybody who shows up in the network stream will be in your address book. + // By default those that aren't are assumed to have closeness = 99; but this isn't + // recorded anywhere. So if cmax is 99, we'll open the search up to anybody in + // the stream with a NULL address book entry. + + $sql_nets .= " AND "; + + if ($cmax == 99) { + $sql_nets .= " ( "; + } + + $sql_nets .= "( abook.abook_closeness >= " . intval($cmin) . " "; + $sql_nets .= " AND abook.abook_closeness <= " . intval($cmax) . " ) "; + + if ($cmax == 99) { + $sql_nets .= " OR abook.abook_closeness IS NULL ) "; + } + } + + $net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : ''); + $net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : ''); + + $abook_uids = " and abook.abook_channel = " . local_channel() . " "; + $uids = " and item.uid = " . local_channel() . " "; + + if (get_pconfig(local_channel(), 'system', 'stream_list_mode')) { + $page_mode = 'list'; + } else { + $page_mode = 'client'; + } + + $simple_update = (($this->updating) ? " and item_changed > = '" . $_SESSION['loadtime_stream'] . "' " : ''); + + $parents_str = ''; + $update_unseen = ''; + $items = []; + + // This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day + // or three and look at your stream page - after opening up your browser. The first page loads just as it + // should. All of a sudden a few seconds later, page 2 will get inserted at the beginning of the page + // (before the page 1 content). The update code is actually doing just what it's supposed + // to, it's fetching posts that have the ITEM_UNSEEN bit set. But the reason that page 2 content is being + // returned in an UPDATE is because you hadn't gotten that far yet - you're still on page 1 and everything + // that we loaded for page 1 is now marked as seen. But the stuff on page 2 hasn't been. So... it's being + // treated as "new fresh" content because it is unseen. We need to distinguish it somehow from content + // which "arrived as you were reading page 1". We're going to do this + // by storing in your session the current UTC time whenever you LOAD a network page, and only UPDATE items + // which are both ITEM_UNSEEN and have "changed" since that time. Cross fingers... + + if ($this->updating && $_SESSION['loadtime_stream']) { + $simple_update = " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_stream']) . "' "; + } + if ($this->loading) { + $simple_update = ''; + } + + if ($static && $simple_update) { + $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; + } + + + // we are not yet using this in updates because the content may have just been marked seen + // and this might prevent us from loading the update. Will need to test further. + + $seenstr = EMPTY_STR; + if (local_channel()) { + $seen = PConfig::Get(local_channel(), 'system', 'seen_items', []); + if ($seen) { + $seenstr = " and not item.id in (" . implode(',', $seen) . ") "; + } + } + + if ($nouveau && $this->loading) { + // "New Item View" - show all items unthreaded in reverse created date order + + $items = q("SELECT item.*, item.id AS item_id, created FROM item left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) $net_query WHERE true $uids $item_normal @@ -573,25 +566,23 @@ class Stream extends Controller { $simple_update $sql_extra $sql_options $sql_nets $net_query2 - ORDER BY item.created DESC $pager_sql " - ); - - xchan_query($items); - - $items = fetch_post_tags($items,true); - } - elseif ($this->updating) { - - // Normal conversation view + ORDER BY item.created DESC $pager_sql "); - if($order === 'post') - $ordering = "created"; - else - $ordering = "commented"; + xchan_query($items); - if ($this->loading) { - // Fetch a page full of parent items for this page - $r = q("SELECT item.parent AS item_id FROM item + $items = fetch_post_tags($items, true); + } elseif ($this->updating) { + // Normal conversation view + + if ($order === 'post') { + $ordering = "created"; + } else { + $ordering = "commented"; + } + + if ($this->loading) { + // Fetch a page full of parent items for this page + $r = q("SELECT item.parent AS item_id FROM item left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) $net_query WHERE true $uids $item_thread_top $item_normal @@ -599,83 +590,77 @@ class Stream extends Controller { and (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra3 $sql_extra $sql_options $sql_nets $net_query2 - ORDER BY $ordering DESC $pager_sql " - ); - } - else { + ORDER BY $ordering DESC $pager_sql "); + } else { + // this is an update - // this is an update - - $r = q("SELECT item.parent AS item_id FROM item + $r = q("SELECT item.parent AS item_id FROM item left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) $net_query WHERE true $uids $item_normal_update $simple_update and (abook.abook_blocked = 0 or abook.abook_flags is null) - $sql_extra3 $sql_extra $sql_options $sql_nets $net_query2" - ); - } + $sql_extra3 $sql_extra $sql_options $sql_nets $net_query2"); + } - if ($r) { - - $parents_str = ids_to_querystr($r,'item_id'); - - $items = q("SELECT item.*, item.id AS item_id FROM item + if ($r) { + $parents_str = ids_to_querystr($r, 'item_id'); + + $items = q( + "SELECT item.*, item.id AS item_id FROM item WHERE true $uids $item_normal AND item.parent IN ( %s ) $sql_extra ", - dbesc($parents_str) - ); - - xchan_query($items,true); - $items = fetch_post_tags($items,true); - $items = conv_sort($items,$ordering); + dbesc($parents_str) + ); - } + xchan_query($items, true); + $items = fetch_post_tags($items, true); + $items = conv_sort($items, $ordering); + } - if ($page_mode === 'list') { - - /** - * in "list mode", only mark the parent item and any like activities as "seen". - * We won't distinguish between comment likes and post likes. The important thing - * is that the number of unseen comments will be accurate. The SQL to separate the - * comment likes could also get somewhat hairy. - */ - - if ($parents_str) { - $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )"; - $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) "; - } - } - else { - if ($parents_str) { - $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )"; - } - } - } - - if ($update_unseen && (! (isset($_SESSION['sudo']) && $_SESSION['sudo']))) { - $x = [ 'channel_id' => local_channel(), 'update' => 'unset' ]; - call_hooks('update_unseen',$x); - if ($x['update'] === 'unset' || intval($x['update'])) { - $r = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d $update_unseen ", - intval(local_channel()) - ); - } - } - - $mode = (($nouveau) ? 'stream-new' : 'stream'); + if ($page_mode === 'list') { - if ($search) { - $mode = 'search'; - } - - $o .= conversation($items,$mode,$this->updating,$page_mode); - - if (($items) && (! $this->updating)) { - $o .= alt_pager(count($items)); - } - - return $o; - } - + /** + * in "list mode", only mark the parent item and any like activities as "seen". + * We won't distinguish between comment likes and post likes. The important thing + * is that the number of unseen comments will be accurate. The SQL to separate the + * comment likes could also get somewhat hairy. + */ + + if ($parents_str) { + $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )"; + $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) "; + } + } else { + if ($parents_str) { + $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )"; + } + } + } + + if ($update_unseen && (!(isset($_SESSION['sudo']) && $_SESSION['sudo']))) { + $x = ['channel_id' => local_channel(), 'update' => 'unset']; + call_hooks('update_unseen', $x); + if ($x['update'] === 'unset' || intval($x['update'])) { + $r = q( + "UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d $update_unseen ", + intval(local_channel()) + ); + } + } + + $mode = (($nouveau) ? 'stream-new' : 'stream'); + + if ($search) { + $mode = 'search'; + } + + $o .= conversation($items, $mode, $this->updating, $page_mode); + + if (($items) && (!$this->updating)) { + $o .= alt_pager(count($items)); + } + + return $o; + } } diff --git a/Zotlabs/Module/Subthread.php b/Zotlabs/Module/Subthread.php index 2761d8103..2007ad6c9 100644 --- a/Zotlabs/Module/Subthread.php +++ b/Zotlabs/Module/Subthread.php @@ -1,4 +1,5 @@ 2) ? notags(trim(argv(2))) : 0); - - if (argv(1) === 'sub') { - $activity = ACTIVITY_FOLLOW; - } - elseif (argv(1) === 'unsub') { - $activity = ACTIVITY_IGNORE; - } - - $i = q("select * from item where id = %d and uid = %d", - intval($item_id), - intval(local_channel()) - ); + $sys = get_sys_channel(); + $channel = App::get_channel(); - if (! $i) { - // try the global public stream - $i = q("select * from item where id = %d and uid = %d", - intval($postid), - intval($sys['channel_id']) - ); - // try the local public stream - if (! $i) { - $i = q("select * from item where id = %d and item_wall = 1 and item_private = 0", - intval($postid) - ); - } + $item_id = ((argc() > 2) ? notags(trim(argv(2))) : 0); - if ($i && local_channel() && (! is_sys_channel(local_channel()))) { - $i = [ copy_of_pubitem($channel, $i[0]['mid']) ]; - $item_id = (($i) ? $i[0]['id'] : 0); - } - } - - if (! $i) { - return; - } + if (argv(1) === 'sub') { + $activity = ACTIVITY_FOLLOW; + } elseif (argv(1) === 'unsub') { + $activity = ACTIVITY_IGNORE; + } - $r = q("select * from item where id = parent and id = %d limit 1", - dbesc($i[0]['parent']) - ); - - if ((! $item_id) || (! $r)) { - logger('subthread: no item ' . $item_id); - return; - } - - $item = $r[0]; - - $owner_uid = $item['uid']; - $observer = App::get_observer(); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - - if (! perm_is_allowed($owner_uid,$ob_hash,'post_comments')) { - return; - } - - $sys = get_sys_channel(); - - $owner_uid = $item['uid']; - $owner_aid = $item['aid']; - - // if this is a "discover" item, (item['uid'] is the sys channel), - // fallback to the item comment policy, which should've been - // respected when generating the conversation thread. - // Even if the activity is rejected by the item owner, it should still get attached - // to the local discover conversation on this site. - - if (($owner_uid != $sys['channel_id']) && (! perm_is_allowed($owner_uid,$observer['xchan_hash'],'post_comments'))) { - notice( t('Permission denied') . EOL); - killme(); - } - - $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($item['owner_xchan']) - ); - if ($r) { - $thread_owner = $r[0]; - } - else { - killme(); - } - - $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($item['author_xchan']) - ); - if ($r) { - $item_author = $r[0]; - } - else { - killme(); - } - - $uuid = new_uuid(); - $mid = z_root() . '/item/' . $uuid; - - $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status')); - - $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $item['plink'])); - $objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); - - $body = $item['body']; + $i = q( + "select * from item where id = %d and uid = %d", + intval($item_id), + intval(local_channel()) + ); - $obj = Activity::fetch_item( [ 'id' => $item['mid'] ] ); - $objtype = $obj['type']; + if (!$i) { + // try the global public stream + $i = q( + "select * from item where id = %d and uid = %d", + intval($postid), + intval($sys['channel_id']) + ); + // try the local public stream + if (!$i) { + $i = q( + "select * from item where id = %d and item_wall = 1 and item_private = 0", + intval($postid) + ); + } - if (! intval($item['item_thread_top'])) - $post_type = 'comment'; - - if ($activity === ACTIVITY_FOLLOW) { - $bodyverb = t('%1$s is following %2$s\'s %3$s'); - } - if ($activity === ACTIVITY_IGNORE) { - $bodyverb = t('%1$s stopped following %2$s\'s %3$s'); - } - - $arr = []; + if ($i && local_channel() && (!is_sys_channel(local_channel()))) { + $i = [copy_of_pubitem($channel, $i[0]['mid'])]; + $item_id = (($i) ? $i[0]['id'] : 0); + } + } - $arr['uuid'] = $uuid; - $arr['mid'] = $mid; - $arr['aid'] = $owner_aid; - $arr['uid'] = $owner_uid; - $arr['parent'] = $item['id']; - $arr['parent_mid'] = $item['mid']; - $arr['thr_parent'] = $item['mid']; - $arr['owner_xchan'] = $thread_owner['xchan_hash']; - $arr['author_xchan'] = $observer['xchan_hash']; - $arr['item_origin'] = 1; - $arr['item_notshown'] = 1; + if (!$i) { + return; + } - if (intval($item['item_wall'])) { - $arr['item_wall'] = 1; - } - else { - $arr['item_wall'] = 0; - } - - $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]'; - $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; - $plink = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]'; - - $arr['body'] = sprintf( $bodyverb, $alink, $ulink, $plink ); - - $arr['verb'] = $activity; - $arr['obj_type'] = $objtype; - $arr['obj'] = json_encode($obj); - - $arr['allow_cid'] = $item['allow_cid']; - $arr['allow_gid'] = $item['allow_gid']; - $arr['deny_cid'] = $item['deny_cid']; - $arr['deny_gid'] = $item['deny_gid']; - - $post = item_store($arr); - $post_id = $post['item_id']; - - $arr['id'] = $post_id; - - call_hooks('post_local_end', $arr); - - killme(); - } + $r = q( + "select * from item where id = parent and id = %d limit 1", + dbesc($i[0]['parent']) + ); + + if ((!$item_id) || (!$r)) { + logger('subthread: no item ' . $item_id); + return; + } + + $item = $r[0]; + + $owner_uid = $item['uid']; + $observer = App::get_observer(); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + if (!perm_is_allowed($owner_uid, $ob_hash, 'post_comments')) { + return; + } + + $sys = get_sys_channel(); + + $owner_uid = $item['uid']; + $owner_aid = $item['aid']; + + // if this is a "discover" item, (item['uid'] is the sys channel), + // fallback to the item comment policy, which should've been + // respected when generating the conversation thread. + // Even if the activity is rejected by the item owner, it should still get attached + // to the local discover conversation on this site. + + if (($owner_uid != $sys['channel_id']) && (!perm_is_allowed($owner_uid, $observer['xchan_hash'], 'post_comments'))) { + notice(t('Permission denied') . EOL); + killme(); + } + + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['owner_xchan']) + ); + if ($r) { + $thread_owner = $r[0]; + } else { + killme(); + } + + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['author_xchan']) + ); + if ($r) { + $item_author = $r[0]; + } else { + killme(); + } + + $uuid = new_uuid(); + $mid = z_root() . '/item/' . $uuid; + + $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status')); + + $links = array(array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item['plink'])); + $objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE); + + $body = $item['body']; + + $obj = Activity::fetch_item(['id' => $item['mid']]); + $objtype = $obj['type']; + + if (!intval($item['item_thread_top'])) { + $post_type = 'comment'; + } + + if ($activity === ACTIVITY_FOLLOW) { + $bodyverb = t('%1$s is following %2$s\'s %3$s'); + } + if ($activity === ACTIVITY_IGNORE) { + $bodyverb = t('%1$s stopped following %2$s\'s %3$s'); + } + + $arr = []; + + $arr['uuid'] = $uuid; + $arr['mid'] = $mid; + $arr['aid'] = $owner_aid; + $arr['uid'] = $owner_uid; + $arr['parent'] = $item['id']; + $arr['parent_mid'] = $item['mid']; + $arr['thr_parent'] = $item['mid']; + $arr['owner_xchan'] = $thread_owner['xchan_hash']; + $arr['author_xchan'] = $observer['xchan_hash']; + $arr['item_origin'] = 1; + $arr['item_notshown'] = 1; + + if (intval($item['item_wall'])) { + $arr['item_wall'] = 1; + } else { + $arr['item_wall'] = 0; + } + + $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]'; + $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; + $plink = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]'; + + $arr['body'] = sprintf($bodyverb, $alink, $ulink, $plink); + + $arr['verb'] = $activity; + $arr['obj_type'] = $objtype; + $arr['obj'] = json_encode($obj); + + $arr['allow_cid'] = $item['allow_cid']; + $arr['allow_gid'] = $item['allow_gid']; + $arr['deny_cid'] = $item['deny_cid']; + $arr['deny_gid'] = $item['deny_gid']; + + $post = item_store($arr); + $post_id = $post['item_id']; + + $arr['id'] = $post_id; + + call_hooks('post_local_end', $arr); + + killme(); + } } diff --git a/Zotlabs/Module/Suggestions.php b/Zotlabs/Module/Suggestions.php index 39cb545c2..81d51e97e 100644 --- a/Zotlabs/Module/Suggestions.php +++ b/Zotlabs/Module/Suggestions.php @@ -1,6 +1,6 @@ [ [ 'uid' => local_channel(), 'xchan' => $_GET['ignore'] ]]] ); - } - } - - - function get() { - - $o = ''; - if (! local_channel()) { - notice( t('Permission denied.') . EOL); - return; - } + public function init() + { + if (!local_channel()) { + return; + } - if (Apps::system_app_installed(local_channel(),'Suggest Channels')) { + if (x($_GET, 'ignore')) { + q( + "insert into xign ( uid, xchan ) values ( %d, '%s' ) ", + intval(local_channel()), + dbesc($_GET['ignore']) + ); + Libsync::build_sync_packet(local_channel(), ['xign' => [['uid' => local_channel(), 'xchan' => $_GET['ignore']]]]); + } + } + + + public function get() + { + + $o = ''; + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + return; + } + + if (Apps::system_app_installed(local_channel(), 'Suggest Channels')) { goaway(z_root() . '/directory?f=&suggest=1'); } - $desc = t('This app (when installed) displays a small number of friend suggestions on selected pages or you can run the app to display a full list of channel suggestions.'); + $desc = t('This app (when installed) displays a small number of friend suggestions on selected pages or you can run the app to display a full list of channel suggestions.'); return '
' . $desc . ''; - - } - + } } diff --git a/Zotlabs/Module/Superblock.php b/Zotlabs/Module/Superblock.php index 8bb540f72..0d2dfc493 100644 --- a/Zotlabs/Module/Superblock.php +++ b/Zotlabs/Module/Superblock.php @@ -9,247 +9,253 @@ use Zotlabs\Lib\Libsync; use Zotlabs\Lib\LibBlock; use Zotlabs\Lib\Libzot; -class Superblock extends Controller { +class Superblock extends Controller +{ - function init() { - - if (! local_channel()) { - return; - } + public function init() + { - $inline = (isset($_REQUEST['manual_block']) ? true : false); + if (!local_channel()) { + return; + } - $type = BLOCKTYPE_CHANNEL; - $blocked = trim($_REQUEST['block']); - if (! $blocked) { - $blocked = trim($_REQUEST['blocksite']); - if ($blocked) { - $type = BLOCKTYPE_SERVER; - } - } + $inline = (isset($_REQUEST['manual_block']) ? true : false); - $m = parse_url($blocked); - if ($m['scheme'] && $m['host'] && (($type === BLOCKTYPE_SERVER) || (! $m['path']))) { - if (strcasecmp($m['host'],App::get_hostname()) === 0) { - notice(t('Blocking this site is not permitted.')); - if ($inline) { - return; - } - killme(); - } - $type = BLOCKTYPE_SERVER; - $blocked = $m['host']; - } + $type = BLOCKTYPE_CHANNEL; + $blocked = trim($_REQUEST['block']); + if (!$blocked) { + $blocked = trim($_REQUEST['blocksite']); + if ($blocked) { + $type = BLOCKTYPE_SERVER; + } + } - $handled = false; - $ignored = []; + $m = parse_url($blocked); + if ($m['scheme'] && $m['host'] && (($type === BLOCKTYPE_SERVER) || (!$m['path']))) { + if (strcasecmp($m['host'], App::get_hostname()) === 0) { + notice(t('Blocking this site is not permitted.')); + if ($inline) { + return; + } + killme(); + } + $type = BLOCKTYPE_SERVER; + $blocked = $m['host']; + } - if ($blocked) { - $handled = true; - if ($type === BLOCKTYPE_CHANNEL) { + $handled = false; + $ignored = []; - $r = q("select * from xchan where ( xchan_hash = '%s' or xchan_addr = '%s' or xchan_url = '%s' )", - dbesc($blocked), - dbesc($blocked), - dbesc($blocked) - ); + if ($blocked) { + $handled = true; + if ($type === BLOCKTYPE_CHANNEL) { + $r = q( + "select * from xchan where ( xchan_hash = '%s' or xchan_addr = '%s' or xchan_url = '%s' )", + dbesc($blocked), + dbesc($blocked), + dbesc($blocked) + ); - if (! $r) { - // not in cache - try discovery - $wf = discover_by_webbie($blocked,'',false); - - if (! $wf) { - notice( t('Channel not found.') . EOL); - if ($inline) { - return; - } - killme(); - } + if (!$r) { + // not in cache - try discovery + $wf = discover_by_webbie($blocked, '', false); - if ($wf) { + if (!$wf) { + notice(t('Channel not found.') . EOL); + if ($inline) { + return; + } + killme(); + } - // something was discovered - find the record which was just created. - - $r = q("select * from xchan where ( xchan_hash = '%s' or xchan_url = '%s' or xchan_addr = '%s' )", - dbesc(($wf) ? $wf : $blocked), - dbesc($blocked), - dbesc($blocked) - ); - } - } + if ($wf) { + // something was discovered - find the record which was just created. - if ($r) { - $r = Libzot::zot_record_preferred($r,'xchan_network'); - $blocked = $r['xchan_hash']; - } - } + $r = q( + "select * from xchan where ( xchan_hash = '%s' or xchan_url = '%s' or xchan_addr = '%s' )", + dbesc(($wf) ? $wf : $blocked), + dbesc($blocked), + dbesc($blocked) + ); + } + } - $bl = [ - 'block_channel_id' => local_channel(), - 'block_entity' => $blocked, - 'block_type' => $type, - 'block_comment' => t('Added by Superblock') - ]; + if ($r) { + $r = Libzot::zot_record_preferred($r, 'xchan_network'); + $blocked = $r['xchan_hash']; + } + } - LibBlock::store($bl); + $bl = [ + 'block_channel_id' => local_channel(), + 'block_entity' => $blocked, + 'block_type' => $type, + 'block_comment' => t('Added by Superblock') + ]; - $sync = []; - - $sync['block'] = [ LibBlock::fetch_by_entity(local_channel(),$blocked) ]; + LibBlock::store($bl); - if ($type === BLOCKTYPE_CHANNEL) { - $z = q("insert into xign ( uid, xchan ) values ( %d , '%s' ) ", - intval(local_channel()), - dbesc($blocked) - ); - $ab = q("select * from abook where abook_channel = %d and abook_xchan = '%s'", - intval(local_channel()), - dbesc($blocked) - ); - if (($ab) && (! intval($ab['abook_blocked']))) { - q("update abook set abook_blocked = 1 where abook_channel = %d and abook_xchan = '%s'", - intval(local_channel()), - dbesc($blocked) - ); - - $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1", - intval(local_channel()), - dbesc($blocked) - ); - if ($r) { - $r = array_shift($r); - $abconfig = load_abconfig(local_channel(),$blocked); - if ($abconfig) { - $r['abconfig'] = $abconfig; - } - unset($r['abook_id']); - unset($r['abook_account']); - unset($r['abook_channel']); - $sync['abook'] = [ $r ]; - } - } - $sync['xign'] = [[ 'uid' => local_channel(), 'xchan' => $_GET['block'] ]]; - } - Libsync::build_sync_packet(0, $sync); - } + $sync = []; - $type = BLOCKTYPE_CHANNEL; - $unblocked = trim($_REQUEST['unblock']); - if (! $unblocked) { - $unblocked = trim($_REQUEST['unblocksite']); - if ($unblocked) { - $type = BLOCKTYPE_SERVER; - } - } - if ($unblocked) { - $handled = true; - if (check_form_security_token('superblock','sectok')) { - $r = LibBlock::fetch_by_entity(local_channel(), $unblocked); - if ($r) { - LibBlock::remove(local_channel(), $unblocked); + $sync['block'] = [LibBlock::fetch_by_entity(local_channel(), $blocked)]; - $sync = []; - $sync['block'] = [[ - 'block_channel_id' => local_channel(), - 'block_entity' => $unblocked, - 'block_type' => $type, - 'deleted' => true, - ]]; - if ($type === BLOCKTYPE_CHANNEL) { - $ab = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_xchan = '%s'", - intval(local_channel()), - dbesc($unblocked) - ); - if (($ab) && (intval($ab['abook_blocked']))) { - q("update abook set abook_blocked = 1 where abook_channel = %d and abook_xchan = '%s'", - intval(local_channel()), - dbesc($unblocked) - ); - $ab['abook_blocked'] = 0; - $abconfig = load_abconfig(local_channel(),$unblocked); - if ($abconfig) { - $ab['abconfig'] = $abconfig; - } - unset($ab['abook_id']); - unset($ab['abook_account']); - unset($ab['abook_channel']); - $sync['abook'] = [ $ab ]; - } + if ($type === BLOCKTYPE_CHANNEL) { + $z = q( + "insert into xign ( uid, xchan ) values ( %d , '%s' ) ", + intval(local_channel()), + dbesc($blocked) + ); + $ab = q( + "select * from abook where abook_channel = %d and abook_xchan = '%s'", + intval(local_channel()), + dbesc($blocked) + ); + if (($ab) && (!intval($ab['abook_blocked']))) { + q( + "update abook set abook_blocked = 1 where abook_channel = %d and abook_xchan = '%s'", + intval(local_channel()), + dbesc($blocked) + ); - $z = q("delete from xign where uid = %d and xchan = '%s' ", - intval(local_channel()), - dbesc($unblocked) - ); - } - Libsync::build_sync_packet(0, $sync ); - } - } - } + $r = q( + "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1", + intval(local_channel()), + dbesc($blocked) + ); + if ($r) { + $r = array_shift($r); + $abconfig = load_abconfig(local_channel(), $blocked); + if ($abconfig) { + $r['abconfig'] = $abconfig; + } + unset($r['abook_id']); + unset($r['abook_account']); + unset($r['abook_channel']); + $sync['abook'] = [$r]; + } + } + $sync['xign'] = [['uid' => local_channel(), 'xchan' => $_GET['block']]]; + } + Libsync::build_sync_packet(0, $sync); + } - if ($handled) { + $type = BLOCKTYPE_CHANNEL; + $unblocked = trim($_REQUEST['unblock']); + if (!$unblocked) { + $unblocked = trim($_REQUEST['unblocksite']); + if ($unblocked) { + $type = BLOCKTYPE_SERVER; + } + } + if ($unblocked) { + $handled = true; + if (check_form_security_token('superblock', 'sectok')) { + $r = LibBlock::fetch_by_entity(local_channel(), $unblocked); + if ($r) { + LibBlock::remove(local_channel(), $unblocked); - info( t('superblock settings updated') . EOL ); + $sync = []; + $sync['block'] = [[ + 'block_channel_id' => local_channel(), + 'block_entity' => $unblocked, + 'block_type' => $type, + 'deleted' => true, + ]]; + if ($type === BLOCKTYPE_CHANNEL) { + $ab = q( + "select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_xchan = '%s'", + intval(local_channel()), + dbesc($unblocked) + ); + if (($ab) && (intval($ab['abook_blocked']))) { + q( + "update abook set abook_blocked = 1 where abook_channel = %d and abook_xchan = '%s'", + intval(local_channel()), + dbesc($unblocked) + ); + $ab['abook_blocked'] = 0; + $abconfig = load_abconfig(local_channel(), $unblocked); + if ($abconfig) { + $ab['abconfig'] = $abconfig; + } + unset($ab['abook_id']); + unset($ab['abook_account']); + unset($ab['abook_channel']); + $sync['abook'] = [$ab]; + } - if ($unblocked || $inline) { - return; - } - - killme(); - } + $z = q( + "delete from xign where uid = %d and xchan = '%s' ", + intval(local_channel()), + dbesc($unblocked) + ); + } + Libsync::build_sync_packet(0, $sync); + } + } + } - } + if ($handled) { + info(t('superblock settings updated') . EOL); - function get() { + if ($unblocked || $inline) { + return; + } - $l = LibBlock::fetch(local_channel(),BLOCKTYPE_CHANNEL); + killme(); + } + } - $list = ids_to_array($l,'block_entity'); + public function get() + { - stringify_array_elms($list,true); - $query_str = implode(',',$list); - if ($query_str) { - $r = q("select * from xchan where xchan_hash in ( " . $query_str . " ) "); - } - else { - $r = []; - } - if ($r) { - for ($x = 0; $x < count($r); $x ++) { - $r[$x]['encoded_hash'] = urlencode($r[$x]['xchan_hash']); - } - } + $l = LibBlock::fetch(local_channel(), BLOCKTYPE_CHANNEL); - $sc .= replace_macros(get_markup_template('superblock_list.tpl'), [ - '$blocked' => t('Blocked channels'), - '$entries' => $r, - '$nothing' => (($r) ? '' : t('No channels currently blocked')), - '$token' => get_form_security_token('superblock'), - '$remove' => t('Remove') - ]); + $list = ids_to_array($l, 'block_entity'); + + stringify_array_elms($list, true); + $query_str = implode(',', $list); + if ($query_str) { + $r = q("select * from xchan where xchan_hash in ( " . $query_str . " ) "); + } else { + $r = []; + } + if ($r) { + for ($x = 0; $x < count($r); $x++) { + $r[$x]['encoded_hash'] = urlencode($r[$x]['xchan_hash']); + } + } + + $sc .= replace_macros(get_markup_template('superblock_list.tpl'), [ + '$blocked' => t('Blocked channels'), + '$entries' => $r, + '$nothing' => (($r) ? '' : t('No channels currently blocked')), + '$token' => get_form_security_token('superblock'), + '$remove' => t('Remove') + ]); - $l = LibBlock::fetch(local_channel(),BLOCKTYPE_SERVER); - $list = ids_to_array($l,'block_entity'); - if ($list) { - for ($x = 0; $x < count($list); $x ++ ) { - $list[$x] = [ $list[$x], urlencode($list[$x]) ]; - } - } + $l = LibBlock::fetch(local_channel(), BLOCKTYPE_SERVER); + $list = ids_to_array($l, 'block_entity'); + if ($list) { + for ($x = 0; $x < count($list); $x++) { + $list[$x] = [$list[$x], urlencode($list[$x])]; + } + } - $sc .= replace_macros(get_markup_template('superblock_serverlist.tpl'), [ - '$blocked' => t('Blocked servers'), - '$entries' => $list, - '$nothing' => (($list) ? '' : t('No servers currently blocked')), - '$token' => get_form_security_token('superblock'), - '$remove' => t('Remove') - ]); + $sc .= replace_macros(get_markup_template('superblock_serverlist.tpl'), [ + '$blocked' => t('Blocked servers'), + '$entries' => $list, + '$nothing' => (($list) ? '' : t('No servers currently blocked')), + '$token' => get_form_security_token('superblock'), + '$remove' => t('Remove') + ]); - $s .= replace_macros(get_markup_template('generic_app_settings.tpl'), [ - '$addon' => array('superblock', t('Manage Blocks'), '', t('Submit')), - '$content' => $sc - ]); + $s .= replace_macros(get_markup_template('generic_app_settings.tpl'), [ + '$addon' => array('superblock', t('Manage Blocks'), '', t('Submit')), + '$content' => $sc + ]); - return $s; - - } -} \ No newline at end of file + return $s; + } +} diff --git a/Zotlabs/Module/Tagadelic.php b/Zotlabs/Module/Tagadelic.php index d17fdb36a..a4d1b8352 100644 --- a/Zotlabs/Module/Tagadelic.php +++ b/Zotlabs/Module/Tagadelic.php @@ -9,28 +9,30 @@ use Zotlabs\Lib\Libprofile; use Zotlabs\Web\Controller; use Zotlabs\Render\Comanche; -class Tagadelic extends Controller { +class Tagadelic extends Controller +{ - function init() { + public function init() + { - if(local_channel()) { - $channel = App::get_channel(); - if($channel && $channel['channel_address']) { - $which = $channel['channel_address']; - } - Libprofile::load($which,0); - } - - } + if (local_channel()) { + $channel = App::get_channel(); + if ($channel && $channel['channel_address']) { + $which = $channel['channel_address']; + } + Libprofile::load($which, 0); + } + } - function get() { + public function get() + { $desc = t('This app displays a hashtag cloud on your channel homepage.'); $text = '' . $desc . ''; - if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Tagadelic'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Tagadelic'))) { return $text; } @@ -39,10 +41,7 @@ class Tagadelic extends Controller { $text = '' . $desc . ''; - $c = new Comanche; - return $text . EOL . EOL . $c->widget('tagcloud_wall',EMPTY_STR); - - } - - + $c = new Comanche(); + return $text . EOL . EOL . $c->widget('tagcloud_wall', EMPTY_STR); + } } diff --git a/Zotlabs/Module/Tagger.php b/Zotlabs/Module/Tagger.php index 88745d164..9bef7e43e 100644 --- a/Zotlabs/Module/Tagger.php +++ b/Zotlabs/Module/Tagger.php @@ -1,170 +1,178 @@ 1) ? notags(trim(argv(1))) : 0); - - logger('tagger: tag ' . $term . ' item ' . $item_id); - - $r = q("select * from item where id = %d and uid = %d limit 1", - intval($item_id), - intval(local_channel()) - ); + $observer_hash = get_observer_hash(); + //strip html-tags + $term = notags(trim($_GET['term'])); + //check if empty + if (!$term) { + return; + } - if(! $r) { - $r = q("select * from item where id = %d and uid = %d limit 1", - intval($item_id), - intval($sys['channel_id']) - ); - if (! $r) { - $r = q("select * from item where id = %d and item_private = 0 and item_wall = 1", - intval($item_id) - ); - } - if ($r && local_channel() && (! is_sys_channel(local_channel()))) { - $r = [ copy_of_pubitem($channel, $i[0]['mid']) ]; + $item_id = ((argc() > 1) ? notags(trim(argv(1))) : 0); + + logger('tagger: tag ' . $term . ' item ' . $item_id); + + $r = q( + "select * from item where id = %d and uid = %d limit 1", + intval($item_id), + intval(local_channel()) + ); + + if (!$r) { + $r = q( + "select * from item where id = %d and uid = %d limit 1", + intval($item_id), + intval($sys['channel_id']) + ); + if (!$r) { + $r = q( + "select * from item where id = %d and item_private = 0 and item_wall = 1", + intval($item_id) + ); + } + if ($r && local_channel() && (!is_sys_channel(local_channel()))) { + $r = [copy_of_pubitem($channel, $i[0]['mid'])]; $item_id = (($r) ? $r[0]['id'] : 0); - } - } + } + } - if(! $r) { - notice( t('Post not found.') . EOL); - return; - } + if (!$r) { + notice(t('Post not found.') . EOL); + return; + } - $r = q("SELECT * FROM item left join xchan on xchan_hash = author_xchan WHERE id = %d and uid = %d LIMIT 1", - intval($item_id), - intval(local_channel()) - ); - - if((! $item_id) || (! $r)) { - logger('tagger: no item ' . $item_id); - return; - } - - $item = $r[0]; - - $owner_uid = $item['uid']; - - switch($item['resource_type']) { - case 'photo': - $targettype = ACTIVITY_OBJ_PHOTO; - $post_type = t('photo'); - break; - case 'event': - $targgettype = ACTIVITY_OBJ_EVENT; - $post_type = t('event'); - break; - default: - $targettype = ACTIVITY_OBJ_NOTE; - $post_type = t('post'); - if($item['mid'] != $item['parent_mid']) - $post_type = t('comment'); - break; - } - + $r = q( + "SELECT * FROM item left join xchan on xchan_hash = author_xchan WHERE id = %d and uid = %d LIMIT 1", + intval($item_id), + intval(local_channel()) + ); - $clean_term = trim($term,'"\' '); - - $links = array(array('rel' => 'alternate','type' => 'text/html', - 'href' => z_root() . '/display/' . gen_link_id($item['mid']))); - - $target = json_encode(array( - 'type' => $targettype, - 'id' => $item['mid'], - 'link' => $links, - 'title' => $item['title'], - 'content' => $item['body'], - 'created' => $item['created'], - 'edited' => $item['edited'], - 'author' => array( - 'name' => $item['xchan_name'], - 'address' => $item['xchan_addr'], - 'guid' => $item['xchan_guid'], - 'guid_sig' => $item['xchan_guid_sig'], - 'link' => array( - array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item['xchan_url']), - array('rel' => 'photo', 'type' => $item['xchan_photo_mimetype'], 'href' => $item['xchan_photo_m'])), - ), - )); - - $tagid = z_root() . '/search?tag=' . $clean_term; - $objtype = ACTIVITY_OBJ_TAGTERM; - - $obj = json_encode(array( - 'type' => $objtype, - 'id' => $tagid, - 'link' => array(array('rel' => 'alternate','type' => 'text/html', 'href' => $tagid)), - 'title' => $clean_term, - 'content' => $clean_term - )); - - $bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s'); - - // saving here for reference - // also check out x22d5 and x2317 and x0d6b and x0db8 and x24d0 and xff20 !!! - - $termlink = html_entity_decode('⋕') . '[zrl=' . z_root() . '/search?tag=' . urlencode($clean_term) . ']'. $clean_term . '[/zrl]'; - - $channel = \App::get_channel(); - - $arr = []; - - $arr['owner_xchan'] = $item['owner_xchan']; - $arr['author_xchan'] = $channel['channel_hash']; - - $arr['item_origin'] = 1; - $arr['item_wall'] = ((intval($item['item_wall'])) ? 1 : 0); - - $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]'; - $alink = '[zrl=' . $item['xchan_url'] . ']' . $item['xchan_name'] . '[/zrl]'; - $plink = '[zrl=' . $item['plink'] . ']' . $post_type . '[/zrl]'; - - $arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink, $termlink ); - - $arr['verb'] = ACTIVITY_TAG; - $arr['tgt_type'] = $targettype; - $arr['target'] = $target; - $arr['obj_type'] = $objtype; - $arr['obj'] = $obj; - $arr['parent_mid'] = $item['mid']; - store_item_tag($item['uid'],$item['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$clean_term,$tagid); - $ret = post_activity_item($arr); + if ((!$item_id) || (!$r)) { + logger('tagger: no item ' . $item_id); + return; + } - if($ret['success']) { - Libsync::build_sync_packet(local_channel(), - [ - 'item' => [ encode_item($ret['activity'],true) ] - ] - ); - } - - killme(); - - } - + $item = $r[0]; + + $owner_uid = $item['uid']; + + switch ($item['resource_type']) { + case 'photo': + $targettype = ACTIVITY_OBJ_PHOTO; + $post_type = t('photo'); + break; + case 'event': + $targgettype = ACTIVITY_OBJ_EVENT; + $post_type = t('event'); + break; + default: + $targettype = ACTIVITY_OBJ_NOTE; + $post_type = t('post'); + if ($item['mid'] != $item['parent_mid']) { + $post_type = t('comment'); + } + break; + } + + + $clean_term = trim($term, '"\' '); + + $links = array(array('rel' => 'alternate', 'type' => 'text/html', + 'href' => z_root() . '/display/' . gen_link_id($item['mid']))); + + $target = json_encode(array( + 'type' => $targettype, + 'id' => $item['mid'], + 'link' => $links, + 'title' => $item['title'], + 'content' => $item['body'], + 'created' => $item['created'], + 'edited' => $item['edited'], + 'author' => array( + 'name' => $item['xchan_name'], + 'address' => $item['xchan_addr'], + 'guid' => $item['xchan_guid'], + 'guid_sig' => $item['xchan_guid_sig'], + 'link' => array( + array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item['xchan_url']), + array('rel' => 'photo', 'type' => $item['xchan_photo_mimetype'], 'href' => $item['xchan_photo_m'])), + ), + )); + + $tagid = z_root() . '/search?tag=' . $clean_term; + $objtype = ACTIVITY_OBJ_TAGTERM; + + $obj = json_encode(array( + 'type' => $objtype, + 'id' => $tagid, + 'link' => array(array('rel' => 'alternate', 'type' => 'text/html', 'href' => $tagid)), + 'title' => $clean_term, + 'content' => $clean_term + )); + + $bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s'); + + // saving here for reference + // also check out x22d5 and x2317 and x0d6b and x0db8 and x24d0 and xff20 !!! + + $termlink = html_entity_decode('⋕') . '[zrl=' . z_root() . '/search?tag=' . urlencode($clean_term) . ']' . $clean_term . '[/zrl]'; + + $channel = App::get_channel(); + + $arr = []; + + $arr['owner_xchan'] = $item['owner_xchan']; + $arr['author_xchan'] = $channel['channel_hash']; + + $arr['item_origin'] = 1; + $arr['item_wall'] = ((intval($item['item_wall'])) ? 1 : 0); + + $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]'; + $alink = '[zrl=' . $item['xchan_url'] . ']' . $item['xchan_name'] . '[/zrl]'; + $plink = '[zrl=' . $item['plink'] . ']' . $post_type . '[/zrl]'; + + $arr['body'] = sprintf($bodyverb, $ulink, $alink, $plink, $termlink); + + $arr['verb'] = ACTIVITY_TAG; + $arr['tgt_type'] = $targettype; + $arr['target'] = $target; + $arr['obj_type'] = $objtype; + $arr['obj'] = $obj; + $arr['parent_mid'] = $item['mid']; + store_item_tag($item['uid'], $item['id'], TERM_OBJ_POST, TERM_COMMUNITYTAG, $clean_term, $tagid); + $ret = post_activity_item($arr); + + if ($ret['success']) { + Libsync::build_sync_packet( + local_channel(), + [ + 'item' => [encode_item($ret['activity'], true)] + ] + ); + } + + killme(); + } } diff --git a/Zotlabs/Module/Tagrm.php b/Zotlabs/Module/Tagrm.php index c8b613258..4879170b6 100644 --- a/Zotlabs/Module/Tagrm.php +++ b/Zotlabs/Module/Tagrm.php @@ -1,147 +1,158 @@ ' . t('Remove Item Tag') . ''; - - $o .= '' . t('Select a tag to remove: ') . '
'; - - $o .= ''; - - return $o; - - } - - } - + public function post() + { + + if (!local_channel()) { + goaway(z_root() . '/' . $_SESSION['photo_return']); + } + + + if ((x($_POST, 'submit')) && ($_POST['submit'] === t('Cancel'))) { + goaway(z_root() . '/' . $_SESSION['photo_return']); + } + + $tag = ((x($_POST, 'tag')) ? trim($_POST['tag']) : ''); + $item = ((x($_POST, 'item')) ? intval($_POST['item']) : 0); + + $r = q( + "SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1", + intval($item), + intval(local_channel()) + ); + + if (!$r) { + goaway(z_root() . '/' . $_SESSION['photo_return']); + } + + $r = fetch_post_tags($r, true); + + $item = $r[0]; + $new_tags = []; + + if ($item['term']) { + for ($x = 0; $x < count($item['term']); $x++) { + if ($item['term'][$x]['term'] !== hex2bin($tag)) { + $new_tags[] = $item['term'][$x]; + } + } + } + + if ($new_tags) { + $item['term'] = $new_tags; + } else { + unset($item['term']); + } + + item_store_update($item); + + info(t('Tag removed') . EOL); + goaway(z_root() . '/' . $_SESSION['photo_return']); + + // NOTREACHED + } + + + public function get() + { + + if (!local_channel()) { + goaway(z_root() . '/' . $_SESSION['photo_return']); + // NOTREACHED + } + + // remove tag on the fly if item and tag are provided + if ((argc() == 4) && (argv(1) === 'drop') && intval(argv(2))) { + $item = intval(argv(2)); + $tag = argv(3); + + $r = q( + "SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1", + intval($item), + intval(local_channel()) + ); + + if (!$r) { + goaway(z_root() . '/' . $_SESSION['photo_return']); + } + + $r = fetch_post_tags($r, true); + + $item = $r[0]; + + $new_tags = []; + + if ($item['term']) { + for ($x = 0; $x < count($item['term']); $x++) { + if ($item['term'][$x]['term'] !== hex2bin($tag)) { + $new_tags[] = $item['term'][$x]; + } + } + } + + if ($new_tags) { + $item['term'] = $new_tags; + } else { + unset($item['term']); + } + + item_store_update($item); + + info(t('Tag removed') . EOL); + goaway(z_root() . '/' . $_SESSION['photo_return']); + } + + //if we got only the item print a list of tags to select + if ((argc() == 3) && (argv(1) === 'drop') && intval(argv(2))) { + $o = ''; + + $item = intval(argv(2)); + + $r = q( + "SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1", + intval($item), + intval(local_channel()) + ); + + if (!$r) { + goaway(z_root() . '/' . $_SESSION['photo_return']); + } + + $r = fetch_post_tags($r, true); + + if (!count($r[0]['term'])) { + goaway(z_root() . '/' . $_SESSION['photo_return']); + } + + $o .= '' . t('Remove Item Tag') . '
'; + + $o .= '' . t('Select a tag to remove: ') . '
'; + + $o .= ''; + + return $o; + } + } } diff --git a/Zotlabs/Module/Tasks.php b/Zotlabs/Module/Tasks.php index 17c578c52..38deac91d 100644 --- a/Zotlabs/Module/Tasks.php +++ b/Zotlabs/Module/Tasks.php @@ -1,115 +1,117 @@ 1 && argv(1) === 'fetch') { - if (argc() > 2 && argv(2) === 'all') - $arr['all'] = 1; - - $x = tasks_fetch($arr); - $x['html'] = ''; - if(isset($x['tasks']) && is_array($x['tasks'])) { - foreach($x['tasks'] as $y) { - $x['html'] .= '' . $y['summary'] . ''; - } - } - json_return_and_die($x); - } - - } - - - - function post() { - // logger('post: ' . print_r($_POST,true)); - - - if (! local_channel()) { - return; - } - - $channel = App::get_channel(); - - if ((argc() > 2) && (argv(1) === 'complete') && intval(argv(2))) { - $ret = array('success' => false); - $r = q("select * from event where etype = 'task' and uid = %d and id = %d limit 1", - intval(local_channel()), - intval(argv(2)) - ); - if ($r) { - $event = $r[0]; - if ($event['event_status'] === 'COMPLETED') { - $event['event_status'] = 'IN-PROCESS'; - $event['event_status_date'] = NULL_DATE; - $event['event_percent'] = 0; - $event['event_sequence'] = $event['event_sequence'] + 1; - $event['edited'] = datetime_convert(); - } - else { - $event['event_status'] = 'COMPLETED'; - $event['event_status_date'] = datetime_convert(); - $event['event_percent'] = 100; - $event['event_sequence'] = $event['event_sequence'] + 1; - $event['edited'] = datetime_convert(); - } - $x = event_store_event($event); - if ($x) { - $ret['success'] = true; - } - } - json_return_and_die($ret); - } - - if (argc() == 2 && argv(1) === 'new') { - $text = escape_tags(trim($_REQUEST['summary'])); - if (! $text) { - return [ 'success' => false ]; - } - $event = []; - $event['account'] = $channel['channel_account_id']; - $event['uid'] = $channel['channel_id']; - $event['event_xchan'] = $channel['channel_hash']; - $event['etype'] = 'task'; - $event['nofinish'] = true; - $event['created'] = $event['edited'] = $event['dtstart'] = datetime_convert(); - $event['adjust'] = 1; - $event['allow_cid'] = '<' . $channel['channel_hash'] . '>'; - $event['summary'] = escape_tags($_REQUEST['summary']); - $x = event_store_event($event); - if ($x) { - $x['success'] = true; - } - else { - $x = [ 'success' => false ]; - } - json_return_and_die($x); - } - } + public function init() + { + // logger('request: ' . print_r($_REQUEST,true)); - function get() { + $arr = []; + + if (argc() > 1 && argv(1) === 'fetch') { + if (argc() > 2 && argv(2) === 'all') { + $arr['all'] = 1; + } + + $x = tasks_fetch($arr); + $x['html'] = ''; + if (isset($x['tasks']) && is_array($x['tasks'])) { + foreach ($x['tasks'] as $y) { + $x['html'] .= '' . $y['summary'] . ''; + } + } + json_return_and_die($x); + } + } + + + public function post() + { + // logger('post: ' . print_r($_POST,true)); + + + if (!local_channel()) { + return; + } + + $channel = App::get_channel(); + + if ((argc() > 2) && (argv(1) === 'complete') && intval(argv(2))) { + $ret = array('success' => false); + $r = q( + "select * from event where etype = 'task' and uid = %d and id = %d limit 1", + intval(local_channel()), + intval(argv(2)) + ); + if ($r) { + $event = $r[0]; + if ($event['event_status'] === 'COMPLETED') { + $event['event_status'] = 'IN-PROCESS'; + $event['event_status_date'] = NULL_DATE; + $event['event_percent'] = 0; + $event['event_sequence'] = $event['event_sequence'] + 1; + $event['edited'] = datetime_convert(); + } else { + $event['event_status'] = 'COMPLETED'; + $event['event_status_date'] = datetime_convert(); + $event['event_percent'] = 100; + $event['event_sequence'] = $event['event_sequence'] + 1; + $event['edited'] = datetime_convert(); + } + $x = event_store_event($event); + if ($x) { + $ret['success'] = true; + } + } + json_return_and_die($ret); + } + + if (argc() == 2 && argv(1) === 'new') { + $text = escape_tags(trim($_REQUEST['summary'])); + if (!$text) { + return ['success' => false]; + } + $event = []; + $event['account'] = $channel['channel_account_id']; + $event['uid'] = $channel['channel_id']; + $event['event_xchan'] = $channel['channel_hash']; + $event['etype'] = 'task'; + $event['nofinish'] = true; + $event['created'] = $event['edited'] = $event['dtstart'] = datetime_convert(); + $event['adjust'] = 1; + $event['allow_cid'] = '<' . $channel['channel_hash'] . '>'; + $event['summary'] = escape_tags($_REQUEST['summary']); + $x = event_store_event($event); + if ($x) { + $x['success'] = true; + } else { + $x = ['success' => false]; + } + json_return_and_die($x); + } + } + + public function get() + { $desc = t('This app provides a simple personal and task list.'); $text = '' . $desc . ''; - if(! ( local_channel() && Apps::system_app_installed(local_channel(),'Tasks'))) { + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Tasks'))) { return $text; } - $obj = new \Zotlabs\Widget\Tasklist; - return $obj->widget([]); - } - - + $obj = new Tasklist(); + return $obj->widget([]); + } } diff --git a/Zotlabs/Module/Theme_info.php b/Zotlabs/Module/Theme_info.php index a03b9b160..8334b8497 100644 --- a/Zotlabs/Module/Theme_info.php +++ b/Zotlabs/Module/Theme_info.php @@ -2,70 +2,72 @@ namespace Zotlabs\Module; +use App; +use Zotlabs\Web\Controller; -class Theme_info extends \Zotlabs\Web\Controller { +class Theme_info extends Controller +{ - function get() { - $theme = argv(1); - if(! $theme) - killme(); - - $schemalist = []; + public function get() + { + $theme = argv(1); + if (!$theme) { + killme(); + } - $theme_config = ""; - if(($themeconfigfile = $this->get_theme_config_file($theme)) != null){ - require_once($themeconfigfile); - if(class_exists('\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config')) { - $clsname = '\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config'; - $th_config = new $clsname(); - $schemas = $th_config->get_schemas(); - if($schemas) { - foreach($schemas as $k => $v) { - $schemalist[] = [ 'key' => $k, 'val' => $v ]; - } - } - $theme_config = $th_config->get(); - } - } - $info = get_theme_info($theme); - if($info) { - // unfortunately there will be no translation for this string - $desc = $info['description']; - $version = $info['version']; - $credits = $info['credits']; - } - else { - $desc = ''; - $version = ''; - $credits = ''; - } + $schemalist = []; - $ret = [ - 'theme' => $theme, - 'img' => get_theme_screenshot($theme), - 'desc' => $desc, - 'version' => $version, - 'credits' => $credits, - 'schemas' => $schemalist, - 'config' => $theme_config - ]; - json_return_and_die($ret); - - } + $theme_config = ""; + if (($themeconfigfile = $this->get_theme_config_file($theme)) != null) { + require_once($themeconfigfile); + if (class_exists('\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config')) { + $clsname = '\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config'; + $th_config = new $clsname(); + $schemas = $th_config->get_schemas(); + if ($schemas) { + foreach ($schemas as $k => $v) { + $schemalist[] = ['key' => $k, 'val' => $v]; + } + } + $theme_config = $th_config->get(); + } + } + $info = get_theme_info($theme); + if ($info) { + // unfortunately there will be no translation for this string + $desc = $info['description']; + $version = $info['version']; + $credits = $info['credits']; + } else { + $desc = ''; + $version = ''; + $credits = ''; + } + + $ret = [ + 'theme' => $theme, + 'img' => get_theme_screenshot($theme), + 'desc' => $desc, + 'version' => $version, + 'credits' => $credits, + 'schemas' => $schemalist, + 'config' => $theme_config + ]; + json_return_and_die($ret); + } - function get_theme_config_file($theme){ + public function get_theme_config_file($theme) + { - $base_theme = \App::$theme_info['extends']; - - if (file_exists("view/theme/$theme/php/config.php")){ - return "view/theme/$theme/php/config.php"; - } - if (file_exists("view/theme/$base_theme/php/config.php")){ - return "view/theme/$base_theme/php/config.php"; - } - return null; - } + $base_theme = App::$theme_info['extends']; - -} \ No newline at end of file + if (file_exists("view/theme/$theme/php/config.php")) { + return "view/theme/$theme/php/config.php"; + } + if (file_exists("view/theme/$base_theme/php/config.php")) { + return "view/theme/$base_theme/php/config.php"; + } + return null; + } +} diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php index 460556fe5..9228177eb 100644 --- a/Zotlabs/Module/Thing.php +++ b/Zotlabs/Module/Thing.php @@ -2,13 +2,12 @@ namespace Zotlabs\Module; - use App; +use Zotlabs\Access\AccessControl; use Zotlabs\Web\Controller; use Zotlabs\Lib\Libprofile; use Zotlabs\Lib\Libsync; - /** * @file Zotlabs/Module/Thing.php */ @@ -18,387 +17,406 @@ require_once('include/security.php'); require_once('include/acl_selectors.php'); -class Thing extends Controller { - - function init() { - - if(! local_channel()) - return; - - $channel = \App::get_channel(); - - if($_SERVER['REQUEST_METHOD'] === 'GET' && argc() < 2) { - Libprofile::load($channel['channel_address']); - } - - - $term_hash = (($_REQUEST['term_hash']) ? $_REQUEST['term_hash'] : ''); - - $name = escape_tags($_REQUEST['term']); - $verb = escape_tags($_REQUEST['verb']); - $activity = intval($_REQUEST['activity']); - $profile_guid = escape_tags($_REQUEST['profile_assign']); - $url = $_REQUEST['url']; - $photo = $_REQUEST['img']; - - $hash = random_string(); - - $verbs = obj_verbs(); - - /** - * verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants" - * We use the first person form when creating an activity, but the third person for use in activities - * @FIXME There is no accounting for verb gender for languages where this is significant. We may eventually - * require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module. - */ - - $translated_verb = $verbs[$verb][1]; - - /* - * The site administrator can do things that normals cannot. - * This is restricted because it will likely cause - * an activitystreams protocol violation and the activity might - * choke in some other network and result in unnecessary - * support requests. It isn't because we're trying to be heavy-handed - * about what you can and can't do. - */ - - if(! $translated_verb) { - if(is_site_admin()) - $translated_verb = $verb; - } - - /* - * Things, objects: We do not provide definite (a, an) or indefinite (the) articles or singular/plural designators - * That needs to be specified in your thing. e.g. Mike has "a carrot", Greg wants "balls", Bob likes "the Boston Red Sox". - */ - - /* - * Future work on this module might produce more complex activities with targets, e.g. Phillip likes Karen's moustache - * and to describe other non-thing objects like channels, such as Karl wants Susan - where Susan represents a channel profile. - */ - - if((! $name) || (! $translated_verb)) - return; - - $acl = new \Zotlabs\Access\AccessControl($channel); - - if(array_key_exists('contact_allow',$_REQUEST) - || array_key_exists('group_allow',$_REQUEST) - || array_key_exists('contact_deny',$_REQUEST) - || array_key_exists('group_deny',$_REQUEST)) { - $acl->set_from_array($_REQUEST); - } - - $x = $acl->get(); - - if($term_hash) { - $t = q("select * from obj where obj_obj = '%s' and obj_channel = %d limit 1", - dbesc($term_hash), - intval(local_channel()) - ); - if(! $t) { - notice( t('Item not found.') . EOL); - return; - } - $orig_record = $t[0]; - if($photo != $orig_record['obj_imgurl']) { - delete_thing_photo($orig_record['obj_imgurl'],get_observer_hash()); - $arr = import_remote_xchan_photo($photo,get_observer_hash(),true); - if ($arr) { - $local_photo = $arr[0]; - $local_photo_type = $arr[3]; - } - else { - $local_photo = $orig_record['obj_imgurl']; - } - } - else { - $local_photo = $orig_record['obj_imgurl']; - } - if ($local_photo) { - $r = q("update obj set obj_term = '%s', obj_url = '%s', obj_imgurl = '%s', obj_edited = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where obj_obj = '%s' and obj_channel = %d ", - dbesc($name), - dbesc(($url) ? $url : z_root() . '/thing/' . $term_hash), - dbesc($local_photo), - dbesc(datetime_convert()), - dbesc($x['allow_cid']), - dbesc($x['allow_gid']), - dbesc($x['deny_cid']), - dbesc($x['deny_gid']), - dbesc($term_hash), - intval(local_channel()) - ); - } - info( t('Thing updated') . EOL); - - $r = q("select * from obj where obj_channel = %d and obj_obj = '%s' limit 1", - intval(local_channel()), - dbesc($term_hash) - ); - if($r) { - Libsync::build_sync_packet(0, array('obj' => $r)); - } - - return; - } - - $sql = (($profile_guid) ? " and profile_guid = '" . dbesc($profile_guid) . "' " : " and is_default = 1 "); - $p = q("select profile_guid, is_default from profile where uid = %d $sql limit 1", - intval(local_channel()) - ); - - if($p) - $profile = $p[0]; - else - return; - - $local_photo = null; - - if($photo) { - $arr = import_remote_xchan_photo($photo,get_observer_hash(),true); - if ($arr) { - $local_photo = $arr[0]; - $local_photo_type = $arr[3]; - } - else { - $local_photo = $photo; - } - } - - - $created = datetime_convert(); - $url = (($url) ? $url : z_root() . '/thing/' . $hash); - - $r = q("insert into obj ( obj_page, obj_verb, obj_type, obj_channel, obj_obj, obj_term, obj_url, obj_imgurl, obj_created, obj_edited, allow_cid, allow_gid, deny_cid, deny_gid ) values ('%s','%s', %d, %d, '%s','%s','%s','%s','%s','%s','%s','%s','%s','%s') ", - dbesc($profile['profile_guid']), - dbesc($verb), - intval(TERM_OBJ_THING), - intval(local_channel()), - dbesc($hash), - dbesc($name), - dbesc($url), - dbesc(($photo) ? $local_photo : ''), - dbesc($created), - dbesc($created), - dbesc($x['allow_cid']), - dbesc($x['allow_gid']), - dbesc($x['deny_cid']), - dbesc($x['deny_gid']) - ); - - if(! $r) { - notice( t('Object store: failed')); - return; - } - - info( t('Thing added')); - - $r = q("select * from obj where obj_channel = %d and obj_obj = '%s' limit 1", - intval(local_channel()), - dbesc($hash) - ); - if($r) { - Libsync::build_sync_packet(0, array('obj' => $r)); - } - - if($activity) { - $arr = []; - $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $url)); - if($local_photo) - $links[] = array('rel' => 'photo', 'type' => $local_photo_type, 'href' => $local_photo); - - $objtype = ACTIVITY_OBJ_THING; - - $obj = json_encode(array( - 'type' => $objtype, - 'id' => $url, - 'link' => $links, - 'title' => $name, - 'content' => $name - )); - - $bodyverb = str_replace('OBJ: ', '',t('OBJ: %1$s %2$s %3$s')); - - $arr['owner_xchan'] = $channel['channel_hash']; - $arr['author_xchan'] = $channel['channel_hash']; - - $arr['item_origin'] = 1; - $arr['item_wall'] = 1; - $arr['item_thread_top'] = 1; - - $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]'; - $plink = '[zrl=' . $url . ']' . $name . '[/zrl]'; - - $arr['body'] = sprintf( $bodyverb, $ulink, $translated_verb, $plink ); - - if($local_photo) - $arr['body'] .= "\n\n[zmg]" . $local_photo . "[/zmg]"; - - $arr['verb'] = $verb; - $arr['obj_type'] = $objtype; - $arr['obj'] = $obj; - - if(! $profile['is_default']) { - $arr['item_private'] = true; - $str = ''; - $r = q("select abook_xchan from abook where abook_channel = %d and abook_profile = '%s'", - intval(local_channel()), - dbesc($profile_guid) - ); - if($r) { - $arr['allow_cid'] = ''; - foreach($r as $rr) - $arr['allow_cid'] .= '<' . $rr['abook_xchan'] . '>'; - } - else - $arr['allow_cid'] = '<' . get_observer_hash() . '>'; - } - - $ret = post_activity_item($arr); - } - } - - - function get() { - - // @FIXME one problem with things is we can't share them unless we provide the channel in the url - // so we can definitively lookup the owner. - - if(argc() == 2) { - - $r = q("select obj_channel from obj where obj_type = %d and obj_obj = '%s' limit 1", - intval(TERM_OBJ_THING), - dbesc(argv(1)) - ); - if($r) - $sql_extra = permissions_sql($r[0]['obj_channel']); - - $r = q("select * from obj where obj_type = %d and obj_obj = '%s' $sql_extra limit 1", - intval(TERM_OBJ_THING), - dbesc(argv(1)) - ); - - if($r) { - return replace_macros(get_markup_template('show_thing.tpl'), array( - '$header' => t('Show Thing'), - '$edit' => t('Edit'), - '$delete' => t('Delete'), - '$canedit' => ((local_channel() && local_channel() == $r[0]['obj_channel']) ? true : false), - '$thing' => $r[0] )); - } - else { - notice( t('item not found.') . EOL); - return; - } - } - - $channel = \App::get_channel(); - - if(! (local_channel() && $channel)) { - notice( t('Permission denied.') . EOL); - return; - } - - $acl = new \Zotlabs\Access\AccessControl($channel); - $channel_acl = $acl->get(); - - $lockstate = (($acl->is_private()) ? 'lock' : 'unlock'); - - $thing_hash = ''; - - if(argc() == 3 && argv(1) === 'edit') { - $thing_hash = argv(2); - - $r = q("select * from obj where obj_type = %d and obj_obj = '%s' limit 1", - intval(TERM_OBJ_THING), - dbesc($thing_hash) - ); - - if((! $r) || ($r[0]['obj_channel'] != local_channel())) { - notice( t('Permission denied.') . EOL); - return ''; - } - - $o .= replace_macros(get_markup_template('thing_edit.tpl'),array( - '$thing_hdr' => t('Edit Thing'), - '$multiprof' => feature_enabled(local_channel(),'multi_profiles'), - '$profile_lbl' => t('Select a profile'), - '$profile_select' => contact_profile_assign($r[0]['obj_page']), - '$verb_lbl' => $channel['channel_name'], - '$verb_select' => obj_verb_selector($r[0]['obj_verb']), - '$activity' => array('activity',t('Post an activity'),true,t('Only sends to viewers of the applicable profile')), - '$thing_hash' => $thing_hash, - '$thing_lbl' => t('Name of thing e.g. something'), - '$thething' => $r[0]['obj_term'], - '$url_lbl' => t('URL of thing (optional)'), - '$theurl' => $r[0]['obj_url'], - '$img_lbl' => t('URL for photo of thing (optional)'), - '$imgurl' => $r[0]['obj_imgurl'], - '$permissions' => t('Permissions'), - '$aclselect' => populate_acl($channel_acl,false), - '$allow_cid' => acl2json($channel_acl['allow_cid']), - '$allow_gid' => acl2json($channel_acl['allow_gid']), - '$deny_cid' => acl2json($channel_acl['deny_cid']), - '$deny_gid' => acl2json($channel_acl['deny_gid']), - '$lockstate' => $lockstate, - '$submit' => t('Submit') - )); - - return $o; - } - - if(argc() == 3 && argv(1) === 'drop') { - $thing_hash = argv(2); - - $r = q("select * from obj where obj_type = %d and obj_obj = '%s' limit 1", - intval(TERM_OBJ_THING), - dbesc($thing_hash) - ); - - if((! $r) || ($r[0]['obj_channel'] != local_channel())) { - notice( t('Permission denied.') . EOL); - return ''; - } - - - delete_thing_photo($r[0]['obj_imgurl'],get_observer_hash()); - - $x = q("delete from obj where obj_obj = '%s' and obj_type = %d and obj_channel = %d", - dbesc($thing_hash), - intval(TERM_OBJ_THING), - intval(local_channel()) - ); - - $r[0]['obj_deleted'] = 1; - - Libsync::build_sync_packet(0,array('obj' => $r)); - - return $o; - } - - $o .= replace_macros(get_markup_template('thing_input.tpl'),array( - '$thing_hdr' => t('Add Thing to your Profile'), - '$multiprof' => feature_enabled(local_channel(),'multi_profiles'), - '$profile_lbl' => t('Select a profile'), - '$profile_select' => contact_profile_assign(''), - '$verb_lbl' => $channel['channel_name'], - '$activity' => array('activity',t('Post an activity'),((array_key_exists('activity',$_REQUEST)) ? $_REQUEST['activity'] : true),t('Only sends to viewers of the applicable profile')), - '$verb_select' => obj_verb_selector(), - '$thing_lbl' => t('Name of thing e.g. something'), - '$url_lbl' => t('URL of thing (optional)'), - '$img_lbl' => t('URL for photo of thing (optional)'), - '$permissions' => t('Permissions'), - '$aclselect' => populate_acl($channel_acl,false), - '$allow_cid' => acl2json($channel_acl['allow_cid']), - '$allow_gid' => acl2json($channel_acl['allow_gid']), - '$deny_cid' => acl2json($channel_acl['deny_cid']), - '$deny_gid' => acl2json($channel_acl['deny_gid']), - '$lockstate' => $lockstate, - '$submit' => t('Submit') - )); - - return $o; - } - +class Thing extends Controller +{ + + public function init() + { + + if (!local_channel()) { + return; + } + + $channel = App::get_channel(); + + if ($_SERVER['REQUEST_METHOD'] === 'GET' && argc() < 2) { + Libprofile::load($channel['channel_address']); + } + + + $term_hash = (($_REQUEST['term_hash']) ? $_REQUEST['term_hash'] : ''); + + $name = escape_tags($_REQUEST['term']); + $verb = escape_tags($_REQUEST['verb']); + $activity = intval($_REQUEST['activity']); + $profile_guid = escape_tags($_REQUEST['profile_assign']); + $url = $_REQUEST['url']; + $photo = $_REQUEST['img']; + + $hash = random_string(); + + $verbs = obj_verbs(); + + /** + * verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants" + * We use the first person form when creating an activity, but the third person for use in activities + * @FIXME There is no accounting for verb gender for languages where this is significant. We may eventually + * require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module. + */ + + $translated_verb = $verbs[$verb][1]; + + /* + * The site administrator can do things that normals cannot. + * This is restricted because it will likely cause + * an activitystreams protocol violation and the activity might + * choke in some other network and result in unnecessary + * support requests. It isn't because we're trying to be heavy-handed + * about what you can and can't do. + */ + + if (!$translated_verb) { + if (is_site_admin()) { + $translated_verb = $verb; + } + } + + /* + * Things, objects: We do not provide definite (a, an) or indefinite (the) articles or singular/plural designators + * That needs to be specified in your thing. e.g. Mike has "a carrot", Greg wants "balls", Bob likes "the Boston Red Sox". + */ + + /* + * Future work on this module might produce more complex activities with targets, e.g. Phillip likes Karen's moustache + * and to describe other non-thing objects like channels, such as Karl wants Susan - where Susan represents a channel profile. + */ + + if ((!$name) || (!$translated_verb)) { + return; + } + + $acl = new AccessControl($channel); + + if ( + array_key_exists('contact_allow', $_REQUEST) + || array_key_exists('group_allow', $_REQUEST) + || array_key_exists('contact_deny', $_REQUEST) + || array_key_exists('group_deny', $_REQUEST) + ) { + $acl->set_from_array($_REQUEST); + } + + $x = $acl->get(); + + if ($term_hash) { + $t = q( + "select * from obj where obj_obj = '%s' and obj_channel = %d limit 1", + dbesc($term_hash), + intval(local_channel()) + ); + if (!$t) { + notice(t('Item not found.') . EOL); + return; + } + $orig_record = $t[0]; + if ($photo != $orig_record['obj_imgurl']) { + delete_thing_photo($orig_record['obj_imgurl'], get_observer_hash()); + $arr = import_remote_xchan_photo($photo, get_observer_hash(), true); + if ($arr) { + $local_photo = $arr[0]; + $local_photo_type = $arr[3]; + } else { + $local_photo = $orig_record['obj_imgurl']; + } + } else { + $local_photo = $orig_record['obj_imgurl']; + } + if ($local_photo) { + $r = q( + "update obj set obj_term = '%s', obj_url = '%s', obj_imgurl = '%s', obj_edited = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where obj_obj = '%s' and obj_channel = %d ", + dbesc($name), + dbesc(($url) ? $url : z_root() . '/thing/' . $term_hash), + dbesc($local_photo), + dbesc(datetime_convert()), + dbesc($x['allow_cid']), + dbesc($x['allow_gid']), + dbesc($x['deny_cid']), + dbesc($x['deny_gid']), + dbesc($term_hash), + intval(local_channel()) + ); + } + info(t('Thing updated') . EOL); + + $r = q( + "select * from obj where obj_channel = %d and obj_obj = '%s' limit 1", + intval(local_channel()), + dbesc($term_hash) + ); + if ($r) { + Libsync::build_sync_packet(0, array('obj' => $r)); + } + + return; + } + + $sql = (($profile_guid) ? " and profile_guid = '" . dbesc($profile_guid) . "' " : " and is_default = 1 "); + $p = q( + "select profile_guid, is_default from profile where uid = %d $sql limit 1", + intval(local_channel()) + ); + + if ($p) { + $profile = $p[0]; + } else { + return; + } + + $local_photo = null; + + if ($photo) { + $arr = import_remote_xchan_photo($photo, get_observer_hash(), true); + if ($arr) { + $local_photo = $arr[0]; + $local_photo_type = $arr[3]; + } else { + $local_photo = $photo; + } + } + + + $created = datetime_convert(); + $url = (($url) ? $url : z_root() . '/thing/' . $hash); + + $r = q( + "insert into obj ( obj_page, obj_verb, obj_type, obj_channel, obj_obj, obj_term, obj_url, obj_imgurl, obj_created, obj_edited, allow_cid, allow_gid, deny_cid, deny_gid ) values ('%s','%s', %d, %d, '%s','%s','%s','%s','%s','%s','%s','%s','%s','%s') ", + dbesc($profile['profile_guid']), + dbesc($verb), + intval(TERM_OBJ_THING), + intval(local_channel()), + dbesc($hash), + dbesc($name), + dbesc($url), + dbesc(($photo) ? $local_photo : ''), + dbesc($created), + dbesc($created), + dbesc($x['allow_cid']), + dbesc($x['allow_gid']), + dbesc($x['deny_cid']), + dbesc($x['deny_gid']) + ); + + if (!$r) { + notice(t('Object store: failed')); + return; + } + + info(t('Thing added')); + + $r = q( + "select * from obj where obj_channel = %d and obj_obj = '%s' limit 1", + intval(local_channel()), + dbesc($hash) + ); + if ($r) { + Libsync::build_sync_packet(0, array('obj' => $r)); + } + + if ($activity) { + $arr = []; + $links = array(array('rel' => 'alternate', 'type' => 'text/html', 'href' => $url)); + if ($local_photo) { + $links[] = array('rel' => 'photo', 'type' => $local_photo_type, 'href' => $local_photo); + } + + $objtype = ACTIVITY_OBJ_THING; + + $obj = json_encode(array( + 'type' => $objtype, + 'id' => $url, + 'link' => $links, + 'title' => $name, + 'content' => $name + )); + + $bodyverb = str_replace('OBJ: ', '', t('OBJ: %1$s %2$s %3$s')); + + $arr['owner_xchan'] = $channel['channel_hash']; + $arr['author_xchan'] = $channel['channel_hash']; + + $arr['item_origin'] = 1; + $arr['item_wall'] = 1; + $arr['item_thread_top'] = 1; + + $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]'; + $plink = '[zrl=' . $url . ']' . $name . '[/zrl]'; + + $arr['body'] = sprintf($bodyverb, $ulink, $translated_verb, $plink); + + if ($local_photo) { + $arr['body'] .= "\n\n[zmg]" . $local_photo . "[/zmg]"; + } + + $arr['verb'] = $verb; + $arr['obj_type'] = $objtype; + $arr['obj'] = $obj; + + if (!$profile['is_default']) { + $arr['item_private'] = true; + $str = ''; + $r = q( + "select abook_xchan from abook where abook_channel = %d and abook_profile = '%s'", + intval(local_channel()), + dbesc($profile_guid) + ); + if ($r) { + $arr['allow_cid'] = ''; + foreach ($r as $rr) { + $arr['allow_cid'] .= '<' . $rr['abook_xchan'] . '>'; + } + } else { + $arr['allow_cid'] = '<' . get_observer_hash() . '>'; + } + } + + $ret = post_activity_item($arr); + } + } + + + public function get() + { + + // @FIXME one problem with things is we can't share them unless we provide the channel in the url + // so we can definitively lookup the owner. + + if (argc() == 2) { + $r = q( + "select obj_channel from obj where obj_type = %d and obj_obj = '%s' limit 1", + intval(TERM_OBJ_THING), + dbesc(argv(1)) + ); + if ($r) { + $sql_extra = permissions_sql($r[0]['obj_channel']); + } + + $r = q( + "select * from obj where obj_type = %d and obj_obj = '%s' $sql_extra limit 1", + intval(TERM_OBJ_THING), + dbesc(argv(1)) + ); + + if ($r) { + return replace_macros(get_markup_template('show_thing.tpl'), array( + '$header' => t('Show Thing'), + '$edit' => t('Edit'), + '$delete' => t('Delete'), + '$canedit' => ((local_channel() && local_channel() == $r[0]['obj_channel']) ? true : false), + '$thing' => $r[0])); + } else { + notice(t('item not found.') . EOL); + return; + } + } + + $channel = App::get_channel(); + + if (!(local_channel() && $channel)) { + notice(t('Permission denied.') . EOL); + return; + } + + $acl = new AccessControl($channel); + $channel_acl = $acl->get(); + + $lockstate = (($acl->is_private()) ? 'lock' : 'unlock'); + + $thing_hash = ''; + + if (argc() == 3 && argv(1) === 'edit') { + $thing_hash = argv(2); + + $r = q( + "select * from obj where obj_type = %d and obj_obj = '%s' limit 1", + intval(TERM_OBJ_THING), + dbesc($thing_hash) + ); + + if ((!$r) || ($r[0]['obj_channel'] != local_channel())) { + notice(t('Permission denied.') . EOL); + return ''; + } + + $o .= replace_macros(get_markup_template('thing_edit.tpl'), array( + '$thing_hdr' => t('Edit Thing'), + '$multiprof' => feature_enabled(local_channel(), 'multi_profiles'), + '$profile_lbl' => t('Select a profile'), + '$profile_select' => contact_profile_assign($r[0]['obj_page']), + '$verb_lbl' => $channel['channel_name'], + '$verb_select' => obj_verb_selector($r[0]['obj_verb']), + '$activity' => array('activity', t('Post an activity'), true, t('Only sends to viewers of the applicable profile')), + '$thing_hash' => $thing_hash, + '$thing_lbl' => t('Name of thing e.g. something'), + '$thething' => $r[0]['obj_term'], + '$url_lbl' => t('URL of thing (optional)'), + '$theurl' => $r[0]['obj_url'], + '$img_lbl' => t('URL for photo of thing (optional)'), + '$imgurl' => $r[0]['obj_imgurl'], + '$permissions' => t('Permissions'), + '$aclselect' => populate_acl($channel_acl, false), + '$allow_cid' => acl2json($channel_acl['allow_cid']), + '$allow_gid' => acl2json($channel_acl['allow_gid']), + '$deny_cid' => acl2json($channel_acl['deny_cid']), + '$deny_gid' => acl2json($channel_acl['deny_gid']), + '$lockstate' => $lockstate, + '$submit' => t('Submit') + )); + + return $o; + } + + if (argc() == 3 && argv(1) === 'drop') { + $thing_hash = argv(2); + + $r = q( + "select * from obj where obj_type = %d and obj_obj = '%s' limit 1", + intval(TERM_OBJ_THING), + dbesc($thing_hash) + ); + + if ((!$r) || ($r[0]['obj_channel'] != local_channel())) { + notice(t('Permission denied.') . EOL); + return ''; + } + + + delete_thing_photo($r[0]['obj_imgurl'], get_observer_hash()); + + $x = q( + "delete from obj where obj_obj = '%s' and obj_type = %d and obj_channel = %d", + dbesc($thing_hash), + intval(TERM_OBJ_THING), + intval(local_channel()) + ); + + $r[0]['obj_deleted'] = 1; + + Libsync::build_sync_packet(0, array('obj' => $r)); + + return $o; + } + + $o .= replace_macros(get_markup_template('thing_input.tpl'), array( + '$thing_hdr' => t('Add Thing to your Profile'), + '$multiprof' => feature_enabled(local_channel(), 'multi_profiles'), + '$profile_lbl' => t('Select a profile'), + '$profile_select' => contact_profile_assign(''), + '$verb_lbl' => $channel['channel_name'], + '$activity' => array('activity', t('Post an activity'), ((array_key_exists('activity', $_REQUEST)) ? $_REQUEST['activity'] : true), t('Only sends to viewers of the applicable profile')), + '$verb_select' => obj_verb_selector(), + '$thing_lbl' => t('Name of thing e.g. something'), + '$url_lbl' => t('URL of thing (optional)'), + '$img_lbl' => t('URL for photo of thing (optional)'), + '$permissions' => t('Permissions'), + '$aclselect' => populate_acl($channel_acl, false), + '$allow_cid' => acl2json($channel_acl['allow_cid']), + '$allow_gid' => acl2json($channel_acl['allow_gid']), + '$deny_cid' => acl2json($channel_acl['deny_cid']), + '$deny_gid' => acl2json($channel_acl['deny_gid']), + '$lockstate' => $lockstate, + '$submit' => t('Submit') + )); + + return $o; + } } diff --git a/Zotlabs/Module/Toggle_safesearch.php b/Zotlabs/Module/Toggle_safesearch.php index 2e9bc2575..cab77ba50 100644 --- a/Zotlabs/Module/Toggle_safesearch.php +++ b/Zotlabs/Module/Toggle_safesearch.php @@ -1,31 +1,37 @@ db); - $s = new OAuth2Server($storage); - $request = Request::createFromGlobals(); - $response = $s->handleTokenRequest($request); - $response->send(); - killme(); - } + if (x($_SERVER, 'HTTP_AUTHORIZATION')) { + $userpass = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6)); + if (strlen($userpass)) { + list($name, $password) = explode(':', $userpass); + $_SERVER['PHP_AUTH_USER'] = $name; + $_SERVER['PHP_AUTH_PW'] = $password; + } + } + $storage = new OAuth2Storage(DBA::$dba->db); + $s = new OAuth2Server($storage); + $request = Request::createFromGlobals(); + $response = $s->handleTokenRequest($request); + $response->send(); + killme(); + } } diff --git a/Zotlabs/Module/Uexport.php b/Zotlabs/Module/Uexport.php index 7bea295a1..10a0646fa 100644 --- a/Zotlabs/Module/Uexport.php +++ b/Zotlabs/Module/Uexport.php @@ -1,78 +1,80 @@ 1) { + if (argc() > 1) { + $channel = App::get_channel(); - $channel = App::get_channel(); + if (argc() > 1 && intval(argv(1)) > 1900) { + $year = intval(argv(1)); + } - if (argc() > 1 && intval(argv(1)) > 1900) { - $year = intval(argv(1)); - } - - if (argc() > 2 && intval(argv(2)) > 0 && intval(argv(2)) <= 12) { - $month = intval(argv(2)); - } - - header('content-type: application/json'); - header('Content-Disposition: attachment; filename="' . $channel['channel_address'] . (($year) ? '-' . $year : '') . (($month) ? '-' . $month : '') . (($_REQUEST['sections']) ? '-' . $_REQUEST['sections'] : '') . '.json"' ); - - $flags = ((version_compare(PHP_VERSION,'7.2.0') >= 0) ? JSON_INVALID_UTF8_SUBSTITUTE : 0); + if (argc() > 2 && intval(argv(2)) > 0 && intval(argv(2)) <= 12) { + $month = intval(argv(2)); + } - if ($year) { - echo json_encode(identity_export_year(local_channel(),$year,$month), $flags); - killme(); - } - - if (argc() > 1 && argv(1) === 'basic') { - echo json_encode(identity_basic_export(local_channel(),$sections), $flags); - killme(); - } - - // Warning: this option may consume a lot of memory - - if(argc() > 1 && argv(1) === 'complete') { - $sections[] = 'items'; - echo json_encode(identity_basic_export(local_channel(),$sections)); - killme(); - } - } - } - - function get() { - - $y = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); - - $yearurl = z_root() . '/uexport/' . $y; - $janurl = z_root() . '/uexport/' . $y . '/1'; - $impurl = '/import_items'; - $o = replace_macros(get_markup_template('uexport.tpl'), array( - '$title' => t('Export Channel'), - '$basictitle' => t('Export Channel'), - '$basic' => t('Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content.'), - '$fulltitle' => t('Export Content'), - '$full' => t('Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin.'), + header('content-type: application/json'); + header('Content-Disposition: attachment; filename="' . $channel['channel_address'] . (($year) ? '-' . $year : '') . (($month) ? '-' . $month : '') . (($_REQUEST['sections']) ? '-' . $_REQUEST['sections'] : '') . '.json"'); - '$by_year' => t('Export your posts from a given year.'), - - '$extra' => t('You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range.'), - '$extra2' => sprintf( t('To select all posts for a given year, such as this year, visit %2$s'),$yearurl,$yearurl), - '$extra3' => sprintf( t('To select all posts for a given month, such as January of this year, visit %2$s'),$janurl,$janurl), - '$extra4' => sprintf( t('These content files may be imported or restored by visiting %2$s on any site containing your channel. For best results please import or restore these in date order (oldest first).'),$impurl,$impurl) - - )); - return $o; - } - + $flags = ((version_compare(PHP_VERSION, '7.2.0') >= 0) ? JSON_INVALID_UTF8_SUBSTITUTE : 0); + + if ($year) { + echo json_encode(identity_export_year(local_channel(), $year, $month), $flags); + killme(); + } + + if (argc() > 1 && argv(1) === 'basic') { + echo json_encode(identity_basic_export(local_channel(), $sections), $flags); + killme(); + } + + // Warning: this option may consume a lot of memory + + if (argc() > 1 && argv(1) === 'complete') { + $sections[] = 'items'; + echo json_encode(identity_basic_export(local_channel(), $sections)); + killme(); + } + } + } + + public function get() + { + + $y = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y'); + + $yearurl = z_root() . '/uexport/' . $y; + $janurl = z_root() . '/uexport/' . $y . '/1'; + $impurl = '/import_items'; + $o = replace_macros(get_markup_template('uexport.tpl'), array( + '$title' => t('Export Channel'), + '$basictitle' => t('Export Channel'), + '$basic' => t('Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content.'), + '$fulltitle' => t('Export Content'), + '$full' => t('Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin.'), + + '$by_year' => t('Export your posts from a given year.'), + + '$extra' => t('You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range.'), + '$extra2' => sprintf(t('To select all posts for a given year, such as this year, visit %2$s'), $yearurl, $yearurl), + '$extra3' => sprintf(t('To select all posts for a given month, such as January of this year, visit %2$s'), $janurl, $janurl), + '$extra4' => sprintf(t('These content files may be imported or restored by visiting %2$s on any site containing your channel. For best results please import or restore these in date order (oldest first).'), $impurl, $impurl) + + )); + return $o; + } } diff --git a/Zotlabs/Module/Update.php b/Zotlabs/Module/Update.php index c83fc6b18..b71113504 100644 --- a/Zotlabs/Module/Update.php +++ b/Zotlabs/Module/Update.php @@ -23,59 +23,61 @@ namespace Zotlabs\Module; use App; use Zotlabs\Web\Controller; -class Update extends Controller { +class Update extends Controller +{ - function get() { + public function get() + { - $profile_uid = intval($_GET['p']); + $profile_uid = intval($_GET['p']); - // Change a profile_uid of 0 (not logged in) to (-1) for selected controllers - // as they only respond to liveUpdate with non-zero values - - if ((! $profile_uid) && in_array(argv(1),[ 'display', 'search', 'pubstream', 'home' ])) { - $profile_uid = (-1); - } + // Change a profile_uid of 0 (not logged in) to (-1) for selected controllers + // as they only respond to liveUpdate with non-zero values - if (argc() < 2) { - killme(); - } + if ((!$profile_uid) && in_array(argv(1), ['display', 'search', 'pubstream', 'home'])) { + $profile_uid = (-1); + } - // These modules don't have a completely working liveUpdate implementation currently + if (argc() < 2) { + killme(); + } - if (in_array(strtolower(argv(1)),[ 'articles', 'cards' ])) { - killme(); - } + // These modules don't have a completely working liveUpdate implementation currently - $module = "\\Zotlabs\\Module\\" . ucfirst(argv(1)); - $load = (((argc() > 2) && (argv(2) == 'load')) ? 1 : 0); + if (in_array(strtolower(argv(1)), ['articles', 'cards'])) { + killme(); + } - $mod = new $module; + $module = "\\Zotlabs\\Module\\" . ucfirst(argv(1)); + $load = (((argc() > 2) && (argv(2) == 'load')) ? 1 : 0); - // Set the state flags of the relevant module (only conversational - // modules support state flags - - if (isset($mod->profile_uid)) { - $mod->profile_uid = $profile_uid; - } - if (isset($mod->updating)) { - $mod->updating = 1; - } - if (isset($mod->loading) && $load) { - $mod->loading = 1; - } + $mod = new $module(); - header("Content-type: text/html"); + // Set the state flags of the relevant module (only conversational + // modules support state flags - // Modify the argument parameters to match what the new controller - // expects. They are currently set to what this controller expects. + if (isset($mod->profile_uid)) { + $mod->profile_uid = $profile_uid; + } + if (isset($mod->updating)) { + $mod->updating = 1; + } + if (isset($mod->loading) && $load) { + $mod->loading = 1; + } - App::$argv = [ argv(1) ]; - App::$argc = 1; + header("Content-type: text/html"); - echo "\r\n"; - echo $mod->get(); - echo " \r\n"; + // Modify the argument parameters to match what the new controller + // expects. They are currently set to what this controller expects. - killme(); - } + App::$argv = [argv(1)]; + App::$argc = 1; + + echo "\r\n"; + echo $mod->get(); + echo " \r\n"; + + killme(); + } } diff --git a/Zotlabs/Module/Userinfo.php b/Zotlabs/Module/Userinfo.php index 06c9ee81b..798b47926 100644 --- a/Zotlabs/Module/Userinfo.php +++ b/Zotlabs/Module/Userinfo.php @@ -8,13 +8,14 @@ use Zotlabs\Identity\OAuth2Storage; use Zotlabs\Identity\OAuth2Server; use OAuth2\Request; -class Userinfo extends Controller { - - function init() { - $s = new OAuth2Server(new OAuth2Storage(DBA::$dba->db)); - $request = Request::createFromGlobals(); - $s->handleUserInfoRequest($request)->send(); - killme(); - } +class Userinfo extends Controller +{ + public function init() + { + $s = new OAuth2Server(new OAuth2Storage(DBA::$dba->db)); + $request = Request::createFromGlobals(); + $s->handleUserInfoRequest($request)->send(); + killme(); + } } diff --git a/Zotlabs/Module/View.php b/Zotlabs/Module/View.php index 85497a2a4..0e9bdf234 100644 --- a/Zotlabs/Module/View.php +++ b/Zotlabs/Module/View.php @@ -1,20 +1,24 @@ 1) { - Libprofile::load(argv(1)); - } - } - - function get() { + if (argc() > 1) { + Libprofile::load(argv(1)); + } + } - // logger('request: ' . print_r($_REQUEST,true)); + public function get() + { - if (observer_prohibited()) { - notice( t('Public access denied.') . EOL); - return; - } + // logger('request: ' . print_r($_REQUEST,true)); - if (((! (is_array(App::$profile) && count(App::$profile))) || (App::$profile['hide_friends']))) { - notice( t('Permission denied.') . EOL); - return; - } - - if (! perm_is_allowed(App::$profile['uid'], get_observer_hash(),'view_contacts')) { - notice( t('Permission denied.') . EOL); - return; - } - - if (! $_REQUEST['aj']) { - $_SESSION['return_url'] = App::$query_string; - } - - $is_owner = ((local_channel() && local_channel() == App::$profile['uid']) ? true : false); - - $abook_flags = " and abook_pending = 0 and abook_self = 0 "; - $sql_extra = ''; - - if (! $is_owner) { - $abook_flags .= " and abook_hidden = 0 "; - $sql_extra = " and xchan_hidden = 0 "; - } - - $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d $abook_flags and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra order by xchan_name LIMIT %d OFFSET %d ", - intval(App::$profile['uid']), - intval(App::$pager['itemspage']), - intval(App::$pager['start']) - ); - - if ((! $r) && (! $_REQUEST['aj'])) { - info( t('No connections.') . EOL ); - return $o; - } - - $contacts = []; - - foreach ($r as $rr) { + if (observer_prohibited()) { + notice(t('Public access denied.') . EOL); + return; + } - $oneway = false; - if (! their_perms_contains(App::$profile['uid'],$rr['xchan_hash'],'post_comments')) { - $oneway = true; - } - - $url = chanlink_hash($rr['xchan_hash']); - if ($url) { - $contacts[] = [ - 'id' => $rr['abook_id'], - 'archived' => (intval($rr['abook_archived']) ? true : false), - 'img_hover' => sprintf( t('Visit %1$s\'s profile [%2$s]'), $rr['xchan_name'], $rr['xchan_url']), - 'thumb' => $rr['xchan_photo_m'], - 'name' => substr($rr['xchan_name'],0,20), - 'username' => $rr['xchan_addr'], - 'link' => $url, - 'sparkle' => '', - 'itemurl' => $rr['url'], - 'network' => '', - 'oneway' => $oneway - ]; - } - } - - - if ($_REQUEST['aj']) { - if ($contacts) { - $o = replace_macros(get_markup_template('viewcontactsajax.tpl'), [ - '$contacts' => $contacts - ]); - } - else { - $o = ''; - } - echo $o; - killme(); - } - else { - $o .= ""; - $o .= replace_macros(get_markup_template('viewcontact_template.tpl'), [ - '$title' => t('View Connections'), - '$contacts' => $contacts, - ]); - } - - if (! $contacts) { - $o .= ''; - } - return $o; - } - + if (((!(is_array(App::$profile) && count(App::$profile))) || (App::$profile['hide_friends']))) { + notice(t('Permission denied.') . EOL); + return; + } + + if (!perm_is_allowed(App::$profile['uid'], get_observer_hash(), 'view_contacts')) { + notice(t('Permission denied.') . EOL); + return; + } + + if (!$_REQUEST['aj']) { + $_SESSION['return_url'] = App::$query_string; + } + + $is_owner = ((local_channel() && local_channel() == App::$profile['uid']) ? true : false); + + $abook_flags = " and abook_pending = 0 and abook_self = 0 "; + $sql_extra = ''; + + if (!$is_owner) { + $abook_flags .= " and abook_hidden = 0 "; + $sql_extra = " and xchan_hidden = 0 "; + } + + $r = q( + "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d $abook_flags and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra order by xchan_name LIMIT %d OFFSET %d ", + intval(App::$profile['uid']), + intval(App::$pager['itemspage']), + intval(App::$pager['start']) + ); + + if ((!$r) && (!$_REQUEST['aj'])) { + info(t('No connections.') . EOL); + return $o; + } + + $contacts = []; + + foreach ($r as $rr) { + $oneway = false; + if (!their_perms_contains(App::$profile['uid'], $rr['xchan_hash'], 'post_comments')) { + $oneway = true; + } + + $url = chanlink_hash($rr['xchan_hash']); + if ($url) { + $contacts[] = [ + 'id' => $rr['abook_id'], + 'archived' => (intval($rr['abook_archived']) ? true : false), + 'img_hover' => sprintf(t('Visit %1$s\'s profile [%2$s]'), $rr['xchan_name'], $rr['xchan_url']), + 'thumb' => $rr['xchan_photo_m'], + 'name' => substr($rr['xchan_name'], 0, 20), + 'username' => $rr['xchan_addr'], + 'link' => $url, + 'sparkle' => '', + 'itemurl' => $rr['url'], + 'network' => '', + 'oneway' => $oneway + ]; + } + } + + + if ($_REQUEST['aj']) { + if ($contacts) { + $o = replace_macros(get_markup_template('viewcontactsajax.tpl'), [ + '$contacts' => $contacts + ]); + } else { + $o = ''; + } + echo $o; + killme(); + } else { + $o .= ""; + $o .= replace_macros(get_markup_template('viewcontact_template.tpl'), [ + '$title' => t('View Connections'), + '$contacts' => $contacts, + ]); + } + + if (!$contacts) { + $o .= ''; + } + return $o; + } } diff --git a/Zotlabs/Module/Viewsrc.php b/Zotlabs/Module/Viewsrc.php index 91d11dcdb..0636be433 100644 --- a/Zotlabs/Module/Viewsrc.php +++ b/Zotlabs/Module/Viewsrc.php @@ -1,71 +1,72 @@ 1) ? intval(argv(1)) : 0); + $json = ((argc() > 2 && argv(2) === 'json') ? true : false); + $dload = ((argc() > 2 && argv(2) === 'download') ? true : false); + + if (!local_channel()) { + notice(t('Permission denied.') . EOL); + } + + if (!$item_id) { + App::$error = 404; + notice(t('Item not found.') . EOL); + } + + $item_normal = item_normal_search(); + + if (local_channel() && $item_id) { + $r = q( + "select id, item_flags, mimetype, item_obscured, body, llink, plink from item where uid in (%d , %d) and id = %d $item_normal limit 1", + intval(local_channel()), + intval($sys['channel_id']), + intval($item_id) + ); + + if ($r) { + if (intval($r[0]['item_obscured'])) { + $dload = true; + } + + if ($dload) { + header('Content-type: ' . $r[0]['mimetype']); + header('Content-Disposition: attachment; filename="' . t('item') . '-' . $item_id . '"'); + echo $r[0]['body']; + killme(); + } + + $content = escape_tags($r[0]['body']); + $o = (($json) ? json_encode($content) : str_replace("\n", '
', $content)); + } + } + + $inspect = ((is_site_admin()) ? '| ' . t('inspect') . '' : EMPTY_STR); -class Viewsrc extends Controller { + if (is_ajax()) { + echo ''; + echo ''; + echo ''; + killme(); + } - function get() { - - $o = ''; - - $sys = get_sys_channel(); - - $item_id = ((argc() > 1) ? intval(argv(1)) : 0); - $json = ((argc() > 2 && argv(2) === 'json') ? true : false); - $dload = ((argc() > 2 && argv(2) === 'download') ? true : false); - - if (! local_channel()) { - notice( t('Permission denied.') . EOL); - } - - if (! $item_id) { - App::$error = 404; - notice( t('Item not found.') . EOL); - } - - $item_normal = item_normal_search(); - - if (local_channel() && $item_id) { - $r = q("select id, item_flags, mimetype, item_obscured, body, llink, plink from item where uid in (%d , %d) and id = %d $item_normal limit 1", - intval(local_channel()), - intval($sys['channel_id']), - intval($item_id) - ); - - if ($r) { - if (intval($r[0]['item_obscured'])) - $dload = true; - - if ($dload) { - header('Content-type: ' . $r[0]['mimetype']); - header('Content-Disposition: attachment; filename="' . t('item') . '-' . $item_id . '"' ); - echo $r[0]['body']; - killme(); - } - - $content = escape_tags($r[0]['body']); - $o = (($json) ? json_encode($content) : str_replace("\n",'
'; + echo '' . $o . '
'; + echo '
',$content)); - } - } - - $inspect = ((is_site_admin()) ? '| ' . t('inspect') . '' : EMPTY_STR); - - - if (is_ajax()) { - echo ''; - echo ''; - echo ''; - killme(); - } - - return $o; - } - - + return $o; + } } diff --git a/Zotlabs/Module/Vlists.php b/Zotlabs/Module/Vlists.php index a63ccd405..4f36d7df7 100644 --- a/Zotlabs/Module/Vlists.php +++ b/Zotlabs/Module/Vlists.php @@ -6,10 +6,12 @@ use Zotlabs\Lib\Apps; use Zotlabs\Lib\Libsync; use Zotlabs\Web\Controller; -class Vlists extends Controller { +class Vlists extends Controller +{ - function get() { + public function get() + { $desc = t('This app creates dynamic access lists corresponding to [1] all connections, [2] all ActivityPub protocol connections, and [3] all Nomad or Zot/6 protocol connections. These additional selections will be found within the Permissions setting tool.'); @@ -20,10 +22,10 @@ class Vlists extends Controller { $text2 = '
'; - echo '' . $o . '
'; - echo '' . t('This app is installed. ') . ''; - if (local_channel() && Apps::system_app_installed(local_channel(),'Virtual Lists')) { - $o .= $text2; + if (local_channel() && Apps::system_app_installed(local_channel(), 'Virtual Lists')) { + $o .= $text2; } - return $o; - } + return $o; + } } diff --git a/Zotlabs/Module/Vote.php b/Zotlabs/Module/Vote.php index e614b3f73..accc4abd5 100644 --- a/Zotlabs/Module/Vote.php +++ b/Zotlabs/Module/Vote.php @@ -1,4 +1,5 @@ false, 'message' => EMPTY_STR ]; + $ret = ['success' => false, 'message' => EMPTY_STR]; - $channel = App::get_channel(); + $channel = App::get_channel(); - if (! $channel) { - $ret['message'] = t('Permission denied.'); - json_return_and_die($ret); - } + if (!$channel) { + $ret['message'] = t('Permission denied.'); + json_return_and_die($ret); + } - $fetch = null; - $id = argv(1); - $response = $_REQUEST['answer']; - - if ($id) { - $fetch = q("select * from item where id = %d limit 1", - intval($id) - ); - } + $fetch = null; + $id = argv(1); + $response = $_REQUEST['answer']; - if ($fetch && $fetch[0]['obj_type'] === 'Question') { - $obj = json_decode($fetch[0]['obj'],true); + if ($id) { + $fetch = q( + "select * from item where id = %d limit 1", + intval($id) + ); + } - } - else { - $ret['message'] = t('Poll not found.'); - json_return_and_die($ret); - } + if ($fetch && $fetch[0]['obj_type'] === 'Question') { + $obj = json_decode($fetch[0]['obj'], true); + } else { + $ret['message'] = t('Poll not found.'); + json_return_and_die($ret); + } - $valid = false; - - if ($obj['oneOf']) { - foreach($obj['oneOf'] as $selection) { - // logger('selection: ' . $selection); - // logger('response: ' . $response); - if($selection['name'] && $selection['name'] === $response) { - $valid = true; - } - } - } + $valid = false; - $choices = []; - if ($obj['anyOf']) { - foreach ($obj['anyOf'] as $selection) { - $choices[] = $selection['name']; - } - foreach ($response as $res) { - if (! in_array($res,$choices)) { - $valid = false; - break; - } - $valid = true; - } - } + if ($obj['oneOf']) { + foreach ($obj['oneOf'] as $selection) { + // logger('selection: ' . $selection); + // logger('response: ' . $response); + if ($selection['name'] && $selection['name'] === $response) { + $valid = true; + } + } + } - if (! $valid) { - $ret['message'] = t('Invalid response.'); - json_return_and_die($ret); - } + $choices = []; + if ($obj['anyOf']) { + foreach ($obj['anyOf'] as $selection) { + $choices[] = $selection['name']; + } + foreach ($response as $res) { + if (!in_array($res, $choices)) { + $valid = false; + break; + } + $valid = true; + } + } - if (! is_array($response)) { - $response = [ $response ]; - } + if (!$valid) { + $ret['message'] = t('Invalid response.'); + json_return_and_die($ret); + } - foreach ($response as $res) { + if (!is_array($response)) { + $response = [$response]; + } - $item = []; + foreach ($response as $res) { + $item = []; - $item['aid'] = $channel['channel_account_id']; - $item['uid'] = $channel['channel_id']; - $item['item_origin'] = true; - $item['parent'] = $fetch[0]['id']; - $item['parent_mid'] = $fetch[0]['mid']; - $item['thr_parent'] = $fetch[0]['mid']; - $item['uuid'] = new_uuid(); - $item['mid'] = z_root() . '/item/' . $item['uuid']; - $item['verb'] = 'Create'; - $item['title'] = $res; - $item['author_xchan'] = $channel['channel_hash']; - $item['owner_xchan'] = $fetch[0]['author_xchan']; -// $item['allow_cid'] = '<' . $fetch[0]['author_xchan'] . '>'; -// $item['item_private'] = 1; - - // These two are placeholder values that will be reset after - // we encode the item - - $item['obj_type'] = 'Note'; - $item['author'] = channelx_by_n($channel['channel_id']); + $item['aid'] = $channel['channel_account_id']; + $item['uid'] = $channel['channel_id']; + $item['item_origin'] = true; + $item['parent'] = $fetch[0]['id']; + $item['parent_mid'] = $fetch[0]['mid']; + $item['thr_parent'] = $fetch[0]['mid']; + $item['uuid'] = new_uuid(); + $item['mid'] = z_root() . '/item/' . $item['uuid']; + $item['verb'] = 'Create'; + $item['title'] = $res; + $item['author_xchan'] = $channel['channel_hash']; + $item['owner_xchan'] = $fetch[0]['author_xchan']; +// $item['allow_cid'] = '<' . $fetch[0]['author_xchan'] . '>'; +// $item['item_private'] = 1; - $item['obj'] = Activity::encode_item($item,((get_config('system','activitypub', ACTIVITYPUB_ENABLED)) ? true : false)); + // These two are placeholder values that will be reset after + // we encode the item - // now reset the placeholders + $item['obj_type'] = 'Note'; + $item['author'] = channelx_by_n($channel['channel_id']); - $item['obj_type'] = 'Answer'; - unset($item['author']); - - $x = item_store($item); + $item['obj'] = Activity::encode_item($item, ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? true : false)); - retain_item($fetch[0]['id']); + // now reset the placeholders - if($x['success']) { - $itemid = $x['item_id']; - Run::Summon( [ 'Notifier', 'like', $itemid ] ); - } - - $r = q("select * from item where id = %d", - intval($itemid) - ); - if ($r) { - xchan_query($r); - $sync_item = fetch_post_tags($r); - Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0],true) ] ]); - } - } - $ret['success'] = true; - $ret['message'] = t('Response submitted. Updates may not appear instantly.'); - json_return_and_die($ret); - } + $item['obj_type'] = 'Answer'; + unset($item['author']); + + $x = item_store($item); + + retain_item($fetch[0]['id']); + + if ($x['success']) { + $itemid = $x['item_id']; + Run::Summon(['Notifier', 'like', $itemid]); + } + + $r = q( + "select * from item where id = %d", + intval($itemid) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + Libsync::build_sync_packet($channel['channel_id'], ['item' => [encode_item($sync_item[0], true)]]); + } + } + $ret['success'] = true; + $ret['message'] = t('Response submitted. Updates may not appear instantly.'); + json_return_and_die($ret); + } } - - - - - - - - diff --git a/Zotlabs/Module/Wall_attach.php b/Zotlabs/Module/Wall_attach.php index 1039e29d7..98ad2eb10 100644 --- a/Zotlabs/Module/Wall_attach.php +++ b/Zotlabs/Module/Wall_attach.php @@ -1,4 +1,5 @@ 1) - $channel = channelx_by_nick(argv(1)); - } + if ($_REQUEST['api_source'] && array_key_exists('media', $_FILES)) { + $using_api = true; + } - if (! $channel) - killme(); + if ($using_api) { + require_once('include/api.php'); + if (api_user()) { + $channel = channelx_by_n(api_user()); + } + } else { + if (argc() > 1) { + $channel = channelx_by_nick(argv(1)); + } + } - $matches = []; - $partial = false; + if (!$channel) { + killme(); + } - if (array_key_exists('HTTP_CONTENT_RANGE',$_SERVER)) { - $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/',$_SERVER['HTTP_CONTENT_RANGE'],$matches); - if ($pm) { - // logger('Content-Range: ' . print_r($matches,true)); - $partial = true; - } - } + $matches = []; + $partial = false; - if ($partial) { - $x = save_chunk($channel,$matches[1],$matches[2],$matches[3]); - if ($x['partial']) { - header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); - json_return_and_die($x); - } - else { - header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); + if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) { + $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches); + if ($pm) { + // logger('Content-Range: ' . print_r($matches,true)); + $partial = true; + } + } - $_FILES['userfile'] = [ - 'name' => $x['name'], - 'type' => $x['type'], - 'tmp_name' => $x['tmp_name'], - 'error' => $x['error'], - 'size' => $x['size'] - ]; - } - } - else { - if (! array_key_exists('userfile',$_FILES)) { - $_FILES['userfile'] = [ - 'name' => $_FILES['files']['name'], - 'type' => $_FILES['files']['type'], - 'tmp_name' => $_FILES['files']['tmp_name'], - 'error' => $_FILES['files']['error'], - 'size' => $_FILES['files']['size'] - ]; - } - } + if ($partial) { + $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]); + if ($x['partial']) { + header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); + json_return_and_die($x); + } else { + header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); - $observer = App::get_observer(); - - - $def_album = get_pconfig($channel['channel_id'],'system','photo_path'); - $def_attach = get_pconfig($channel['channel_id'],'system','attach_path'); - - $r = attach_store($channel, (($observer) ? $observer['xchan_hash'] : ''), '', [ - 'source' => 'editor', - 'visible' => 0, - 'album' => $def_album, - 'directory' => $def_attach, - 'flags' => 1, // indicates temporary permissions are created - 'allow_cid' => '<' . $channel['channel_hash'] . '>' - ]); - - if (! $r['success']) { - notice( $r['message'] . EOL); - killme(); - } + $_FILES['userfile'] = [ + 'name' => $x['name'], + 'type' => $x['type'], + 'tmp_name' => $x['tmp_name'], + 'error' => $x['error'], + 'size' => $x['size'] + ]; + } + } else { + if (!array_key_exists('userfile', $_FILES)) { + $_FILES['userfile'] = [ + 'name' => $_FILES['files']['name'], + 'type' => $_FILES['files']['type'], + 'tmp_name' => $_FILES['files']['tmp_name'], + 'error' => $_FILES['files']['error'], + 'size' => $_FILES['files']['size'] + ]; + } + } - $s = EMPTY_STR; - - if (intval($r['data']['is_photo'])) { - $s .= "\n\n" . $r['body'] . "\n\n"; - } + $observer = App::get_observer(); - $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']; - if (strpos($r['data']['filetype'],'video') === 0) { - for ($n = 0; $n < 15; $n ++) { - $thumb = Linkinfo::get_video_poster($url); - if ($thumb) { - break; - } - sleep(1); - continue; - } + $def_album = get_pconfig($channel['channel_id'], 'system', 'photo_path'); + $def_attach = get_pconfig($channel['channel_id'], 'system', 'attach_path'); - if ($thumb) { - $s .= "\n\n" . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . "\n\n"; - } - else { - $s .= "\n\n" . '[zvideo]' . $url . '[/zvideo]' . "\n\n"; - } - } - if (strpos($r['data']['filetype'],'audio') === 0) { - $s .= "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n"; - } - if ($r['data']['filetype'] === 'image/svg+xml') { - $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); - if ($x) { - $bb = svg2bb($x); - if ($bb) { - $s .= "\n\n" . $bb; - } - else { - logger('empty return from svgbb'); - } - } - else { - logger('unable to read svg data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); - } - } - if ($r['data']['filetype'] === 'text/vnd.abc' && addon_is_installed('abc')) { - $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); - if ($x) { - $s .= "\n\n" . '[abc]' . $x . '[/abc]'; - } - else { - logger('unable to read ABC data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); - } - } - if ($r['data']['filetype'] === 'text/calendar') { - $content = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); - if ($content) { - $ev = ical_to_ev($content); - if ($ev) { - $s .= "\n\n" . format_event_bbcode($ev[0]) . "\n\n"; - } - } - } + $r = attach_store($channel, (($observer) ? $observer['xchan_hash'] : ''), '', [ + 'source' => 'editor', + 'visible' => 0, + 'album' => $def_album, + 'directory' => $def_attach, + 'flags' => 1, // indicates temporary permissions are created + 'allow_cid' => '<' . $channel['channel_hash'] . '>' + ]); - $s .= "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n"; + if (!$r['success']) { + notice($r['message'] . EOL); + killme(); + } - - if ($using_api) { - return $s; - } + $s = EMPTY_STR; - $result['message'] = $s; - json_return_and_die($result); - } + if (intval($r['data']['is_photo'])) { + $s .= "\n\n" . $r['body'] . "\n\n"; + } + + $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']; + + if (strpos($r['data']['filetype'], 'video') === 0) { + for ($n = 0; $n < 15; $n++) { + $thumb = Linkinfo::get_video_poster($url); + if ($thumb) { + break; + } + sleep(1); + continue; + } + + if ($thumb) { + $s .= "\n\n" . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . "\n\n"; + } else { + $s .= "\n\n" . '[zvideo]' . $url . '[/zvideo]' . "\n\n"; + } + } + if (strpos($r['data']['filetype'], 'audio') === 0) { + $s .= "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n"; + } + if ($r['data']['filetype'] === 'image/svg+xml') { + $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); + if ($x) { + $bb = svg2bb($x); + if ($bb) { + $s .= "\n\n" . $bb; + } else { + logger('empty return from svgbb'); + } + } else { + logger('unable to read svg data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); + } + } + if ($r['data']['filetype'] === 'text/vnd.abc' && addon_is_installed('abc')) { + $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); + if ($x) { + $s .= "\n\n" . '[abc]' . $x . '[/abc]'; + } else { + logger('unable to read ABC data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); + } + } + if ($r['data']['filetype'] === 'text/calendar') { + $content = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']); + if ($content) { + $ev = ical_to_ev($content); + if ($ev) { + $s .= "\n\n" . format_event_bbcode($ev[0]) . "\n\n"; + } + } + } + + $s .= "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n"; + + + if ($using_api) { + return $s; + } + + $result['message'] = $s; + json_return_and_die($result); + } } diff --git a/Zotlabs/Module/Wall_upload.php b/Zotlabs/Module/Wall_upload.php index 413494bfd..9e71e651e 100644 --- a/Zotlabs/Module/Wall_upload.php +++ b/Zotlabs/Module/Wall_upload.php @@ -1,55 +1,62 @@ 1) - $channel = channelx_by_nick(argv(1)); - } - - if(! $channel) { - if($using_api) - return; - notice( t('Channel not found.') . EOL); - killme(); - } - - $observer = \App::get_observer(); - - $args = array( 'source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash'])); - - $ret = photo_upload($channel,$observer,$args); - - if(! $ret['success']) { - if($using_api) - return; - notice($ret['message']); - killme(); - } - - if($using_api) - return("\n\n" . $ret['body'] . "\n\n"); - else - echo "\n\n" . $ret['body'] . "\n\n"; - killme(); - } - + if ($using_api) { + require_once('include/api.php'); + if (api_user()) { + $channel = channelx_by_n(api_user()); + } + } else { + if (argc() > 1) { + $channel = channelx_by_nick(argv(1)); + } + } + + if (!$channel) { + if ($using_api) { + return; + } + notice(t('Channel not found.') . EOL); + killme(); + } + + $observer = App::get_observer(); + + $args = array('source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash'])); + + $ret = photo_upload($channel, $observer, $args); + + if (!$ret['success']) { + if ($using_api) { + return; + } + notice($ret['message']); + killme(); + } + + if ($using_api) { + return ("\n\n" . $ret['body'] . "\n\n"); + } else { + echo "\n\n" . $ret['body'] . "\n\n"; + } + killme(); + } } diff --git a/Zotlabs/Module/Webfinger.php b/Zotlabs/Module/Webfinger.php index 9c5a2a220..4e195e7e5 100644 --- a/Zotlabs/Module/Webfinger.php +++ b/Zotlabs/Module/Webfinger.php @@ -1,135 +1,145 @@ 3 && $arr[2] === 'zotid') { - $hash = $arr[3]; - $channel_target = channelx_by_hash($hash); - } - } - - if (strpos($resource,'acct:') === 0) { - $channel_nickname = punify(str_replace('acct:','',$resource)); - if (strrpos($channel_nickname,'@') !== false) { - $host = punify(substr($channel_nickname,strrpos($channel_nickname,'@')+1)); + if (!$resource) { + http_status_exit(404, 'Not found'); + } - // If the webfinger address points off site, redirect to the correct site + logger('webfinger: ' . $resource, LOGGER_DEBUG); - if (strcasecmp($host, App::get_hostname())) { - goaway('https://' . $host . '/.well-known/webfinger?f=&resource=' . $resource); - } - $channel_nickname = substr($channel_nickname,0,strrpos($channel_nickname,'@')); - } - } - if (strpos($resource,'http') === 0) { - $channel_nickname = str_replace( ['~','@'],['',''],basename($resource)); - } + // Determine whether to respond as a site actor + // or a normal channel - if ($channel_nickname) { - $channel_target = channelx_by_nick($channel_nickname); - } - - if ($channel_target || $site_query) { - - $h = get_hubloc_addrs_by_hash($channel_target['channel_hash']); + $site_query = false; + if ( + strcasecmp(rtrim($resource, '/'), z_root()) === 0 + || strcasecmp($resource, 'acct:sys@' . App::get_hostname()) === 0 + || $resource === z_root() . '/channel/sys' + ) { + $site_query = true; + $result['subject'] = $resource; + $resource = z_root() . '/channel/sys'; + } - if (! isset($result['subject'])) { - $result['subject'] = $resource; - } + if (strpos($resource, 'tag:' === 0)) { + $arr = explode(':', $resource); + if (count($arr) > 3 && $arr[2] === 'zotid') { + $hash = $arr[3]; + $channel_target = channelx_by_hash($hash); + } + } - $aliases = [ - z_root() . '/channel/' . $channel_target['channel_address'], - z_root() . '/~' . $channel_target['channel_address'], - z_root() . '/@' . $channel_target['channel_address'] + if (strpos($resource, 'acct:') === 0) { + $channel_nickname = punify(str_replace('acct:', '', $resource)); + if (strrpos($channel_nickname, '@') !== false) { + $host = punify(substr($channel_nickname, strrpos($channel_nickname, '@') + 1)); - ]; - - if ($h) { - foreach ($h as $hh) { - $aliases[] = 'acct:' . $hh['hubloc_addr']; - } - } - - $result['aliases'] = []; - - $result['properties'] = [ - 'http://webfinger.net/ns/name' => $site_query ? System::get_site_name() : $channel_target['channel_name'], - 'http://xmlns.com/foaf/0.1/name' => $site_query ? System::get_site_name() : $channel_target['channel_name'], - 'https://w3id.org/security/v1#publicKeyPem' => (($site_query) ? get_config('system','pubkey') : $channel_target['xchan_pubkey']), - 'http://purl.org/zot/federation' => ((get_config('system','activitypub', ACTIVITYPUB_ENABLED)) ? 'nomad,zot6,activitypub' : 'nomad,zot6') - ]; + // If the webfinger address points off site, redirect to the correct site - if ($site_query) { - $aliases[] = z_root(); - $aliases[] = 'acct:sys@' . App::get_hostname(); - } - - foreach ($aliases as $alias) { - if ($alias !== $result['subject']) { - $result['aliases'][] = $alias; - } - } - - $result['links'] = [ + if (strcasecmp($host, App::get_hostname())) { + goaway('https://' . $host . '/.well-known/webfinger?f=&resource=' . $resource); + } + $channel_nickname = substr($channel_nickname, 0, strrpos($channel_nickname, '@')); + } + } + if (strpos($resource, 'http') === 0) { + $channel_nickname = str_replace(['~', '@'], ['', ''], basename($resource)); + } - [ - 'rel' => 'http://webfinger.net/rel/avatar', - 'type' => $channel_target['xchan_photo_mimetype'], - 'href' => $channel_target['xchan_photo_l'] - ], + if ($channel_nickname) { + $channel_target = channelx_by_nick($channel_nickname); + } - [ - 'rel' => 'http://webfinger.net/rel/blog', - 'href' => z_root() . '/channel/' . $channel_target['channel_address'], - ], - - [ - 'rel' => 'http://openid.net/specs/connect/1.0/issuer', - 'href' => z_root() - ], + if ($channel_target || $site_query) { + $h = get_hubloc_addrs_by_hash($channel_target['channel_hash']); + + if (!isset($result['subject'])) { + $result['subject'] = $resource; + } + + $aliases = [ + z_root() . '/channel/' . $channel_target['channel_address'], + z_root() . '/~' . $channel_target['channel_address'], + z_root() . '/@' . $channel_target['channel_address'] + + ]; + + if ($h) { + foreach ($h as $hh) { + $aliases[] = 'acct:' . $hh['hubloc_addr']; + } + } + + $result['aliases'] = []; + + $result['properties'] = [ + 'http://webfinger.net/ns/name' => $site_query ? System::get_site_name() : $channel_target['channel_name'], + 'http://xmlns.com/foaf/0.1/name' => $site_query ? System::get_site_name() : $channel_target['channel_name'], + 'https://w3id.org/security/v1#publicKeyPem' => (($site_query) ? get_config('system', 'pubkey') : $channel_target['xchan_pubkey']), + 'http://purl.org/zot/federation' => ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? 'nomad,zot6,activitypub' : 'nomad,zot6') + ]; + + if ($site_query) { + $aliases[] = z_root(); + $aliases[] = 'acct:sys@' . App::get_hostname(); + } + + foreach ($aliases as $alias) { + if ($alias !== $result['subject']) { + $result['aliases'][] = $alias; + } + } + + $result['links'] = [ + + [ + 'rel' => 'http://webfinger.net/rel/avatar', + 'type' => $channel_target['xchan_photo_mimetype'], + 'href' => $channel_target['xchan_photo_l'] + ], + + [ + 'rel' => 'http://webfinger.net/rel/blog', + 'href' => z_root() . '/channel/' . $channel_target['channel_address'], + ], + + [ + 'rel' => 'http://openid.net/specs/connect/1.0/issuer', + 'href' => z_root() + ], + + [ + 'rel' => 'http://purl.org/zot/protocol/6.0', + 'type' => 'application/x-zot+json', + 'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address']), + ], [ 'rel' => 'http://purl.org/nomad', @@ -143,40 +153,40 @@ class Webfinger extends Controller { 'href' => z_root() . '/owa' ], - [ - 'rel' => 'http://purl.org/zot/protocol/6.0', - 'type' => 'application/x-zot+json', - 'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address']), - ], + [ + 'rel' => 'http://purl.org/openwebauth/v1', + 'type' => 'application/x-zot+json', + 'href' => z_root() . '/owa' + ], - [ - 'rel' => 'self', - 'type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', - 'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address']) - ], - - [ - 'rel' => 'self', - 'type' => 'application/activity+json', - 'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address']) - ], + [ + 'rel' => 'self', + 'type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', + 'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address']) + ], - [ - 'rel' => 'http://ostatus.org/schema/1.0/subscribe', - 'template' => z_root() . '/follow?url={uri}' - ], - ]; - } + [ + 'rel' => 'self', + 'type' => 'application/activity+json', + 'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address']) + ], - if (! $result) { - header($_SERVER['SERVER_PROTOCOL'] . ' ' . 400 . ' ' . 'Bad Request'); - killme(); - } - - $arr = [ 'channel' => $channel_target, 'request' => $_REQUEST, 'result' => $result ]; - call_hooks('webfinger',$arr); + [ + 'rel' => 'http://ostatus.org/schema/1.0/subscribe', + 'template' => z_root() . '/follow?url={uri}' + ], + ]; + } + + if (!$result) { + header($_SERVER['SERVER_PROTOCOL'] . ' ' . 400 . ' ' . 'Bad Request'); + killme(); + } + + $arr = ['channel' => $channel_target, 'request' => $_REQUEST, 'result' => $result]; + call_hooks('webfinger', $arr); - json_return_and_die($arr['result'],'application/jrd+json',true); - } + json_return_and_die($arr['result'], 'application/jrd+json', true); + } } diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index 53ab1d006..2394e9017 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -1,4 +1,5 @@ 1 && argv(1) === 'sys' && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - App::$is_sys = true; - } - } - - if(argc() > 1) - $which = argv(1); - else - return; - - Libprofile::load($which); - - } - - - function get() { - - if(! App::$profile) { - notice( t('Requested profile is not available.') . EOL ); - App::$error = 404; - return; - } + public function init() + { - if(! Apps::system_app_installed(App::$profile_uid, 'Webpages')) { - //Do not display any associated widgets at this point - App::$pdl = ''; + if (argc() > 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + App::$is_sys = true; + } + } - $o = 'Webpages App (Not Installed):
'; - $o .= t('Provide managed web pages on your channel'); - return $o; - } + if (argc() > 1) { + $which = argv(1); + } else { + return; + } - nav_set_selected('Webpages'); + Libprofile::load($which); + } - $which = argv(1); - - $_SESSION['return_url'] = App::$query_string; - - $uid = local_channel(); - $owner = 0; - $observer = App::get_observer(); - - $channel = App::get_channel(); - switch ($_SESSION['action']) { - case 'import': - $_SESSION['action'] = null; - $o .= replace_macros(get_markup_template('webpage_import.tpl'), array( - '$title' => t('Import Webpage Elements'), - '$importbtn' => t('Import selected'), - '$action' => 'import', - '$pages' => $_SESSION['pages'], - '$layouts' => $_SESSION['layouts'], - '$blocks' => $_SESSION['blocks'], - )); - return $o; - - case 'importselected': - $_SESSION['action'] = null; - break; - case 'export_select_list': - $_SESSION['action'] = null; - if(!$uid) { - $_SESSION['export'] = null; - break; - } - require_once('include/import.php'); - - $pages = get_webpage_elements($channel, 'pages'); - $layouts = get_webpage_elements($channel, 'layouts'); - $blocks = get_webpage_elements($channel, 'blocks'); - $o .= replace_macros(get_markup_template('webpage_export_list.tpl'), array( - '$title' => t('Export Webpage Elements'), - '$exportbtn' => t('Export selected'), - '$action' => $_SESSION['export'], // value should be 'zipfile' or 'cloud' - '$pages' => $pages['pages'], - '$layouts' => $layouts['layouts'], - '$blocks' => $blocks['blocks'], - )); - $_SESSION['export'] = null; - return $o; - - default : - $_SESSION['action'] = null; - break; - } - - - if(App::$is_sys && is_site_admin()) { - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - $uid = $owner = intval($sys['channel_id']); - $channel = $sys; - $observer = $sys; - } - } - - if(! $owner) { - // Figure out who the page owner is. - $r = q("select channel_id from channel where channel_address = '%s'", - dbesc($which) - ); - if($r) { - $owner = intval($r[0]['channel_id']); - } - } - - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - - $perms = get_all_perms($owner,$ob_hash); - - if(! $perms['write_pages']) { - notice( t('Permission denied.') . EOL); - return; - } - - $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); - - $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout')); - - // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages - // Nickname is set to the observers xchan, and profile_uid to the owner's. - // This lets you post pages at other people's channels. - - if((! $channel) && ($uid) && ($uid == App::$profile_uid)) { - $channel = App::get_channel(); - } - if($channel) { - $channel_acl = array( - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'] - ); - } - else { - $channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; - } - + public function get() + { - $is_owner = ($uid && $uid == $owner); + if (!App::$profile) { + notice(t('Requested profile is not available.') . EOL); + App::$error = 404; + return; + } - $o = ''; - - $x = array( - 'webpage' => ITEM_TYPE_WEBPAGE, - 'is_owner' => true, - 'nickname' => App::$profile['channel_address'], - 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => (($is_owner) ? populate_acl($channel_acl,false, PermissionDescription::fromGlobalPermission('view_pages')) : ''), - 'permissions' => $channel_acl, - 'showacl' => (($is_owner) ? true : false), - 'visitor' => true, - 'hide_location' => true, - 'hide_voting' => true, - 'profile_uid' => intval($owner), - 'mimetype' => $mimetype, - 'mimeselect' => true, - 'layout' => $layout, - 'layoutselect' => true, - 'expanded' => true, - 'novoting'=> true, - 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true - ); - - if($_REQUEST['title']) - $x['title'] = $_REQUEST['title']; - if($_REQUEST['body']) - $x['body'] = $_REQUEST['body']; - if($_REQUEST['pagetitle']) - $x['pagetitle'] = $_REQUEST['pagetitle']; - - - // Get a list of webpages. We can't display all them because endless scroll makes that unusable, - // so just list titles and an edit link. - - - $sql_extra = item_permissions_sql($owner); - - $r = q("select * from iconfig left join item on iconfig.iid = item.id + if (!Apps::system_app_installed(App::$profile_uid, 'Webpages')) { + //Do not display any associated widgets at this point + App::$pdl = ''; + + $o = 'Webpages App (Not Installed):
'; + $o .= t('Provide managed web pages on your channel'); + return $o; + } + + nav_set_selected('Webpages'); + + $which = argv(1); + + $_SESSION['return_url'] = App::$query_string; + + $uid = local_channel(); + $owner = 0; + $observer = App::get_observer(); + + $channel = App::get_channel(); + + switch ($_SESSION['action']) { + case 'import': + $_SESSION['action'] = null; + $o .= replace_macros(get_markup_template('webpage_import.tpl'), array( + '$title' => t('Import Webpage Elements'), + '$importbtn' => t('Import selected'), + '$action' => 'import', + '$pages' => $_SESSION['pages'], + '$layouts' => $_SESSION['layouts'], + '$blocks' => $_SESSION['blocks'], + )); + return $o; + + case 'importselected': + $_SESSION['action'] = null; + break; + case 'export_select_list': + $_SESSION['action'] = null; + if (!$uid) { + $_SESSION['export'] = null; + break; + } + require_once('include/import.php'); + + $pages = get_webpage_elements($channel, 'pages'); + $layouts = get_webpage_elements($channel, 'layouts'); + $blocks = get_webpage_elements($channel, 'blocks'); + $o .= replace_macros(get_markup_template('webpage_export_list.tpl'), array( + '$title' => t('Export Webpage Elements'), + '$exportbtn' => t('Export selected'), + '$action' => $_SESSION['export'], // value should be 'zipfile' or 'cloud' + '$pages' => $pages['pages'], + '$layouts' => $layouts['layouts'], + '$blocks' => $blocks['blocks'], + )); + $_SESSION['export'] = null; + return $o; + + default: + $_SESSION['action'] = null; + break; + } + + + if (App::$is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if ($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } + } + + if (!$owner) { + // Figure out who the page owner is. + $r = q( + "select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if ($r) { + $owner = intval($r[0]['channel_id']); + } + } + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner, $ob_hash); + + if (!$perms['write_pages']) { + notice(t('Permission denied.') . EOL); + return; + } + + $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner, 'system', 'page_mimetype')); + + $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner, 'system', 'page_layout')); + + // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages + // Nickname is set to the observers xchan, and profile_uid to the owner's. + // This lets you post pages at other people's channels. + + if ((!$channel) && ($uid) && ($uid == App::$profile_uid)) { + $channel = App::get_channel(); + } + if ($channel) { + $channel_acl = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); + } else { + $channel_acl = ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']; + } + + + $is_owner = ($uid && $uid == $owner); + + $o = ''; + + $x = array( + 'webpage' => ITEM_TYPE_WEBPAGE, + 'is_owner' => true, + 'nickname' => App::$profile['channel_address'], + 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'acl' => (($is_owner) ? populate_acl($channel_acl, false, PermissionDescription::fromGlobalPermission('view_pages')) : ''), + 'permissions' => $channel_acl, + 'showacl' => (($is_owner) ? true : false), + 'visitor' => true, + 'hide_location' => true, + 'hide_voting' => true, + 'profile_uid' => intval($owner), + 'mimetype' => $mimetype, + 'mimeselect' => true, + 'layout' => $layout, + 'layoutselect' => true, + 'expanded' => true, + 'novoting' => true, + 'bbco_autocomplete' => 'bbcode', + 'bbcode' => true + ); + + if ($_REQUEST['title']) { + $x['title'] = $_REQUEST['title']; + } + if ($_REQUEST['body']) { + $x['body'] = $_REQUEST['body']; + } + if ($_REQUEST['pagetitle']) { + $x['pagetitle'] = $_REQUEST['pagetitle']; + } + + + // Get a list of webpages. We can't display all them because endless scroll makes that unusable, + // so just list titles and an edit link. + + + $sql_extra = item_permissions_sql($owner); + + $r = q( + "select * from iconfig left join item on iconfig.iid = item.id where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d $sql_extra order by item.created desc", - intval($owner), - intval(ITEM_TYPE_WEBPAGE) - ); + intval($owner), + intval(ITEM_TYPE_WEBPAGE) + ); - if(! $r) - $x['pagetitle'] = 'home'; + if (!$r) { + $x['pagetitle'] = 'home'; + } - $editor = status_editor($x); + $editor = status_editor($x); - $pages = null; - - if($r) { - $pages = []; - foreach($r as $rr) { - unobscure($rr); - - $lockstate = (($rr['allow_cid'] || $rr['allow_gid'] || $rr['deny_cid'] || $rr['deny_gid']) ? 'lock' : 'unlock'); - - $element_arr = array( - 'type' => 'webpage', - 'title' => $rr['title'], - 'body' => $rr['body'], - 'created' => $rr['created'], - 'edited' => $rr['edited'], - 'mimetype' => $rr['mimetype'], - 'pageurl' => str_replace('%2f','/',$rr['v']), - 'pagetitle' => urldecode($rr['v']), - 'mid' => $rr['mid'], - 'layout_mid' => $rr['layout_mid'] - ); - $pages[$rr['iid']][] = array( - 'url' => $rr['iid'], - 'pageurl' => str_replace('%2f','/',$rr['v']), - 'pagetitle' => urldecode($rr['v']), - 'title' => $rr['title'], - 'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']), - 'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']), - 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]', - 'lockstate' => $lockstate - ); - } - } - - - //Build the base URL for edit links - $url = z_root() . '/editwebpage/' . $which; - - $o .= replace_macros(get_markup_template('webpagelist.tpl'), array( - '$listtitle' => t('Webpages'), - '$baseurl' => $url, - '$create' => t('Create'), - '$edit' => t('Edit'), - '$share' => t('Share'), - '$delete' => t('Delete'), - '$pages' => $pages, - '$channel' => $which, - '$editor' => $editor, - '$view' => t('View'), - '$preview' => t('Preview'), - '$actions_txt' => t('Actions'), - '$pagelink_txt' => t('Page Link'), - '$title_txt' => t('Page Title'), - '$created_txt' => t('Created'), - '$edited_txt' => t('Edited') - )); - - return $o; - } - - function post() { - $action = $_REQUEST['action']; - if( $action ){ - switch ($action) { - case 'scan': - - // the state of this variable tracks whether website files have been scanned (null, true, false) - $cloud = null; - - // Website files are to be imported from an uploaded zip file - if(($_FILES) && array_key_exists('zip_file',$_FILES) && isset($_POST['w_upload'])) { - $source = $_FILES["zip_file"]["tmp_name"]; - $type = $_FILES["zip_file"]["type"]; - $okay = false; - $accepted_types = array('application/zip', 'application/x-zip-compressed', 'multipart/x-zip', 'application/x-compressed'); - foreach ($accepted_types as $mime_type) { - if ($mime_type == $type) { - $okay = true; - break; - } - } - if(!$okay) { - notice( t('Invalid file type.') . EOL); - return; - } - $zip = new ZipArchive(); - if ($zip->open($source) === true) { - $tmp_folder_name = random_string(5); - $website = dirname($source) . '/' . $tmp_folder_name; - $zip->extractTo($website); // change this to the correct site path - $zip->close(); - @unlink($source); // delete the compressed file now that the content has been extracted - $cloud = false; - } else { - notice( t('Error opening zip file') . EOL); - return null; - } - } + $pages = null; - // Website files are to be imported from the channel cloud files - if (($_POST) && array_key_exists('path',$_POST) && isset($_POST['cloudsubmit'])) { - - $channel = App::get_channel(); - $dirpath = get_dirpath_by_cloudpath($channel, $_POST['path']); - if(!$dirpath) { - notice( t('Invalid folder path.') . EOL); - return null; - } - $cloud = true; - - } - - // If the website files were uploaded or specified in the cloud files, then $cloud - // should be either true or false - if ($cloud !== null) { - require_once('include/import.php'); - $elements = []; - if($cloud) { - $path = $_POST['path']; - } else { - $path = $website; - } - $elements['pages'] = scan_webpage_elements($path, 'page', $cloud); - $elements['layouts'] = scan_webpage_elements($path, 'layout', $cloud); - $elements['blocks'] = scan_webpage_elements($path, 'block', $cloud); - $_SESSION['blocks'] = $elements['blocks']; - $_SESSION['layouts'] = $elements['layouts']; - $_SESSION['pages'] = $elements['pages']; - if(!(empty($elements['pages']) && empty($elements['blocks']) && empty($elements['layouts']))) { - //info( t('Webpages elements detected.') . EOL); - $_SESSION['action'] = 'import'; - } else { - notice( t('No webpage elements detected.') . EOL); - $_SESSION['action'] = null; - } - - } - - // If the website elements were imported from a zip file, delete the temporary decompressed files - if ($cloud === false && $website && $elements) { - $_SESSION['tempimportpath'] = $website; - //rrmdir($website); // Delete the temporary decompressed files - } - - break; - - case 'importselected': - require_once('include/import.php'); - $channel = App::get_channel(); - - // Import layout first so that pages that reference new layouts will find - // the mid of layout items in the database - - // Obtain the user-selected layouts to import and import them - $checkedlayouts = $_POST['layout']; - $layouts = []; - if (!empty($checkedlayouts)) { - foreach ($checkedlayouts as $name) { - foreach ($_SESSION['layouts'] as &$layout) { - if ($layout['name'] === $name) { - $layout['import'] = 1; - $layoutstoimport[] = $layout; - } - } - } - foreach ($layoutstoimport as $elementtoimport) { - $layouts[] = import_webpage_element($elementtoimport, $channel, 'layout'); - } - } - $_SESSION['import_layouts'] = $layouts; - - // Obtain the user-selected blocks to import and import them - $checkedblocks = $_POST['block']; - $blocks = []; - if (!empty($checkedblocks)) { - foreach ($checkedblocks as $name) { - foreach ($_SESSION['blocks'] as &$block) { - if ($block['name'] === $name) { - $block['import'] = 1; - $blockstoimport[] = $block; - } - } - } - foreach ($blockstoimport as $elementtoimport) { - $blocks[] = import_webpage_element($elementtoimport, $channel, 'block'); - } - } - $_SESSION['import_blocks'] = $blocks; - - // Obtain the user-selected pages to import and import them - $checkedpages = $_POST['page']; + if ($r) { $pages = []; - if (!empty($checkedpages)) { - foreach ($checkedpages as $pagelink) { - foreach ($_SESSION['pages'] as &$page) { - if ($page['pagelink'] === $pagelink) { - $page['import'] = 1; - $pagestoimport[] = $page; + foreach ($r as $rr) { + unobscure($rr); + + $lockstate = (($rr['allow_cid'] || $rr['allow_gid'] || $rr['deny_cid'] || $rr['deny_gid']) ? 'lock' : 'unlock'); + + $element_arr = array( + 'type' => 'webpage', + 'title' => $rr['title'], + 'body' => $rr['body'], + 'created' => $rr['created'], + 'edited' => $rr['edited'], + 'mimetype' => $rr['mimetype'], + 'pageurl' => str_replace('%2f', '/', $rr['v']), + 'pagetitle' => urldecode($rr['v']), + 'mid' => $rr['mid'], + 'layout_mid' => $rr['layout_mid'] + ); + $pages[$rr['iid']][] = array( + 'url' => $rr['iid'], + 'pageurl' => str_replace('%2f', '/', $rr['v']), + 'pagetitle' => urldecode($rr['v']), + 'title' => $rr['title'], + 'created' => datetime_convert('UTC', date_default_timezone_get(), $rr['created']), + 'edited' => datetime_convert('UTC', date_default_timezone_get(), $rr['edited']), + 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]', + 'lockstate' => $lockstate + ); + } + } + + + //Build the base URL for edit links + $url = z_root() . '/editwebpage/' . $which; + + $o .= replace_macros(get_markup_template('webpagelist.tpl'), array( + '$listtitle' => t('Webpages'), + '$baseurl' => $url, + '$create' => t('Create'), + '$edit' => t('Edit'), + '$share' => t('Share'), + '$delete' => t('Delete'), + '$pages' => $pages, + '$channel' => $which, + '$editor' => $editor, + '$view' => t('View'), + '$preview' => t('Preview'), + '$actions_txt' => t('Actions'), + '$pagelink_txt' => t('Page Link'), + '$title_txt' => t('Page Title'), + '$created_txt' => t('Created'), + '$edited_txt' => t('Edited') + )); + + return $o; + } + + public function post() + { + $action = $_REQUEST['action']; + if ($action) { + switch ($action) { + case 'scan': + // the state of this variable tracks whether website files have been scanned (null, true, false) + $cloud = null; + + // Website files are to be imported from an uploaded zip file + if (($_FILES) && array_key_exists('zip_file', $_FILES) && isset($_POST['w_upload'])) { + $source = $_FILES["zip_file"]["tmp_name"]; + $type = $_FILES["zip_file"]["type"]; + $okay = false; + $accepted_types = array('application/zip', 'application/x-zip-compressed', 'multipart/x-zip', 'application/x-compressed'); + foreach ($accepted_types as $mime_type) { + if ($mime_type == $type) { + $okay = true; + break; + } + } + if (!$okay) { + notice(t('Invalid file type.') . EOL); + return; + } + $zip = new ZipArchive(); + if ($zip->open($source) === true) { + $tmp_folder_name = random_string(5); + $website = dirname($source) . '/' . $tmp_folder_name; + $zip->extractTo($website); // change this to the correct site path + $zip->close(); + @unlink($source); // delete the compressed file now that the content has been extracted + $cloud = false; + } else { + notice(t('Error opening zip file') . EOL); + return null; } } - } - foreach ($pagestoimport as $elementtoimport) { - $pages[] = import_webpage_element($elementtoimport, $channel, 'page'); - } - } - $_SESSION['import_pages'] = $pages; - if(!(empty($_SESSION['import_pages']) && empty($_SESSION['import_blocks']) && empty($_SESSION['import_layouts']))) { - info( t('Import complete.') . EOL); - } - if(isset($_SESSION['tempimportpath'])) { - rrmdir($_SESSION['tempimportpath']); // Delete the temporary decompressed files - unset($_SESSION['tempimportpath']); - } - break; - - case 'exportzipfile': - - if(isset($_POST['w_download'])) { - $_SESSION['action'] = 'export_select_list'; - $_SESSION['export'] = 'zipfile'; - if(isset($_POST['zipfilename']) && $_POST['zipfilename'] !== '') { - $filename = filter_var($_POST['zipfilename'], FILTER_SANITIZE_ENCODED); - } else { - $filename = 'website.zip'; - } - $_SESSION['zipfilename'] = $filename; - - } - - break; - - case 'exportcloud': - if(isset($_POST['exportcloudpath']) && $_POST['exportcloudpath'] !== '') { - $_SESSION['action'] = 'export_select_list'; - $_SESSION['export'] = 'cloud'; - $_SESSION['exportcloudpath'] = filter_var($_POST['exportcloudpath'], FILTER_SANITIZE_ENCODED); - } - - break; - - case 'cloud': - case 'zipfile': - - $channel = App::get_channel(); - - $tmp_folder_name = random_string(10); - $zip_folder_name = random_string(10); - $zip_filename = $_SESSION['zipfilename']; - $tmp_folderpath = '/tmp/' . $tmp_folder_name; - $zip_folderpath = '/tmp/' . $zip_folder_name; - if (!mkdir($zip_folderpath, 0770, false)) { - logger('Error creating zip file export folder: ' . $zip_folderpath, LOGGER_NORMAL); - json_return_and_die(array('message' => 'Error creating zip file export folder')); - } - $zip_filepath = '/tmp/' . $zip_folder_name . '/' . $zip_filename; - - $checkedblocks = $_POST['block']; - $blocks = []; - if (!empty($checkedblocks)) { - foreach ($checkedblocks as $mid) { - $b = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig + + // Website files are to be imported from the channel cloud files + if (($_POST) && array_key_exists('path', $_POST) && isset($_POST['cloudsubmit'])) { + $channel = App::get_channel(); + $dirpath = get_dirpath_by_cloudpath($channel, $_POST['path']); + if (!$dirpath) { + notice(t('Invalid folder path.') . EOL); + return null; + } + $cloud = true; + } + + // If the website files were uploaded or specified in the cloud files, then $cloud + // should be either true or false + if ($cloud !== null) { + require_once('include/import.php'); + $elements = []; + if ($cloud) { + $path = $_POST['path']; + } else { + $path = $website; + } + $elements['pages'] = scan_webpage_elements($path, 'page', $cloud); + $elements['layouts'] = scan_webpage_elements($path, 'layout', $cloud); + $elements['blocks'] = scan_webpage_elements($path, 'block', $cloud); + $_SESSION['blocks'] = $elements['blocks']; + $_SESSION['layouts'] = $elements['layouts']; + $_SESSION['pages'] = $elements['pages']; + if (!(empty($elements['pages']) && empty($elements['blocks']) && empty($elements['layouts']))) { + //info( t('Webpages elements detected.') . EOL); + $_SESSION['action'] = 'import'; + } else { + notice(t('No webpage elements detected.') . EOL); + $_SESSION['action'] = null; + } + } + + // If the website elements were imported from a zip file, delete the temporary decompressed files + if ($cloud === false && $website && $elements) { + $_SESSION['tempimportpath'] = $website; + //rrmdir($website); // Delete the temporary decompressed files + } + + break; + + case 'importselected': + require_once('include/import.php'); + $channel = App::get_channel(); + + // Import layout first so that pages that reference new layouts will find + // the mid of layout items in the database + + // Obtain the user-selected layouts to import and import them + $checkedlayouts = $_POST['layout']; + $layouts = []; + if (!empty($checkedlayouts)) { + foreach ($checkedlayouts as $name) { + foreach ($_SESSION['layouts'] as &$layout) { + if ($layout['name'] === $name) { + $layout['import'] = 1; + $layoutstoimport[] = $layout; + } + } + } + foreach ($layoutstoimport as $elementtoimport) { + $layouts[] = import_webpage_element($elementtoimport, $channel, 'layout'); + } + } + $_SESSION['import_layouts'] = $layouts; + + // Obtain the user-selected blocks to import and import them + $checkedblocks = $_POST['block']; + $blocks = []; + if (!empty($checkedblocks)) { + foreach ($checkedblocks as $name) { + foreach ($_SESSION['blocks'] as &$block) { + if ($block['name'] === $name) { + $block['import'] = 1; + $blockstoimport[] = $block; + } + } + } + foreach ($blockstoimport as $elementtoimport) { + $blocks[] = import_webpage_element($elementtoimport, $channel, 'block'); + } + } + $_SESSION['import_blocks'] = $blocks; + + // Obtain the user-selected pages to import and import them + $checkedpages = $_POST['page']; + $pages = []; + if (!empty($checkedpages)) { + foreach ($checkedpages as $pagelink) { + foreach ($_SESSION['pages'] as &$page) { + if ($page['pagelink'] === $pagelink) { + $page['import'] = 1; + $pagestoimport[] = $page; + } + } + } + foreach ($pagestoimport as $elementtoimport) { + $pages[] = import_webpage_element($elementtoimport, $channel, 'page'); + } + } + $_SESSION['import_pages'] = $pages; + if (!(empty($_SESSION['import_pages']) && empty($_SESSION['import_blocks']) && empty($_SESSION['import_layouts']))) { + info(t('Import complete.') . EOL); + } + if (isset($_SESSION['tempimportpath'])) { + rrmdir($_SESSION['tempimportpath']); // Delete the temporary decompressed files + unset($_SESSION['tempimportpath']); + } + break; + + case 'exportzipfile': + if (isset($_POST['w_download'])) { + $_SESSION['action'] = 'export_select_list'; + $_SESSION['export'] = 'zipfile'; + if (isset($_POST['zipfilename']) && $_POST['zipfilename'] !== '') { + $filename = filter_var($_POST['zipfilename'], FILTER_SANITIZE_ENCODED); + } else { + $filename = 'website.zip'; + } + $_SESSION['zipfilename'] = $filename; + } + + break; + + case 'exportcloud': + if (isset($_POST['exportcloudpath']) && $_POST['exportcloudpath'] !== '') { + $_SESSION['action'] = 'export_select_list'; + $_SESSION['export'] = 'cloud'; + $_SESSION['exportcloudpath'] = filter_var($_POST['exportcloudpath'], FILTER_SANITIZE_ENCODED); + } + + break; + + case 'cloud': + case 'zipfile': + $channel = App::get_channel(); + + $tmp_folder_name = random_string(10); + $zip_folder_name = random_string(10); + $zip_filename = $_SESSION['zipfilename']; + $tmp_folderpath = '/tmp/' . $tmp_folder_name; + $zip_folderpath = '/tmp/' . $zip_folder_name; + if (!mkdir($zip_folderpath, 0770, false)) { + logger('Error creating zip file export folder: ' . $zip_folderpath, LOGGER_NORMAL); + json_return_and_die(array('message' => 'Error creating zip file export folder')); + } + $zip_filepath = '/tmp/' . $zip_folder_name . '/' . $zip_filename; + + $checkedblocks = $_POST['block']; + $blocks = []; + if (!empty($checkedblocks)) { + foreach ($checkedblocks as $mid) { + $b = q( + "select iconfig.v, iconfig.k, mimetype, title, body from iconfig left join item on item.id = iconfig.iid where mid = '%s' and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' order by iconfig.v asc limit 1", - dbesc($mid), - intval($channel['channel_id']) - ); - if($b) { - $b = $b[0]; - $blockinfo = array( - 'body' => $b['body'], - 'mimetype' => $b['mimetype'], - 'title' => $b['title'], - 'name' => $b['v'], - 'json' => array( - 'title' => $b['title'], - 'name' => $b['v'], - 'mimetype' => $b['mimetype'], - ) - ); - switch ($blockinfo['mimetype']) { - case 'text/html': - $block_ext = 'html'; - break; - case 'text/bbcode': - case 'text/x-multicode': - $block_ext = 'bbcode'; - break; - case 'text/markdown': - $block_ext = 'md'; - break; - case 'application/x-pdl': - $block_ext = 'pdl'; - break; - case 'application/x-php': - $block_ext = 'php'; - break; - default: - $block_ext = 'bbcode'; - break; - } - $block_filename = $blockinfo['name'] . '.' . $block_ext; - $tmp_blockfolder = $tmp_folderpath . '/blocks/' . $blockinfo['name']; - $block_filepath = $tmp_blockfolder . '/' . $block_filename; - $blockinfo['json']['contentfile'] = $block_filename; - $block_jsonpath = $tmp_blockfolder . '/block.json'; - if (!is_dir($tmp_blockfolder) && !mkdir($tmp_blockfolder, 0770, true)) { - logger('Error creating temp export folder: ' . $tmp_blockfolder, LOGGER_NORMAL); - json_return_and_die(array('message' => 'Error creating temp export folder')); - } - file_put_contents($block_filepath, $blockinfo['body']); - file_put_contents($block_jsonpath, json_encode($blockinfo['json'], JSON_UNESCAPED_SLASHES)); - } - } - } - - $checkedlayouts = $_POST['layout']; - $layouts = []; - if (!empty($checkedlayouts)) { - foreach ($checkedlayouts as $mid) { - $l = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig + dbesc($mid), + intval($channel['channel_id']) + ); + if ($b) { + $b = $b[0]; + $blockinfo = array( + 'body' => $b['body'], + 'mimetype' => $b['mimetype'], + 'title' => $b['title'], + 'name' => $b['v'], + 'json' => array( + 'title' => $b['title'], + 'name' => $b['v'], + 'mimetype' => $b['mimetype'], + ) + ); + switch ($blockinfo['mimetype']) { + case 'text/html': + $block_ext = 'html'; + break; + case 'text/bbcode': + case 'text/x-multicode': + $block_ext = 'bbcode'; + break; + case 'text/markdown': + $block_ext = 'md'; + break; + case 'application/x-pdl': + $block_ext = 'pdl'; + break; + case 'application/x-php': + $block_ext = 'php'; + break; + default: + $block_ext = 'bbcode'; + break; + } + $block_filename = $blockinfo['name'] . '.' . $block_ext; + $tmp_blockfolder = $tmp_folderpath . '/blocks/' . $blockinfo['name']; + $block_filepath = $tmp_blockfolder . '/' . $block_filename; + $blockinfo['json']['contentfile'] = $block_filename; + $block_jsonpath = $tmp_blockfolder . '/block.json'; + if (!is_dir($tmp_blockfolder) && !mkdir($tmp_blockfolder, 0770, true)) { + logger('Error creating temp export folder: ' . $tmp_blockfolder, LOGGER_NORMAL); + json_return_and_die(array('message' => 'Error creating temp export folder')); + } + file_put_contents($block_filepath, $blockinfo['body']); + file_put_contents($block_jsonpath, json_encode($blockinfo['json'], JSON_UNESCAPED_SLASHES)); + } + } + } + + $checkedlayouts = $_POST['layout']; + $layouts = []; + if (!empty($checkedlayouts)) { + foreach ($checkedlayouts as $mid) { + $l = q( + "select iconfig.v, iconfig.k, mimetype, title, body from iconfig left join item on item.id = iconfig.iid where mid = '%s' and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc limit 1", - dbesc($mid), - intval($channel['channel_id']) - ); - if($l) { - $l = $l[0]; - $layoutinfo = array( - 'body' => $l['body'], - 'mimetype' => $l['mimetype'], - 'description' => $l['title'], - 'name' => $l['v'], - 'json' => array( - 'description' => $l['title'], - 'name' => $l['v'], - 'mimetype' => $l['mimetype'], - ) - ); - switch ($layoutinfo['mimetype']) { - case 'text/bbcode': - case 'text/x-multicode': - default: - $layout_ext = 'bbcode'; - break; - } - $layout_filename = $layoutinfo['name'] . '.' . $layout_ext; - $tmp_layoutfolder = $tmp_folderpath . '/layouts/' . $layoutinfo['name']; - $layout_filepath = $tmp_layoutfolder . '/' . $layout_filename; - $layoutinfo['json']['contentfile'] = $layout_filename; - $layout_jsonpath = $tmp_layoutfolder . '/layout.json'; - if (!is_dir($tmp_layoutfolder) && !mkdir($tmp_layoutfolder, 0770, true)) { - logger('Error creating temp export folder: ' . $tmp_layoutfolder, LOGGER_NORMAL); - json_return_and_die(array('message' => 'Error creating temp export folder')); - } - file_put_contents($layout_filepath, $layoutinfo['body']); - file_put_contents($layout_jsonpath, json_encode($layoutinfo['json'], JSON_UNESCAPED_SLASHES)); - } - } - } - - $checkedpages = $_POST['page']; - $pages = []; - if (!empty($checkedpages)) { - foreach ($checkedpages as $mid) { - - $p = q("select * from iconfig left join item on iconfig.iid = item.id + dbesc($mid), + intval($channel['channel_id']) + ); + if ($l) { + $l = $l[0]; + $layoutinfo = array( + 'body' => $l['body'], + 'mimetype' => $l['mimetype'], + 'description' => $l['title'], + 'name' => $l['v'], + 'json' => array( + 'description' => $l['title'], + 'name' => $l['v'], + 'mimetype' => $l['mimetype'], + ) + ); + switch ($layoutinfo['mimetype']) { + case 'text/bbcode': + case 'text/x-multicode': + default: + $layout_ext = 'bbcode'; + break; + } + $layout_filename = $layoutinfo['name'] . '.' . $layout_ext; + $tmp_layoutfolder = $tmp_folderpath . '/layouts/' . $layoutinfo['name']; + $layout_filepath = $tmp_layoutfolder . '/' . $layout_filename; + $layoutinfo['json']['contentfile'] = $layout_filename; + $layout_jsonpath = $tmp_layoutfolder . '/layout.json'; + if (!is_dir($tmp_layoutfolder) && !mkdir($tmp_layoutfolder, 0770, true)) { + logger('Error creating temp export folder: ' . $tmp_layoutfolder, LOGGER_NORMAL); + json_return_and_die(array('message' => 'Error creating temp export folder')); + } + file_put_contents($layout_filepath, $layoutinfo['body']); + file_put_contents($layout_jsonpath, json_encode($layoutinfo['json'], JSON_UNESCAPED_SLASHES)); + } + } + } + + $checkedpages = $_POST['page']; + $pages = []; + if (!empty($checkedpages)) { + foreach ($checkedpages as $mid) { + $p = q( + "select * from iconfig left join item on iconfig.iid = item.id where item.uid = %d and item.mid = '%s' and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d", - intval($channel['channel_id']), - dbesc($mid), - intval(ITEM_TYPE_WEBPAGE) - ); - - if($p) { - foreach ($p as $pp) { - // Get the associated layout - $layoutinfo = []; - if($pp['layout_mid']) { - $l = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig + intval($channel['channel_id']), + dbesc($mid), + intval(ITEM_TYPE_WEBPAGE) + ); + + if ($p) { + foreach ($p as $pp) { + // Get the associated layout + $layoutinfo = []; + if ($pp['layout_mid']) { + $l = q( + "select iconfig.v, iconfig.k, mimetype, title, body from iconfig left join item on item.id = iconfig.iid where mid = '%s' and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc limit 1", - dbesc($pp['layout_mid']), - intval($channel['channel_id']) - ); - if($l) { - $l = $l[0]; - $layoutinfo = array( - 'body' => $l['body'], - 'mimetype' => $l['mimetype'], - 'description' => $l['title'], - 'name' => $l['v'], - 'json' => array( - 'description' => $l['title'], - 'name' => $l['v'], - ) - ); - switch ($layoutinfo['mimetype']) { - case 'text/bbcode': - case 'text/x-multicode': - default: - $layout_ext = 'bbcode'; - break; - } - $layout_filename = $layoutinfo['name'] . '.' . $layout_ext; - $tmp_layoutfolder = $tmp_folderpath . '/layouts/' . $layoutinfo['name']; - $layout_filepath = $tmp_layoutfolder . '/' . $layout_filename; - $layoutinfo['json']['contentfile'] = $layout_filename; - $layout_jsonpath = $tmp_layoutfolder . '/layout.json'; - if (!is_dir($tmp_layoutfolder) && !mkdir($tmp_layoutfolder, 0770, true)) { - logger('Error creating temp export folder: ' . $tmp_layoutfolder, LOGGER_NORMAL); - json_return_and_die(array('message' => 'Error creating temp export folder')); - } - file_put_contents($layout_filepath, $layoutinfo['body']); - file_put_contents($layout_jsonpath, json_encode($layoutinfo['json'], JSON_UNESCAPED_SLASHES)); - } - } - switch ($pp['mimetype']) { - case 'text/html': - $page_ext = 'html'; - break; - case 'text/bbcode': - case 'text/x-multicode': - $page_ext = 'bbcode'; - break; - case 'text/markdown': - $page_ext = 'md'; - break; - case 'application/x-pdl': - $page_ext = 'pdl'; - break; - case 'application/x-php': - $page_ext = 'php'; - break; - default: - break; - } - $pageinfo = array( - 'title' => $pp['title'], - 'body' => $pp['body'], - 'pagelink' => $pp['v'], - 'mimetype' => $pp['mimetype'], - 'contentfile' => $pp['v'] . '.' . $page_ext, - 'layout' => ((x($layoutinfo,'name')) ? $layoutinfo['name'] : ''), - 'json' => array( - 'title' => $pp['title'], - 'pagelink' => $pp['v'], - 'mimetype' => $pp['mimetype'], - 'layout' => ((x($layoutinfo,'name')) ? $layoutinfo['name'] : ''), - ) - ); - $page_filename = $pageinfo['pagelink'] . '.' . $page_ext; - $tmp_pagefolder = $tmp_folderpath . '/pages/' . $pageinfo['pagelink']; - $page_filepath = $tmp_pagefolder . '/' . $page_filename; - $page_jsonpath = $tmp_pagefolder . '/page.json'; - $pageinfo['json']['contentfile'] = $page_filename; - if (!is_dir($tmp_pagefolder) && !mkdir($tmp_pagefolder, 0770, true)) { - logger('Error creating temp export folder: ' . $tmp_pagefolder, LOGGER_NORMAL); - json_return_and_die(array('message' => 'Error creating temp export folder')); - } - file_put_contents($page_filepath, $pageinfo['body']); - file_put_contents($page_jsonpath, json_encode($pageinfo['json'], JSON_UNESCAPED_SLASHES)); - } - } - } - } - if($action === 'zipfile') { - // Generate the zip file - ExtendedZip::zipTree($tmp_folderpath, $zip_filepath, ZipArchive::CREATE); - // Output the file for download - header('Content-Disposition: attachment; filename="' . $zip_filename . '"'); - header("Content-Type: application/zip"); - $success = readfile($zip_filepath); - } elseif ($action === 'cloud') { // Only zipfile or cloud should be possible values for $action here - if(isset($_SESSION['exportcloudpath'])) { - require_once('include/attach.php'); - $cloudpath = urldecode($_SESSION['exportcloudpath']); - $channel = App::get_channel(); - $dirpath = get_dirpath_by_cloudpath($channel, $cloudpath); - if(!$dirpath) { - $x = attach_mkdirp($channel, $channel['channel_hash'], array('pathname' => $cloudpath)); - $folder_hash = (($x['success']) ? $x['data']['hash'] : ''); - - if (!$x['success']) { - logger('Failed to create cloud file folder', LOGGER_NORMAL); - } - $dirpath = get_dirpath_by_cloudpath($channel, $cloudpath); - if (!is_dir($dirpath)) { - logger('Failed to create cloud file folder', LOGGER_NORMAL); - } - } - - $success = copy_folder_to_cloudfiles($channel, $channel['channel_hash'], $tmp_folderpath, $cloudpath); - } - } - if(!$success) { - logger('Error exporting webpage elements', LOGGER_NORMAL); - } - - rrmdir($zip_folderpath); rrmdir($tmp_folderpath); // delete temporary files - killme(); + dbesc($pp['layout_mid']), + intval($channel['channel_id']) + ); + if ($l) { + $l = $l[0]; + $layoutinfo = array( + 'body' => $l['body'], + 'mimetype' => $l['mimetype'], + 'description' => $l['title'], + 'name' => $l['v'], + 'json' => array( + 'description' => $l['title'], + 'name' => $l['v'], + ) + ); + switch ($layoutinfo['mimetype']) { + case 'text/bbcode': + case 'text/x-multicode': + default: + $layout_ext = 'bbcode'; + break; + } + $layout_filename = $layoutinfo['name'] . '.' . $layout_ext; + $tmp_layoutfolder = $tmp_folderpath . '/layouts/' . $layoutinfo['name']; + $layout_filepath = $tmp_layoutfolder . '/' . $layout_filename; + $layoutinfo['json']['contentfile'] = $layout_filename; + $layout_jsonpath = $tmp_layoutfolder . '/layout.json'; + if (!is_dir($tmp_layoutfolder) && !mkdir($tmp_layoutfolder, 0770, true)) { + logger('Error creating temp export folder: ' . $tmp_layoutfolder, LOGGER_NORMAL); + json_return_and_die(array('message' => 'Error creating temp export folder')); + } + file_put_contents($layout_filepath, $layoutinfo['body']); + file_put_contents($layout_jsonpath, json_encode($layoutinfo['json'], JSON_UNESCAPED_SLASHES)); + } + } + switch ($pp['mimetype']) { + case 'text/html': + $page_ext = 'html'; + break; + case 'text/bbcode': + case 'text/x-multicode': + $page_ext = 'bbcode'; + break; + case 'text/markdown': + $page_ext = 'md'; + break; + case 'application/x-pdl': + $page_ext = 'pdl'; + break; + case 'application/x-php': + $page_ext = 'php'; + break; + default: + break; + } + $pageinfo = array( + 'title' => $pp['title'], + 'body' => $pp['body'], + 'pagelink' => $pp['v'], + 'mimetype' => $pp['mimetype'], + 'contentfile' => $pp['v'] . '.' . $page_ext, + 'layout' => ((x($layoutinfo, 'name')) ? $layoutinfo['name'] : ''), + 'json' => array( + 'title' => $pp['title'], + 'pagelink' => $pp['v'], + 'mimetype' => $pp['mimetype'], + 'layout' => ((x($layoutinfo, 'name')) ? $layoutinfo['name'] : ''), + ) + ); + $page_filename = $pageinfo['pagelink'] . '.' . $page_ext; + $tmp_pagefolder = $tmp_folderpath . '/pages/' . $pageinfo['pagelink']; + $page_filepath = $tmp_pagefolder . '/' . $page_filename; + $page_jsonpath = $tmp_pagefolder . '/page.json'; + $pageinfo['json']['contentfile'] = $page_filename; + if (!is_dir($tmp_pagefolder) && !mkdir($tmp_pagefolder, 0770, true)) { + logger('Error creating temp export folder: ' . $tmp_pagefolder, LOGGER_NORMAL); + json_return_and_die(array('message' => 'Error creating temp export folder')); + } + file_put_contents($page_filepath, $pageinfo['body']); + file_put_contents($page_jsonpath, json_encode($pageinfo['json'], JSON_UNESCAPED_SLASHES)); + } + } + } + } + if ($action === 'zipfile') { + // Generate the zip file + ExtendedZip::zipTree($tmp_folderpath, $zip_filepath, ZipArchive::CREATE); + // Output the file for download + header('Content-Disposition: attachment; filename="' . $zip_filename . '"'); + header("Content-Type: application/zip"); + $success = readfile($zip_filepath); + } elseif ($action === 'cloud') { // Only zipfile or cloud should be possible values for $action here + if (isset($_SESSION['exportcloudpath'])) { + require_once('include/attach.php'); + $cloudpath = urldecode($_SESSION['exportcloudpath']); + $channel = App::get_channel(); + $dirpath = get_dirpath_by_cloudpath($channel, $cloudpath); + if (!$dirpath) { + $x = attach_mkdirp($channel, $channel['channel_hash'], array('pathname' => $cloudpath)); + $folder_hash = (($x['success']) ? $x['data']['hash'] : ''); - break; - default : - break; - } - - } - - } - + if (!$x['success']) { + logger('Failed to create cloud file folder', LOGGER_NORMAL); + } + $dirpath = get_dirpath_by_cloudpath($channel, $cloudpath); + if (!is_dir($dirpath)) { + logger('Failed to create cloud file folder', LOGGER_NORMAL); + } + } + + $success = copy_folder_to_cloudfiles($channel, $channel['channel_hash'], $tmp_folderpath, $cloudpath); + } + } + if (!$success) { + logger('Error exporting webpage elements', LOGGER_NORMAL); + } + + rrmdir($zip_folderpath); + rrmdir($tmp_folderpath); // delete temporary files + killme(); + + break; + default: + break; + } + } + } } diff --git a/Zotlabs/Module/Well_known.php b/Zotlabs/Module/Well_known.php index bd4cc3173..492aed0ea 100644 --- a/Zotlabs/Module/Well_known.php +++ b/Zotlabs/Module/Well_known.php @@ -1,4 +1,5 @@ 1) { - - $arr = [ 'server' => $_SERVER, 'request' => $_REQUEST ]; - call_hooks('well_known', $arr); - - if (! check_siteallowed($_SERVER['REMOTE_ADDR'])) { - logger('well_known: site not allowed. ' . $_SERVER['REMOTE_ADDR']); - killme(); - } - - // from php.net re: REMOTE_HOST: - // Note: Your web server must be configured to create this variable. - // For example in Apache you'll need HostnameLookups On inside httpd.conf - // for it to exist. See also gethostbyaddr(). - - if (get_config('system','siteallowed_remote_host') && (! check_siteallowed($_SERVER['REMOTE_HOST']))) { - logger('well_known: site not allowed. ' . $_SERVER['REMOTE_HOST']); - killme(); - } - - switch(argv(1)) { - - case 'webfinger': - App::$argc -= 1; - array_shift(App::$argv); - App::$argv[0] = 'webfinger'; - $module = new Webfinger(); - $module->init(); - break; - - case 'oauth-authorization-server': - case 'openid-configuration': - App::$argc -= 1; - array_shift(\App::$argv); - App::$argv[0] = 'oauthinfo'; - $module = new Oauthinfo(); - $module->init(); - break; + public function init() + { - case 'dnt-policy.txt': - echo file_get_contents('doc/global/dnt-policy.txt'); - killme(); + if (argc() > 1) { + $arr = ['server' => $_SERVER, 'request' => $_REQUEST]; + call_hooks('well_known', $arr); - default: - if (file_exists(App::$cmd)) { - echo file_get_contents(App::$cmd); - killme(); - } - elseif (file_exists(App::$cmd . '.php')) - require_once(App::$cmd . '.php'); - break; - } - } - - http_status_exit(404); - } + if (!check_siteallowed($_SERVER['REMOTE_ADDR'])) { + logger('well_known: site not allowed. ' . $_SERVER['REMOTE_ADDR']); + killme(); + } + + // from php.net re: REMOTE_HOST: + // Note: Your web server must be configured to create this variable. + // For example in Apache you'll need HostnameLookups On inside httpd.conf + // for it to exist. See also gethostbyaddr(). + + if (get_config('system', 'siteallowed_remote_host') && (!check_siteallowed($_SERVER['REMOTE_HOST']))) { + logger('well_known: site not allowed. ' . $_SERVER['REMOTE_HOST']); + killme(); + } + + switch (argv(1)) { + case 'webfinger': + App::$argc -= 1; + array_shift(App::$argv); + App::$argv[0] = 'webfinger'; + $module = new Webfinger(); + $module->init(); + break; + + case 'oauth-authorization-server': + case 'openid-configuration': + App::$argc -= 1; + array_shift(App::$argv); + App::$argv[0] = 'oauthinfo'; + $module = new Oauthinfo(); + $module->init(); + break; + + case 'dnt-policy.txt': + echo file_get_contents('doc/global/dnt-policy.txt'); + killme(); + + default: + if (file_exists(App::$cmd)) { + echo file_get_contents(App::$cmd); + killme(); + } elseif (file_exists(App::$cmd . '.php')) { + require_once(App::$cmd . '.php'); + } + break; + } + } + + http_status_exit(404); + } } diff --git a/Zotlabs/Module/Xchan.php b/Zotlabs/Module/Xchan.php index 526580fad..18290519b 100644 --- a/Zotlabs/Module/Xchan.php +++ b/Zotlabs/Module/Xchan.php @@ -1,47 +1,51 @@ ' . t('Xchan Lookup') . ''; - - $o .= ''; - $o .= '
'; - - if(x($_GET, 'addr')) { - $addr = trim($_GET['addr']); - - $r = q("select * from xchan where xchan_hash like '%s%%' or xchan_addr = '%s' group by xchan_hash", - dbesc($addr), - dbesc($addr) - ); - - if($r) { - foreach($r as $rr) { - $o .= str_replace(array("\n", " "), array("
", " "), print_r($rr, true)) . EOL; - - $s = q("select * from hubloc where hubloc_hash like '%s'", - dbesc($r[0]['xchan_hash']) - ); - - if($s) { - foreach($s as $rrr) - $o .= str_replace(array("\n", " "), array("
", " "), print_r($rrr, true)) . EOL; - } - } - } - else - notice( t('Not found.') . EOL); - - } - return $o; - } - + $o = '' . t('Xchan Lookup') . '
'; + + $o .= ''; + $o .= '
'; + + if (x($_GET, 'addr')) { + $addr = trim($_GET['addr']); + + $r = q( + "select * from xchan where xchan_hash like '%s%%' or xchan_addr = '%s' group by xchan_hash", + dbesc($addr), + dbesc($addr) + ); + + if ($r) { + foreach ($r as $rr) { + $o .= str_replace(array("\n", " "), array("
", " "), print_r($rr, true)) . EOL; + + $s = q( + "select * from hubloc where hubloc_hash like '%s'", + dbesc($r[0]['xchan_hash']) + ); + + if ($s) { + foreach ($s as $rrr) { + $o .= str_replace(array("\n", " "), array("
", " "), print_r($rrr, true)) . EOL; + } + } + } + } else { + notice(t('Not found.') . EOL); + } + } + return $o; + } } diff --git a/Zotlabs/Module/Xp.php b/Zotlabs/Module/Xp.php index 23a4e2cea..e7fba797f 100644 --- a/Zotlabs/Module/Xp.php +++ b/Zotlabs/Module/Xp.php @@ -3,61 +3,63 @@ namespace Zotlabs\Module; use Zotlabs\Web\Controller; -class Xp extends Controller { +class Xp extends Controller +{ - function get() { - if (argc() > 1) { - $path = 'cache/xp/' . substr(argv(1),0,2) . '/' . substr(argv(1),2,2) . '/' . argv(1); + public function get() + { + if (argc() > 1) { + $path = 'cache/xp/' . substr(argv(1), 0, 2) . '/' . substr(argv(1), 2, 2) . '/' . argv(1); - if (! file_exists($path)) { - // no longer cached for some reason, perhaps expired - $resolution = substr(argv(1),(-2),2); - if ($resolution && substr($resolution,0,1) === '-') { - switch (substr($resolution,1,1)) { - case '4': - $path = get_default_profile_photo(); - break; - case '5': - $path = get_default_profile_photo(80); - break; - case '6': - $path = get_default_profile_photo(48); - break; - default: - break; - } - } - } - - if (! file_exists($path)) { - http_status_exit(404,'Not found'); - } - - $x = @getimagesize($path); - if ($x) { - header('Content-Type: ' . $x['mime']); - } + if (!file_exists($path)) { + // no longer cached for some reason, perhaps expired + $resolution = substr(argv(1), (-2), 2); + if ($resolution && substr($resolution, 0, 1) === '-') { + switch (substr($resolution, 1, 1)) { + case '4': + $path = get_default_profile_photo(); + break; + case '5': + $path = get_default_profile_photo(80); + break; + case '6': + $path = get_default_profile_photo(48); + break; + default: + break; + } + } + } - $cache = intval(get_config('system','photo_cache_time')); - if (! $cache) { - $cache = (3600 * 24); // 1 day - } - header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $cache) . ' GMT'); - // Set browser cache age as $cache. But set timeout of 'shared caches' - // much lower in the event that infrastructure caching is present. - $smaxage = intval($cache/12); - header('Cache-Control: s-maxage=' . $smaxage . '; max-age=' . $cache . ';'); - - $infile = fopen($path,'rb'); - $outfile = fopen('php://output','wb'); - if ($infile && $outfile) { - pipe_streams($infile,$outfile); - } - fclose($infile); - fclose($outfile); - killme(); - } + if (!file_exists($path)) { + http_status_exit(404, 'Not found'); + } - http_status_exit(404,'Not found'); - } + $x = @getimagesize($path); + if ($x) { + header('Content-Type: ' . $x['mime']); + } + + $cache = intval(get_config('system', 'photo_cache_time')); + if (!$cache) { + $cache = (3600 * 24); // 1 day + } + header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $cache) . ' GMT'); + // Set browser cache age as $cache. But set timeout of 'shared caches' + // much lower in the event that infrastructure caching is present. + $smaxage = intval($cache / 12); + header('Cache-Control: s-maxage=' . $smaxage . '; max-age=' . $cache . ';'); + + $infile = fopen($path, 'rb'); + $outfile = fopen('php://output', 'wb'); + if ($infile && $outfile) { + pipe_streams($infile, $outfile); + } + fclose($infile); + fclose($outfile); + killme(); + } + + http_status_exit(404, 'Not found'); + } } diff --git a/Zotlabs/Module/Xref.php b/Zotlabs/Module/Xref.php index e9d494da4..1bd3e2b59 100644 --- a/Zotlabs/Module/Xref.php +++ b/Zotlabs/Module/Xref.php @@ -1,26 +1,29 @@ 2) - $url = argv(2); - - goaway (z_root() . '/' . $url); - - } - + public function init() + { + // Sets a referral URL using an xchan directly + // Link format: example.com/xref/[xchan]/[TargetURL] + // Target URL is optional. + // Cookie lasts 24 hours to survive a browser restart. Contains no personal + // information at all - just somebody else's xchan. + $referrer = argv(1); + $expire = time() + 60 * 60 * 2; + $path = 'xref'; + setcookie($path, $referrer, $expire, "/"); + $url = ''; + + if (argc() > 2) { + $url = argv(2); + } + + goaway(z_root() . '/' . $url); + } } diff --git a/Zotlabs/Module/Zot.php b/Zotlabs/Module/Zot.php index e470d5f02..830006d87 100644 --- a/Zotlabs/Module/Zot.php +++ b/Zotlabs/Module/Zot.php @@ -1,4 +1,5 @@ run(),'application/x-nomad+json'); } diff --git a/Zotlabs/Module/Zot_probe.php b/Zotlabs/Module/Zot_probe.php index fad6d4d7d..91c2b7293 100644 --- a/Zotlabs/Module/Zot_probe.php +++ b/Zotlabs/Module/Zot_probe.php @@ -2,53 +2,50 @@ namespace Zotlabs\Module; +use App; use Zotlabs\Lib\ZotURL; use Zotlabs\Lib\Zotfinger; - +use Zotlabs\Web\Controller; use Zotlabs\Web\HTTPSig; -class Zot_probe extends \Zotlabs\Web\Controller { +class Zot_probe extends Controller +{ - function get() { + public function get() + { - $o = replace_macros(get_markup_template('zot_probe.tpl'), [ - '$page_title' => t('Zot6 Probe Diagnostic'), - '$resource' => [ 'resource', t('Object URL') , $_REQUEST['resource'], EMPTY_STR ], - '$authf' => [ 'authf', t('Authenticated fetch'), $_REQUEST['authf'], EMPTY_STR, [ t('No'), t('Yes') ] ], - '$submit' => t('Submit') - ]); + $o = replace_macros(get_markup_template('zot_probe.tpl'), [ + '$page_title' => t('Zot6 Probe Diagnostic'), + '$resource' => ['resource', t('Object URL'), $_REQUEST['resource'], EMPTY_STR], + '$authf' => ['authf', t('Authenticated fetch'), $_REQUEST['authf'], EMPTY_STR, [t('No'), t('Yes')]], + '$submit' => t('Submit') + ]); + if (x($_GET, 'resource')) { + $resource = $_GET['resource']; + $channel = (($_GET['authf']) ? App::get_channel() : null); - if(x($_GET,'resource')) { - $resource = $_GET['resource']; - $channel = (($_GET['authf']) ? \App::get_channel() : null); + if (strpos($resource, 'x-zot:') === 0) { + $x = ZotURL::fetch($resource, $channel); + } else { + $x = Zotfinger::exec($resource, $channel); - if(strpos($resource,'x-zot:') === 0) { - $x = ZotURL::fetch($resource,$channel); - } - else { - $x = Zotfinger::exec($resource,$channel); - - $o .= '' . htmlspecialchars(print_array($x)) . '
'; + $o .= '' . htmlspecialchars(print_array($x)) . '
'; $headers = 'Accept: application/x-nomad+json, application/x-zot+json, application/jrd+json, application/json'; - $redirects = 0; - $x = z_fetch_url($resource,true,$redirects, [ 'headers' => [ $headers ]]); - } + $redirects = 0; + $x = z_fetch_url($resource, true, $redirects, ['headers' => [$headers]]); + } - if($x['success']) { + if ($x['success']) { + $o .= '' . htmlspecialchars($x['header']) . '
' . EOL; - $o .= '' . htmlspecialchars($x['header']) . '
' . EOL; + $o .= 'verify returns: ' . str_replace("\n", EOL, print_r(HTTPSig::verify($x, EMPTY_STR, 'zot6'), true)) . EOL; - $o .= 'verify returns: ' . str_replace("\n",EOL,print_r(HTTPSig::verify($x, EMPTY_STR, 'zot6'),true)) . EOL; - - $o .= '' . htmlspecialchars(json_encode(json_decode($x['body']),JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES)) . '
' . EOL; - - } - - } - return $o; - } - + $o .= '' . htmlspecialchars(json_encode(json_decode($x['body']), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) . '
' . EOL; + } + } + return $o; + } } diff --git a/Zotlabs/Module/Zotfinger.php b/Zotlabs/Module/Zotfinger.php index 9411bab82..420c5cc44 100644 --- a/Zotlabs/Module/Zotfinger.php +++ b/Zotlabs/Module/Zotfinger.php @@ -1,4 +1,5 @@ t('Zotfinger Diagnostic'), - '$resource' => [ 'resource', t('Lookup URL') , $_GET['resource'], EMPTY_STR ], - '$submit' => t('Submit') - ]); + $o = replace_macros(get_markup_template('zotfinger.tpl'), [ + '$page_title' => t('Zotfinger Diagnostic'), + '$resource' => ['resource', t('Lookup URL'), $_GET['resource'], EMPTY_STR], + '$submit' => t('Submit') + ]); - if ($_GET['resource']) { - $channel = App::get_channel(); - $resource = trim(escape_tags($_GET['resource'])); - $do_import = ((intval($_GET['import']) && is_site_admin()) ? true : false); - - $j = Zfinger::exec($resource,$channel); + if ($_GET['resource']) { + $channel = App::get_channel(); + $resource = trim(escape_tags($_GET['resource'])); + $do_import = ((intval($_GET['import']) && is_site_admin()) ? true : false); - if ($do_import && $j) { - $x = Libzot::import_xchan($j['data']); - } - $o .= '' . str_replace("\n",''; - } - return $o; - } - + $j = Zfinger::exec($resource, $channel); + + if ($do_import && $j) { + $x = Libzot::import_xchan($j['data']); + } + $o .= '
',print_array($j)) . '' . str_replace("\n", ''; + } + return $o; + } } diff --git a/Zotlabs/Photo/PhotoDriver.php b/Zotlabs/Photo/PhotoDriver.php index 030ee2cc6..8a5c1d595 100644 --- a/Zotlabs/Photo/PhotoDriver.php +++ b/Zotlabs/Photo/PhotoDriver.php @@ -3,6 +3,7 @@ namespace Zotlabs\Photo; use App; +use Imagick; /** * @brief Abstract photo driver class. @@ -10,470 +11,475 @@ use App; * Inheritance seems not to be the best design pattern for such photo drivers. */ -abstract class PhotoDriver { +abstract class PhotoDriver +{ - /** - * @brief This variable keeps the image. - * - * For GD it is a PHP image resource. - * For ImageMagick it is an \Imagick object. - * - * @var resource|\Imagick - */ - protected $image; + /** + * @brief This variable keeps the image. + * + * For GD it is a PHP image resource. + * For ImageMagick it is an \Imagick object. + * + * @var resource|Imagick + */ + protected $image; - /** - * @var integer - */ - protected $width; + /** + * @var int + */ + protected $width; - /** - * @var integer - */ - protected $height; + /** + * @var int + */ + protected $height; - /** - * @var boolean - */ - protected $valid; + /** + * @var bool + */ + protected $valid; - /** - * @brief The mimetype of the image. - * - * @var string - */ - protected $type; + /** + * @brief The mimetype of the image. + * + * @var string + */ + protected $type; - /** - * @brief Supported mimetypes by the used photo driver. - * - * @var array - */ - protected $types; + /** + * @brief Supported mimetypes by the used photo driver. + * + * @var array + */ + protected $types; - /** - * @brief Return an array with supported mimetypes. - * - * @return array - * Associative array with mimetype as key and file extension as value. - */ - abstract public function supportedTypes(); + /** + * @brief Return an array with supported mimetypes. + * + * @return array + * Associative array with mimetype as key and file extension as value. + */ + abstract public function supportedTypes(); - abstract protected function load($data, $type); + abstract protected function load($data, $type); - abstract protected function destroy(); + abstract protected function destroy(); - abstract protected function setDimensions(); + abstract protected function setDimensions(); - /** - * @brief Return the current image. - * - * @fixme Shouldn't his method be protected, because outside of the current - * driver it makes no sense at all because of the different return values. - * - * @return boolean|resource|\Imagick - * false on failure, a PHP image resource for GD driver, an \Imagick object - * for ImageMagick driver. - */ + /** + * @brief Return the current image. + * + * @fixme Shouldn't his method be protected, because outside of the current + * driver it makes no sense at all because of the different return values. + * + * @return bool|resource|Imagick + * false on failure, a PHP image resource for GD driver, an \Imagick object + * for ImageMagick driver. + */ - abstract public function getImage(); + abstract public function getImage(); - abstract public function doScaleImage($new_width, $new_height); + abstract public function doScaleImage($new_width, $new_height); - abstract public function rotate($degrees); + abstract public function rotate($degrees); - abstract public function flip($horiz = true, $vert = false); + abstract public function flip($horiz = true, $vert = false); - /** - * @brief Crops the image. - * - * @param int $maxx width of the new image - * @param int $maxy height of the new image - * @param int $x x-offset for region - * @param int $y y-offset for region - * @param int $w width of region - * @param int $h height of region - * - * @return boolean|void false on failure - */ - abstract public function cropImageRect($maxx, $maxy, $x, $y, $w, $h); + /** + * @brief Crops the image. + * + * @param int $maxx width of the new image + * @param int $maxy height of the new image + * @param int $x x-offset for region + * @param int $y y-offset for region + * @param int $w width of region + * @param int $h height of region + * + * @return bool|void false on failure + */ + abstract public function cropImageRect($maxx, $maxy, $x, $y, $w, $h); - /** - * @brief Return a binary string from the image resource. - * - * @return string A Binary String. - */ - abstract public function imageString($animations = true); + /** + * @brief Return a binary string from the image resource. + * + * @return string A Binary String. + */ + abstract public function imageString($animations = true); - abstract public function clearexif(); + abstract public function clearexif(); - /** - * @brief PhotoDriver constructor. - * - * @param string $data Image - * @param string $type mimetype - */ - public function __construct($data, $type = '') { - $this->types = $this->supportedTypes(); - if (! array_key_exists($type, $this->types)) { - $type = 'image/jpeg'; - } - $this->type = $type; - $this->valid = false; - $this->load($data, $type); - } + /** + * @brief PhotoDriver constructor. + * + * @param string $data Image + * @param string $type mimetype + */ + public function __construct($data, $type = '') + { + $this->types = $this->supportedTypes(); + if (! array_key_exists($type, $this->types)) { + $type = 'image/jpeg'; + } + $this->type = $type; + $this->valid = false; + $this->load($data, $type); + } - public function __destruct() { - if ($this->is_valid()) { - $this->destroy(); - } - } + public function __destruct() + { + if ($this->is_valid()) { + $this->destroy(); + } + } - /** - * @brief Is it a valid image object. - * - * @return boolean - */ - public function is_valid() { - return $this->valid; - } + /** + * @brief Is it a valid image object. + * + * @return bool + */ + public function is_valid() + { + return $this->valid; + } - /** - * @brief Get the width of the image. - * - * @return boolean|number Width of image in pixels, or false on failure - */ - public function getWidth() { - if (! $this->is_valid()) { - return false; - } - return $this->width; - } + /** + * @brief Get the width of the image. + * + * @return bool|number Width of image in pixels, or false on failure + */ + public function getWidth() + { + if (! $this->is_valid()) { + return false; + } + return $this->width; + } - /** - * @brief Get the height of the image. - * - * @return boolean|number Height of image in pixels, or false on failure - */ - public function getHeight() { - if (! $this->is_valid()) { - return false; - } - return $this->height; - } + /** + * @brief Get the height of the image. + * + * @return bool|number Height of image in pixels, or false on failure + */ + public function getHeight() + { + if (! $this->is_valid()) { + return false; + } + return $this->height; + } - /** - * @brief Saves the image resource to a file in filesystem. - * - * @param string $path Path and filename where to save the image - * @return boolean False on failure, otherwise true - */ - public function saveImage($path, $animated = true) { - if (! $this->is_valid()) { - return false; - } - return (file_put_contents($path, $this->imageString($animated)) ? true : false); - } + /** + * @brief Saves the image resource to a file in filesystem. + * + * @param string $path Path and filename where to save the image + * @return bool False on failure, otherwise true + */ + public function saveImage($path, $animated = true) + { + if (! $this->is_valid()) { + return false; + } + return (file_put_contents($path, $this->imageString($animated)) ? true : false); + } - /** - * @brief Return mimetype of the image resource. - * - * @return boolean|string False on failure, otherwise mimetype. - */ - public function getType() { - if (! $this->is_valid()) { - return false; - } - return $this->type; - } + /** + * @brief Return mimetype of the image resource. + * + * @return bool|string False on failure, otherwise mimetype. + */ + public function getType() + { + if (! $this->is_valid()) { + return false; + } + return $this->type; + } - /** - * @brief Return file extension of the image resource. - * - * @return boolean|string False on failure, otherwise file extension. - */ - public function getExt() { - if (! $this->is_valid()) { - return false; - } - return $this->types[$this->getType()]; - } + /** + * @brief Return file extension of the image resource. + * + * @return bool|string False on failure, otherwise file extension. + */ + public function getExt() + { + if (! $this->is_valid()) { + return false; + } + return $this->types[$this->getType()]; + } - /** - * @brief Scale image to max pixel size in either dimension. - * - * @param int $max maximum pixel size in either dimension - * @param boolean $float_height (optional) - * If true allow height to float to any length on tall images, constraining - * only the width - * @return boolean|void false on failure, otherwise void - */ - public function scaleImage($max, $float_height = true) { - if (! $this->is_valid()) { - return false; - } + /** + * @brief Scale image to max pixel size in either dimension. + * + * @param int $max maximum pixel size in either dimension + * @param bool $float_height (optional) + * If true allow height to float to any length on tall images, constraining + * only the width + * @return bool|void false on failure, otherwise void + */ + public function scaleImage($max, $float_height = true) + { + if (! $this->is_valid()) { + return false; + } - $width = $this->width; - $height = $this->height; + $width = $this->width; + $height = $this->height; - $dest_width = $dest_height = 0; + $dest_width = $dest_height = 0; - if (! ($width && $height)) { - return false; - } + if (! ($width && $height)) { + return false; + } - if ($width > $max && $height > $max) { + if ($width > $max && $height > $max) { + // very tall image (greater than 16:9) + // constrain the width - let the height float. - // very tall image (greater than 16:9) - // constrain the width - let the height float. + if (((($height * 9) / 16) > $width) && ($float_height)) { + $dest_width = $max; + $dest_height = intval(($height * $max) / $width); + } // else constrain both dimensions + elseif ($width > $height) { + $dest_width = $max; + $dest_height = intval(($height * $max) / $width); + } else { + $dest_width = intval(($width * $max) / $height); + $dest_height = $max; + } + } else { + if ($width > $max) { + $dest_width = $max; + $dest_height = intval(($height * $max) / $width); + } else { + if ($height > $max) { + // very tall image (greater than 16:9) + // but width is OK - don't do anything - if (((($height * 9) / 16) > $width) && ($float_height)) { - $dest_width = $max; - $dest_height = intval(($height * $max) / $width); - } // else constrain both dimensions - elseif ($width > $height) { - $dest_width = $max; - $dest_height = intval(($height * $max) / $width); - } - else { - $dest_width = intval(($width * $max) / $height); - $dest_height = $max; - } - } - else { - if ($width > $max) { - $dest_width = $max; - $dest_height = intval(($height * $max) / $width); - } - else { - if ($height > $max) { + if (((($height * 9) / 16) > $width) && ($float_height)) { + $dest_width = $width; + $dest_height = $height; + } else { + $dest_width = intval(($width * $max) / $height); + $dest_height = $max; + } + } else { + $dest_width = $width; + $dest_height = $height; + } + } + } + $this->doScaleImage($dest_width, $dest_height); + } - // very tall image (greater than 16:9) - // but width is OK - don't do anything + public function scaleImageUp($min) + { + if (! $this->is_valid()) { + return false; + } - if (((($height * 9) / 16) > $width) && ($float_height)) { - $dest_width = $width; - $dest_height = $height; - } - else { - $dest_width = intval(($width * $max) / $height); - $dest_height = $max; - } - } - else { - $dest_width = $width; - $dest_height = $height; - } - } - } - $this->doScaleImage($dest_width, $dest_height); - } + $width = $this->width; + $height = $this->height; - public function scaleImageUp($min) { - if (! $this->is_valid()) { - return false; - } + $dest_width = $dest_height = 0; - $width = $this->width; - $height = $this->height; + if (! ($width && $height)) { + return false; + } - $dest_width = $dest_height = 0; + if ($width < $min && $height < $min) { + if ($width > $height) { + $dest_width = $min; + $dest_height = intval(($height * $min) / $width); + } else { + $dest_width = intval(($width * $min) / $height); + $dest_height = $min; + } + } else { + if ($width < $min) { + $dest_width = $min; + $dest_height = intval(($height * $min) / $width); + } else { + if ($height < $min) { + $dest_width = intval(($width * $min) / $height); + $dest_height = $min; + } else { + $dest_width = $width; + $dest_height = $height; + } + } + } + $this->doScaleImage($dest_width, $dest_height); + } - if (! ($width && $height)) { - return false; - } + /** + * @brief Scales image to a square. + * + * @param int $dim Pixel of square image + * @return bool|void false on failure, otherwise void + */ + public function scaleImageSquare($dim) + { + if (! $this->is_valid()) { + return false; + } + $this->doScaleImage($dim, $dim); + } - if ($width < $min && $height < $min) { - if ($width > $height) { - $dest_width = $min; - $dest_height = intval(($height * $min) / $width); - } - else { - $dest_width = intval(($width * $min) / $height); - $dest_height = $min; - } - } - else { - if ($width < $min) { - $dest_width = $min; - $dest_height = intval(($height * $min) / $width); - } - else { - if ($height < $min) { - $dest_width = intval(($width * $min) / $height); - $dest_height = $min; - } - else { - $dest_width = $width; - $dest_height = $height; - } - } - } - $this->doScaleImage($dest_width, $dest_height); - } + /** + * @brief Crops a square image. + * + * @see cropImageRect() + * + * @param int $max size of the new image + * @param int $x x-offset for region + * @param int $y y-offset for region + * @param int $w width of region + * @param int $h height of region + * + * @return bool|void false on failure + */ + public function cropImage($max, $x, $y, $w, $h) + { + if (! $this->is_valid()) { + return false; + } + $this->cropImageRect($max, $max, $x, $y, $w, $h); + } - /** - * @brief Scales image to a square. - * - * @param int $dim Pixel of square image - * @return boolean|void false on failure, otherwise void - */ - public function scaleImageSquare($dim) { - if (! $this->is_valid()) { - return false; - } - $this->doScaleImage($dim, $dim); - } + /** + * @brief Reads exif data from a given filename. + * + * @param string $filename + * @return bool|array + */ + public function exif($filename) + { + if ((! function_exists('exif_read_data')) || (! in_array($this->getType(), ['image/jpeg', 'image/tiff']))) { + return false; + } - /** - * @brief Crops a square image. - * - * @see cropImageRect() - * - * @param int $max size of the new image - * @param int $x x-offset for region - * @param int $y y-offset for region - * @param int $w width of region - * @param int $h height of region - * - * @return boolean|void false on failure - */ - public function cropImage($max, $x, $y, $w, $h) { - if (! $this->is_valid()) { - return false; - } - $this->cropImageRect($max, $max, $x, $y, $w, $h); - } + /* + * PHP 7.2 allows you to use a stream resource, which should reduce/avoid + * memory exhaustion on large images. + */ - /** - * @brief Reads exif data from a given filename. - * - * @param string $filename - * @return boolean|array - */ - public function exif($filename) { - if ((! function_exists('exif_read_data')) || (! in_array($this->getType(), ['image/jpeg', 'image/tiff']))) { - return false; - } + if (version_compare(PHP_VERSION, '7.2.0') >= 0) { + $f = @fopen($filename, 'rb'); + } else { + $f = $filename; + } - /* - * PHP 7.2 allows you to use a stream resource, which should reduce/avoid - * memory exhaustion on large images. - */ + if ($f) { + return @exif_read_data($f, null, true); + } - if (version_compare(PHP_VERSION, '7.2.0') >= 0) { - $f = @fopen($filename, 'rb'); - } - else { - $f = $filename; - } + return false; + } - if ($f) { - return @exif_read_data($f, null, true); - } + /** + * @brief Orients current image based on exif orientation information. + * + * @param array $exif + * @return bool true if oriented, otherwise false + */ + public function orient($exif) + { + if (! ($this->is_valid() && $exif)) { + return false; + } - return false; - } + $ort = ((array_key_exists('IFD0', $exif)) ? $exif['IFD0']['Orientation'] : $exif['Orientation']); - /** - * @brief Orients current image based on exif orientation information. - * - * @param array $exif - * @return boolean true if oriented, otherwise false - */ - public function orient($exif) { - if (! ($this->is_valid() && $exif)) { - return false; - } + if (! $ort) { + return false; + } - $ort = ((array_key_exists('IFD0', $exif)) ? $exif['IFD0']['Orientation'] : $exif['Orientation']); + switch ($ort) { + case 1: // nothing + break; + case 2: // horizontal flip + $this->flip(); + break; + case 3: // 180 rotate left + $this->rotate(180); + break; + case 4: // vertical flip + $this->flip(false, true); + break; + case 5: // vertical flip + 90 rotate right + $this->flip(false, true); + $this->rotate(-90); + break; + case 6: // 90 rotate right + $this->rotate(-90); + break; + case 7: // horizontal flip + 90 rotate right + $this->flip(); + $this->rotate(-90); + break; + case 8: // 90 rotate left + $this->rotate(90); + break; + default: + break; + } - if (! $ort) { - return false; - } + return true; + } - switch ($ort) { - case 1 : // nothing - break; - case 2 : // horizontal flip - $this->flip(); - break; - case 3 : // 180 rotate left - $this->rotate(180); - break; - case 4 : // vertical flip - $this->flip(false, true); - break; - case 5 : // vertical flip + 90 rotate right - $this->flip(false, true); - $this->rotate(-90); - break; - case 6 : // 90 rotate right - $this->rotate(-90); - break; - case 7 : // horizontal flip + 90 rotate right - $this->flip(); - $this->rotate(-90); - break; - case 8 : // 90 rotate left - $this->rotate(90); - break; - default : - break; - } + /** + * @brief Save photo to database. + * + * @param array $arr + * @param bool $skipcheck (optional) default false + * @return bool|array + */ + public function save($arr, $skipcheck = false) + { + if (! ($skipcheck || $this->is_valid())) { + logger('Attempt to store invalid photo.'); + return false; + } - return true; - } + $p = []; - /** - * @brief Save photo to database. - * - * @param array $arr - * @param boolean $skipcheck (optional) default false - * @return boolean|array - */ - public function save($arr, $skipcheck = false) { - if (! ($skipcheck || $this->is_valid())) { - logger('Attempt to store invalid photo.'); - return false; - } + $p['aid'] = ((intval($arr['aid'])) ? intval($arr['aid']) : 0); + $p['uid'] = ((intval($arr['uid'])) ? intval($arr['uid']) : 0); + $p['xchan'] = (($arr['xchan']) ? $arr['xchan'] : ''); + $p['resource_id'] = (($arr['resource_id']) ? $arr['resource_id'] : ''); + $p['filename'] = (($arr['filename']) ? $arr['filename'] : ''); + $p['mimetype'] = (($arr['mimetype']) ? $arr['mimetype'] : $this->getType()); + $p['album'] = (($arr['album']) ? $arr['album'] : ''); + $p['imgscale'] = ((intval($arr['imgscale'])) ? intval($arr['imgscale']) : 0); + $p['allow_cid'] = (($arr['allow_cid']) ? $arr['allow_cid'] : ''); + $p['allow_gid'] = (($arr['allow_gid']) ? $arr['allow_gid'] : ''); + $p['deny_cid'] = (($arr['deny_cid']) ? $arr['deny_cid'] : ''); + $p['deny_gid'] = (($arr['deny_gid']) ? $arr['deny_gid'] : ''); + $p['edited'] = (($arr['edited']) ? $arr['edited'] : datetime_convert()); + $p['title'] = (($arr['title']) ? $arr['title'] : ''); + $p['description'] = (($arr['description']) ? $arr['description'] : ''); + $p['photo_usage'] = intval($arr['photo_usage']); + $p['os_storage'] = intval($arr['os_storage']); + $p['os_path'] = $arr['os_path']; + $p['os_syspath'] = ((array_key_exists('os_syspath', $arr)) ? $arr['os_syspath'] : ''); + $p['display_path'] = (($arr['display_path']) ? $arr['display_path'] : ''); + $p['width'] = (($arr['width']) ? $arr['width'] : $this->getWidth()); + $p['height'] = (($arr['height']) ? $arr['height'] : $this->getHeight()); + $p['expires'] = (($arr['expires']) ? $arr['expires'] : gmdate('Y-m-d H:i:s', time() + get_config('system', 'photo_cache_time', 86400))); + $p['profile'] = ((array_key_exists('profile', $arr)) ? intval($arr['profile']) : 0); - $p = []; + if (! intval($p['imgscale'])) { + logger('save: ' . print_r($arr, true), LOGGER_DATA); + } + $x = q("select id, created from photo where resource_id = '%s' and uid = %d and xchan = '%s' and imgscale = %d limit 1", dbesc($p['resource_id']), intval($p['uid']), dbesc($p['xchan']), intval($p['imgscale'])); - $p['aid'] = ((intval($arr['aid'])) ? intval($arr['aid']) : 0); - $p['uid'] = ((intval($arr['uid'])) ? intval($arr['uid']) : 0); - $p['xchan'] = (($arr['xchan']) ? $arr['xchan'] : ''); - $p['resource_id'] = (($arr['resource_id']) ? $arr['resource_id'] : ''); - $p['filename'] = (($arr['filename']) ? $arr['filename'] : ''); - $p['mimetype'] = (($arr['mimetype']) ? $arr['mimetype'] : $this->getType()); - $p['album'] = (($arr['album']) ? $arr['album'] : ''); - $p['imgscale'] = ((intval($arr['imgscale'])) ? intval($arr['imgscale']) : 0); - $p['allow_cid'] = (($arr['allow_cid']) ? $arr['allow_cid'] : ''); - $p['allow_gid'] = (($arr['allow_gid']) ? $arr['allow_gid'] : ''); - $p['deny_cid'] = (($arr['deny_cid']) ? $arr['deny_cid'] : ''); - $p['deny_gid'] = (($arr['deny_gid']) ? $arr['deny_gid'] : ''); - $p['edited'] = (($arr['edited']) ? $arr['edited'] : datetime_convert()); - $p['title'] = (($arr['title']) ? $arr['title'] : ''); - $p['description'] = (($arr['description']) ? $arr['description'] : ''); - $p['photo_usage'] = intval($arr['photo_usage']); - $p['os_storage'] = intval($arr['os_storage']); - $p['os_path'] = $arr['os_path']; - $p['os_syspath'] = ((array_key_exists('os_syspath', $arr)) ? $arr['os_syspath'] : ''); - $p['display_path'] = (($arr['display_path']) ? $arr['display_path'] : ''); - $p['width'] = (($arr['width']) ? $arr['width'] : $this->getWidth()); - $p['height'] = (($arr['height']) ? $arr['height'] : $this->getHeight()); - $p['expires'] = (($arr['expires']) ? $arr['expires'] : gmdate('Y-m-d H:i:s', time() + get_config('system', 'photo_cache_time', 86400))); - $p['profile'] = ((array_key_exists('profile', $arr)) ? intval($arr['profile']) : 0); - - if (! intval($p['imgscale'])) { - logger('save: ' . print_r($arr, true), LOGGER_DATA); - } - $x = q("select id, created from photo where resource_id = '%s' and uid = %d and xchan = '%s' and imgscale = %d limit 1", dbesc($p['resource_id']), intval($p['uid']), dbesc($p['xchan']), intval($p['imgscale'])); - - if ($x) { - $p['created'] = (($x['created']) ? $x['created'] : $p['edited']); - $r = q("UPDATE photo set + if ($x) { + $p['created'] = (($x['created']) ? $x['created'] : $p['edited']); + $r = q( + "UPDATE photo set aid = %d, uid = %d, xchan = '%s', @@ -501,48 +507,74 @@ abstract class PhotoDriver { expires = '%s', profile = %d where id = %d", - intval($p['aid']), intval($p['uid']), dbesc($p['xchan']), dbesc($p['resource_id']), dbescdate($p['created']), dbescdate($p['edited']), dbesc(basename($p['filename'])), dbesc($p['mimetype']), dbesc($p['album']), intval($p['height']), intval($p['width']), (intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())), intval($p['os_storage']), (intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())), intval($p['imgscale']), intval($p['photo_usage']), dbesc($p['title']), dbesc($p['description']), dbesc($p['os_path']), dbesc($p['display_path']), dbesc($p['allow_cid']), dbesc($p['allow_gid']), dbesc($p['deny_cid']), dbesc($p['deny_gid']), dbescdate($p['expires']), intval($p['profile']), intval($x[0]['id'])); - } - else { - $p['created'] = (($arr['created']) ? $arr['created'] : $p['edited']); - $r = q("INSERT INTO photo + intval($p['aid']), + intval($p['uid']), + dbesc($p['xchan']), + dbesc($p['resource_id']), + dbescdate($p['created']), + dbescdate($p['edited']), + dbesc(basename($p['filename'])), + dbesc($p['mimetype']), + dbesc($p['album']), + intval($p['height']), + intval($p['width']), + (intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())), + intval($p['os_storage']), + (intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())), + intval($p['imgscale']), + intval($p['photo_usage']), + dbesc($p['title']), + dbesc($p['description']), + dbesc($p['os_path']), + dbesc($p['display_path']), + dbesc($p['allow_cid']), + dbesc($p['allow_gid']), + dbesc($p['deny_cid']), + dbesc($p['deny_gid']), + dbescdate($p['expires']), + intval($p['profile']), + intval($x[0]['id']) + ); + } else { + $p['created'] = (($arr['created']) ? $arr['created'] : $p['edited']); + $r = q("INSERT INTO photo ( aid, uid, xchan, resource_id, created, edited, filename, mimetype, album, height, width, content, os_storage, filesize, imgscale, photo_usage, title, description, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid, expires, profile ) VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)", intval($p['aid']), intval($p['uid']), dbesc($p['xchan']), dbesc($p['resource_id']), dbescdate($p['created']), dbescdate($p['edited']), dbesc(basename($p['filename'])), dbesc($p['mimetype']), dbesc($p['album']), intval($p['height']), intval($p['width']), (intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())), intval($p['os_storage']), (intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())), intval($p['imgscale']), intval($p['photo_usage']), dbesc($p['title']), dbesc($p['description']), dbesc($p['os_path']), dbesc($p['display_path']), dbesc($p['allow_cid']), dbesc($p['allow_gid']), dbesc($p['deny_cid']), dbesc($p['deny_gid']), dbescdate($p['expires']), intval($p['profile'])); - } - logger('Photo save imgscale ' . $p['imgscale'] . ' returned ' . intval($r)); + } + logger('Photo save imgscale ' . $p['imgscale'] . ' returned ' . intval($r)); - return $r; - } - - /** - * @brief Stores thumbnail to database or filesystem. - * - * @param array $arr - * @param scale int - * @return boolean|array - */ + return $r; + } - public function storeThumbnail($arr, $scale = 0, $animated = true) { - - $arr['imgscale'] = $scale; - - if (boolval(get_config('system','filesystem_storage_thumbnails', 1)) && $scale > 0) { - $channel = channelx_by_n($arr['uid']); - $arr['os_storage'] = 1; - $arr['os_syspath'] = 'store/' . $channel['channel_address'] . '/' . $arr['os_path'] . '-' . $scale; - if (! $this->saveImage($arr['os_syspath'], $animated)) { - return false; - } - } - - if (! $this->save($arr)) { - if (array_key_exists('os_syspath', $arr)) { - @unlink($arr['os_syspath']); - } - return false; - } - - return true; - } + /** + * @brief Stores thumbnail to database or filesystem. + * + * @param array $arr + * @param scale int + * @return bool|array + */ + public function storeThumbnail($arr, $scale = 0, $animated = true) + { + + $arr['imgscale'] = $scale; + + if (boolval(get_config('system', 'filesystem_storage_thumbnails', 1)) && $scale > 0) { + $channel = channelx_by_n($arr['uid']); + $arr['os_storage'] = 1; + $arr['os_syspath'] = 'store/' . $channel['channel_address'] . '/' . $arr['os_path'] . '-' . $scale; + if (! $this->saveImage($arr['os_syspath'], $animated)) { + return false; + } + } + + if (! $this->save($arr)) { + if (array_key_exists('os_syspath', $arr)) { + @unlink($arr['os_syspath']); + } + return false; + } + + return true; + } } diff --git a/Zotlabs/Photo/PhotoGd.php b/Zotlabs/Photo/PhotoGd.php index 83c450968..92c5244d7 100644 --- a/Zotlabs/Photo/PhotoGd.php +++ b/Zotlabs/Photo/PhotoGd.php @@ -2,199 +2,212 @@ namespace Zotlabs\Photo; +use function imagejpeg; +use function imagepng; +use function imagewebp; + /** * @brief GD photo driver. * */ -class PhotoGd extends PhotoDriver { +class PhotoGd extends PhotoDriver +{ - /** - * {@inheritDoc} - * @see \Zotlabs\Photo\PhotoDriver::supportedTypes() - */ - public function supportedTypes() { - $t = []; - $t['image/jpeg'] = 'jpg'; - if (imagetypes() & IMG_PNG) { - $t['image/png'] = 'png'; - } - if (imagetypes() & IMG_GIF) { - $t['image/gif'] = 'gif'; - } - if (imagetypes() & IMG_WEBP) { - $t['image/webp'] = 'webp'; - } + /** + * {@inheritDoc} + * @see \Zotlabs\Photo\PhotoDriver::supportedTypes() + */ + public function supportedTypes() + { + $t = []; + $t['image/jpeg'] = 'jpg'; + if (imagetypes() & IMG_PNG) { + $t['image/png'] = 'png'; + } + if (imagetypes() & IMG_GIF) { + $t['image/gif'] = 'gif'; + } + if (imagetypes() & IMG_WEBP) { + $t['image/webp'] = 'webp'; + } - return $t; - } + return $t; + } - protected function load($data, $type) { - $this->valid = false; - if (! $data) { - return; - } + protected function load($data, $type) + { + $this->valid = false; + if (! $data) { + return; + } - $this->image = @imagecreatefromstring($data); + $this->image = @imagecreatefromstring($data); - if ($this->image !== false) { - $this->valid = true; - $this->setDimensions(); - imagealphablending($this->image, false); - imagesavealpha($this->image, true); - } - else { - logger('image load failed'); - } - } + if ($this->image !== false) { + $this->valid = true; + $this->setDimensions(); + imagealphablending($this->image, false); + imagesavealpha($this->image, true); + } else { + logger('image load failed'); + } + } - protected function setDimensions() { - $this->width = imagesx($this->image); - $this->height = imagesy($this->image); - } + protected function setDimensions() + { + $this->width = imagesx($this->image); + $this->height = imagesy($this->image); + } - /** - * @brief GD driver does not preserve EXIF, so not need to clear it. - * - * @return void - */ - public function clearexif() { - return; - } + /** + * @brief GD driver does not preserve EXIF, so not need to clear it. + * + * @return void + */ + public function clearexif() + { + return; + } - protected function destroy() { - if ($this->is_valid()) { - imagedestroy($this->image); - } - } + protected function destroy() + { + if ($this->is_valid()) { + imagedestroy($this->image); + } + } - /** - * @brief Return a PHP image resource of the current image. - * - * @see \Zotlabs\Photo\PhotoDriver::getImage() - * - * @return boolean|resource - */ - public function getImage() { - if (! $this->is_valid()) { - return false; - } + /** + * @brief Return a PHP image resource of the current image. + * + * @see \Zotlabs\Photo\PhotoDriver::getImage() + * + * @return bool|resource + */ + public function getImage() + { + if (! $this->is_valid()) { + return false; + } - return $this->image; - } + return $this->image; + } - public function doScaleImage($dest_width, $dest_height) { + public function doScaleImage($dest_width, $dest_height) + { - $dest = imagecreatetruecolor($dest_width, $dest_height); - $width = imagesx($this->image); - $height = imagesy($this->image); + $dest = imagecreatetruecolor($dest_width, $dest_height); + $width = imagesx($this->image); + $height = imagesy($this->image); - imagealphablending($dest, false); - imagesavealpha($dest, true); - if ($this->type == 'image/png') { - imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha - } - imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height); - if ($this->image) { - imagedestroy($this->image); - } + imagealphablending($dest, false); + imagesavealpha($dest, true); + if ($this->type == 'image/png') { + imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha + } + imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height); + if ($this->image) { + imagedestroy($this->image); + } - $this->image = $dest; - $this->setDimensions(); - } + $this->image = $dest; + $this->setDimensions(); + } - public function rotate($degrees) { - if (! $this->is_valid()) { - return false; - } + public function rotate($degrees) + { + if (! $this->is_valid()) { + return false; + } - $this->image = imagerotate($this->image, $degrees, 0); - $this->setDimensions(); - } + $this->image = imagerotate($this->image, $degrees, 0); + $this->setDimensions(); + } - public function flip($horiz = true, $vert = false) { - if (! $this->is_valid()) { - return false; - } + public function flip($horiz = true, $vert = false) + { + if (! $this->is_valid()) { + return false; + } - $w = imagesx($this->image); - $h = imagesy($this->image); - $flipped = imagecreate($w, $h); - if ($horiz) { - for ($x = 0; $x < $w; $x++) { - imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h); - } - } - if ($vert) { - for ($y = 0; $y < $h; $y++) { - imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1); - } - } - $this->image = $flipped; - $this->setDimensions(); // Shouldn't really be necessary - } + $w = imagesx($this->image); + $h = imagesy($this->image); + $flipped = imagecreate($w, $h); + if ($horiz) { + for ($x = 0; $x < $w; $x++) { + imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h); + } + } + if ($vert) { + for ($y = 0; $y < $h; $y++) { + imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1); + } + } + $this->image = $flipped; + $this->setDimensions(); // Shouldn't really be necessary + } - public function cropImageRect($maxx, $maxy, $x, $y, $w, $h) { - if (! $this->is_valid()) { - return false; - } + public function cropImageRect($maxx, $maxy, $x, $y, $w, $h) + { + if (! $this->is_valid()) { + return false; + } - $dest = imagecreatetruecolor($maxx, $maxy); - imagealphablending($dest, false); - imagesavealpha($dest, true); - if ($this->type == 'image/png') { - imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha - } - imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $maxx, $maxy, $w, $h); - if ($this->image) { - imagedestroy($this->image); - } - $this->image = $dest; - $this->setDimensions(); - } + $dest = imagecreatetruecolor($maxx, $maxy); + imagealphablending($dest, false); + imagesavealpha($dest, true); + if ($this->type == 'image/png') { + imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha + } + imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $maxx, $maxy, $w, $h); + if ($this->image) { + imagedestroy($this->image); + } + $this->image = $dest; + $this->setDimensions(); + } - /** - * {@inheritDoc} - * @see \Zotlabs\Photo\PhotoDriver::imageString() - */ - public function imageString($animated = true) { - if (! $this->is_valid()) { - return false; - } + /** + * {@inheritDoc} + * @see \Zotlabs\Photo\PhotoDriver::imageString() + */ + public function imageString($animated = true) + { + if (! $this->is_valid()) { + return false; + } - $quality = false; + $quality = false; - ob_start(); + ob_start(); - switch ($this->getType()){ - case 'image/webp': + switch ($this->getType()) { + case 'image/webp': + imagewebp($this->image); + break; - \imagewebp($this->image); - break; - - case 'image/png': - $quality = get_config('system', 'png_quality'); - if ((! $quality) || ($quality > 9)) { - $quality = PNG_QUALITY; - } + case 'image/png': + $quality = get_config('system', 'png_quality'); + if ((! $quality) || ($quality > 9)) { + $quality = PNG_QUALITY; + } - \imagepng($this->image, NULL, $quality); - break; - case 'image/jpeg': - // gd can lack imagejpeg(), but we verify during installation it is available - default: - $quality = get_config('system', 'jpeg_quality'); - if ((! $quality) || ($quality > 100)) { - $quality = JPEG_QUALITY; - } + imagepng($this->image, null, $quality); + break; + case 'image/jpeg': + // gd can lack imagejpeg(), but we verify during installation it is available + default: + $quality = get_config('system', 'jpeg_quality'); + if ((! $quality) || ($quality > 100)) { + $quality = JPEG_QUALITY; + } - \imagejpeg($this->image, NULL, $quality); - break; - } - $string = ob_get_contents(); - ob_end_clean(); - - return $string; - } + imagejpeg($this->image, null, $quality); + break; + } + $string = ob_get_contents(); + ob_end_clean(); + return $string; + } } diff --git a/Zotlabs/Photo/PhotoImagick.php b/Zotlabs/Photo/PhotoImagick.php index 56867866d..14e757dbe 100644 --- a/Zotlabs/Photo/PhotoImagick.php +++ b/Zotlabs/Photo/PhotoImagick.php @@ -4,214 +4,230 @@ namespace Zotlabs\Photo; use Imagick; use Exception; - +use ImagickPixel; /** * @brief ImageMagick photo driver. */ -class PhotoImagick extends PhotoDriver { +class PhotoImagick extends PhotoDriver +{ - public function supportedTypes() { - return [ - 'image/jpeg' => 'jpg', - 'image/png' => 'png', - 'image/gif' => 'gif', - 'image/webp' => 'webp', - ]; - } + public function supportedTypes() + { + return [ + 'image/jpeg' => 'jpg', + 'image/png' => 'png', + 'image/gif' => 'gif', + 'image/webp' => 'webp', + ]; + } - private function get_FormatsMap() { - return [ - 'image/jpeg' => 'JPG', - 'image/png' => 'PNG', - 'image/gif' => 'GIF', - 'image/webp' => 'WEBP' - ]; - } + private function get_FormatsMap() + { + return [ + 'image/jpeg' => 'JPG', + 'image/png' => 'PNG', + 'image/gif' => 'GIF', + 'image/webp' => 'WEBP' + ]; + } - protected function load($data, $type) { - $this->valid = false; - $this->image = new Imagick(); + protected function load($data, $type) + { + $this->valid = false; + $this->image = new Imagick(); - if (! $data) { - return; - } + if (! $data) { + return; + } - try { - $this->image->readImageBlob($data); - } catch(Exception $e) { - logger('Imagick read failed'); - // logger('Imagick readImageBlob() exception:' . print_r($e, true)); - return; - } + try { + $this->image->readImageBlob($data); + } catch (Exception $e) { + logger('Imagick read failed'); + // logger('Imagick readImageBlob() exception:' . print_r($e, true)); + return; + } - /* - * Setup the image to the format it will be saved to - */ + /* + * Setup the image to the format it will be saved to + */ - $map = $this->get_FormatsMap(); - $format = $map[$type]; + $map = $this->get_FormatsMap(); + $format = $map[$type]; - if ($this->image) { - $this->image->setFormat($format); + if ($this->image) { + $this->image->setFormat($format); - // Always coalesce, if it is not a multi-frame image it won't hurt anyway - $this->image = $this->image->coalesceImages(); + // Always coalesce, if it is not a multi-frame image it won't hurt anyway + $this->image = $this->image->coalesceImages(); - $this->valid = true; - $this->setDimensions(); + $this->valid = true; + $this->setDimensions(); - /* - * setup the compression here, so we'll do it only once - */ - switch ($this->getType()) { - case 'image/png': - $quality = get_config('system', 'png_quality'); - if ((! $quality) || ($quality > 9)) { - $quality = PNG_QUALITY; - } - /* - * From http://www.imagemagick.org/script/command-line-options.php#quality: - * - * 'For the MNG and PNG image formats, the quality value sets - * the zlib compression level (quality / 10) and filter-type (quality % 10). - * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering, - * unless the image has a color map, in which case it means compression level 7 with no PNG filtering' - */ - $quality = $quality * 10; - $this->image->setCompressionQuality($quality); - break; - case 'image/jpeg': - $quality = get_config('system', 'jpeg_quality'); - if ((! $quality) || ($quality > 100)) { - $quality = JPEG_QUALITY; - } - $this->image->setCompressionQuality($quality); - default: - break; - } - } - } + /* + * setup the compression here, so we'll do it only once + */ + switch ($this->getType()) { + case 'image/png': + $quality = get_config('system', 'png_quality'); + if ((! $quality) || ($quality > 9)) { + $quality = PNG_QUALITY; + } + /* + * From http://www.imagemagick.org/script/command-line-options.php#quality: + * + * 'For the MNG and PNG image formats, the quality value sets + * the zlib compression level (quality / 10) and filter-type (quality % 10). + * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering, + * unless the image has a color map, in which case it means compression level 7 with no PNG filtering' + */ + $quality = $quality * 10; + $this->image->setCompressionQuality($quality); + break; + case 'image/jpeg': + $quality = get_config('system', 'jpeg_quality'); + if ((! $quality) || ($quality > 100)) { + $quality = JPEG_QUALITY; + } + $this->image->setCompressionQuality($quality); + default: + break; + } + } + } - protected function destroy() { - if ($this->is_valid()) { - $this->image->clear(); - $this->image->destroy(); - } - } + protected function destroy() + { + if ($this->is_valid()) { + $this->image->clear(); + $this->image->destroy(); + } + } - protected function setDimensions() { - $this->width = $this->image->getImageWidth(); - $this->height = $this->image->getImageHeight(); - } + protected function setDimensions() + { + $this->width = $this->image->getImageWidth(); + $this->height = $this->image->getImageHeight(); + } - /** - * @brief Strips the image of all profiles and comments. - * - * Keep ICC profile for better colors. - * - * @see \Zotlabs\Photo\PhotoDriver::clearexif() - */ - public function clearexif() { - $profiles = $this->image->getImageProfiles('icc', true); + /** + * @brief Strips the image of all profiles and comments. + * + * Keep ICC profile for better colors. + * + * @see \Zotlabs\Photo\PhotoDriver::clearexif() + */ + public function clearexif() + { + $profiles = $this->image->getImageProfiles('icc', true); - $this->image->stripImage(); + $this->image->stripImage(); - if (! empty($profiles)) { - $this->image->profileImage('icc', $profiles['icc']); - } - } + if (! empty($profiles)) { + $this->image->profileImage('icc', $profiles['icc']); + } + } - /** - * @brief Return a \Imagick object of the current image. - * - * @see \Zotlabs\Photo\PhotoDriver::getImage() - * - * @return boolean|\Imagick - */ - public function getImage() { - if (! $this->is_valid()) { - return false; - } + /** + * @brief Return a \Imagick object of the current image. + * + * @see \Zotlabs\Photo\PhotoDriver::getImage() + * + * @return bool|Imagick + */ + public function getImage() + { + if (! $this->is_valid()) { + return false; + } - $this->image = $this->image->deconstructImages(); - return $this->image; - } + $this->image = $this->image->deconstructImages(); + return $this->image; + } - public function doScaleImage($dest_width, $dest_height) { - /* - * If it is not animated, there will be only one iteration here, - * so don't bother checking - */ - // Don't forget to go back to the first frame - $this->image->setFirstIterator(); - do { - $this->image->scaleImage($dest_width, $dest_height); - } while($this->image->nextImage()); + public function doScaleImage($dest_width, $dest_height) + { + /* + * If it is not animated, there will be only one iteration here, + * so don't bother checking + */ + // Don't forget to go back to the first frame + $this->image->setFirstIterator(); + do { + $this->image->scaleImage($dest_width, $dest_height); + } while ($this->image->nextImage()); - $this->setDimensions(); - } + $this->setDimensions(); + } - public function rotate($degrees) { - if (! $this->is_valid()) { - return false; - } + public function rotate($degrees) + { + if (! $this->is_valid()) { + return false; + } - $this->image->setFirstIterator(); - do { - // ImageMagick rotates in the opposite direction of imagerotate() - $this->image->rotateImage(new \ImagickPixel(), -$degrees); - } while($this->image->nextImage()); + $this->image->setFirstIterator(); + do { + // ImageMagick rotates in the opposite direction of imagerotate() + $this->image->rotateImage(new ImagickPixel(), -$degrees); + } while ($this->image->nextImage()); - $this->setDimensions(); - } + $this->setDimensions(); + } - public function flip($horiz = true, $vert = false) { - if (! $this->is_valid()) { - return false; - } + public function flip($horiz = true, $vert = false) + { + if (! $this->is_valid()) { + return false; + } - $this->image->setFirstIterator(); - do { - if($horiz) $this->image->flipImage(); - if($vert) $this->image->flopImage(); - } while($this->image->nextImage()); + $this->image->setFirstIterator(); + do { + if ($horiz) { + $this->image->flipImage(); + } + if ($vert) { + $this->image->flopImage(); + } + } while ($this->image->nextImage()); - $this->setDimensions(); // Shouldn't really be necessary - } + $this->setDimensions(); // Shouldn't really be necessary + } - public function cropImageRect($maxx, $maxy, $x, $y, $w, $h) { - if (! $this->is_valid()) { - return false; - } + public function cropImageRect($maxx, $maxy, $x, $y, $w, $h) + { + if (! $this->is_valid()) { + return false; + } - $this->image->setFirstIterator(); - do { - $this->image->cropImage($w, $h, $x, $y); - /* - * We need to remove the canvas, - * or the image is not resized to the crop: - * http://php.net/manual/en/imagick.cropimage.php#97232 - */ - $this->image->setImagePage(0, 0, 0, 0); - } while($this->image->nextImage()); + $this->image->setFirstIterator(); + do { + $this->image->cropImage($w, $h, $x, $y); + /* + * We need to remove the canvas, + * or the image is not resized to the crop: + * http://php.net/manual/en/imagick.cropimage.php#97232 + */ + $this->image->setImagePage(0, 0, 0, 0); + } while ($this->image->nextImage()); - $this->doScaleImage($maxx, $maxy); - } + $this->doScaleImage($maxx, $maxy); + } - public function imageString($animated = true) { - if (! $this->is_valid()) { - return false; - } - - /* Clean it */ - $this->image = $this->image->deconstructImages(); - if ($animated) { - return $this->image->getImagesBlob(); - } - return $this->image->getImageBlob(); - } + public function imageString($animated = true) + { + if (! $this->is_valid()) { + return false; + } + /* Clean it */ + $this->image = $this->image->deconstructImages(); + if ($animated) { + return $this->image->getImagesBlob(); + } + return $this->image->getImageBlob(); + } } diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php index 3adef7c1e..883774870 100644 --- a/Zotlabs/Render/Comanche.php +++ b/Zotlabs/Render/Comanche.php @@ -1,8 +1,11 @@ -get_condition_var($mtch[1]); + $default = $mtch[3]; + $cases = []; + $cntt = preg_match_all("/\[case (.*?)\](.*?)\[\/case\]/ism", $mtch[2], $cases, PREG_SET_ORDER); + if ($cntt) { + foreach ($cases as $case) { + if ($case[1] === $switch_var) { + $switch_done = 1; + $s = str_replace($mtch[0], $case[2], $s); + break; + } + } + if ($switch_done === 0) { + $s = str_replace($mtch[0], $default, $s); + } + } + } + } - $cnt = preg_match_all("/\[switch (.*?)\](.*?)\[default\](.*?)\[\/default\]\s*\[\/switch\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $switch_done = 0; - $switch_var = $this->get_condition_var($mtch[1]); - $default = $mtch[3]; - $cases = []; - $cntt = preg_match_all("/\[case (.*?)\](.*?)\[\/case\]/ism", $mtch[2], $cases, PREG_SET_ORDER); - if ($cntt) { - foreach ($cases as $case) { - if ($case[1] === $switch_var) { - $switch_done = 1; - $s = str_replace($mtch[0], $case[2], $s); - break; - } - } - if ($switch_done === 0) { - $s = str_replace($mtch[0], $default, $s); - } - } - } - } + $cnt = preg_match_all("/\[if (.*?)\](.*?)\[else\](.*?)\[\/if\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + if ($this->test_condition($mtch[1])) { + $s = str_replace($mtch[0], $mtch[2], $s); + } else { + $s = str_replace($mtch[0], $mtch[3], $s); + } + } + } else { + $cnt = preg_match_all("/\[if (.*?)\](.*?)\[\/if\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + if ($this->test_condition($mtch[1])) { + $s = str_replace($mtch[0], $mtch[2], $s); + } else { + $s = str_replace($mtch[0], '', $s); + } + } + } + } + if ($pass == 0) { + $this->parse_pass0($s); + } else { + $this->parse_pass1($s); + } + } - $cnt = preg_match_all("/\[if (.*?)\](.*?)\[else\](.*?)\[\/if\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - if ($this->test_condition($mtch[1])) { - $s = str_replace($mtch[0], $mtch[2], $s); - } - else { - $s = str_replace($mtch[0], $mtch[3], $s); - } - } - } - else { - $cnt = preg_match_all("/\[if (.*?)\](.*?)\[\/if\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - if ($this->test_condition($mtch[1])) { - $s = str_replace($mtch[0], $mtch[2], $s); - } - else { - $s = str_replace($mtch[0], '', $s); - } - } - } - } - if ($pass == 0) { - $this->parse_pass0($s); - } - else { - $this->parse_pass1($s); - } - } + public function parse_pass0($s) + { - function parse_pass0($s) { + $matches = null; - $matches = null; + $cnt = preg_match("/\[layout\](.*?)\[\/layout\]/ism", $s, $matches); + if ($cnt) { + App::$page['template'] = trim($matches[1]); + } - $cnt = preg_match("/\[layout\](.*?)\[\/layout\]/ism", $s, $matches); - if ($cnt) { - App::$page['template'] = trim($matches[1]); - } - - $cnt = preg_match("/\[template=(.*?)\](.*?)\[\/template\]/ism", $s, $matches); - if ($cnt) { - App::$page['template'] = trim($matches[2]); - App::$page['template_style'] = trim($matches[2]) . '_' . $matches[1]; - } + $cnt = preg_match("/\[template=(.*?)\](.*?)\[\/template\]/ism", $s, $matches); + if ($cnt) { + App::$page['template'] = trim($matches[2]); + App::$page['template_style'] = trim($matches[2]) . '_' . $matches[1]; + } - $cnt = preg_match("/\[template\](.*?)\[\/template\]/ism", $s, $matches); - if ($cnt) { - App::$page['template'] = trim($matches[1]); - } + $cnt = preg_match("/\[template\](.*?)\[\/template\]/ism", $s, $matches); + if ($cnt) { + App::$page['template'] = trim($matches[1]); + } - $cnt = preg_match("/\[theme=(.*?)\](.*?)\[\/theme\]/ism", $s, $matches); - if ($cnt) { - App::$layout['schema'] = trim($matches[1]); - App::$layout['theme'] = trim($matches[2]); - } + $cnt = preg_match("/\[theme=(.*?)\](.*?)\[\/theme\]/ism", $s, $matches); + if ($cnt) { + App::$layout['schema'] = trim($matches[1]); + App::$layout['theme'] = trim($matches[2]); + } - $cnt = preg_match("/\[theme\](.*?)\[\/theme\]/ism", $s, $matches); - if ($cnt) { - App::$layout['theme'] = trim($matches[1]); - } - - $cnt = preg_match("/\[navbar\](.*?)\[\/navbar\]/ism", $s, $matches); - if ($cnt) { - App::$layout['navbar'] = trim($matches[1]); - } + $cnt = preg_match("/\[theme\](.*?)\[\/theme\]/ism", $s, $matches); + if ($cnt) { + App::$layout['theme'] = trim($matches[1]); + } - $cnt = preg_match_all("/\[webpage\](.*?)\[\/webpage\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - // only the last webpage definition is used if there is more than one - foreach ($matches as $mtch) { - App::$layout['webpage'] = $this->webpage($a,$mtch[1]); - } - } - } + $cnt = preg_match("/\[navbar\](.*?)\[\/navbar\]/ism", $s, $matches); + if ($cnt) { + App::$layout['navbar'] = trim($matches[1]); + } - function parse_pass1($s) { - $cnt = preg_match_all("/\[region=(.*?)\](.*?)\[\/region\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - App::$layout['region_' . $mtch[1]] = $this->region($mtch[2],$mtch[1]); - } - } - } + $cnt = preg_match_all("/\[webpage\](.*?)\[\/webpage\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + // only the last webpage definition is used if there is more than one + foreach ($matches as $mtch) { + App::$layout['webpage'] = $this->webpage($a, $mtch[1]); + } + } + } - /** - * @brief Replace conditional variables with real values. - * - * Currently supported condition variables: - * * $config.xxx.yyy - get_config with cat = xxx and k = yyy - * * $request - request uri for this page - * * $observer.language - viewer's preferred language (closest match) - * * $observer.address - xchan_addr or false - * * $observer.name - xchan_name or false - * * $observer - xchan_hash of observer or empty string - * * $local_channel - logged in channel_id or false - * - * @param string $v The conditional variable name - * @return string|boolean - */ - function get_condition_var($v) { - if ($v) { - $x = explode('.', $v); - if ($x[0] == 'config') { - return get_config($x[1],$x[2]); - } - elseif ($x[0] === 'request') { - return $_SERVER['REQUEST_URI']; - } - elseif ($x[0] === 'local_channel') { - return local_channel(); - } - elseif ($x[0] === 'observer') { - if (count($x) > 1) { - if ($x[1] == 'language') { - return App::$language; - } - $y = App::get_observer(); - if (! $y) { - return false; - } - if ($x[1] == 'address') { - return $y['xchan_addr']; - } - elseif ($x[1] == 'name') { - return $y['xchan_name']; - } - elseif ($x[1] == 'webname') { - return substr($y['xchan_addr'],0,strpos($y['xchan_addr'],'@')); - } - return false; - } - return get_observer_hash(); - } - else { - return false; - } - } - return false; - } + public function parse_pass1($s) + { + $cnt = preg_match_all("/\[region=(.*?)\](.*?)\[\/region\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + App::$layout['region_' . $mtch[1]] = $this->region($mtch[2], $mtch[1]); + } + } + } - /** - * @brief Test for Conditional Execution conditions. - * - * This is extensible. The first version of variable testing supports tests of the forms: - * - * - [if $config.system.foo ~= baz] which will check if get_config('system','foo') contains the string 'baz'; - * - [if $config.system.foo == baz] which will check if get_config('system','foo') is the string 'baz'; - * - [if $config.system.foo != baz] which will check if get_config('system','foo') is not the string 'baz'; - * - [if $config.system.foo >= 3] which will check if get_config('system','foo') is greater than or equal to 3; - * - [if $config.system.foo > 3] which will check if get_config('system','foo') is greater than 3; - * - [if $config.system.foo <= 3] which will check if get_config('system','foo') is less than or equal to 3; - * - [if $config.system.foo < 3] which will check if get_config('system','foo') is less than 3; - * - * - [if $config.system.foo {} baz] which will check if 'baz' is an array element in get_config('system','foo') - * - [if $config.system.foo {*} baz] which will check if 'baz' is an array key in get_config('system','foo') - * - [if $config.system.foo] which will check for a return of a true condition for get_config('system','foo'); - * - * The values 0, '', an empty array, and an unset value will all evaluate to false. - * - * @param int|string $s - * @return boolean - */ - function test_condition($s) { + /** + * @brief Replace conditional variables with real values. + * + * Currently supported condition variables: + * * $config.xxx.yyy - get_config with cat = xxx and k = yyy + * * $request - request uri for this page + * * $observer.language - viewer's preferred language (closest match) + * * $observer.address - xchan_addr or false + * * $observer.name - xchan_name or false + * * $observer - xchan_hash of observer or empty string + * * $local_channel - logged in channel_id or false + * + * @param string $v The conditional variable name + * @return string|bool + */ + public function get_condition_var($v) + { + if ($v) { + $x = explode('.', $v); + if ($x[0] == 'config') { + return get_config($x[1], $x[2]); + } elseif ($x[0] === 'request') { + return $_SERVER['REQUEST_URI']; + } elseif ($x[0] === 'local_channel') { + return local_channel(); + } elseif ($x[0] === 'observer') { + if (count($x) > 1) { + if ($x[1] == 'language') { + return App::$language; + } + $y = App::get_observer(); + if (!$y) { + return false; + } + if ($x[1] == 'address') { + return $y['xchan_addr']; + } elseif ($x[1] == 'name') { + return $y['xchan_name']; + } elseif ($x[1] == 'webname') { + return substr($y['xchan_addr'], 0, strpos($y['xchan_addr'], '@')); + } + return false; + } + return get_observer_hash(); + } else { + return false; + } + } + return false; + } - if (preg_match('/[\$](.*?)\s\~\=\s(.*?)$/',$s,$matches)) { - $x = $this->get_condition_var($matches[1]); - if (stripos($x,trim($matches[2])) !== false) { - return true; - } - return false; - } + /** + * @brief Test for Conditional Execution conditions. + * + * This is extensible. The first version of variable testing supports tests of the forms: + * + * - [if $config.system.foo ~= baz] which will check if get_config('system','foo') contains the string 'baz'; + * - [if $config.system.foo == baz] which will check if get_config('system','foo') is the string 'baz'; + * - [if $config.system.foo != baz] which will check if get_config('system','foo') is not the string 'baz'; + * - [if $config.system.foo >= 3] which will check if get_config('system','foo') is greater than or equal to 3; + * - [if $config.system.foo > 3] which will check if get_config('system','foo') is greater than 3; + * - [if $config.system.foo <= 3] which will check if get_config('system','foo') is less than or equal to 3; + * - [if $config.system.foo < 3] which will check if get_config('system','foo') is less than 3; + * + * - [if $config.system.foo {} baz] which will check if 'baz' is an array element in get_config('system','foo') + * - [if $config.system.foo {*} baz] which will check if 'baz' is an array key in get_config('system','foo') + * - [if $config.system.foo] which will check for a return of a true condition for get_config('system','foo'); + * + * The values 0, '', an empty array, and an unset value will all evaluate to false. + * + * @param int|string $s + * @return bool + */ + public function test_condition($s) + { - if (preg_match('/[\$](.*?)\s\=\=\s(.*?)$/',$s,$matches)) { - $x = $this->get_condition_var($matches[1]); - if ($x == trim($matches[2])) { - return true; - } - return false; - } + if (preg_match('/[\$](.*?)\s\~\=\s(.*?)$/', $s, $matches)) { + $x = $this->get_condition_var($matches[1]); + if (stripos($x, trim($matches[2])) !== false) { + return true; + } + return false; + } - if (preg_match('/[\$](.*?)\s\!\=\s(.*?)$/',$s,$matches)) { - $x = $this->get_condition_var($matches[1]); - if ($x != trim($matches[2])) { - return true; - } - return false; - } + if (preg_match('/[\$](.*?)\s\=\=\s(.*?)$/', $s, $matches)) { + $x = $this->get_condition_var($matches[1]); + if ($x == trim($matches[2])) { + return true; + } + return false; + } - if (preg_match('/[\$](.*?)\s\>\=\s(.*?)$/',$s,$matches)) { - $x = $this->get_condition_var($matches[1]); - if ($x >= trim($matches[2])) { - return true; - } - return false; - } + if (preg_match('/[\$](.*?)\s\!\=\s(.*?)$/', $s, $matches)) { + $x = $this->get_condition_var($matches[1]); + if ($x != trim($matches[2])) { + return true; + } + return false; + } - if (preg_match('/[\$](.*?)\s\<\=\s(.*?)$/',$s,$matches)) { - $x = $this->get_condition_var($matches[1]); - if ($x <= trim($matches[2])) { - return true; - } - return false; - } + if (preg_match('/[\$](.*?)\s\>\=\s(.*?)$/', $s, $matches)) { + $x = $this->get_condition_var($matches[1]); + if ($x >= trim($matches[2])) { + return true; + } + return false; + } - if (preg_match('/[\$](.*?)\s\>\s(.*?)$/',$s,$matches)) { - $x = $this->get_condition_var($matches[1]); - if ($x > trim($matches[2])) { - return true; - } - return false; - } + if (preg_match('/[\$](.*?)\s\<\=\s(.*?)$/', $s, $matches)) { + $x = $this->get_condition_var($matches[1]); + if ($x <= trim($matches[2])) { + return true; + } + return false; + } - if (preg_match('/[\$](.*?)\s\>\s(.*?)$/',$s,$matches)) { - $x = $this->get_condition_var($matches[1]); - if ($x < trim($matches[2])) { - return true; - } - return false; - } + if (preg_match('/[\$](.*?)\s\>\s(.*?)$/', $s, $matches)) { + $x = $this->get_condition_var($matches[1]); + if ($x > trim($matches[2])) { + return true; + } + return false; + } - if (preg_match('/[\$](.*?)\s\{\}\s(.*?)$/',$s,$matches)) { - $x = $this->get_condition_var($matches[1]); - if (is_array($x) && in_array(trim($matches[2]),$x)) { - return true; - } - return false; - } + if (preg_match('/[\$](.*?)\s\>\s(.*?)$/', $s, $matches)) { + $x = $this->get_condition_var($matches[1]); + if ($x < trim($matches[2])) { + return true; + } + return false; + } - if (preg_match('/[\$](.*?)\s\{\*\}\s(.*?)$/',$s,$matches)) { - $x = $this->get_condition_var($matches[1]); - if (is_array($x) && array_key_exists(trim($matches[2]),$x)) { - return true; - } - return false; - } + if (preg_match('/[\$](.*?)\s\{\}\s(.*?)$/', $s, $matches)) { + $x = $this->get_condition_var($matches[1]); + if (is_array($x) && in_array(trim($matches[2]), $x)) { + return true; + } + return false; + } - if (preg_match('/[\$](.*?)$/',$s,$matches)) { - $x = $this->get_condition_var($matches[1]); - if ($x) { - return true; - } - return false; - } - return false; - } + if (preg_match('/[\$](.*?)\s\{\*\}\s(.*?)$/', $s, $matches)) { + $x = $this->get_condition_var($matches[1]); + if (is_array($x) && array_key_exists(trim($matches[2]), $x)) { + return true; + } + return false; + } - /** - * @brief Return rendered menu for current channel_id. - * - * @see menu_render() - * @param string $s - * @param string $class (optional) default empty - * @return string - */ - function menu($s, $class = '') { + if (preg_match('/[\$](.*?)$/', $s, $matches)) { + $x = $this->get_condition_var($matches[1]); + if ($x) { + return true; + } + return false; + } + return false; + } - $channel_id = $this->get_channel_id(); - $name = $s; + /** + * @brief Return rendered menu for current channel_id. + * + * @param string $s + * @param string $class (optional) default empty + * @return string + * @see menu_render() + */ + public function menu($s, $class = '') + { - $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $var[$mtch[1]] = $mtch[2]; - $name = str_replace($mtch[0], '', $name); - } - } + $channel_id = $this->get_channel_id(); + $name = $s; - if ($channel_id) { - $m = menu_fetch($name, $channel_id, get_observer_hash()); - return menu_render($m, $class, $edit = false, $var); - } - } + $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $var[$mtch[1]] = $mtch[2]; + $name = str_replace($mtch[0], '', $name); + } + } + + if ($channel_id) { + $m = menu_fetch($name, $channel_id, get_observer_hash()); + return menu_render($m, $class, $edit = false, $var); + } + } - function replace_region($match) { - if (array_key_exists($match[1], App::$page)) { - return App::$page[$match[1]]; - } - } + public function replace_region($match) + { + if (array_key_exists($match[1], App::$page)) { + return App::$page[$match[1]]; + } + } - /** - * @brief Returns the channel_id of the profile owner of the page. - * - * Returns the channel_id of the profile owner of the page, or the local_channel - * if there is no profile owner. Otherwise returns 0. - * - * @return int channel_id - */ - function get_channel_id() { - $channel_id = ((is_array(App::$profile)) ? App::$profile['profile_uid'] : 0); + /** + * @brief Returns the channel_id of the profile owner of the page. + * + * Returns the channel_id of the profile owner of the page, or the local_channel + * if there is no profile owner. Otherwise returns 0. + * + * @return int channel_id + */ + public function get_channel_id() + { + $channel_id = ((is_array(App::$profile)) ? App::$profile['profile_uid'] : 0); - if ((! $channel_id) && (local_channel())) { - $channel_id = local_channel(); - } - return $channel_id; - } + if ((!$channel_id) && (local_channel())) { + $channel_id = local_channel(); + } + return $channel_id; + } - /** - * @brief Returns a parsed block. - * - * @param string $s - * @param string $class (optional) default empty - * @return string parsed HTML of block - */ - function block($s, $class = '') { - $var = []; - $matches = []; - $name = $s; - $class = (($class) ? $class : 'bblock widget'); + /** + * @brief Returns a parsed block. + * + * @param string $s + * @param string $class (optional) default empty + * @return string parsed HTML of block + */ + public function block($s, $class = '') + { + $var = []; + $matches = []; + $name = $s; + $class = (($class) ? $class : 'bblock widget'); - $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $var[$mtch[1]] = $mtch[2]; - $name = str_replace($mtch[0], '', $name); - } - } + $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $var[$mtch[1]] = $mtch[2]; + $name = str_replace($mtch[0], '', $name); + } + } - $o = ''; - $channel_id = $this->get_channel_id(); + $o = ''; + $channel_id = $this->get_channel_id(); - if ($channel_id) { - $r = q("select * from item inner join iconfig on iconfig.iid = item.id and item.uid = %d + if ($channel_id) { + $r = q( + "select * from item inner join iconfig on iconfig.iid = item.id and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' and iconfig.v = '%s' limit 1", - intval($channel_id), - dbesc($name) - ); + intval($channel_id), + dbesc($name) + ); - if ($r) { - //check for eventual menus in the block and parse them - $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $r[0]['body'], $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $r[0]['body'] = str_replace($mtch[0], $this->menu(trim($mtch[1])), $r[0]['body']); - } - } - $cnt = preg_match_all("/\[menu=(.*?)\](.*?)\[\/menu\]/ism", $r[0]['body'], $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $r[0]['body'] = str_replace($mtch[0],$this->menu(trim($mtch[2]),$mtch[1]),$r[0]['body']); - } - } + if ($r) { + //check for eventual menus in the block and parse them + $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $r[0]['body'], $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $r[0]['body'] = str_replace($mtch[0], $this->menu(trim($mtch[1])), $r[0]['body']); + } + } + $cnt = preg_match_all("/\[menu=(.*?)\](.*?)\[\/menu\]/ism", $r[0]['body'], $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $r[0]['body'] = str_replace($mtch[0], $this->menu(trim($mtch[2]), $mtch[1]), $r[0]['body']); + } + } - // emit the block - $o .= (($var['wrap'] == 'none') ? '' : '
', print_array($j)) . ''); + // emit the block + $o .= (($var['wrap'] == 'none') ? '' : ''); + } + } - return $o; - } + return $o; + } - /** - * @brief Include JS depending on framework. - * - * @param string $s - * @return string - */ - function js($s) { + /** + * @brief Include JS depending on framework. + * + * @param string $s + * @return string + */ + public function js($s) + { - switch ($s) { - case 'jquery': - $path = 'view/js/jquery.js'; - break; - case 'bootstrap': - $path = 'vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js'; - break; - case 'foundation': - $path = 'library/foundation/js/foundation.js'; - $init = "\r\n" . ''; - break; - } + switch ($s) { + case 'jquery': + $path = 'view/js/jquery.js'; + break; + case 'bootstrap': + $path = 'vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js'; + break; + case 'foundation': + $path = 'library/foundation/js/foundation.js'; + $init = "\r\n" . ''; + break; + } - $ret = ''; - if ($init) { - $ret .= $init; - } - return $ret; - } + $ret = ''; + if ($init) { + $ret .= $init; + } + return $ret; + } - /** - * @brief Include CSS depending on framework. - * - * @param string $s - * @return string - */ - function css($s) { + /** + * @brief Include CSS depending on framework. + * + * @param string $s + * @return string + */ + public function css($s) + { - switch ($s) { - case 'bootstrap': - $path = 'vendor/twbs/bootstrap/dist/css/bootstrap.min.css'; - break; - case 'foundation': - $path = 'library/foundation/css/foundation.min.css'; - break; - } + switch ($s) { + case 'bootstrap': + $path = 'vendor/twbs/bootstrap/dist/css/bootstrap.min.css'; + break; + case 'foundation': + $path = 'library/foundation/css/foundation.min.css'; + break; + } - $ret = ''; + $ret = ''; - return $ret; - } + return $ret; + } - /** - * This doesn't really belong in Comanche, but it could also be argued that it is the perfect place. - * We need to be able to select what kind of template and decoration to use for the webpage at the heart of our content. - * For now we'll allow an '[authored]' element which defaults to name and date, or 'none' to remove these, and perhaps - * 'full' to provide a social network style profile photo. - * - * But leave it open to have richer templating options and perhaps ultimately discard this one, once we have a better idea - * of what template and webpage options we might desire. - * - * @param[in,out] array $a - * @param string $s - * @return array - */ - function webpage(&$a, $s) { - $ret = []; - $matches = []; + /** + * This doesn't really belong in Comanche, but it could also be argued that it is the perfect place. + * We need to be able to select what kind of template and decoration to use for the webpage at the heart of our content. + * For now we'll allow an '[authored]' element which defaults to name and date, or 'none' to remove these, and perhaps + * 'full' to provide a social network style profile photo. + * + * But leave it open to have richer templating options and perhaps ultimately discard this one, once we have a better idea + * of what template and webpage options we might desire. + * + * @param[in,out] array $a + * @param string $s + * @return array + */ + public function webpage(&$a, $s) + { + $ret = []; + $matches = []; - $cnt = preg_match_all("/\[authored\](.*?)\[\/authored\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $ret['authored'] = $mtch[1]; - } - } + $cnt = preg_match_all("/\[authored\](.*?)\[\/authored\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $ret['authored'] = $mtch[1]; + } + } - return $ret; - } + return $ret; + } - /** - * @brief Render a widget. - * - * @param string $name - * @param string $text - */ - function widget($name, $text) { - $vars = []; - $matches = []; + /** + * @brief Render a widget. + * + * @param string $name + * @param string $text + */ + public function widget($name, $text) + { + $vars = []; + $matches = []; - $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $text, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $vars[$mtch[1]] = $mtch[2]; - } - } + $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $text, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $vars[$mtch[1]] = $mtch[2]; + } + } - if (! purify_filename($name)) { - return ''; - } + if (!purify_filename($name)) { + return ''; + } - $clsname = ucfirst($name); - $nsname = "\\Zotlabs\\Widget\\" . $clsname; + $clsname = ucfirst($name); + $nsname = "\\Zotlabs\\Widget\\" . $clsname; - $found = false; - $widgets = \Zotlabs\Extend\Widget::get(); - if ($widgets) { - foreach ($widgets as $widget) { - if (is_array($widget) && strtolower($widget[1]) === strtolower($name) && file_exists($widget[0])) { - require_once($widget[0]); - $found = true; - } - } - } + $found = false; + $widgets = Widget::get(); + if ($widgets) { + foreach ($widgets as $widget) { + if (is_array($widget) && strtolower($widget[1]) === strtolower($name) && file_exists($widget[0])) { + require_once($widget[0]); + $found = true; + } + } + } - if (! $found) { - if (file_exists('Zotlabs/SiteWidget/' . $clsname . '.php')) { - require_once('Zotlabs/SiteWidget/' . $clsname . '.php'); - } - elseif (file_exists('widget/' . $clsname . '/' . $clsname . '.php')) { - require_once('widget/' . $clsname . '/' . $clsname . '.php'); - } - elseif (file_exists('Zotlabs/Widget/' . $clsname . '.php')) { - require_once('Zotlabs/Widget/' . $clsname . '.php'); - } - else { - $pth = theme_include($clsname . '.php'); - if ($pth) { - require_once($pth); - } - } - } + if (!$found) { + if (file_exists('Zotlabs/SiteWidget/' . $clsname . '.php')) { + require_once('Zotlabs/SiteWidget/' . $clsname . '.php'); + } elseif (file_exists('widget/' . $clsname . '/' . $clsname . '.php')) { + require_once('widget/' . $clsname . '/' . $clsname . '.php'); + } elseif (file_exists('Zotlabs/Widget/' . $clsname . '.php')) { + require_once('Zotlabs/Widget/' . $clsname . '.php'); + } else { + $pth = theme_include($clsname . '.php'); + if ($pth) { + require_once($pth); + } + } + } - if (class_exists($nsname)) { - $x = new $nsname; - $f = 'widget'; - if (method_exists($x,$f)) { - return $x->$f($vars); - } - } + if (class_exists($nsname)) { + $x = new $nsname(); + $f = 'widget'; + if (method_exists($x, $f)) { + return $x->$f($vars); + } + } - $func = 'widget_' . trim($name); + $func = 'widget_' . trim($name); - if (! function_exists($func)) { - if (file_exists('widget/' . trim($name) . '.php')) { - require_once('widget/' . trim($name) . '.php'); - } - elseif (file_exists('widget/' . trim($name) . '/' . trim($name) . '.php')) { - require_once('widget/' . trim($name) . '/' . trim($name) . '.php'); - } - if (! function_exists($func)) { - $theme_widget = $func . '.php'; - if (theme_include($theme_widget)) { - require_once(theme_include($theme_widget)); - } - } - } + if (!function_exists($func)) { + if (file_exists('widget/' . trim($name) . '.php')) { + require_once('widget/' . trim($name) . '.php'); + } elseif (file_exists('widget/' . trim($name) . '/' . trim($name) . '.php')) { + require_once('widget/' . trim($name) . '/' . trim($name) . '.php'); + } + if (!function_exists($func)) { + $theme_widget = $func . '.php'; + if (theme_include($theme_widget)) { + require_once(theme_include($theme_widget)); + } + } + } - if (function_exists($func)) { - return $func($vars); - } - } + if (function_exists($func)) { + return $func($vars); + } + } - function region($s,$region_name) { + public function region($s, $region_name) + { - $s = str_replace('$region',$region_name,$s); + $s = str_replace('$region', $region_name, $s); - $matches = []; + $matches = []; - $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $s = str_replace($mtch[0], $this->menu(trim($mtch[1])), $s); - } - } + $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $s = str_replace($mtch[0], $this->menu(trim($mtch[1])), $s); + } + } - // menu class e.g. [menu=horizontal]my_menu[/menu] or [menu=tabbed]my_menu[/menu] - // allows different menu renderings to be applied + // menu class e.g. [menu=horizontal]my_menu[/menu] or [menu=tabbed]my_menu[/menu] + // allows different menu renderings to be applied - $cnt = preg_match_all("/\[menu=(.*?)\](.*?)\[\/menu\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $s = str_replace($mtch[0],$this->menu(trim($mtch[2]),$mtch[1]),$s); - } - } - $cnt = preg_match_all("/\[block\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $s = str_replace($mtch[0],$this->block(trim($mtch[1])),$s); - } - } + $cnt = preg_match_all("/\[menu=(.*?)\](.*?)\[\/menu\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $s = str_replace($mtch[0], $this->menu(trim($mtch[2]), $mtch[1]), $s); + } + } + $cnt = preg_match_all("/\[block\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $s = str_replace($mtch[0], $this->block(trim($mtch[1])), $s); + } + } - $cnt = preg_match_all("/\[block=(.*?)\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $s = str_replace($mtch[0],$this->block(trim($mtch[2]),trim($mtch[1])),$s); - } - } + $cnt = preg_match_all("/\[block=(.*?)\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $s = str_replace($mtch[0], $this->block(trim($mtch[2]), trim($mtch[1])), $s); + } + } - $cnt = preg_match_all("/\[js\](.*?)\[\/js\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $s = str_replace($mtch[0],$this->js(trim($mtch[1])),$s); - } - } + $cnt = preg_match_all("/\[js\](.*?)\[\/js\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $s = str_replace($mtch[0], $this->js(trim($mtch[1])), $s); + } + } - $cnt = preg_match_all("/\[css\](.*?)\[\/css\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $s = str_replace($mtch[0],$this->css(trim($mtch[1])),$s); - } - } + $cnt = preg_match_all("/\[css\](.*?)\[\/css\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $s = str_replace($mtch[0], $this->css(trim($mtch[1])), $s); + } + } - $cnt = preg_match_all("/\[widget=(.*?)\](.*?)\[\/widget\]/ism", $s, $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - $s = str_replace($mtch[0],$this->widget(trim($mtch[1]),$mtch[2]),$s); - } - } + $cnt = preg_match_all("/\[widget=(.*?)\](.*?)\[\/widget\]/ism", $s, $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + $s = str_replace($mtch[0], $this->widget(trim($mtch[1]), $mtch[2]), $s); + } + } - return $s; - } + return $s; + } - /** - * @brief Registers a page template/variant for use by Comanche selectors. - * - * @param array $arr - * 'template' => template name - * 'variant' => array( - * 'name' => variant name - * 'desc' => text description - * 'regions' => array( - * 'name' => name - * 'desc' => text description - * ) - * ) - */ - function register_page_template($arr) { - App::$page_layouts[$arr['template']] = array($arr['variant']); - return; - } - + /** + * @brief Registers a page template/variant for use by Comanche selectors. + * + * @param array $arr + * 'template' => template name + * 'variant' => array( + * 'name' => variant name + * 'desc' => text description + * 'regions' => array( + * 'name' => name + * 'desc' => text description + * ) + * ) + */ + public function register_page_template($arr) + { + App::$page_layouts[$arr['template']] = array($arr['variant']); + return; + } } diff --git a/Zotlabs/Render/SimpleTemplate.php b/Zotlabs/Render/SimpleTemplate.php index 83b92eb28..27c062720 100644 --- a/Zotlabs/Render/SimpleTemplate.php +++ b/Zotlabs/Render/SimpleTemplate.php @@ -2,326 +2,351 @@ namespace Zotlabs\Render; -define ("KEY_NOT_EXISTS", '^R_key_not_Exists^'); +define("KEY_NOT_EXISTS", '^R_key_not_Exists^'); -class SimpleTemplate implements TemplateEngine { +class SimpleTemplate implements TemplateEngine +{ - static $name = 'internal'; + public static $name = 'internal'; - var $r; - var $search; - var $replace; - var $stack = []; - var $nodes = []; - var $done = false; - var $d = false; - var $lang = null; - var $debug = false; + public $r; + public $search; + public $replace; + public $stack = []; + public $nodes = []; + public $done = false; + public $d = false; + public $lang = null; + public $debug = false; - private function _preg_error() { - switch (preg_last_error()) { - case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR'); break; - case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR'); break; - case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR'); break; - case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR'); break; + private function _preg_error() + { + switch (preg_last_error()) { + case PREG_INTERNAL_ERROR: + echo('PREG_INTERNAL_ERROR'); + break; + case PREG_BACKTRACK_LIMIT_ERROR: + echo('PREG_BACKTRACK_LIMIT_ERROR'); + break; + case PREG_RECURSION_LIMIT_ERROR: + echo('PREG_RECURSION_LIMIT_ERROR'); + break; + case PREG_BAD_UTF8_ERROR: + echo('PREG_BAD_UTF8_ERROR'); + break; // This is only valid for php > 5.3, not certain how to code around it for unit tests -// case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break; - default: - // die("Unknown preg error."); - return; - } - echo "'); - if ($r[0]['title'] && trim($r[0]['body']) != '$content') { - $o .= ''); - } - } + $o .= (($var['wrap'] == 'none') ? '' : '' . $r[0]['title'] . '
'; - } + if ($r[0]['title'] && trim($r[0]['body']) != '$content') { + $o .= '' . $r[0]['title'] . '
'; + } - if (trim($r[0]['body']) === '$content') { - $o .= App::$page['content']; - } - else { - $o .= prepare_text($r[0]['body'], $r[0]['mimetype']); - } + if (trim($r[0]['body']) === '$content') { + $o .= App::$page['content']; + } else { + $o .= prepare_text($r[0]['body'], $r[0]['mimetype']); + } - $o .= (($var['wrap'] == 'none') ? '' : '"; - debug_print_backtrace(); - die(); - } +// case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break; + default: + // die("Unknown preg error."); + return; + } + echo ""; + debug_print_backtrace(); + die(); + } - private function _push_stack() { - $this->stack[] = [ $this->r, $this->nodes ]; - } + private function _push_stack() + { + $this->stack[] = [ $this->r, $this->nodes ]; + } - private function _pop_stack(){ - list($this->r, $this->nodes) = array_pop($this->stack); - } + private function _pop_stack() + { + list($this->r, $this->nodes) = array_pop($this->stack); + } - private function _get_var($name, $retNoKey = false) { - $keys = array_map('trim',explode('.',$name)); - if ($retNoKey && ! array_key_exists($keys[0], $this->r)) { - return KEY_NOT_EXISTS; - } + private function _get_var($name, $retNoKey = false) + { + $keys = array_map('trim', explode('.', $name)); + if ($retNoKey && ! array_key_exists($keys[0], $this->r)) { + return KEY_NOT_EXISTS; + } - $val = $this->r; - foreach ($keys as $k) { - $val = (isset($val[$k]) ? $val[$k] : null); - } + $val = $this->r; + foreach ($keys as $k) { + $val = (isset($val[$k]) ? $val[$k] : null); + } - return template_escape($val); - } + return template_escape($val); + } - /** - * IF node - * \code - * {{ if <$var> }}...[{{ else }} ...] {{ endif }} - * {{ if <$var>==[with $var1=$var2] }}{{ endinc }} - * \endcode - */ - private function _replcb_inc($args) { - if (strpos($args[2],'with')) { - list($tplfile, $newctx) = array_map('trim', explode("with",$args[2])); - } - else { - $tplfile = trim($args[2]); - $newctx = null; - } + /** + * INC node + * \code + * {{ inc [with $var1=$var2] }}{{ endinc }} + * \endcode + */ + private function _replcb_inc($args) + { + if (strpos($args[2], 'with')) { + list($tplfile, $newctx) = array_map('trim', explode("with", $args[2])); + } else { + $tplfile = trim($args[2]); + $newctx = null; + } - if ($tplfile[0] == '$') { - $tplfile = $this->_get_var($tplfile); - } + if ($tplfile[0] == '$') { + $tplfile = $this->_get_var($tplfile); + } - $this->_push_stack(); - $r = $this->r; - if (! is_null($newctx)) { - list($a,$b) = array_map('trim', explode('=',$newctx)); - $r[$a] = $this->_get_var($b); - } - $this->nodes = Array(); - $tpl = get_markup_template($tplfile); - $ret = $this->replace($tpl, $r); - $this->_pop_stack(); + $this->_push_stack(); + $r = $this->r; + if (! is_null($newctx)) { + list($a,$b) = array_map('trim', explode('=', $newctx)); + $r[$a] = $this->_get_var($b); + } + $this->nodes = array(); + $tpl = get_markup_template($tplfile); + $ret = $this->replace($tpl, $r); + $this->_pop_stack(); - return $ret; - } + return $ret; + } - /** - * DEBUG node - * \code - * {{ debug $var [$var [$var [...]]] }}{{ enddebug }} - * \endcode - * replace node with var_dump($var, $var, ...);
- */ - private function _replcb_debug($args) { - $vars = array_map('trim', explode(" ",$args[2])); - $vars[] = $args[1]; + /** + * DEBUG node + * \code + * {{ debug $var [$var [$var [...]]] }}{{ enddebug }} + * \endcode + * replace node withvar_dump($var, $var, ...);
+ */ + private function _replcb_debug($args) + { + $vars = array_map('trim', explode(" ", $args[2])); + $vars[] = $args[1]; - $ret = ""; - foreach ($vars as $var) { - $ret .= htmlspecialchars(var_export( $this->_get_var($var), true )); - $ret .= "\n"; - } - $ret .= ""; + $ret = ""; + foreach ($vars as $var) { + $ret .= htmlspecialchars(var_export($this->_get_var($var), true)); + $ret .= "\n"; + } + $ret .= ""; - return $ret; - } + return $ret; + } - private function _replcb_node($m) { - $node = $this->nodes[$m[1]]; - if (method_exists($this, "_replcb_" . $node[1])) { - $s = call_user_func(array($this, "_replcb_".$node[1]), $node); - } else { - $s = ""; - } - $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s); + private function _replcb_node($m) + { + $node = $this->nodes[$m[1]]; + if (method_exists($this, "_replcb_" . $node[1])) { + $s = call_user_func(array($this, "_replcb_" . $node[1]), $node); + } else { + $s = ""; + } + $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s); - return $s; - } + return $s; + } - private function _replcb($m) { - //var_dump(array_map('htmlspecialchars', $m)); - $this->done = false; - $this->nodes[] = (array) $m; + private function _replcb($m) + { + //var_dump(array_map('htmlspecialchars', $m)); + $this->done = false; + $this->nodes[] = (array) $m; - return "||". (count($this->nodes)-1) ."||"; - } + return "||" . (count($this->nodes) - 1) . "||"; + } - private function _build_nodes($s) { - $this->done = false; - while (!$this->done) { - $this->done=true; - $s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*({{ *else *}}[^{]*)?){{ *end\1 *}}|', array($this, "_replcb"), $s); - if ($s==Null) $this->_preg_error(); - } - //({{ *else *}}[^{]*)? - krsort($this->nodes); + private function _build_nodes($s) + { + $this->done = false; + while (!$this->done) { + $this->done = true; + $s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*({{ *else *}}[^{]*)?){{ *end\1 *}}|', array($this, "_replcb"), $s); + if ($s == null) { + $this->_preg_error(); + } + } + //({{ *else *}}[^{]*)? + krsort($this->nodes); - return $s; - } + return $s; + } - private function var_replace($s) { - $m = []; - /** regexp: - * \$ literal $ - * (\[)? optional open square bracket - * ([a-zA-Z0-9-_]+\.?)+ var name, followed by optional - * dot, repeated at least 1 time - * (?(1)\]) if there was opened square bracket - * (subgrup 1), match close bracket - */ - if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(?(1)\])/', $s,$m)) { - foreach ($m[0] as $var) { - $exp = str_replace(array("[", "]"), array("", ""), $var); - $exptks = explode("|", $exp); + private function var_replace($s) + { + $m = []; + /** regexp: + * \$ literal $ + * (\[)? optional open square bracket + * ([a-zA-Z0-9-_]+\.?)+ var name, followed by optional + * dot, repeated at least 1 time + * (?(1)\]) if there was opened square bracket + * (subgrup 1), match close bracket + */ + if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(?(1)\])/', $s, $m)) { + foreach ($m[0] as $var) { + $exp = str_replace(array("[", "]"), array("", ""), $var); + $exptks = explode("|", $exp); - $varn = $exptks[0]; - unset($exptks[0]); - $val = $this->_get_var($varn, true); - if ($val != KEY_NOT_EXISTS) { - /* run filters */ - /* - * Filter are in form of: - * filtername:arg:arg:arg - * - * "filtername" is function name - * "arg"s are optional, var value is appended to the end - * if one "arg"==='x' , is replaced with var value - * - * examples: - * $item.body|htmlspecialchars // escape html chars - * $item.body|htmlspecialchars|strtoupper // escape html and uppercase result - * $item.created|date:%Y %M %j // format date (created is a timestamp) - * $item.body|str_replace:cat:dog // replace all "cat" with "dog" - * $item.body|str_replace:cat:dog:x:1 // replace one "cat" with "dog" - */ - foreach ($exptks as $filterstr) { - $filter = explode(":", $filterstr); - $filtername = $filter[0]; - unset($filter[0]); - $valkey = array_search("x", $filter); - if ($valkey === false) { - $filter[] = $val; - } else { - $filter[$valkey] = $val; - } - if (function_exists($filtername)) { - $val = call_user_func_array($filtername, $filter); - } - } - $s = str_replace($var, $val, $s); - } - } - } + $varn = $exptks[0]; + unset($exptks[0]); + $val = $this->_get_var($varn, true); + if ($val != KEY_NOT_EXISTS) { + /* run filters */ + /* + * Filter are in form of: + * filtername:arg:arg:arg + * + * "filtername" is function name + * "arg"s are optional, var value is appended to the end + * if one "arg"==='x' , is replaced with var value + * + * examples: + * $item.body|htmlspecialchars // escape html chars + * $item.body|htmlspecialchars|strtoupper // escape html and uppercase result + * $item.created|date:%Y %M %j // format date (created is a timestamp) + * $item.body|str_replace:cat:dog // replace all "cat" with "dog" + * $item.body|str_replace:cat:dog:x:1 // replace one "cat" with "dog" + */ + foreach ($exptks as $filterstr) { + $filter = explode(":", $filterstr); + $filtername = $filter[0]; + unset($filter[0]); + $valkey = array_search("x", $filter); + if ($valkey === false) { + $filter[] = $val; + } else { + $filter[$valkey] = $val; + } + if (function_exists($filtername)) { + $val = call_user_func_array($filtername, $filter); + } + } + $s = str_replace($var, $val, $s); + } + } + } - return $s; - } + return $s; + } - private function replace($s, $r) { - $this->replace_macros($s, $r); - } + private function replace($s, $r) + { + $this->replace_macros($s, $r); + } - // TemplateEngine interface + // TemplateEngine interface - public function replace_macros($s, $r) { - $this->r = $r; + public function replace_macros($s, $r) + { + $this->r = $r; - $s = $this->_build_nodes($s); + $s = $this->_build_nodes($s); - $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s); - if ($s == Null) - $this->_preg_error(); + $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s); + if ($s == null) { + $this->_preg_error(); + } - // remove comments block - $s = preg_replace('/{#[^#]*#}/', "" , $s); + // remove comments block + $s = preg_replace('/{#[^#]*#}/', "", $s); - //$t2 = dba_timer(); + //$t2 = dba_timer(); - // replace strings recursively (limit to 10 loops) - $os = ""; - $count=0; - while (($os !== $s) && $count<10) { - $os = $s; - $count++; - $s = $this->var_replace($s); - } + // replace strings recursively (limit to 10 loops) + $os = ""; + $count = 0; + while (($os !== $s) && $count < 10) { + $os = $s; + $count++; + $s = $this->var_replace($s); + } - return $s; - } + return $s; + } - public function get_markup_template($file, $root='') { - $template_file = theme_include($file, $root); - if ($template_file) { - $content = file_get_contents($template_file); - } + public function get_markup_template($file, $root = '') + { + $template_file = theme_include($file, $root); + if ($template_file) { + $content = file_get_contents($template_file); + } - return $content; - } + return $content; + } } -function template_escape($s) { - return str_replace(array('$','{{'),array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'),$s); +function template_escape($s) +{ + return str_replace(array('$','{{'), array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'), $s); } -function template_unescape($s) { - return str_replace(array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'),array('$','{{'),$s); +function template_unescape($s) +{ + return str_replace(array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'), array('$','{{'), $s); } diff --git a/Zotlabs/Render/SmartyInterface.php b/Zotlabs/Render/SmartyInterface.php index 72db8116b..58747744e 100644 --- a/Zotlabs/Render/SmartyInterface.php +++ b/Zotlabs/Render/SmartyInterface.php @@ -1,69 +1,72 @@ - "view/theme/$thname/tpl/" ]; - if ( x(App::$theme_info,"extends") ) { - $template_dirs = $template_dirs + [ 'extends' => "view/theme/" . App::$theme_info["extends"] . '/tpl/' ]; - } - $template_dirs = $template_dirs + array('base' => 'view/tpl/'); - $this->setTemplateDir($template_dirs); + $template_dirs = ['theme' => "view/theme/$thname/tpl/"]; + if (x(App::$theme_info, "extends")) { + $template_dirs = $template_dirs + ['extends' => "view/theme/" . App::$theme_info["extends"] . '/tpl/']; + } + $template_dirs = $template_dirs + array('base' => 'view/tpl/'); + $this->setTemplateDir($template_dirs); - // Cannot use get_config() here because it is called during installation when there is no DB. - // FIXME: this may leak private information such as system pathnames. + // Cannot use get_config() here because it is called during installation when there is no DB. + // FIXME: this may leak private information such as system pathnames. - $basecompiledir = ((array_key_exists('smarty3_folder', App::$config['system'])) - ? App::$config['system']['smarty3_folder'] : ''); - if (! $basecompiledir) { - $basecompiledir = str_replace('Zotlabs','',dirname(__DIR__)) . TEMPLATE_BUILD_PATH; - } - if (! is_dir($basecompiledir)) { - @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true); - } - if (! is_dir($basecompiledir)) { - echo "ERROR: folder $basecompiledir does not exist."; killme(); - - } + $basecompiledir = ((array_key_exists('smarty3_folder', App::$config['system'])) + ? App::$config['system']['smarty3_folder'] : ''); + if (!$basecompiledir) { + $basecompiledir = str_replace('Zotlabs', '', dirname(__DIR__)) . TEMPLATE_BUILD_PATH; + } + if (!is_dir($basecompiledir)) { + @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true); + } + if (!is_dir($basecompiledir)) { + echo "ERROR: folder $basecompiledir does not exist."; + killme(); + } - if (! is_writable($basecompiledir)) { - echo "ERROR: folder $basecompiledir must be writable by webserver."; killme(); - } - App::$config['system']['smarty3_folder'] = $basecompiledir; + if (!is_writable($basecompiledir)) { + echo "ERROR: folder $basecompiledir must be writable by webserver."; + killme(); + } + App::$config['system']['smarty3_folder'] = $basecompiledir; - $this->setCompileDir($basecompiledir.'/compiled/'); - $this->setConfigDir($basecompiledir.'/config/'); - $this->setCacheDir($basecompiledir.'/cache/'); + $this->setCompileDir($basecompiledir . '/compiled/'); + $this->setConfigDir($basecompiledir . '/config/'); + $this->setCacheDir($basecompiledir . '/cache/'); - $this->left_delimiter = App::get_template_ldelim('smarty3'); - $this->right_delimiter = App::get_template_rdelim('smarty3'); + $this->left_delimiter = App::get_template_ldelim('smarty3'); + $this->right_delimiter = App::get_template_rdelim('smarty3'); - // Don't report errors so verbosely - $this->error_reporting = (E_ERROR | E_PARSE); - } + // Don't report errors so verbosely + $this->error_reporting = (E_ERROR | E_PARSE); + } - function parsed($template = '') { - if ($template) { - return $this->fetch('string:' . $template); - } - return $this->fetch('file:' . $this->filename); - } + public function parsed($template = '') + { + if ($template) { + return $this->fetch('string:' . $template); + } + return $this->fetch('file:' . $this->filename); + } } - - - diff --git a/Zotlabs/Render/SmartyTemplate.php b/Zotlabs/Render/SmartyTemplate.php index 7eaa8a55c..e0cc329c6 100644 --- a/Zotlabs/Render/SmartyTemplate.php +++ b/Zotlabs/Render/SmartyTemplate.php @@ -1,91 +1,96 @@ -ERROR: folder $basecompiledir does not exist."; killme(); - } + $basecompiledir = str_replace('Zotlabs', '', dirname(__dir__)) . "/" . TEMPLATE_BUILD_PATH; } - if (! is_writable($basecompiledir)) { - echo "ERROR: folder $basecompiledir must be writable by webserver."; killme(); - } - App::$config['system']['smarty3_folder'] = $basecompiledir; - } - - // TemplateEngine interface + if (! is_dir($basecompiledir)) { + @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true); + if (! is_dir($basecompiledir)) { + echo "ERROR: folder $basecompiledir does not exist."; + killme(); + } + } + if (! is_writable($basecompiledir)) { + echo "ERROR: folder $basecompiledir must be writable by webserver."; + killme(); + } + App::$config['system']['smarty3_folder'] = $basecompiledir; + } - public function replace_macros($s, $r) { - $template = ''; + // TemplateEngine interface - // macro or macros available for use in all templates + public function replace_macros($s, $r) + { + $template = ''; - $r['$z_baseurl'] = z_root(); + // macro or macros available for use in all templates - if (gettype($s) === 'string') { - $template = $s; - $s = new SmartyInterface(); - } - foreach ($r as $key => $value) { - if ($key[0] === '$') { - $key = substr($key, 1); - } - $s->assign($key, $value); - } - return $s->parsed($template); - } - - public function get_markup_template($file, $root = '') { - $template_file = theme_include($file, $root); - if ($template_file) { - $template = new SmartyInterface(); - $template->filename = $template_file; + $r['$z_baseurl'] = z_root(); - return $template; - } - return EMPTY_STR; - } + if (gettype($s) === 'string') { + $template = $s; + $s = new SmartyInterface(); + } + foreach ($r as $key => $value) { + if ($key[0] === '$') { + $key = substr($key, 1); + } + $s->assign($key, $value); + } + return $s->parsed($template); + } - public function get_intltext_template($file, $root = '') { - - $lang = App::$language; - if ($root != '' && substr($root,-1) != '/' ) { - $root .= '/'; - } - foreach ( [ $root . "view/$lang/$file", $root . "view/en/$file", '' ] as $template_file) { - if (is_file($template_file)) { - break; - } - } - if ($template_file == '') { - $template_file = theme_include($file,$root); - } - if ($template_file) { - $template = new SmartyInterface(); - $template->filename = $template_file; - return $template; - } - return EMPTY_STR; - } + public function get_markup_template($file, $root = '') + { + $template_file = theme_include($file, $root); + if ($template_file) { + $template = new SmartyInterface(); + $template->filename = $template_file; + return $template; + } + return EMPTY_STR; + } + public function get_intltext_template($file, $root = '') + { + $lang = App::$language; + if ($root != '' && substr($root, -1) != '/') { + $root .= '/'; + } + foreach ([ $root . "view/$lang/$file", $root . "view/en/$file", '' ] as $template_file) { + if (is_file($template_file)) { + break; + } + } + if ($template_file == '') { + $template_file = theme_include($file, $root); + } + if ($template_file) { + $template = new SmartyInterface(); + $template->filename = $template_file; + return $template; + } + return EMPTY_STR; + } } diff --git a/Zotlabs/Render/TemplateEngine.php b/Zotlabs/Render/TemplateEngine.php index bc25ce1af..b9e85edb4 100644 --- a/Zotlabs/Render/TemplateEngine.php +++ b/Zotlabs/Render/TemplateEngine.php @@ -6,7 +6,8 @@ namespace Zotlabs\Render; * @brief Interface for template engines. */ -interface TemplateEngine { - public function replace_macros($s, $v); - public function get_markup_template($file, $root = ''); +interface TemplateEngine +{ + public function replace_macros($s, $v); + public function get_markup_template($file, $root = ''); } diff --git a/Zotlabs/Render/Theme.php b/Zotlabs/Render/Theme.php index 0eebba1ba..1c1e9279e 100644 --- a/Zotlabs/Render/Theme.php +++ b/Zotlabs/Render/Theme.php @@ -4,129 +4,139 @@ namespace Zotlabs\Render; use App; +class Theme +{ -class Theme { + public static $system_theme = null; - static $system_theme = null; + public static $session_theme = null; - static $session_theme = null; - - /** - * @brief Array with base or fallback themes. - */ - static $base_themes = array('redbasic'); + /** + * @brief Array with base or fallback themes. + */ + public static $base_themes = array('redbasic'); - /** - * @brief Figure out the best matching theme and return it. - * - * The theme will depend on channel settings, mobile, session, core compatibility, etc. - * - * @return array - */ - static public function current(){ + /** + * @brief Figure out the best matching theme and return it. + * + * The theme will depend on channel settings, mobile, session, core compatibility, etc. + * + * @return array + */ + public static function current() + { - self::$system_theme = ((isset(\App::$config['system']['theme'])) - ? \App::$config['system']['theme'] : ''); - self::$session_theme = ((isset($_SESSION) && x($_SESSION, 'theme')) - ? $_SESSION['theme'] : self::$system_theme); + self::$system_theme = ((isset(App::$config['system']['theme'])) + ? App::$config['system']['theme'] : ''); + self::$session_theme = ((isset($_SESSION) && x($_SESSION, 'theme')) + ? $_SESSION['theme'] : self::$system_theme); - $page_theme = null; + $page_theme = null; - // Find the theme that belongs to the channel whose stuff we are looking at + // Find the theme that belongs to the channel whose stuff we are looking at - if(\App::$profile_uid) { - $r = q("select channel_theme from channel where channel_id = %d limit 1", - intval(\App::$profile_uid) - ); - if($r) { - $page_theme = $r[0]['channel_theme']; - } - } + if (App::$profile_uid) { + $r = q( + "select channel_theme from channel where channel_id = %d limit 1", + intval(App::$profile_uid) + ); + if ($r) { + $page_theme = $r[0]['channel_theme']; + } + } - // Themes from Comanche layouts over-ride the channel theme + // Themes from Comanche layouts over-ride the channel theme - if(array_key_exists('theme', \App::$layout) && \App::$layout['theme']) - $page_theme = \App::$layout['theme']; + if (array_key_exists('theme', App::$layout) && App::$layout['theme']) { + $page_theme = App::$layout['theme']; + } - $chosen_theme = self::$session_theme; + $chosen_theme = self::$session_theme; - if($page_theme) { - $chosen_theme = $page_theme; - } + if ($page_theme) { + $chosen_theme = $page_theme; + } - if(array_key_exists('theme_preview', $_GET)) - $chosen_theme = $_GET['theme_preview']; + if (array_key_exists('theme_preview', $_GET)) { + $chosen_theme = $_GET['theme_preview']; + } - // Allow theme selection of the form 'theme_name:schema_name' - $themepair = explode(':', $chosen_theme); + // Allow theme selection of the form 'theme_name:schema_name' + $themepair = explode(':', $chosen_theme); - // Check if $chosen_theme is compatible with core. If not fall back to default - $info = get_theme_info($themepair[0]); - $compatible = check_plugin_versions($info); - if(!$compatible) { - $chosen_theme = ''; - } + // Check if $chosen_theme is compatible with core. If not fall back to default + $info = get_theme_info($themepair[0]); + $compatible = check_plugin_versions($info); + if (!$compatible) { + $chosen_theme = ''; + } - if($chosen_theme && (file_exists('view/theme/' . $themepair[0] . '/css/style.css') || file_exists('view/theme/' . $themepair[0] . '/php/style.php'))) { - return($themepair); - } + if ($chosen_theme && (file_exists('view/theme/' . $themepair[0] . '/css/style.css') || file_exists('view/theme/' . $themepair[0] . '/php/style.php'))) { + return ($themepair); + } - foreach(self::$base_themes as $t) { - if(file_exists('view/theme/' . $t . '/css/style.css') || - file_exists('view/theme/' . $t . '/php/style.php')) { - return(array($t)); - } - } + foreach (self::$base_themes as $t) { + if ( + file_exists('view/theme/' . $t . '/css/style.css') || + file_exists('view/theme/' . $t . '/php/style.php') + ) { + return (array($t)); + } + } - // Worst case scenario, the default base theme or themes don't exist; perhaps somebody renamed it/them. + // Worst case scenario, the default base theme or themes don't exist; perhaps somebody renamed it/them. - // Find any theme at all and use it. + // Find any theme at all and use it. - $fallback = array_merge(glob('view/theme/*/css/style.css'), glob('view/theme/*/php/style.php')); - if(count($fallback)) - return(array(str_replace('view/theme/', '', substr($fallback[0], 0, -14)))); - } + $fallback = array_merge(glob('view/theme/*/css/style.css'), glob('view/theme/*/php/style.php')); + if (count($fallback)) { + return (array(str_replace('view/theme/', '', substr($fallback[0], 0, -14)))); + } + } - /** - * @brief Return full URL to theme which is currently in effect. - * - * Provide a sane default if nothing is chosen or the specified theme does not exist. - * - * @param bool $installing (optional) default false, if true return the name of the first base theme - * - * @return string - */ - static public function url($installing = false) { + /** + * @brief Return full URL to theme which is currently in effect. + * + * Provide a sane default if nothing is chosen or the specified theme does not exist. + * + * @param bool $installing (optional) default false, if true return the name of the first base theme + * + * @return string + */ + public static function url($installing = false) + { - if($installing) - return self::$base_themes[0]; + if ($installing) { + return self::$base_themes[0]; + } - $theme = self::current(); + $theme = self::current(); - $t = $theme[0]; - $s = ((count($theme) > 1) ? $theme[1] : ''); + $t = $theme[0]; + $s = ((count($theme) > 1) ? $theme[1] : ''); - $opts = ''; - $opts = ((\App::$profile_uid) ? '?f=&puid=' . \App::$profile_uid : ''); + $opts = ''; + $opts = ((App::$profile_uid) ? '?f=&puid=' . App::$profile_uid : ''); - $schema_str = ((x(\App::$layout,'schema')) ? '&schema=' . App::$layout['schema'] : ''); - if(($s) && (! $schema_str)) - $schema_str = '&schema=' . $s; + $schema_str = ((x(App::$layout, 'schema')) ? '&schema=' . App::$layout['schema'] : ''); + if (($s) && (!$schema_str)) { + $schema_str = '&schema=' . $s; + } - $opts .= $schema_str; + $opts .= $schema_str; - if(file_exists('view/theme/' . $t . '/php/style.php')) - return('/view/theme/' . $t . '/php/style.pcss' . $opts); + if (file_exists('view/theme/' . $t . '/php/style.php')) { + return ('/view/theme/' . $t . '/php/style.pcss' . $opts); + } - return('/view/theme/' . $t . '/css/style.css'); - } - - function debug() { - logger('system_theme: ' . self::$system_theme); - logger('session_theme: ' . self::$session_theme); - } + return ('/view/theme/' . $t . '/css/style.css'); + } + public function debug() + { + logger('system_theme: ' . self::$system_theme); + logger('session_theme: ' . self::$session_theme); + } } - diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php index 52a8986f8..cb3375bf5 100644 --- a/Zotlabs/Storage/BasicAuth.php +++ b/Zotlabs/Storage/BasicAuth.php @@ -4,6 +4,8 @@ namespace Zotlabs\Storage; use App; use Sabre\DAV; +use Sabre\DAV\Browser\Plugin; +use Sabre\HTTP\Auth\Basic; use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; @@ -13,137 +15,140 @@ use Sabre\HTTP\ResponseInterface; * This class also contains some data which is not necessary for authentication * like timezone settings. * - * @extends \\Sabre\\DAV\\Auth\\Backend\\AbstractBasic + * @extends \Sabre\\DAV\\Auth\\Backend\\AbstractBasic * * @link http://github.com/friendica/red * @license http://opensource.org/unlicense.org */ -class BasicAuth extends DAV\Auth\Backend\AbstractBasic { +class BasicAuth extends DAV\Auth\Backend\AbstractBasic +{ - /** - * @brief This variable holds the currently logged-in channel_address. - * - * It is used for building path in filestorage/. - * - * @var string|null $channel_name - */ - public $channel_name = null; - /** - * @brief channel_id of the current channel of the logged-in account. - * - * @var int $channel_id - */ - public $channel_id = 0; - /** - * @brief channel_hash of the current channel of the logged-in account. - * - * @var string $channel_hash - */ - public $channel_hash = ''; - /** - * @brief Set in mod/cloud.php to observer_hash. - * - * @var string $observer - */ - public $observer = ''; - /** - * - * @see Browser::set_writeable() - * @var \\Sabre\\DAV\\Browser\\Plugin $browser - */ - public $browser; - /** - * @brief channel_id of the current visited path. Set in Directory::getDir(). - * - * @var int $owner_id - */ - public $owner_id = 0; - /** - * channel_name of the current visited path. Set in Directory::getDir(). - * - * Used for creating the path in cloud/ - * - * @var string $owner_nick - */ - public $owner_nick = ''; - /** - * Timezone from the visiting channel's channel_timezone. - * - * Used in @ref Browser - * - * @var string $timezone - */ - protected $timezone = ''; + /** + * @brief This variable holds the currently logged-in channel_address. + * + * It is used for building path in filestorage/. + * + * @var string|null $channel_name + */ + public $channel_name = null; + /** + * @brief channel_id of the current channel of the logged-in account. + * + * @var int $channel_id + */ + public $channel_id = 0; + /** + * @brief channel_hash of the current channel of the logged-in account. + * + * @var string $channel_hash + */ + public $channel_hash = ''; + /** + * @brief Set in mod/cloud.php to observer_hash. + * + * @var string $observer + */ + public $observer = ''; + /** + * + * @see Browser::set_writeable() + * @var \Sabre\\DAV\\Browser\\Plugin $browser + */ + public $browser; + /** + * @brief channel_id of the current visited path. Set in Directory::getDir(). + * + * @var int $owner_id + */ + public $owner_id = 0; + /** + * channel_name of the current visited path. Set in Directory::getDir(). + * + * Used for creating the path in cloud/ + * + * @var string $owner_nick + */ + public $owner_nick = ''; + /** + * Timezone from the visiting channel's channel_timezone. + * + * Used in @ref Browser + * + * @var string $timezone + */ + protected $timezone = ''; - public $module_disabled = false; + public $module_disabled = false; - /** - * @brief Validates a username and password. - * - * - * @see \\Sabre\\DAV\\Auth\\Backend\\AbstractBasic::validateUserPass - * @param string $username - * @param string $password - * @return bool - */ - protected function validateUserPass($username, $password) { + /** + * @brief Validates a username and password. + * + * + * @param string $username + * @param string $password + * @return bool + * @see \\Sabre\\DAV\\Auth\\Backend\\AbstractBasic::validateUserPass + */ + protected function validateUserPass($username, $password) + { - require_once('include/auth.php'); - $record = account_verify_password($username, $password); - if($record && $record['account']) { - if($record['channel']) - $channel = $record['channel']; - else { - $r = q("SELECT * FROM channel WHERE channel_account_id = %d AND channel_id = %d LIMIT 1", - intval($record['account']['account_id']), - intval($record['account']['account_default_channel']) - ); - if($r) - $channel = $r[0]; - } - } - if($channel && $this->check_module_access($channel['channel_id'])) { - return $this->setAuthenticated($channel); - } + require_once('include/auth.php'); + $record = account_verify_password($username, $password); + if ($record && $record['account']) { + if ($record['channel']) + $channel = $record['channel']; + else { + $r = q("SELECT * FROM channel WHERE channel_account_id = %d AND channel_id = %d LIMIT 1", + intval($record['account']['account_id']), + intval($record['account']['account_default_channel']) + ); + if ($r) + $channel = $r[0]; + } + } + if ($channel && $this->check_module_access($channel['channel_id'])) { + return $this->setAuthenticated($channel); + } - if($this->module_disabled) - $error = 'module not enabled for ' . $username; - else - $error = 'password failed for ' . $username; - logger($error); - log_failed_login($error); + if ($this->module_disabled) + $error = 'module not enabled for ' . $username; + else + $error = 'password failed for ' . $username; + logger($error); + log_failed_login($error); - return false; - } + return false; + } - /** - * @brief Sets variables and session parameters after successfull authentication. - * - * @param array $r - * Array with the values for the authenticated channel. - * @return bool - */ - protected function setAuthenticated($channel) { - $this->channel_name = $channel['channel_address']; - $this->channel_id = $channel['channel_id']; - $this->channel_hash = $this->observer = $channel['channel_hash']; - - if ($this->observer) { - $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($this->observer) - ); - if ($r) { - App::set_observer(array_shift($r)); - } - } + /** + * @brief Sets variables and session parameters after successfull authentication. + * + * @param array $r + * Array with the values for the authenticated channel. + * @return bool + */ + protected function setAuthenticated($channel) + { + $this->channel_name = $channel['channel_address']; + $this->channel_id = $channel['channel_id']; + $this->channel_hash = $this->observer = $channel['channel_hash']; - $_SESSION['uid'] = $channel['channel_id']; - $_SESSION['account_id'] = $channel['channel_account_id']; - $_SESSION['authenticated'] = true; - return true; - } + if ($this->observer) { + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($this->observer) + ); + if ($r) { + App::set_observer(array_shift($r)); + } + } + + $_SESSION['uid'] = $channel['channel_id']; + $_SESSION['account_id'] = $channel['channel_account_id']; + $_SESSION['authenticated'] = true; + return true; + } /** * When this method is called, the backend must check if authentication was @@ -173,17 +178,17 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic { * @param ResponseInterface $response * @return array */ - function check(RequestInterface $request, ResponseInterface $response) { + public function check(RequestInterface $request, ResponseInterface $response) + { - if (local_channel()) { - $this->setAuthenticated(\App::get_channel()); - return [ true, $this->principalPrefix . $this->channel_name ]; - } - elseif (remote_channel()) { - return [ true, $this->principalPrefix . $this->observer ]; - } + if (local_channel()) { + $this->setAuthenticated(App::get_channel()); + return [true, $this->principalPrefix . $this->channel_name]; + } elseif (remote_channel()) { + return [true, $this->principalPrefix . $this->observer]; + } - $auth = new \Sabre\HTTP\Auth\Basic( + $auth = new Basic( $this->realm, $request, $response @@ -200,78 +205,87 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic { } - protected function check_module_access($channel_id) { - if($channel_id && in_array(\App::$module,[ 'dav', 'cdav', 'snap'] )) { - return true; - } - $this->module_disabled = true; - return false; - } + protected function check_module_access($channel_id) + { + if ($channel_id && in_array(App::$module, ['dav', 'cdav', 'snap'])) { + return true; + } + $this->module_disabled = true; + return false; + } - /** - * Sets the channel_name from the currently logged-in channel. - * - * @param string $name - * The channel's name - */ - public function setCurrentUser($name) { - $this->channel_name = $name; - } - /** - * Returns information about the currently logged-in channel. - * - * If nobody is currently logged in, this method should return null. - * - * @see \\Sabre\\DAV\\Auth\\Backend\\AbstractBasic::getCurrentUser - * @return string|null - */ - public function getCurrentUser() { - return $this->channel_name; - } + /** + * Sets the channel_name from the currently logged-in channel. + * + * @param string $name + * The channel's name + */ + public function setCurrentUser($name) + { + $this->channel_name = $name; + } - /** - * @brief Sets the timezone from the channel in BasicAuth. - * - * Set in mod/cloud.php if the channel has a timezone set. - * - * @param string $timezone - * The channel's timezone. - * @return void - */ - public function setTimezone($timezone) { - $this->timezone = $timezone; - } - /** - * @brief Returns the timezone. - * - * @return string - * Return the channel's timezone. - */ - public function getTimezone() { - return $this->timezone; - } + /** + * Returns information about the currently logged-in channel. + * + * If nobody is currently logged in, this method should return null. + * + * @return string|null + * @see \\Sabre\\DAV\\Auth\\Backend\\AbstractBasic::getCurrentUser + */ + public function getCurrentUser() + { + return $this->channel_name; + } - /** - * @brief Set browser plugin for SabreDAV. - * - * @see RedBrowser::set_writeable() - * @param \Sabre\DAV\Browser\Plugin $browser - */ - public function setBrowserPlugin($browser) { - $this->browser = $browser; - } + /** + * @brief Sets the timezone from the channel in BasicAuth. + * + * Set in mod/cloud.php if the channel has a timezone set. + * + * @param string $timezone + * The channel's timezone. + * @return void + */ + public function setTimezone($timezone) + { + $this->timezone = $timezone; + } - /** - * @brief Prints out all BasicAuth variables to logger(). - * - * @return void - */ - public function log() { + /** + * @brief Returns the timezone. + * + * @return string + * Return the channel's timezone. + */ + public function getTimezone() + { + return $this->timezone; + } + + /** + * @brief Set browser plugin for SabreDAV. + * + * @param Plugin $browser + * @see RedBrowser::set_writeable() + */ + public function setBrowserPlugin($browser) + { + $this->browser = $browser; + } + + /** + * @brief Prints out all BasicAuth variables to logger(). + * + * @return void + */ + public function log() + { // logger('channel_name ' . $this->channel_name, LOGGER_DATA); // logger('channel_id ' . $this->channel_id, LOGGER_DATA); // logger('channel_hash ' . $this->channel_hash, LOGGER_DATA); // logger('observer ' . $this->observer, LOGGER_DATA); // logger('owner_id ' . $this->owner_id, LOGGER_DATA); // logger('owner_nick ' . $this->owner_nick, LOGGER_DATA); - } + } } diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index cdd85046a..8448ba3a0 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -1,11 +1,14 @@ server->getBaseUri() . $parentUri); + $fullPath = encodePath($this->server->getBaseUri() . $parentUri); $parentpath['icon'] = $this->enableAssets ? '' : ''; $parentpath['path'] = $fullPath; @@ -182,7 +185,7 @@ class Browser extends DAV\Browser\Plugin { $size = isset($file[200]['{DAV:}getcontentlength']) ? (int)$file[200]['{DAV:}getcontentlength'] : ''; $lastmodified = ((isset($file[200]['{DAV:}getlastmodified'])) ? $file[200]['{DAV:}getlastmodified']->getTime()->format('Y-m-d H:i:s') : ''); - $fullPath = \Sabre\HTTP\encodePath('/' . trim($this->server->getBaseUri() . ($path ? $path . '/' : '') . $name, '/')); + $fullPath = encodePath('/' . trim($this->server->getBaseUri() . ($path ? $path . '/' : '') . $name, '/')); $displayName = isset($file[200]['{DAV:}displayname']) ? $file[200]['{DAV:}displayname'] : $name; @@ -343,11 +346,11 @@ class Browser extends DAV\Browser\Plugin { /** * @brief Creates a form to add new folders and upload files. * - * @param \Sabre\DAV\INode $node + * @param INode $node * @param[in,out] string &$output * @param string $path */ - public function htmlActionsPanel(DAV\INode $node, &$output, $path) { + public function htmlActionsPanel(INode $node, &$output, $path) { if (! $node instanceof DAV\ICollection) { return; } diff --git a/Zotlabs/Storage/CalDAVClient.php b/Zotlabs/Storage/CalDAVClient.php index c1a8db932..8ab34e23f 100644 --- a/Zotlabs/Storage/CalDAVClient.php +++ b/Zotlabs/Storage/CalDAVClient.php @@ -2,76 +2,80 @@ namespace Zotlabs\Storage; -// The Hubzilla CalDAV client will store calendar information in the 'cal' DB table. +// The Hubzilla CalDAV client will store calendar information in the 'cal' DB table. // Event information will remain in the 'event' table. In order to implement CalDAV on top of our // existing system, there is an event table column called vdata. This will hold the "one true record" // of the event in VCALENDAR format. When we receive a foreign event, we will pick out the fields -// of this entry that are important to us and use it to populate the other event table fields. +// of this entry that are important to us and use it to populate the other event table fields. // When we make an event change, it is required that we load this entry as a vobject, make the changes on the // vobject, and then store the result back in event.vdata. This will preserve foreign keys which we // know nothing about. Then we sync this back to the DAV server. -// We still need a DB update to create a 'cal' table entry for our existing events and link these together. -// I'm currently anticipating separating tasks/to-do items from events, so each new account wil get two default calendars. +// We still need a DB update to create a 'cal' table entry for our existing events and link these together. +// I'm currently anticipating separating tasks/to-do items from events, so each new account wil get two default calendars. -// We will eventually provide for magic-auth or cookie login of the CURL process so we won't be required to -// store our hubzilla password. Currently for testing we are using HTTP BASIC-AUTH and must initialise the -// username/password correctly to make the connection. +// We will eventually provide for magic-auth or cookie login of the CURL process so we won't be required to +// store our hubzilla password. Currently for testing we are using HTTP BASIC-AUTH and must initialise the +// username/password correctly to make the connection. -// Repeating events will be awkward because every instance has the same UUID. This would make it difficult to -// search for upcoming events if the initial instance was created (for instance) a few years ago. So the current plan is -// to create event instances for a prescribed time limit from now (perhaps 5-10 years for annual events). +// Repeating events will be awkward because every instance has the same UUID. This would make it difficult to +// search for upcoming events if the initial instance was created (for instance) a few years ago. So the current plan is +// to create event instances for a prescribed time limit from now (perhaps 5-10 years for annual events). // This plan may change. The repurcussions of this decision mean that an edit to a recurring event must // edit all existing instances of the event, and only one unique instance can be used for sync. -// Sabre vobject provides a function to automatically expand recurring events into individual event instances. +// Sabre vobject provides a function to automatically expand recurring events into individual event instances. +class CalDAVClient +{ -class CalDAVClient { + private $username; + private $password; - private $username; - private $password; + private $url; - private $url; + public $filepos = 0; + public $request_data = ''; - public $filepos = 0; - public $request_data = ''; + public function __construct($user, $pass, $url) + { + $this->username = $user; + $this->password = $pass; + $this->url = $url; + } - function __construct($user,$pass,$url) { - $this->username = $user; - $this->password = $pass; - $this->url = $url; + private function set_data($s) + { + $this->request_data = $s; + $this->filepos = 0; + } - } + public function curl_read($ch, $fh, $size) + { - private function set_data($s) { - $this->request_data = $s; - $this->filepos = 0; - } + if ($this->filepos < 0) { + unset($fh); + return ''; + } - public function curl_read($ch,$fh,$size) { + $s = substr($this->request_data, $this->filepos, $size); - if($this->filepos < 0) { - unset($fh); - return ''; - } + if (strlen($s) < $size) { + $this->filepos = (-1); + } else { + $this->filepos = $this->filepos + $size; + } - $s = substr($this->request_data,$this->filepos,$size); + return $s; + } - if(strlen($s) < $size) - $this->filepos = (-1); - else - $this->filepos = $this->filepos + $size; + public function ctag_fetch() + { + $headers = ['Depth: 0', 'Prefer: return-minimal', 'Content-Type: application/xml; charset=utf-8']; - return $s; - } + // recommended ctag fetch by sabre - function ctag_fetch() { - $headers = [ 'Depth: 0', 'Prefer: return-minimal', 'Content-Type: application/xml; charset=utf-8']; - - // recommended ctag fetch by sabre - - $this->set_data(' + $this->set_data('
'; - $o .= ''; - } - return $o; - } - -} + if ($arr) { + $o .= '' . t('Activity','widget') . '
- ';
-
- foreach($arr as $rv) {
- $o .= '
- ' . ((intval($rv['total'])) ? intval($rv['total']) : '') . '
' . $rv['author']['xchan_name'] . '
';
- }
- $o .= '
'; + $o .= ''; + } + return $o; + } +} diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php index 229f2a624..194059c92 100644 --- a/Zotlabs/Widget/Activity_filter.php +++ b/Zotlabs/Widget/Activity_filter.php @@ -5,330 +5,329 @@ namespace Zotlabs\Widget; use App; use Zotlabs\Lib\Apps; -class Activity_filter { +class Activity_filter +{ - function widget($arr) { + public function widget($arr) + { - if (! local_channel()) { - return EMPTY_STR; - } + if (!local_channel()) { + return EMPTY_STR; + } - $cmd = App::$cmd; + $cmd = App::$cmd; - $filter_active = false; - $events_active = false; - $video_active = false; - $polls_active = false; - $group_active = false; - $drafts_active = false; - $forum_active = false; - - $tabs = []; + $filter_active = false; + $events_active = false; + $video_active = false; + $polls_active = false; + $group_active = false; + $drafts_active = false; + $forum_active = false; - $dm_active = ((isset($_GET['dm']) && intval($_GET['dm'])) ? 'active' : ''); - if ($dm_active) { - $filter_active = 'dm'; - } + $tabs = []; - $tabs[] = [ - 'label' => t('Direct Messages'), - 'icon' => 'envelope-o', - 'url' => z_root() . '/' . $cmd . '/?dm=1', - 'sel' => $dm_active, - 'title' => t('Show direct (private) messages') - ]; + $dm_active = ((isset($_GET['dm']) && intval($_GET['dm'])) ? 'active' : ''); + if ($dm_active) { + $filter_active = 'dm'; + } + + $tabs[] = [ + 'label' => t('Direct Messages'), + 'icon' => 'envelope-o', + 'url' => z_root() . '/' . $cmd . '/?dm=1', + 'sel' => $dm_active, + 'title' => t('Show direct (private) messages') + ]; - $conv_active = ((isset($_GET['conv']) && intval($_GET['conv'])) ? 'active' : ''); - if ($conv_active) { - $filter_active = 'personal'; - } + $conv_active = ((isset($_GET['conv']) && intval($_GET['conv'])) ? 'active' : ''); + if ($conv_active) { + $filter_active = 'personal'; + } - $tabs[] = [ - 'label' => t('Personal Posts'), - 'icon' => 'user-circle', - 'url' => z_root() . '/' . $cmd . '/?conv=1', - 'sel' => $conv_active, - 'title' => t('Show posts that mention or involve me') - ]; + $tabs[] = [ + 'label' => t('Personal Posts'), + 'icon' => 'user-circle', + 'url' => z_root() . '/' . $cmd . '/?conv=1', + 'sel' => $conv_active, + 'title' => t('Show posts that mention or involve me') + ]; - $starred_active = ((isset($_GET['star']) && intval($_GET['star'])) ? 'active' : ''); - if ($starred_active) { - $filter_active = 'star'; - } + $starred_active = ((isset($_GET['star']) && intval($_GET['star'])) ? 'active' : ''); + if ($starred_active) { + $filter_active = 'star'; + } - $tabs[] = [ - 'label' => t('Saved Posts'), - 'icon' => 'star', - 'url' => z_root() . '/' . $cmd . '/?star=1', - 'sel' => $starred_active, - 'title' => t('Show posts that I have saved') - ]; + $tabs[] = [ + 'label' => t('Saved Posts'), + 'icon' => 'star', + 'url' => z_root() . '/' . $cmd . '/?star=1', + 'sel' => $starred_active, + 'title' => t('Show posts that I have saved') + ]; - if (local_channel() && Apps::system_app_installed(local_channel(),'Drafts')) { - $drafts_active = ((isset($_GET['draft']) && intval($_GET['draft'])) ? 'active' : ''); - if ($drafts_active) { - $filter_active = 'drafts'; - } + if (local_channel() && Apps::system_app_installed(local_channel(), 'Drafts')) { + $drafts_active = ((isset($_GET['draft']) && intval($_GET['draft'])) ? 'active' : ''); + if ($drafts_active) { + $filter_active = 'drafts'; + } - $tabs[] = [ - 'label' => t('Drafts'), - 'icon' => 'floppy-o', - 'url' => z_root() . '/' . $cmd . '/?draft=1', - 'sel' => $drafts_active, - 'title' => t('Show drafts that I have saved') - ]; - } + $tabs[] = [ + 'label' => t('Drafts'), + 'icon' => 'floppy-o', + 'url' => z_root() . '/' . $cmd . '/?draft=1', + 'sel' => $drafts_active, + 'title' => t('Show drafts that I have saved') + ]; + } - if(x($_GET,'search')) { - $video_active = (($_GET['search'] == 'video]') ? 'active' : ''); - $filter_active = (($events_active) ? 'videos' : 'search'); - } + if (x($_GET, 'search')) { + $video_active = (($_GET['search'] == 'video]') ? 'active' : ''); + $filter_active = (($events_active) ? 'videos' : 'search'); + } - $tabs[] = [ - 'label' => t('Videos'), - 'icon' => 'video', - 'url' => z_root() . '/' . $cmd . '/?search=video%5D', - 'sel' => $video_active, - 'title' => t('Show posts that include videos') - ]; + $tabs[] = [ + 'label' => t('Videos'), + 'icon' => 'video', + 'url' => z_root() . '/' . $cmd . '/?search=video%5D', + 'sel' => $video_active, + 'title' => t('Show posts that include videos') + ]; - if(x($_GET,'verb')) { - $events_active = (($_GET['verb'] == '.Event') ? 'active' : ''); - $polls_active = (($_GET['verb'] == '.Question') ? 'active' : ''); - $filter_active = (($events_active) ? 'events' : 'polls'); - } + if (x($_GET, 'verb')) { + $events_active = (($_GET['verb'] == '.Event') ? 'active' : ''); + $polls_active = (($_GET['verb'] == '.Question') ? 'active' : ''); + $filter_active = (($events_active) ? 'events' : 'polls'); + } - $tabs[] = [ - 'label' => t('Events'), - 'icon' => 'calendar', - 'url' => z_root() . '/' . $cmd . '/?verb=%2EEvent', - 'sel' => $events_active, - 'title' => t('Show posts that include events') - ]; + $tabs[] = [ + 'label' => t('Events'), + 'icon' => 'calendar', + 'url' => z_root() . '/' . $cmd . '/?verb=%2EEvent', + 'sel' => $events_active, + 'title' => t('Show posts that include events') + ]; - $tabs[] = [ - 'label' => t('Polls'), - 'icon' => 'bar-chart', - 'url' => z_root() . '/' . $cmd . '/?verb=%2EQuestion', - 'sel' => $polls_active, - 'title' => t('Show posts that include polls') - ]; + $tabs[] = [ + 'label' => t('Polls'), + 'icon' => 'bar-chart', + 'url' => z_root() . '/' . $cmd . '/?verb=%2EQuestion', + 'sel' => $polls_active, + 'title' => t('Show posts that include polls') + ]; + $groups = q( + "SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + intval(local_channel()) + ); - $groups = q("SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", - intval(local_channel()) - ); + if ($groups || Apps::system_app_installed(local_channel(), 'Virtual Lists')) { + if ($groups) { + foreach ($groups as $g) { + if (x($_GET, 'gid')) { + $group_active = (($_GET['gid'] == $g['id']) ? 'active' : ''); + $filter_active = 'group'; + } + $gsub[] = [ + 'label' => $g['gname'], + 'icon' => '', + 'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $g['id'], + 'sel' => $group_active, + 'title' => sprintf(t('Show posts related to the %s access list'), $g['gname']) + ]; + } + } + if (Apps::system_app_installed(local_channel(), 'Virtual Lists')) { + foreach ([':1', ':2', ':3'] as $l) { + switch ($l) { + case ':1': + $gname = t('Connections'); + break; + case ':2': + $gname = t('Nomad'); + break; + case ':3': + $gname = t('ActivityPub'); + break; + default: + break; + } - if($groups || Apps::system_app_installed(local_channel(),'Virtual Lists')) { - if ($groups) { - foreach($groups as $g) { - if(x($_GET,'gid')) { - $group_active = (($_GET['gid'] == $g['id']) ? 'active' : ''); - $filter_active = 'group'; - } - $gsub[] = [ - 'label' => $g['gname'], - 'icon' => '', - 'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $g['id'], - 'sel' => $group_active, - 'title' => sprintf(t('Show posts related to the %s access list'), $g['gname']) - ]; - } - } - if (Apps::system_app_installed(local_channel(),'Virtual Lists')) { - foreach ([ ':1', ':2', ':3' ] as $l) { - switch ($l) { - case ':1': - $gname = t('Connections'); - break; - case ':2': - $gname = t('Nomad'); - break; - case ':3': - $gname = t('ActivityPub'); - break; - default: - break; - } + if (x($_GET, 'gid')) { + $group_active = (($_GET['gid'] == $l) ? 'active' : ''); + $filter_active = 'group'; + } - if(x($_GET,'gid')) { - $group_active = (($_GET['gid'] == $l) ? 'active' : ''); - $filter_active = 'group'; - } - - $gsub[] = [ - 'label' => $gname, - 'icon' => '', - 'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $l, - 'sel' => $group_active, - 'title' => sprintf(t('Show posts related to the %s access list'), $gname) - ]; - } - } - $tabs[] = [ - 'id' => 'privacy_groups', - 'label' => t('Lists'), - 'icon' => 'users', - 'url' => '#', - 'sel' => (($filter_active == 'group') ? true : false), - 'title' => t('Show my access lists'), - 'sub' => $gsub - ]; - } + $gsub[] = [ + 'label' => $gname, + 'icon' => '', + 'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $l, + 'sel' => $group_active, + 'title' => sprintf(t('Show posts related to the %s access list'), $gname) + ]; + } + } + $tabs[] = [ + 'id' => 'privacy_groups', + 'label' => t('Lists'), + 'icon' => 'users', + 'url' => '#', + 'sel' => (($filter_active == 'group') ? true : false), + 'title' => t('Show my access lists'), + 'sub' => $gsub + ]; + } - $forums = get_forum_channels(local_channel(),1); + $forums = get_forum_channels(local_channel(), 1); - if($forums) { - foreach($forums as $f) { - if(x($_GET,'pf') && x($_GET,'cid')) { - $forum_active = ((x($_GET,'pf') && $_GET['cid'] == $f['abook_id']) ? 'active' : ''); - $filter_active = 'forums'; - } - $fsub[] = [ - 'label' => $f['xchan_name'], - 'img' => $f['xchan_photo_s'], - 'url' => z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id'], - 'sel' => $forum_active, - 'title' => t('Show posts to this group'), - 'lock' => ((isset($f['private_forum']) && $f['private_forum']) ? 'lock' : ''), - 'edit' => t('New post'), - 'edit_url' => $f['xchan_url'] - ]; - } + if ($forums) { + foreach ($forums as $f) { + if (x($_GET, 'pf') && x($_GET, 'cid')) { + $forum_active = ((x($_GET, 'pf') && $_GET['cid'] == $f['abook_id']) ? 'active' : ''); + $filter_active = 'forums'; + } + $fsub[] = [ + 'label' => $f['xchan_name'], + 'img' => $f['xchan_photo_s'], + 'url' => z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id'], + 'sel' => $forum_active, + 'title' => t('Show posts to this group'), + 'lock' => ((isset($f['private_forum']) && $f['private_forum']) ? 'lock' : ''), + 'edit' => t('New post'), + 'edit_url' => $f['xchan_url'] + ]; + } - $tabs[] = [ - 'id' => 'forums', - 'label' => t('Groups'), - 'icon' => 'comments-o', - 'url' => '#', - 'sel' => (($filter_active == 'forums') ? true : false), - 'title' => t('Show groups'), - 'sub' => $fsub - ]; - } + $tabs[] = [ + 'id' => 'forums', + 'label' => t('Groups'), + 'icon' => 'comments-o', + 'url' => '#', + 'sel' => (($filter_active == 'forums') ? true : false), + 'title' => t('Show groups'), + 'sub' => $fsub + ]; + } - if(feature_enabled(local_channel(),'filing')) { - $terms = q("select distinct term from term where uid = %d and ttype = %d order by term asc", - intval(local_channel()), - intval(TERM_FILE) - ); + if (feature_enabled(local_channel(), 'filing')) { + $terms = q( + "select distinct term from term where uid = %d and ttype = %d order by term asc", + intval(local_channel()), + intval(TERM_FILE) + ); - if($terms) { - foreach($terms as $t) { - if(x($_GET,'file')) { - $file_active = (($_GET['file'] == $t['term']) ? 'active' : ''); - $filter_active = 'file'; - } - $tsub[] = [ - 'label' => $t['term'], - 'icon' => '', - 'url' => z_root() . '/' . $cmd . '/?f=&file=' . $t['term'], - 'sel' => $file_active, - 'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']), - ]; - } + if ($terms) { + foreach ($terms as $t) { + if (x($_GET, 'file')) { + $file_active = (($_GET['file'] == $t['term']) ? 'active' : ''); + $filter_active = 'file'; + } + $tsub[] = [ + 'label' => $t['term'], + 'icon' => '', + 'url' => z_root() . '/' . $cmd . '/?f=&file=' . $t['term'], + 'sel' => $file_active, + 'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']), + ]; + } - $tabs[] = [ - 'id' => 'saved_folders', - 'label' => t('Saved Folders'), - 'icon' => 'folder', - 'url' => '#', - 'sel' => (($filter_active == 'file') ? true : false), - 'title' => t('Show filed post categories'), - 'sub' => $tsub + $tabs[] = [ + 'id' => 'saved_folders', + 'label' => t('Saved Folders'), + 'icon' => 'folder', + 'url' => '#', + 'sel' => (($filter_active == 'file') ? true : false), + 'title' => t('Show filed post categories'), + 'sub' => $tsub - ]; - } - } + ]; + } + } - $ft = get_pconfig(local_channel(),'system','followed_tags', EMPTY_STR); - if (is_array($ft) && $ft) { - foreach($ft as $t) { - $tag_active = ((isset($_GET['netsearch']) && $_GET['netsearch'] === '#' . $t) ? 'active' : ''); - if ($tag_active) { - $filter_active = 'tags'; - } - - $tsub[] = [ - 'label' => '#' . $t, - 'icon' => '', - 'url' => z_root() . '/' . $cmd . '/?search=' . '%23' . $t, - 'sel' => $tag_active, - 'title' => sprintf(t('Show posts with hashtag %s'), '#' . $t), - ]; - } + $ft = get_pconfig(local_channel(), 'system', 'followed_tags', EMPTY_STR); + if (is_array($ft) && $ft) { + foreach ($ft as $t) { + $tag_active = ((isset($_GET['netsearch']) && $_GET['netsearch'] === '#' . $t) ? 'active' : ''); + if ($tag_active) { + $filter_active = 'tags'; + } - $tabs[] = [ - 'id' => 'followed_tags', - 'label' => t('Followed Hashtags'), - 'icon' => 'bookmark', - 'url' => '#', - 'sel' => (($filter_active == 'tags') ? true : false), - 'title' => t('Show followed hashtags'), - 'sub' => $tsub - ]; + $tsub[] = [ + 'label' => '#' . $t, + 'icon' => '', + 'url' => z_root() . '/' . $cmd . '/?search=' . '%23' . $t, + 'sel' => $tag_active, + 'title' => sprintf(t('Show posts with hashtag %s'), '#' . $t), + ]; + } - } + $tabs[] = [ + 'id' => 'followed_tags', + 'label' => t('Followed Hashtags'), + 'icon' => 'bookmark', + 'url' => '#', + 'sel' => (($filter_active == 'tags') ? true : false), + 'title' => t('Show followed hashtags'), + 'sub' => $tsub + ]; + } +// if(x($_GET,'search')) { +// $filter_active = 'search'; +// $tabs[] = [ +// 'label' => t('Search'), +// 'icon' => 'search', +// 'url' => z_root() . '/' . $cmd . '/?search=' . $_GET['search'], +// 'sel' => 'active disabled', +// 'title' => t('Panel search') +// ]; +// } -// if(x($_GET,'search')) { -// $filter_active = 'search'; -// $tabs[] = [ -// 'label' => t('Search'), -// 'icon' => 'search', -// 'url' => z_root() . '/' . $cmd . '/?search=' . $_GET['search'], -// 'sel' => 'active disabled', -// 'title' => t('Panel search') -// ]; -// } + $name = []; + if (isset($_GET['name']) && $_GET['name']) { + $filter_active = 'name'; + } + $name = [ + 'label' => x($_GET, 'name') ? $_GET['name'] : t('Name'), + 'icon' => 'filter', + 'url' => z_root() . '/' . $cmd . '/', + 'sel' => $filter_active == 'name' ? 'is-valid' : '', + 'title' => '' + ]; - $name = []; - if(isset($_GET['name']) && $_GET['name']) { - $filter_active = 'name'; - } - $name = [ - 'label' => x($_GET,'name') ? $_GET['name'] : t('Name'), - 'icon' => 'filter', - 'url'=> z_root() . '/' . $cmd . '/', - 'sel'=> $filter_active == 'name' ? 'is-valid' : '', - 'title' => '' - ]; + $reset = []; + if ($filter_active) { + $reset = [ + 'label' => '', + 'icon' => 'remove', + 'url' => z_root() . '/' . $cmd, + 'sel' => '', + 'title' => t('Remove active filter') + ]; + } - $reset = []; - if ($filter_active) { - $reset = [ - 'label' => '', - 'icon' => 'remove', - 'url'=> z_root() . '/' . $cmd, - 'sel'=> '', - 'title' => t('Remove active filter') - ]; - } + $arr = ['tabs' => $tabs]; - $arr = ['tabs' => $tabs]; + call_hooks('activity_filter', $arr); - call_hooks('activity_filter', $arr); + $o = ''; - $o = ''; + if ($arr['tabs']) { + $content = replace_macros(get_markup_template('common_pills.tpl'), [ + '$pills' => $arr['tabs'] + ]); - if($arr['tabs']) { - $content = replace_macros(get_markup_template('common_pills.tpl'), [ - '$pills' => $arr['tabs'] - ]); - - $o .= replace_macros(get_markup_template('activity_filter_widget.tpl'), [ - '$title' => t('Stream Filters'), - '$reset' => $reset, - '$content' => $content, - '$name' => $name - ]); - } - - return $o; - - } + $o .= replace_macros(get_markup_template('activity_filter_widget.tpl'), [ + '$title' => t('Stream Filters'), + '$reset' => $reset, + '$content' => $content, + '$name' => $name + ]); + } + return $o; + } } diff --git a/Zotlabs/Widget/Admin.php b/Zotlabs/Widget/Admin.php index b4eec9940..2cb617ef2 100644 --- a/Zotlabs/Widget/Admin.php +++ b/Zotlabs/Widget/Admin.php @@ -2,69 +2,71 @@ namespace Zotlabs\Widget; -class Admin { +use App; - function widget($arr) { +class Admin +{ - /* - * Side bar links - */ + public function widget($arr) + { - if(! is_site_admin()) { - return ''; - } + /* + * Side bar links + */ - $o = ''; + if (!is_site_admin()) { + return ''; + } - // array( url, name, extra css classes ) + $o = ''; - $aside = [ - 'site' => array(z_root() . '/admin/site/', t('Site'), 'site'), -// 'profile_photo' => array(z_root() . '/admin/profile_photo', t('Site icon/logo'), 'profile_photo'), -// 'cover_photo' => array(z_root() . '/admin/cover_photo', t('Site photo'), 'cover_photo'), - 'accounts' => array(z_root() . '/admin/accounts/', t('Accounts'), 'accounts', 'pending-update', t('Member registrations waiting for confirmation')), - 'channels' => array(z_root() . '/admin/channels/', t('Channels'), 'channels'), - 'security' => array(z_root() . '/admin/security/', t('Security'), 'security'), -// 'features' => array(z_root() . '/admin/features/', t('Features'), 'features'), - 'addons' => array(z_root() . '/admin/addons/', t('Addons'), 'addons'), - 'themes' => array(z_root() . '/admin/themes/', t('Themes'), 'themes'), - 'queue' => array(z_root() . '/admin/queue', t('Inspect queue'), 'queue'), -// 'profs' => array(z_root() . '/admin/profs', t('Profile Fields'), 'profs'), - 'dbsync' => array(z_root() . '/admin/dbsync/', t('DB updates'), 'dbsync') - ]; + // array( url, name, extra css classes ) - /* get plugins admin page */ + $aside = [ + 'site' => array(z_root() . '/admin/site/', t('Site'), 'site'), +// 'profile_photo' => array(z_root() . '/admin/profile_photo', t('Site icon/logo'), 'profile_photo'), +// 'cover_photo' => array(z_root() . '/admin/cover_photo', t('Site photo'), 'cover_photo'), + 'accounts' => array(z_root() . '/admin/accounts/', t('Accounts'), 'accounts', 'pending-update', t('Member registrations waiting for confirmation')), + 'channels' => array(z_root() . '/admin/channels/', t('Channels'), 'channels'), + 'security' => array(z_root() . '/admin/security/', t('Security'), 'security'), +// 'features' => array(z_root() . '/admin/features/', t('Features'), 'features'), + 'addons' => array(z_root() . '/admin/addons/', t('Addons'), 'addons'), + 'themes' => array(z_root() . '/admin/themes/', t('Themes'), 'themes'), + 'queue' => array(z_root() . '/admin/queue', t('Inspect queue'), 'queue'), +// 'profs' => array(z_root() . '/admin/profs', t('Profile Fields'), 'profs'), + 'dbsync' => array(z_root() . '/admin/dbsync/', t('DB updates'), 'dbsync') + ]; - $r = q("SELECT * FROM addon WHERE plugin_admin = 1"); + /* get plugins admin page */ - $plugins = []; - if($r) { - foreach ($r as $h){ - $plugin = $h['aname']; - $plugins[] = array(z_root() . '/admin/addons/' . $plugin, $plugin, 'plugin'); - // temp plugins with admin - \App::$plugins_admin[] = $plugin; - } - } + $r = q("SELECT * FROM addon WHERE plugin_admin = 1"); - $logs = array(z_root() . '/admin/logs/', t('Logs'), 'logs'); + $plugins = []; + if ($r) { + foreach ($r as $h) { + $plugin = $h['aname']; + $plugins[] = array(z_root() . '/admin/addons/' . $plugin, $plugin, 'plugin'); + // temp plugins with admin + App::$plugins_admin[] = $plugin; + } + } - $arr = array('links' => $aside,'plugins' => $plugins,'logs' => $logs); - call_hooks('admin_aside',$arr); + $logs = array(z_root() . '/admin/logs/', t('Logs'), 'logs'); - $o .= replace_macros(get_markup_template('admin_aside.tpl'), array( - '$admin' => $aside, - '$admtxt' => t('Admin'), - '$plugadmtxt' => t('Addon Features'), - '$plugins' => $plugins, - '$logtxt' => t('Logs'), - '$logs' => $logs, - '$h_pending' => t('Member registrations waiting for confirmation'), - '$admurl'=> z_root() . '/admin/' - )); + $arr = array('links' => $aside, 'plugins' => $plugins, 'logs' => $logs); + call_hooks('admin_aside', $arr); - return $o; + $o .= replace_macros(get_markup_template('admin_aside.tpl'), array( + '$admin' => $aside, + '$admtxt' => t('Admin'), + '$plugadmtxt' => t('Addon Features'), + '$plugins' => $plugins, + '$logtxt' => t('Logs'), + '$logs' => $logs, + '$h_pending' => t('Member registrations waiting for confirmation'), + '$admurl' => z_root() . '/admin/' + )); - } + return $o; + } } - diff --git a/Zotlabs/Widget/Affinity.php b/Zotlabs/Widget/Affinity.php index bcd54f9cf..ecca26414 100644 --- a/Zotlabs/Widget/Affinity.php +++ b/Zotlabs/Widget/Affinity.php @@ -4,46 +4,47 @@ namespace Zotlabs\Widget; use Zotlabs\Lib\Apps; -class Affinity { +class Affinity +{ - function widget($arr) { + public function widget($arr) + { - if(! local_channel()) - return ''; - - $default_cmin = ((Apps::system_app_installed(local_channel(),'Friend Zoom')) ? get_pconfig(local_channel(),'affinity','cmin',0) : 0); - $default_cmax = ((Apps::system_app_installed(local_channel(),'Friend Zoom')) ? get_pconfig(local_channel(),'affinity','cmax',99) : 99); + if (!local_channel()) { + return ''; + } - $cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : $default_cmin); - $cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : $default_cmax); + $default_cmin = ((Apps::system_app_installed(local_channel(), 'Friend Zoom')) ? get_pconfig(local_channel(), 'affinity', 'cmin', 0) : 0); + $default_cmax = ((Apps::system_app_installed(local_channel(), 'Friend Zoom')) ? get_pconfig(local_channel(), 'affinity', 'cmax', 99) : 99); + + $cmin = ((x($_REQUEST, 'cmin')) ? intval($_REQUEST['cmin']) : $default_cmin); + $cmax = ((x($_REQUEST, 'cmax')) ? intval($_REQUEST['cmax']) : $default_cmax); - if(Apps::system_app_installed(local_channel(),'Friend Zoom')) { + if (Apps::system_app_installed(local_channel(), 'Friend Zoom')) { + $labels = array( + 0 => t('Me'), + 20 => t('Family'), + 40 => t('Friends'), + 60 => t('Peers'), + 80 => t('Connections'), + 99 => t('All') + ); + call_hooks('affinity_labels', $labels); - $labels = array( - 0 => t('Me'), - 20 => t('Family'), - 40 => t('Friends'), - 60 => t('Peers'), - 80 => t('Connections'), - 99 => t('All') - ); - call_hooks('affinity_labels',$labels); + $tpl = get_markup_template('main_slider.tpl'); + $x = replace_macros($tpl, [ + '$cmin' => $cmin, + '$cmax' => $cmax, + '$lbl' => t('Friend zoom in/out'), + '$refresh' => t('Refresh'), + '$labels' => $labels, + ]); - $tpl = get_markup_template('main_slider.tpl'); - $x = replace_macros($tpl, [ - '$cmin' => $cmin, - '$cmax' => $cmax, - '$lbl' => t('Friend zoom in/out'), - '$refresh' => t('Refresh'), - '$labels' => $labels, - ]); - - $arr = array('html' => $x); - call_hooks('main_slider',$arr); - return $arr['html']; - } - return ''; - } + $arr = array('html' => $x); + call_hooks('main_slider', $arr); + return $arr['html']; + } + return ''; + } } - \ No newline at end of file diff --git a/Zotlabs/Widget/Album.php b/Zotlabs/Widget/Album.php index 45d941d75..500cf601e 100644 --- a/Zotlabs/Widget/Album.php +++ b/Zotlabs/Widget/Album.php @@ -3,108 +3,113 @@ namespace Zotlabs\Widget; use App; + require_once('include/attach.php'); -class Album { +class Album +{ - function widget($args) { + public function widget($args) + { - $owner_uid = App::$profile_uid; - $sql_extra = permissions_sql($owner_uid); + $owner_uid = App::$profile_uid; + $sql_extra = permissions_sql($owner_uid); - if (! perm_is_allowed($owner_uid,get_observer_hash(),'view_storage')) { - return ''; - } + if (!perm_is_allowed($owner_uid, get_observer_hash(), 'view_storage')) { + return ''; + } - if ($args['album']) { - $album = $args['album']; - } - if ($args['title']) { - $title = $args['title']; - } - - /** - * This may return incorrect permissions if you have multiple directories of the same name. - * It is a limitation of the photo table using a name for a photo album instead of a folder hash - */ + if ($args['album']) { + $album = $args['album']; + } + if ($args['title']) { + $title = $args['title']; + } - if ($album) { - $x = q("select hash from attach where filename = '%s' and uid = %d limit 1", - dbesc($album), - intval($owner_uid) - ); - if($x) { - $y = attach_can_view_folder($owner_uid,get_observer_hash(),$x[0]['hash']); - if(! $y) - return ''; - } - } + /** + * This may return incorrect permissions if you have multiple directories of the same name. + * It is a limitation of the photo table using a name for a photo album instead of a folder hash + */ - $order = 'DESC'; + if ($album) { + $x = q( + "select hash from attach where filename = '%s' and uid = %d limit 1", + dbesc($album), + intval($owner_uid) + ); + if ($x) { + $y = attach_can_view_folder($owner_uid, get_observer_hash(), $x[0]['hash']); + if (!$y) { + return ''; + } + } + } - $r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN + $order = 'DESC'; + + $r = q( + "SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN (SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 AND photo_usage IN ( %d, %d ) $sql_extra GROUP BY resource_id) ph ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale) ORDER BY created $order ", - intval($owner_uid), - dbesc($album), - intval(PHOTO_NORMAL), - intval(PHOTO_PROFILE) - ); + intval($owner_uid), + dbesc($album), + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE) + ); - //edit album name - $album_edit = null; + //edit album name + $album_edit = null; - $photos = []; - if($r) { - $twist = 'rotright'; - foreach($r as $rr) { + $photos = []; + if ($r) { + $twist = 'rotright'; + foreach ($r as $rr) { + if ($twist == 'rotright') { + $twist = 'rotleft'; + } else { + $twist = 'rotright'; + } - if($twist == 'rotright') - $twist = 'rotleft'; - else - $twist = 'rotright'; + $ext = $phototypes[$rr['mimetype']]; - $ext = $phototypes[$rr['mimetype']]; + $imgalt_e = $rr['filename']; + $desc_e = $rr['description']; - $imgalt_e = $rr['filename']; - $desc_e = $rr['description']; - - $imagelink = (z_root() . '/photos/' . \App::$profile['channel_address'] . '/image/' . $rr['resource_id']); + $imagelink = (z_root() . '/photos/' . App::$profile['channel_address'] . '/image/' . $rr['resource_id']); - $photos[] = array( - 'id' => $rr['id'], - 'twist' => ' ' . $twist . rand(2,4), - 'link' => $imagelink, - 'title' => t('View Photo'), - 'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext, - 'alt' => $imgalt_e, - 'desc'=> $desc_e, - 'ext' => $ext, - 'hash'=> $rr['resource_id'], - 'unknown' => t('Unknown') - ); - } - } + $photos[] = array( + 'id' => $rr['id'], + 'twist' => ' ' . $twist . rand(2, 4), + 'link' => $imagelink, + 'title' => t('View Photo'), + 'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' . $ext, + 'alt' => $imgalt_e, + 'desc' => $desc_e, + 'ext' => $ext, + 'hash' => $rr['resource_id'], + 'unknown' => t('Unknown') + ); + } + } - $tpl = get_markup_template('photo_album.tpl'); - $o .= replace_macros($tpl, array( - '$photos' => $photos, - '$album' => (($title) ? $title : $album), - '$album_id' => rand(), - '$album_edit' => array(t('Edit Album'), $album_edit), - '$can_post' => false, - '$upload' => array(t('Upload'), z_root() . '/photos/' . App::$profile['channel_address'] . '/upload/' . bin2hex($album)), - '$order' => false, - '$upload_form' => $upload_form, - '$usage' => $usage_message - )); - - return $o; - } + $tpl = get_markup_template('photo_album.tpl'); + $o .= replace_macros($tpl, array( + '$photos' => $photos, + '$album' => (($title) ? $title : $album), + '$album_id' => rand(), + '$album_edit' => array(t('Edit Album'), $album_edit), + '$can_post' => false, + '$upload' => array(t('Upload'), z_root() . '/photos/' . App::$profile['channel_address'] . '/upload/' . bin2hex($album)), + '$order' => false, + '$upload_form' => $upload_form, + '$usage' => $usage_message + )); + + return $o; + } } - diff --git a/Zotlabs/Widget/Appcategories.php b/Zotlabs/Widget/Appcategories.php index c698be069..2544ffd7f 100644 --- a/Zotlabs/Widget/Appcategories.php +++ b/Zotlabs/Widget/Appcategories.php @@ -2,28 +2,33 @@ namespace Zotlabs\Widget; -class Appcategories { +class Appcategories +{ - function widget($arr) { + public function widget($arr) + { - if(! local_channel()) - return ''; + if (!local_channel()) { + return ''; + } - $selected = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : ''); + $selected = ((x($_REQUEST, 'cat')) ? htmlspecialchars($_REQUEST['cat'], ENT_COMPAT, 'UTF-8') : ''); - // @FIXME ??? $srchurl undefined here - commented out until is reviewed - //$srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&'); - //$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); + // @FIXME ??? $srchurl undefined here - commented out until is reviewed + //$srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&'); + //$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); - // Leaving this line which negates the effect of the two invalid lines prior - $srchurl = z_root() . '/apps'; - if(argc() > 1 && argv(1) === 'available') - $srchurl .= '/available'; + // Leaving this line which negates the effect of the two invalid lines prior + $srchurl = z_root() . '/apps'; + if (argc() > 1 && argv(1) === 'available') { + $srchurl .= '/available'; + } - $terms = []; + $terms = []; - $r = q("select distinct(term.term) + $r = q( + "select distinct(term.term) from term join app on term.oid = app.id where app_channel = %d and term.uid = app_channel @@ -31,23 +36,24 @@ class Appcategories { and term.term != 'nav_featured_app' and term.term != 'nav_pinned_app' order by term.term asc", - intval(local_channel()), - intval(TERM_OBJ_APP) - ); + intval(local_channel()), + intval(TERM_OBJ_APP) + ); - if($r) { - foreach($r as $rr) - $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : '')); + if ($r) { + foreach ($r as $rr) { + $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : '')); + } - return replace_macros(get_markup_template('categories_widget.tpl'),array( - '$title' => t('Categories'), - '$desc' => '', - '$sel_all' => (($selected == '') ? 'selected' : ''), - '$all' => t('Everything'), - '$terms' => $terms, - '$base' => $srchurl, + return replace_macros(get_markup_template('categories_widget.tpl'), array( + '$title' => t('Categories'), + '$desc' => '', + '$sel_all' => (($selected == '') ? 'selected' : ''), + '$all' => t('Everything'), + '$terms' => $terms, + '$base' => $srchurl, - )); - } - } + )); + } + } } diff --git a/Zotlabs/Widget/Appcloud.php b/Zotlabs/Widget/Appcloud.php index 2a4671eee..f3cbe74c2 100644 --- a/Zotlabs/Widget/Appcloud.php +++ b/Zotlabs/Widget/Appcloud.php @@ -2,12 +2,14 @@ namespace Zotlabs\Widget; -class Appcloud { +class Appcloud +{ - function widget($arr) { - if(! local_channel()) - return ''; - return app_tagblock(z_root() . '/apps'); - } + public function widget($arr) + { + if (!local_channel()) { + return ''; + } + return app_tagblock(z_root() . '/apps'); + } } - diff --git a/Zotlabs/Widget/Appstore.php b/Zotlabs/Widget/Appstore.php index 0f5d29ee7..18cdca009 100644 --- a/Zotlabs/Widget/Appstore.php +++ b/Zotlabs/Widget/Appstore.php @@ -2,17 +2,18 @@ namespace Zotlabs\Widget; +class Appstore +{ -class Appstore { - - function widget($arr) { - $store = ((argc() > 1 && argv(1) === 'available') ? 1 : 0); - return replace_macros(get_markup_template('appstore.tpl'), [ - '$title' => t('App Collections'), - '$options' => [ - [ z_root() . '/apps', t('Installed Apps'), 1 - $store ], - [ z_root() . '/apps/available', t('Available Apps'), $store ] - ] - ]); - } + public function widget($arr) + { + $store = ((argc() > 1 && argv(1) === 'available') ? 1 : 0); + return replace_macros(get_markup_template('appstore.tpl'), [ + '$title' => t('App Collections'), + '$options' => [ + [z_root() . '/apps', t('Installed Apps'), 1 - $store], + [z_root() . '/apps/available', t('Available Apps'), $store] + ] + ]); + } } diff --git a/Zotlabs/Widget/Archive.php b/Zotlabs/Widget/Archive.php index 9adaac38f..a12cf1205 100644 --- a/Zotlabs/Widget/Archive.php +++ b/Zotlabs/Widget/Archive.php @@ -2,54 +2,59 @@ namespace Zotlabs\Widget; +use App; -class Archive { +class Archive +{ - function widget($arr) { + public function widget($arr) + { - $o = ''; + $o = ''; - if(! \App::$profile_uid) { - return ''; - } + if (!App::$profile_uid) { + return ''; + } - $uid = \App::$profile_uid; + $uid = App::$profile_uid; - if(! feature_enabled($uid,'archives')) - return ''; + if (!feature_enabled($uid, 'archives')) { + return ''; + } - if(! perm_is_allowed($uid,get_observer_hash(),'view_stream')) - return ''; + if (!perm_is_allowed($uid, get_observer_hash(), 'view_stream')) { + return ''; + } - $wall = ((array_key_exists('wall', $arr)) ? intval($arr['wall']) : 0); - $wall = ((array_key_exists('articles', $arr)) ? 2 : $wall); + $wall = ((array_key_exists('wall', $arr)) ? intval($arr['wall']) : 0); + $wall = ((array_key_exists('articles', $arr)) ? 2 : $wall); - $style = ((array_key_exists('style', $arr)) ? $arr['style'] : 'select'); - $showend = ((get_pconfig($uid,'system','archive_show_end_date')) ? true : false); - $mindate = get_pconfig($uid,'system','archive_mindate'); - $visible_years = get_pconfig($uid,'system','archive_visible_years',5); + $style = ((array_key_exists('style', $arr)) ? $arr['style'] : 'select'); + $showend = ((get_pconfig($uid, 'system', 'archive_show_end_date')) ? true : false); + $mindate = get_pconfig($uid, 'system', 'archive_mindate'); + $visible_years = get_pconfig($uid, 'system', 'archive_visible_years', 5); - $url = z_root() . '/' . \App::$cmd; + $url = z_root() . '/' . App::$cmd; - $ret = list_post_dates($uid,$wall,$mindate); + $ret = list_post_dates($uid, $wall, $mindate); - if(! count($ret)) - return ''; + if (!count($ret)) { + return ''; + } - $cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years; - $cutoff = ((array_key_exists($cutoff_year,$ret))? true : false); + $cutoff_year = intval(datetime_convert('', date_default_timezone_get(), 'now', 'Y')) - $visible_years; + $cutoff = ((array_key_exists($cutoff_year, $ret)) ? true : false); - $o = replace_macros(get_markup_template('posted_date_widget.tpl'),array( - '$title' => t('Archives'), - '$size' => $visible_years, - '$cutoff_year' => $cutoff_year, - '$cutoff' => $cutoff, - '$url' => $url, - '$style' => $style, - '$showend' => $showend, - '$dates' => $ret - )); - return $o; - } + $o = replace_macros(get_markup_template('posted_date_widget.tpl'), array( + '$title' => t('Archives'), + '$size' => $visible_years, + '$cutoff_year' => $cutoff_year, + '$cutoff' => $cutoff, + '$url' => $url, + '$style' => $style, + '$showend' => $showend, + '$dates' => $ret + )); + return $o; + } } - diff --git a/Zotlabs/Widget/Bookmarkedchats.php b/Zotlabs/Widget/Bookmarkedchats.php index d64bbdb4b..2584a5e2a 100644 --- a/Zotlabs/Widget/Bookmarkedchats.php +++ b/Zotlabs/Widget/Bookmarkedchats.php @@ -2,27 +2,34 @@ namespace Zotlabs\Widget; -class Bookmarkedchats { +use App; - function widget($arr) { +class Bookmarkedchats +{ - if(! feature_enabled(\App::$profile['profile_uid'],'ajaxchat')) - return ''; + public function widget($arr) + { - $h = get_observer_hash(); - if(! $h) - return; - $r = q("select xchat_url, xchat_desc from xchat where xchat_xchan = '%s' order by xchat_desc", - dbesc($h) - ); - if($r) { - for($x = 0; $x < count($r); $x ++) { - $r[$x]['xchat_url'] = zid($r[$x]['xchat_url']); - } - } - return replace_macros(get_markup_template('bookmarkedchats.tpl'),array( - '$header' => t('Bookmarked Chatrooms'), - '$rooms' => $r - )); - } + if (!feature_enabled(App::$profile['profile_uid'], 'ajaxchat')) { + return ''; + } + + $h = get_observer_hash(); + if (!$h) { + return; + } + $r = q( + "select xchat_url, xchat_desc from xchat where xchat_xchan = '%s' order by xchat_desc", + dbesc($h) + ); + if ($r) { + for ($x = 0; $x < count($r); $x++) { + $r[$x]['xchat_url'] = zid($r[$x]['xchat_url']); + } + } + return replace_macros(get_markup_template('bookmarkedchats.tpl'), array( + '$header' => t('Bookmarked Chatrooms'), + '$rooms' => $r + )); + } } diff --git a/Zotlabs/Widget/Catcloud.php b/Zotlabs/Widget/Catcloud.php index f21fe55fd..4cab3218e 100644 --- a/Zotlabs/Widget/Catcloud.php +++ b/Zotlabs/Widget/Catcloud.php @@ -2,45 +2,47 @@ namespace Zotlabs\Widget; -class Catcloud { +use App; - function widget($arr) { +class Catcloud +{ - if((! \App::$profile['profile_uid']) || (! \App::$profile['channel_hash'])) - return ''; + public function widget($arr) + { - $limit = ((array_key_exists('limit',$arr)) ? intval($arr['limit']) : 50); + if ((!App::$profile['profile_uid']) || (!App::$profile['channel_hash'])) { + return ''; + } - if(array_key_exists('type',$arr)) { - switch($arr['type']) { + $limit = ((array_key_exists('limit', $arr)) ? intval($arr['limit']) : 50); - case 'cards': + if (array_key_exists('type', $arr)) { + switch ($arr['type']) { + case 'cards': + if (!perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_pages')) { + return ''; + } - if(! perm_is_allowed(\App::$profile['profile_uid'], get_observer_hash(), 'view_pages')) - return ''; + return card_catblock(App::$profile['profile_uid'], $limit, '', App::$profile['channel_hash']); - return card_catblock(\App::$profile['profile_uid'], $limit, '', \App::$profile['channel_hash']); + case 'articles': + if (!perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_articles')) { + return ''; + } - case 'articles': - - if(! perm_is_allowed(\App::$profile['profile_uid'], get_observer_hash(), 'view_articles')) - return ''; - - return article_catblock(\App::$profile['profile_uid'], $limit, '', \App::$profile['channel_hash']); + return article_catblock(App::$profile['profile_uid'], $limit, '', App::$profile['channel_hash']); - default: - break; - } - } + default: + break; + } + } - if(! perm_is_allowed(\App::$profile['profile_uid'], get_observer_hash(), 'view_stream')) - return ''; - - return catblock(\App::$profile['profile_uid'], $limit, '', \App::$profile['channel_hash']); - - - } + if (!perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_stream')) { + return ''; + } + return catblock(App::$profile['profile_uid'], $limit, '', App::$profile['channel_hash']); + } } diff --git a/Zotlabs/Widget/Catcloud_wall.php b/Zotlabs/Widget/Catcloud_wall.php index 4e06a8e1c..4a1b9b50d 100644 --- a/Zotlabs/Widget/Catcloud_wall.php +++ b/Zotlabs/Widget/Catcloud_wall.php @@ -4,18 +4,21 @@ namespace Zotlabs\Widget; use App; -class Catcloud_wall { +class Catcloud_wall +{ - function widget($arr) { + public function widget($arr) + { - if((! App::$profile['profile_uid']) || (! App::$profile['channel_hash'])) - return ''; - if(! perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_stream')) - return ''; + if ((!App::$profile['profile_uid']) || (!App::$profile['channel_hash'])) { + return ''; + } + if (!perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_stream')) { + return ''; + } - $limit = ((array_key_exists('limit',$arr)) ? intval($arr['limit']) : 50); - - return catblock(App::$profile['profile_uid'], $limit, '', App::$profile['channel_hash'], 'wall'); - } + $limit = ((array_key_exists('limit', $arr)) ? intval($arr['limit']) : 50); + return catblock(App::$profile['profile_uid'], $limit, '', App::$profile['channel_hash'], 'wall'); + } } diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php index 7170a3ded..cd26dba18 100644 --- a/Zotlabs/Widget/Categories.php +++ b/Zotlabs/Widget/Categories.php @@ -5,54 +5,63 @@ namespace Zotlabs\Widget; use App; use Zotlabs\Lib\Apps; -class Categories { +class Categories +{ - function widget($arr) { + public function widget($arr) + { - $cards = ((array_key_exists('cards',$arr) && $arr['cards']) ? true : false); + $cards = ((array_key_exists('cards', $arr) && $arr['cards']) ? true : false); - if(($cards) && (! Apps::system_app_installed(App::$profile['profile_uid'], 'Cards'))) - return ''; + if (($cards) && (!Apps::system_app_installed(App::$profile['profile_uid'], 'Cards'))) { + return ''; + } - $articles = ((array_key_exists('articles',$arr) && $arr['articles']) ? true : false); + $articles = ((array_key_exists('articles', $arr) && $arr['articles']) ? true : false); - if(($articles) && (! Apps::addon_app_installed(App::$profile['profile_uid'],'articles'))) - return ''; + if (($articles) && (!Apps::addon_app_installed(App::$profile['profile_uid'], 'articles'))) { + return ''; + } - if((! App::$profile['profile_uid']) - || (! perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),(($cards || $articles) ? 'view_pages' : 'view_articles')))) { - return ''; - } + if ( + (!App::$profile['profile_uid']) + || (!perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), (($cards || $articles) ? 'view_pages' : 'view_articles'))) + ) { + return ''; + } - $cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : ''); - $srchurl = (($cards) ? App::$argv[0] . '/' . App::$argv[1] : App::$query_string); - $srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&'); - $srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); + $cat = ((x($_REQUEST, 'cat')) ? htmlspecialchars($_REQUEST['cat'], ENT_COMPAT, 'UTF-8') : ''); + $srchurl = (($cards) ? App::$argv[0] . '/' . App::$argv[1] : App::$query_string); + $srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is', '', $srchurl), '&'); + $srchurl = str_replace(array('?f=', '&f='), array('', ''), $srchurl); - if($cards) - return self::cardcategories_widget($srchurl, $cat); - elseif($articles) - return self::articlecategories_widget($srchurl, $cat); - else - return self::categories_widget($srchurl, $cat); - - } + if ($cards) { + return self::cardcategories_widget($srchurl, $cat); + } elseif ($articles) { + return self::articlecategories_widget($srchurl, $cat); + } else { + return self::categories_widget($srchurl, $cat); + } + } - static function articlecategories_widget($baseurl,$selected = '') { - - if(! Apps::system_app_installed(App::$profile['profile_uid'],'Categories')) - return ''; + public static function articlecategories_widget($baseurl, $selected = '') + { - $sql_extra = item_permissions_sql(App::$profile['profile_uid']); + if (!Apps::system_app_installed(App::$profile['profile_uid'], 'Categories')) { + return ''; + } - $item_normal = "and item.item_hidden = 0 and item.item_type = 7 and item.item_deleted = 0 + $sql_extra = item_permissions_sql(App::$profile['profile_uid']); + + $item_normal = "and item.item_hidden = 0 and item.item_type = 7 and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_blocked = 0 "; - $terms = []; - $r = q("select distinct(term.term) + $terms = []; + $r = q( + "select distinct(term.term) from term join item on term.oid = item.id where item.uid = %d and term.uid = item.uid @@ -62,41 +71,45 @@ class Categories { $item_normal $sql_extra order by term.term asc", - intval(App::$profile['profile_uid']), - intval(TERM_CATEGORY), - intval(TERM_OBJ_POST), - dbesc(App::$profile['channel_hash']) - ); - if($r && count($r)) { - foreach($r as $rr) - $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : '')); + intval(App::$profile['profile_uid']), + intval(TERM_CATEGORY), + intval(TERM_OBJ_POST), + dbesc(App::$profile['channel_hash']) + ); + if ($r && count($r)) { + foreach ($r as $rr) { + $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : '')); + } - return replace_macros(get_markup_template('categories_widget.tpl'),array( - '$title' => t('Categories'), - '$desc' => '', - '$sel_all' => (($selected == '') ? 'selected' : ''), - '$all' => t('Everything'), - '$terms' => $terms, - '$base' => $baseurl, + return replace_macros(get_markup_template('categories_widget.tpl'), array( + '$title' => t('Categories'), + '$desc' => '', + '$sel_all' => (($selected == '') ? 'selected' : ''), + '$all' => t('Everything'), + '$terms' => $terms, + '$base' => $baseurl, - )); - } - return ''; - } + )); + } + return ''; + } - static function cardcategories_widget($baseurl,$selected = '') { - - if(! Apps::system_app_installed(App::$profile['profile_uid'],'Categories')) - return ''; + public static function cardcategories_widget($baseurl, $selected = '') + { - $sql_extra = item_permissions_sql(App::$profile['profile_uid']); + if (!Apps::system_app_installed(App::$profile['profile_uid'], 'Categories')) { + return ''; + } - $item_normal = "and item.item_hidden = 0 and item.item_type = 6 and item.item_deleted = 0 + $sql_extra = item_permissions_sql(App::$profile['profile_uid']); + + $item_normal = "and item.item_hidden = 0 and item.item_type = 6 and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_blocked = 0 "; - $terms = []; - $r = q("select distinct(term.term) + $terms = []; + $r = q( + "select distinct(term.term) from term join item on term.oid = item.id where item.uid = %d and term.uid = item.uid @@ -106,42 +119,46 @@ class Categories { $item_normal $sql_extra order by term.term asc", - intval(App::$profile['profile_uid']), - intval(TERM_CATEGORY), - intval(TERM_OBJ_POST), - dbesc(App::$profile['channel_hash']) - ); - if($r && count($r)) { - foreach($r as $rr) - $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : '')); + intval(App::$profile['profile_uid']), + intval(TERM_CATEGORY), + intval(TERM_OBJ_POST), + dbesc(App::$profile['channel_hash']) + ); + if ($r && count($r)) { + foreach ($r as $rr) { + $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : '')); + } - return replace_macros(get_markup_template('categories_widget.tpl'),array( - '$title' => t('Categories'), - '$desc' => '', - '$sel_all' => (($selected == '') ? 'selected' : ''), - '$all' => t('Everything'), - '$terms' => $terms, - '$base' => $baseurl, + return replace_macros(get_markup_template('categories_widget.tpl'), array( + '$title' => t('Categories'), + '$desc' => '', + '$sel_all' => (($selected == '') ? 'selected' : ''), + '$all' => t('Everything'), + '$terms' => $terms, + '$base' => $baseurl, - )); - } - return ''; - } + )); + } + return ''; + } - static function categories_widget($baseurl,$selected = '') { - - if(! Apps::system_app_installed(App::$profile['profile_uid'],'Categories')) - return ''; + public static function categories_widget($baseurl, $selected = '') + { - require_once('include/security.php'); + if (!Apps::system_app_installed(App::$profile['profile_uid'], 'Categories')) { + return ''; + } - $sql_extra = item_permissions_sql(App::$profile['profile_uid']); - - $item_normal = item_normal(); + require_once('include/security.php'); - $terms = []; - $r = q("select distinct(term.term) from term join item on term.oid = item.id + $sql_extra = item_permissions_sql(App::$profile['profile_uid']); + + $item_normal = item_normal(); + + $terms = []; + $r = q( + "select distinct(term.term) from term join item on term.oid = item.id where item.uid = %d and term.uid = item.uid and term.ttype = %d @@ -152,27 +169,27 @@ class Categories { $item_normal $sql_extra order by term.term asc", - intval(App::$profile['profile_uid']), - intval(TERM_CATEGORY), - intval(TERM_OBJ_POST), - dbesc(App::$profile['channel_hash']), - dbesc(ACTIVITY_UPDATE) - ); - if($r && count($r)) { - foreach($r as $rr) - $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : '')); + intval(App::$profile['profile_uid']), + intval(TERM_CATEGORY), + intval(TERM_OBJ_POST), + dbesc(App::$profile['channel_hash']), + dbesc(ACTIVITY_UPDATE) + ); + if ($r && count($r)) { + foreach ($r as $rr) { + $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : '')); + } - return replace_macros(get_markup_template('categories_widget.tpl'),array( - '$title' => t('Categories'), - '$desc' => '', - '$sel_all' => (($selected == '') ? 'selected' : ''), - '$all' => t('Everything'), - '$terms' => $terms, - '$base' => $baseurl, - - )); - } - return ''; - } + return replace_macros(get_markup_template('categories_widget.tpl'), array( + '$title' => t('Categories'), + '$desc' => '', + '$sel_all' => (($selected == '') ? 'selected' : ''), + '$all' => t('Everything'), + '$terms' => $terms, + '$base' => $baseurl, + )); + } + return ''; + } } diff --git a/Zotlabs/Widget/Cdav.php b/Zotlabs/Widget/Cdav.php index 2a2e0855f..3be6e49ba 100644 --- a/Zotlabs/Widget/Cdav.php +++ b/Zotlabs/Widget/Cdav.php @@ -2,189 +2,193 @@ namespace Zotlabs\Widget; +use App; +use DBA; +use Sabre\CardDAV\Backend\PDO; +class Cdav +{ -class Cdav { + public function widget() + { + if (!local_channel()) { + return; + } - function widget() { - if(!local_channel()) - return; + $channel = App::get_channel(); + $principalUri = 'principals/' . $channel['channel_address']; - $channel = \App::get_channel(); - $principalUri = 'principals/' . $channel['channel_address']; + if (!cdav_principal($principalUri)) { + return; + } - if(!cdav_principal($principalUri)) - return; + $pdo = DBA::$dba->db; - $pdo = \DBA::$dba->db; + require_once 'vendor/autoload.php'; - require_once 'vendor/autoload.php'; + $o = ''; - $o = ''; + if (argc() <= 3 && argv(1) === 'calendar') { + $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo); - if(argc() <= 3 && argv(1) === 'calendar') { + $sabrecals = $caldavBackend->getCalendarsForUser($principalUri); - $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo); + //TODO: we should probably also check for permission to send stream here + $local_channels = q( + "SELECT * FROM channel LEFT JOIN abook ON abook_xchan = channel_hash WHERE channel_system = 0 AND channel_removed = 0 AND channel_hash != '%s' AND abook_channel = %d", + dbesc($channel['channel_hash']), + intval($channel['channel_id']) + ); - $sabrecals = $caldavBackend->getCalendarsForUser($principalUri); + $sharee_options .= '' . "\r\n"; + foreach ($local_channels as $local_channel) { + $sharee_options .= '' . "\r\n"; + } - //TODO: we should probably also check for permission to send stream here - $local_channels = q("SELECT * FROM channel LEFT JOIN abook ON abook_xchan = channel_hash WHERE channel_system = 0 AND channel_removed = 0 AND channel_hash != '%s' AND abook_channel = %d", - dbesc($channel['channel_hash']), - intval($channel['channel_id']) - ); + $access_options = '' . "\r\n"; + $access_options .= '' . "\r\n"; - $sharee_options .= '' . "\r\n"; - foreach($local_channels as $local_channel) { - $sharee_options .= '' . "\r\n"; - } + //list calendars + foreach ($sabrecals as $sabrecal) { + if ($sabrecal['share-access'] == 1) { + $access = ''; + } + if ($sabrecal['share-access'] == 2) { + $access = 'read'; + } + if ($sabrecal['share-access'] == 3) { + $access = 'read-write'; + } - $access_options = '' . "\r\n"; - $access_options .= '' . "\r\n"; + $invites = $caldavBackend->getInvites($sabrecal['id']); - //list calendars - foreach($sabrecals as $sabrecal) { - if($sabrecal['share-access'] == 1) - $access = ''; - if($sabrecal['share-access'] == 2) - $access = 'read'; - if($sabrecal['share-access'] == 3) - $access = 'read-write'; + $json_source = '/cdav/calendar/json/' . $sabrecal['id'][0] . '/' . $sabrecal['id'][1]; - $invites = $caldavBackend->getInvites($sabrecal['id']); + $switch = get_pconfig(local_channel(), 'cdav_calendar', $sabrecal['id'][0]); - $json_source = '/cdav/calendar/json/' . $sabrecal['id'][0] . '/' . $sabrecal['id'][1]; + $color = (($sabrecal['{http://apple.com/ns/ical/}calendar-color']) ? $sabrecal['{http://apple.com/ns/ical/}calendar-color'] : '#6cad39'); - $switch = get_pconfig(local_channel(), 'cdav_calendar', $sabrecal['id'][0]); + $editable = (($sabrecal['share-access'] == 2) ? 'false' : 'true'); // false/true must be string since we're passing it to javascript - $color = (($sabrecal['{http://apple.com/ns/ical/}calendar-color']) ? $sabrecal['{http://apple.com/ns/ical/}calendar-color'] : '#6cad39'); + $sharees = []; + $share_displayname = []; - $editable = (($sabrecal['share-access'] == 2) ? 'false' : 'true'); // false/true must be string since we're passing it to javascript + foreach ($invites as $invite) { + if (strpos($invite->href, 'mailto:') !== false) { + $sharee = channelx_by_nick(substr($invite->principal, 11)); + $sharees[] = [ + 'name' => $sharee['channel_name'], + 'access' => (($invite->access == 3) ? ' (RW)' : ' (R)'), + 'hash' => $sharee['channel_hash'] + ]; + } + } - $sharees = []; - $share_displayname = []; + if (!$access) { + $my_calendars[] = [ + 'ownernick' => $channel['channel_address'], + 'uri' => $sabrecal['uri'], + 'displayname' => $sabrecal['{DAV:}displayname'], + 'calendarid' => $sabrecal['id'][0], + 'instanceid' => $sabrecal['id'][1], + 'json_source' => $json_source, + 'color' => $color, + 'editable' => $editable, + 'switch' => $switch, + 'sharees' => $sharees + ]; + } else { + $shared_calendars[] = [ + 'ownernick' => $channel['channel_address'], + 'uri' => $sabrecal['uri'], + 'displayname' => $sabrecal['{DAV:}displayname'], + 'calendarid' => $sabrecal['id'][0], + 'instanceid' => $sabrecal['id'][1], + 'json_source' => $json_source, + 'color' => $color, + 'editable' => $editable, + 'switch' => $switch, + 'sharer' => $sabrecal['{urn:ietf:params:xml:ns:caldav}calendar-description'], + 'access' => $access + ]; + } - foreach($invites as $invite) { - if(strpos($invite->href, 'mailto:') !== false) { - $sharee = channelx_by_nick(substr($invite->principal, 11)); - $sharees[] = [ - 'name' => $sharee['channel_name'], - 'access' => (($invite->access == 3) ? ' (RW)' : ' (R)'), - 'hash' => $sharee['channel_hash'] - ]; - } - } + if (!$access || $access === 'read-write') { + $writable_calendars[] = [ + 'displayname' => ((!$access) ? $sabrecal['{DAV:}displayname'] : $share_displayname[0]), + 'id' => $sabrecal['id'] + ]; + } + } - if(!$access) { - $my_calendars[] = [ - 'ownernick' => $channel['channel_address'], - 'uri' => $sabrecal['uri'], - 'displayname' => $sabrecal['{DAV:}displayname'], - 'calendarid' => $sabrecal['id'][0], - 'instanceid' => $sabrecal['id'][1], - 'json_source' => $json_source, - 'color' => $color, - 'editable' => $editable, - 'switch' => $switch, - 'sharees' => $sharees - ]; - } - else { - $shared_calendars[] = [ - 'ownernick' => $channel['channel_address'], - 'uri' => $sabrecal['uri'], - 'displayname' => $sabrecal['{DAV:}displayname'], - 'calendarid' => $sabrecal['id'][0], - 'instanceid' => $sabrecal['id'][1], - 'json_source' => $json_source, - 'color' => $color, - 'editable' => $editable, - 'switch' => $switch, - 'sharer' => $sabrecal['{urn:ietf:params:xml:ns:caldav}calendar-description'], - 'access' => $access - ]; - } + $calendars[] = [ + 'ownernick' => $channel['channel_address'], + 'displayname' => $channel['channel_name'], + 'calendarid' => 'calendar', + 'json_source' => '/calendar/json', + 'color' => '#3a87ad', + 'editable' => true, + 'switch' => get_pconfig(local_channel(), 'cdav_calendar', 'calendar') + ]; - if(!$access || $access === 'read-write') { - $writable_calendars[] = [ - 'displayname' => ((!$access) ? $sabrecal['{DAV:}displayname'] : $share_displayname[0]), - 'id' => $sabrecal['id'] - ]; - } - } + $o .= replace_macros(get_markup_template('cdav_widget_calendar.tpl'), [ + '$calendars_label' => t('Channel Calendar'), + '$calendars' => $calendars, + '$my_calendars_label' => t('CalDAV Calendars'), + '$my_calendars' => $my_calendars, + '$shared_calendars_label' => t('Shared CalDAV Calendars'), + '$shared_calendars' => $shared_calendars, + '$sharee_options' => $sharee_options, + '$access_options' => $access_options, + '$share_label' => t('Share this calendar'), + '$share' => t('Share'), + '$edit_label' => t('Calendar name and color'), + '$edit' => t('Edit'), + '$create_label' => t('Create new CalDAV calendar'), + '$create' => t('Create'), + '$create_placeholder' => t('Calendar Name'), + '$tools_label' => t('Calendar Tools'), + '$tools_options_label' => [t('Channel Calendars'), t('CalDAV Calendars')], + '$import_label' => t('Import calendar'), + '$import_placeholder' => t('Select a calendar to import to'), + '$upload' => t('Upload'), + '$writable_calendars' => $writable_calendars + ]); - $calendars[] = [ - 'ownernick' => $channel['channel_address'], - 'displayname' => $channel['channel_name'], - 'calendarid' => 'calendar', - 'json_source' => '/calendar/json', - 'color' => '#3a87ad', - 'editable' => true, - 'switch' => get_pconfig(local_channel(), 'cdav_calendar', 'calendar') - ]; + return $o; + } - $o .= replace_macros(get_markup_template('cdav_widget_calendar.tpl'), [ - '$calendars_label' => t('Channel Calendar'), - '$calendars' => $calendars, - '$my_calendars_label' => t('CalDAV Calendars'), - '$my_calendars' => $my_calendars, - '$shared_calendars_label' => t('Shared CalDAV Calendars'), - '$shared_calendars' => $shared_calendars, - '$sharee_options' => $sharee_options, - '$access_options' => $access_options, - '$share_label' => t('Share this calendar'), - '$share' => t('Share'), - '$edit_label' => t('Calendar name and color'), - '$edit' => t('Edit'), - '$create_label' => t('Create new CalDAV calendar'), - '$create' => t('Create'), - '$create_placeholder' => t('Calendar Name'), - '$tools_label' => t('Calendar Tools'), - '$tools_options_label' => [t('Channel Calendars'), t('CalDAV Calendars')], - '$import_label' => t('Import calendar'), - '$import_placeholder' => t('Select a calendar to import to'), - '$upload' => t('Upload'), - '$writable_calendars' => $writable_calendars - ]); + if (argc() >= 2 && argv(1) === 'addressbook') { + $carddavBackend = new PDO($pdo); - return $o; + $sabreabooks = $carddavBackend->getAddressBooksForUser($principalUri); - } + //list addressbooks + foreach ($sabreabooks as $sabreabook) { + $addressbooks[] = [ + 'ownernick' => $channel['channel_address'], + 'uri' => $sabreabook['uri'], + 'displayname' => $sabreabook['{DAV:}displayname'], + 'id' => $sabreabook['id'] - if(argc() >= 2 && argv(1) === 'addressbook') { + ]; + } - $carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo); + $o .= replace_macros(get_markup_template('cdav_widget_addressbook.tpl'), [ + '$addressbooks_label' => t('Addressbooks'), + '$addressbooks' => $addressbooks, + '$edit_label' => t('Addressbook name'), + '$edit' => t('Edit'), + '$create_label' => t('Create new addressbook'), + '$create_placeholder' => t('Addressbook Name'), + '$create' => t('Create'), + '$tools_label' => t('Addressbook Tools'), + '$import_label' => t('Import addressbook'), + '$import_placeholder' => t('Select an addressbook to import to'), + '$upload' => t('Upload') + ]); - $sabreabooks = $carddavBackend->getAddressBooksForUser($principalUri); - - //list addressbooks - foreach($sabreabooks as $sabreabook) { - $addressbooks[] = [ - 'ownernick' => $channel['channel_address'], - 'uri' => $sabreabook['uri'], - 'displayname' => $sabreabook['{DAV:}displayname'], - 'id' => $sabreabook['id'] - - ]; - } - - $o .= replace_macros(get_markup_template('cdav_widget_addressbook.tpl'), [ - '$addressbooks_label' => t('Addressbooks'), - '$addressbooks' => $addressbooks, - '$edit_label' => t('Addressbook name'), - '$edit' => t('Edit'), - '$create_label' => t('Create new addressbook'), - '$create_placeholder' => t('Addressbook Name'), - '$create' => t('Create'), - '$tools_label' => t('Addressbook Tools'), - '$import_label' => t('Import addressbook'), - '$import_placeholder' => t('Select an addressbook to import to'), - '$upload' => t('Upload') - ]); - - return $o; - - } - - } + return $o; + } + } } diff --git a/Zotlabs/Widget/Chatroom_list.php b/Zotlabs/Widget/Chatroom_list.php index e2aad0e05..425dc9488 100644 --- a/Zotlabs/Widget/Chatroom_list.php +++ b/Zotlabs/Widget/Chatroom_list.php @@ -2,23 +2,29 @@ namespace Zotlabs\Widget; -class Chatroom_list { +use App; +use Zotlabs\Lib\Chatroom; - function widget($arr) { +class Chatroom_list +{ - if(! \App::$profile) - return ''; + public function widget($arr) + { - $r = \Zotlabs\Lib\Chatroom::roomlist(\App::$profile['profile_uid']); + if (!App::$profile) { + return ''; + } - if($r) { - return replace_macros(get_markup_template('chatroomlist.tpl'), array( - '$header' => t('Chatrooms'), - '$baseurl' => z_root(), - '$nickname' => \App::$profile['channel_address'], - '$items' => $r, - '$overview' => t('Overview') - )); - } - } + $r = Chatroom::roomlist(App::$profile['profile_uid']); + + if ($r) { + return replace_macros(get_markup_template('chatroomlist.tpl'), array( + '$header' => t('Chatrooms'), + '$baseurl' => z_root(), + '$nickname' => App::$profile['channel_address'], + '$items' => $r, + '$overview' => t('Overview') + )); + } + } } diff --git a/Zotlabs/Widget/Chatroom_members.php b/Zotlabs/Widget/Chatroom_members.php index 8ed77fb3c..c9385831f 100644 --- a/Zotlabs/Widget/Chatroom_members.php +++ b/Zotlabs/Widget/Chatroom_members.php @@ -2,14 +2,15 @@ namespace Zotlabs\Widget; -class Chatroom_members { +class Chatroom_members +{ - // The actual contents are filled in via AJAX - - function widget() { - return replace_macros(get_markup_template('chatroom_members.tpl'), array( - '$header' => t('Chat Members') - )); - } + // The actual contents are filled in via AJAX + public function widget() + { + return replace_macros(get_markup_template('chatroom_members.tpl'), array( + '$header' => t('Chat Members') + )); + } } diff --git a/Zotlabs/Widget/Clock.php b/Zotlabs/Widget/Clock.php index 8dae200c0..fd37c383f 100644 --- a/Zotlabs/Widget/Clock.php +++ b/Zotlabs/Widget/Clock.php @@ -2,13 +2,15 @@ namespace Zotlabs\Widget; -class Clock { +class Clock +{ - function widget($arr) { + public function widget($arr) + { - $miltime = ((isset($arr['military']) && $arr['military']) ? intval($arr['military']) : false); + $miltime = ((isset($arr['military']) && $arr['military']) ? intval($arr['military']) : false); - $o = <<< EOT + $o = <<< EOT ', $l); - return $t; +function upgrade_link($bbcode = false) +{ + $l = get_config('service_class', 'upgrade_link'); + if (! $l) { + return ''; + } + if ($bbcode) { + $t = sprintf('[zrl=%s]' . t('Click here to upgrade.') . '[/zrl]', $l); + } else { + $t = sprintf('' . t('Click here to upgrade.') . '' . t('Activity', 'widget') . '
- ';
+ foreach ($arr as $rv) {
+ $o .= '
- ' . ((intval($rv['total'])) ? intval($rv['total']) : '') . '';
+ }
+ $o .= '
These permissions set who is allowed to view the post.'); + // I'm trying to make two points in this description text - warn about finality of wall + // post permissions, and try to clear up confusion that these permissions set who is + // *shown* the post, istead of who is able to see the post, i.e. make it clear that clicking + // the "Show" button on a group does not post it to the feed of people in that group, it + // mearly allows those people to view the post if they are viewing/following this channel. + $description = t('Post permissions cannot be changed after a post is shared.
These permissions set who is allowed to view the post.'); - // Lets keep the emphasis styling seperate from the translation. It may change. - //$emphasisOpen = ''; - //$emphasisClose = ''; + // Lets keep the emphasis styling seperate from the translation. It may change. + //$emphasisOpen = ''; + //$emphasisClose = ''; - return $description; + return $description; } diff --git a/include/addon.php b/include/addon.php index 189dc3e68..49058ca0f 100644 --- a/include/addon.php +++ b/include/addon.php @@ -13,18 +13,19 @@ * @param string $error_text text of error * @param bool $uninstall uninstall plugin */ -function handleerrors_plugin($plugin,$notice,$log,$uninstall=false){ - logger("Addons: [" . $plugin . "] Error: ".$log, LOGGER_ERROR); - if ($notice != '') { - notice("[" . $plugin . "] Error: ".$notice, LOGGER_ERROR); - } +function handleerrors_plugin($plugin, $notice, $log, $uninstall = false) +{ + logger("Addons: [" . $plugin . "] Error: ".$log, LOGGER_ERROR); + if ($notice != '') { + notice("[" . $plugin . "] Error: ".$notice, LOGGER_ERROR); + } - if ($uninstall) { - $idx = array_search($plugin, App::$plugins); - unset(App::$plugins[$idx]); - uninstall_plugin($plugin); - set_config("system","addon", implode(", ",App::$plugins)); - } + if ($uninstall) { + $idx = array_search($plugin, App::$plugins); + unset(App::$plugins[$idx]); + uninstall_plugin($plugin); + set_config("system", "addon", implode(", ", App::$plugins)); + } } /** @@ -32,53 +33,56 @@ function handleerrors_plugin($plugin,$notice,$log,$uninstall=false){ * * @param string $plugin name of the addon */ -function unload_plugin($plugin){ - logger("Addons: unloading " . $plugin, LOGGER_DEBUG); +function unload_plugin($plugin) +{ + logger("Addons: unloading " . $plugin, LOGGER_DEBUG); - @include_once('addon/' . $plugin . '/' . $plugin . '.php'); - if (function_exists($plugin . '_unload')) { - $func = $plugin . '_unload'; - try { - $func(); - } catch (Exception $e) { - handleerrors_plugin($plugin,"Unable to unload.",$e->getMessage()); - } - } + @include_once('addon/' . $plugin . '/' . $plugin . '.php'); + if (function_exists($plugin . '_unload')) { + $func = $plugin . '_unload'; + try { + $func(); + } catch (Exception $e) { + handleerrors_plugin($plugin, "Unable to unload.", $e->getMessage()); + } + } } /** * @brief Uninstalls an addon. * * @param string $plugin name of the addon - * @return boolean + * @return bool */ -function uninstall_plugin($plugin) { +function uninstall_plugin($plugin) +{ - unload_plugin($plugin); + unload_plugin($plugin); - if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) { - q("DELETE FROM addon WHERE aname = '%s' ", - dbesc($plugin) - ); - return false; - } + if (! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) { + q( + "DELETE FROM addon WHERE aname = '%s' ", + dbesc($plugin) + ); + return false; + } - logger("Addons: uninstalling " . $plugin); - //$t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php'); - @include_once('addon/' . $plugin . '/' . $plugin . '.php'); - if(function_exists($plugin . '_uninstall')) { - $func = $plugin . '_uninstall'; - try { - $func(); - } catch (Exception $e) { - handleerrors_plugin($plugin,"Unable to uninstall.","Unable to run _uninstall : ".$e->getMessage()); - } - } - - q("DELETE FROM addon WHERE aname = '%s' ", - dbesc($plugin) - ); + logger("Addons: uninstalling " . $plugin); + //$t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php'); + @include_once('addon/' . $plugin . '/' . $plugin . '.php'); + if (function_exists($plugin . '_uninstall')) { + $func = $plugin . '_uninstall'; + try { + $func(); + } catch (Exception $e) { + handleerrors_plugin($plugin, "Unable to uninstall.", "Unable to run _uninstall : ".$e->getMessage()); + } + } + q( + "DELETE FROM addon WHERE aname = '%s' ", + dbesc($plugin) + ); } /** @@ -90,37 +94,41 @@ function uninstall_plugin($plugin) { * @param string $plugin name of the addon * @return bool */ -function install_plugin($plugin) { - if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) - return false; +function install_plugin($plugin) +{ + if (! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) { + return false; + } - logger("Addons: installing " . $plugin); - $t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php'); - @include_once('addon/' . $plugin . '/' . $plugin . '.php'); - if(function_exists($plugin . '_install')) { - $func = $plugin . '_install'; - try { - $func(); - } catch (Exception $e) { - handleerrors_plugin($plugin,"Install failed.","Install failed : ".$e->getMessage()); - return; - } - } + logger("Addons: installing " . $plugin); + $t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php'); + @include_once('addon/' . $plugin . '/' . $plugin . '.php'); + if (function_exists($plugin . '_install')) { + $func = $plugin . '_install'; + try { + $func(); + } catch (Exception $e) { + handleerrors_plugin($plugin, "Install failed.", "Install failed : ".$e->getMessage()); + return; + } + } - $plugin_admin = (function_exists($plugin . '_plugin_admin') ? 1 : 0); + $plugin_admin = (function_exists($plugin . '_plugin_admin') ? 1 : 0); - $d = q("select * from addon where aname = '%s' limit 1", - dbesc($plugin) - ); - if(! $d) { - q("INSERT INTO addon (aname, installed, tstamp, plugin_admin) VALUES ( '%s', 1, %d , %d ) ", - dbesc($plugin), - intval($t), - $plugin_admin - ); - } + $d = q( + "select * from addon where aname = '%s' limit 1", + dbesc($plugin) + ); + if (! $d) { + q( + "INSERT INTO addon (aname, installed, tstamp, plugin_admin) VALUES ( '%s', 1, %d , %d ) ", + dbesc($plugin), + intval($t), + $plugin_admin + ); + } - load_plugin($plugin); + load_plugin($plugin); } /** @@ -129,38 +137,40 @@ function install_plugin($plugin) { * @param string $plugin name of the addon * @return bool */ -function load_plugin($plugin) { - // silently fail if plugin was removed - if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) - return false; +function load_plugin($plugin) +{ + // silently fail if plugin was removed + if (! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) { + return false; + } - logger("Addons: loading " . $plugin, LOGGER_DEBUG); - //$t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php'); - @include_once('addon/' . $plugin . '/' . $plugin . '.php'); - if(function_exists($plugin . '_load')) { - $func = $plugin . '_load'; - try { - $func(); - } catch (Exception $e) { - handleerrors_plugin($plugin,"Unable to load.","FAILED loading : ".$e->getMessage(),true); - return; - } + logger("Addons: loading " . $plugin, LOGGER_DEBUG); + //$t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php'); + @include_once('addon/' . $plugin . '/' . $plugin . '.php'); + if (function_exists($plugin . '_load')) { + $func = $plugin . '_load'; + try { + $func(); + } catch (Exception $e) { + handleerrors_plugin($plugin, "Unable to load.", "FAILED loading : ".$e->getMessage(), true); + return; + } - // we can add the following with the previous SQL - // once most site tables have been updated. - // This way the system won't fall over dead during the update. + // we can add the following with the previous SQL + // once most site tables have been updated. + // This way the system won't fall over dead during the update. - if(file_exists('addon/' . $plugin . '/.hidden')) { - q("update addon set hidden = 1 where name = '%s'", - dbesc($plugin) - ); - } - return true; - } - else { - logger("Addons: FAILED loading " . $plugin . " (missing _load function)"); - return false; - } + if (file_exists('addon/' . $plugin . '/.hidden')) { + q( + "update addon set hidden = 1 where name = '%s'", + dbesc($plugin) + ); + } + return true; + } else { + logger("Addons: FAILED loading " . $plugin . " (missing _load function)"); + return false; + } } @@ -168,151 +178,161 @@ function load_plugin($plugin) { * @brief Check if addon is installed (deprecated). * * @param string $name - * @return boolean + * @return bool */ -function plugin_is_installed($name) { - $r = q("select aname from addon where aname = '%s' and installed = 1 limit 1", - dbesc($name) - ); - if($r) - return true; +function plugin_is_installed($name) +{ + $r = q( + "select aname from addon where aname = '%s' and installed = 1 limit 1", + dbesc($name) + ); + if ($r) { + return true; + } - return false; + return false; } /** * @brief Check if addon is installed (use this one). * * @param string $name - * @return boolean + * @return bool */ -function addon_is_installed($name) { - $r = q("select aname from addon where aname = '%s' and installed = 1 limit 1", - dbesc($name) - ); - if($r) - return true; +function addon_is_installed($name) +{ + $r = q( + "select aname from addon where aname = '%s' and installed = 1 limit 1", + dbesc($name) + ); + if ($r) { + return true; + } - return false; + return false; } /** * @brief Reload all updated plugins. */ -function reload_plugins() { - $plugins = get_config('system', 'addon'); - if(strlen($plugins)) { - $r = q("SELECT * FROM addon WHERE installed = 1"); - if(count($r)) - $installed = $r; - else - $installed = []; +function reload_plugins() +{ + $plugins = get_config('system', 'addon'); + if (strlen($plugins)) { + $r = q("SELECT * FROM addon WHERE installed = 1"); + if (count($r)) { + $installed = $r; + } else { + $installed = []; + } - $parr = explode(',', $plugins); + $parr = explode(',', $plugins); - if(count($parr)) { - foreach($parr as $pl) { - $pl = trim($pl); + if (count($parr)) { + foreach ($parr as $pl) { + $pl = trim($pl); - $fname = 'addon/' . $pl . '/' . $pl . '.php'; + $fname = 'addon/' . $pl . '/' . $pl . '.php'; - if(file_exists($fname)) { - $t = @filemtime($fname); - foreach($installed as $i) { - if(($i['aname'] == $pl) && ($i['tstamp'] != $t)) { - logger('Reloading plugin: ' . $i['aname']); - @include_once($fname); + if (file_exists($fname)) { + $t = @filemtime($fname); + foreach ($installed as $i) { + if (($i['aname'] == $pl) && ($i['tstamp'] != $t)) { + logger('Reloading plugin: ' . $i['aname']); + @include_once($fname); - if(function_exists($pl . '_unload')) { - $func = $pl . '_unload'; - try { - $func(); - } catch (Exception $e) { - handleerrors_plugin($plugin,"","UNLOAD FAILED (uninstalling) : ".$e->getMessage(),true); - continue; - } - } - if(function_exists($pl . '_load')) { - $func = $pl . '_load'; - try { - $func(); - } catch (Exception $e) { - handleerrors_plugin($plugin,"","LOAD FAILED (uninstalling): ".$e->getMessage(),true); - continue; - } - } - q("UPDATE addon SET tstamp = %d WHERE id = %d", - intval($t), - intval($i['id']) - ); - } - } - } - } - } - } + if (function_exists($pl . '_unload')) { + $func = $pl . '_unload'; + try { + $func(); + } catch (Exception $e) { + handleerrors_plugin($plugin, "", "UNLOAD FAILED (uninstalling) : ".$e->getMessage(), true); + continue; + } + } + if (function_exists($pl . '_load')) { + $func = $pl . '_load'; + try { + $func(); + } catch (Exception $e) { + handleerrors_plugin($plugin, "", "LOAD FAILED (uninstalling): ".$e->getMessage(), true); + continue; + } + } + q( + "UPDATE addon SET tstamp = %d WHERE id = %d", + intval($t), + intval($i['id']) + ); + } + } + } + } + } + } } -function plugins_installed_list() { +function plugins_installed_list() +{ - $r = q("select * from addon where installed = 1 order by aname asc"); - return(($r) ? ids_to_array($r,'aname') : []); + $r = q("select * from addon where installed = 1 order by aname asc"); + return(($r) ? ids_to_array($r, 'aname') : []); } -function plugins_sync() { +function plugins_sync() +{ - /** - * - * Synchronise plugins: - * - * App::$config['system']['addon'] contains a comma-separated list of names - * of plugins/addons which are used on this system. - * Go through the database list of already installed addons, and if we have - * an entry, but it isn't in the config list, call the unload procedure - * and mark it uninstalled in the database (for now we'll remove it). - * 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. - * - */ + /** + * + * Synchronise plugins: + * + * App::$config['system']['addon'] contains a comma-separated list of names + * of plugins/addons which are used on this system. + * Go through the database list of already installed addons, and if we have + * an entry, but it isn't in the config list, call the unload procedure + * and mark it uninstalled in the database (for now we'll remove it). + * 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. + * + */ - $installed = plugins_installed_list(); + $installed = plugins_installed_list(); - $plugins = get_config('system', 'addon', ''); + $plugins = get_config('system', 'addon', ''); - $plugins_arr = explode(',', $plugins); + $plugins_arr = explode(',', $plugins); - // array_trim is in include/text.php + // array_trim is in include/text.php - if(! array_walk($plugins_arr,'array_trim')) - return; + if (! array_walk($plugins_arr, 'array_trim')) { + return; + } - App::$plugins = $plugins_arr; + App::$plugins = $plugins_arr; - $installed_arr = []; + $installed_arr = []; - if(count($installed)) { - foreach($installed as $i) { - if(! in_array($i, $plugins_arr)) { - unload_plugin($i); - } - else { - $installed_arr[] = $i; - } - } - } - - if(count($plugins_arr)) { - foreach($plugins_arr as $p) { - if(! in_array($p, $installed_arr)) { - load_plugin($p); - } - } - } + if (count($installed)) { + foreach ($installed as $i) { + if (! in_array($i, $plugins_arr)) { + unload_plugin($i); + } else { + $installed_arr[] = $i; + } + } + } + if (count($plugins_arr)) { + foreach ($plugins_arr as $p) { + if (! in_array($p, $installed_arr)) { + load_plugin($p); + } + } + } } @@ -321,19 +341,20 @@ function plugins_sync() { * * @return array */ -function visible_plugin_list() { - - $r = q("select * from addon where hidden = 0 order by aname asc"); - $x = (($r) ? ids_to_array($r,'aname') : []); - $y = []; - if($x) { - foreach($x as $xv) { - if(is_dir('addon/' . $xv)) { - $y[] = $xv; - } - } - } - return $y; +function visible_plugin_list() +{ + + $r = q("select * from addon where hidden = 0 order by aname asc"); + $x = (($r) ? ids_to_array($r, 'aname') : []); + $y = []; + if ($x) { + foreach ($x as $xv) { + if (is_dir('addon/' . $xv)) { + $y[] = $xv; + } + } + } + return $y; } @@ -348,23 +369,27 @@ function visible_plugin_list() { * @param int $priority A priority (defaults to 0) * @return mixed|bool */ -function register_hook($hook, $file, $function, $priority = 0) { - $r = q("SELECT * FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s' LIMIT 1", - dbesc($hook), - dbesc($file), - dbesc($function) - ); - if($r) - return true; +function register_hook($hook, $file, $function, $priority = 0) +{ + $r = q( + "SELECT * FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s' LIMIT 1", + dbesc($hook), + dbesc($file), + dbesc($function) + ); + if ($r) { + return true; + } - $r = q("INSERT INTO hook (hook, file, fn, priority) VALUES ( '%s', '%s', '%s', '%s' )", - dbesc($hook), - dbesc($file), - dbesc($function), - dbesc($priority) - ); + $r = q( + "INSERT INTO hook (hook, file, fn, priority) VALUES ( '%s', '%s', '%s', '%s' )", + dbesc($hook), + dbesc($file), + dbesc($function), + dbesc($priority) + ); - return $r; + return $r; } @@ -378,14 +403,16 @@ function register_hook($hook, $file, $function, $priority = 0) { * @param string $function the name of the function that the hook called * @return array */ -function unregister_hook($hook, $file, $function) { - $r = q("DELETE FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s'", - dbesc($hook), - dbesc($file), - dbesc($function) - ); +function unregister_hook($hook, $file, $function) +{ + $r = q( + "DELETE FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s'", + dbesc($hook), + dbesc($file), + dbesc($function) + ); - return $r; + return $r; } /** @@ -400,35 +427,35 @@ function unregister_hook($hook, $file, $function) { */ -function load_hooks() { +function load_hooks() +{ - App::$hooks = []; + App::$hooks = []; - $r = q("SELECT * FROM hook WHERE true ORDER BY priority DESC"); - if($r) { - - foreach($r as $rv) { - $duplicated = false; - if(! array_key_exists($rv['hook'],App::$hooks)) { - App::$hooks[$rv['hook']] = []; - } - else { - foreach(App::$hooks[$rv['hook']] as $h) { - if($h[0] === $rv['file'] && $h[1] === $rv['fn']) { - $duplicated = true; - q("delete from hook where id = %d", - intval($rv['id']) - ); - logger('duplicate hook ' . $h[1] . ' removed'); - } - } - } - if(! $duplicated) { - App::$hooks[$rv['hook']][] = [ $rv['file'], $rv['fn'], $rv['priority'], $rv['hook_version']]; - } - } - } - // logger('hooks: ' . print_r(App::$hooks,true)); + $r = q("SELECT * FROM hook WHERE true ORDER BY priority DESC"); + if ($r) { + foreach ($r as $rv) { + $duplicated = false; + if (! array_key_exists($rv['hook'], App::$hooks)) { + App::$hooks[$rv['hook']] = []; + } else { + foreach (App::$hooks[$rv['hook']] as $h) { + if ($h[0] === $rv['file'] && $h[1] === $rv['fn']) { + $duplicated = true; + q( + "delete from hook where id = %d", + intval($rv['id']) + ); + logger('duplicate hook ' . $h[1] . ' removed'); + } + } + } + if (! $duplicated) { + App::$hooks[$rv['hook']][] = [ $rv['file'], $rv['fn'], $rv['priority'], $rv['hook_version']]; + } + } + } + // logger('hooks: ' . print_r(App::$hooks,true)); } /** @@ -450,15 +477,18 @@ function load_hooks() { * @param int $version (optional) default 0 * @param int $priority (optional) default 0 */ -function insert_hook($hook, $fn, $version = 0, $priority = 0) { +function insert_hook($hook, $fn, $version = 0, $priority = 0) +{ - if(! is_array(App::$hooks)) - App::$hooks = []; + if (! is_array(App::$hooks)) { + App::$hooks = []; + } - if(! array_key_exists($hook, App::$hooks)) - App::$hooks[$hook] = []; + if (! array_key_exists($hook, App::$hooks)) { + App::$hooks[$hook] = []; + } - App::$hooks[$hook][] = array('', $fn, $priority, $version); + App::$hooks[$hook][] = array('', $fn, $priority, $version); } /** @@ -470,46 +500,47 @@ function insert_hook($hook, $fn, $version = 0, $priority = 0) { * @param string $name of the hook to call * @param[in,out] string|array &$data to transmit to the callback handler */ -function call_hooks($name, &$data = null) { - $a = 0; +function call_hooks($name, &$data = null) +{ + $a = 0; - if (isset(App::$hooks[$name])) { - foreach(App::$hooks[$name] as $hook) { - $origfn = $hook[1]; - if($hook[0]) - @include_once($hook[0]); - if(preg_match('|^a:[0-9]+:{.*}$|s', $hook[1])) { - $hook[1] = unserialize($hook[1]); - } - elseif(strpos($hook[1],'::')) { - // We shouldn't need to do this, but it appears that PHP - // isn't able to directly execute a string variable with a class - // method in the manner we are attempting it, so we'll - // turn it into an array. - $hook[1] = explode('::',$hook[1]); - } + if (isset(App::$hooks[$name])) { + foreach (App::$hooks[$name] as $hook) { + $origfn = $hook[1]; + if ($hook[0]) { + @include_once($hook[0]); + } + if (preg_match('|^a:[0-9]+:{.*}$|s', $hook[1])) { + $hook[1] = unserialize($hook[1]); + } elseif (strpos($hook[1], '::')) { + // We shouldn't need to do this, but it appears that PHP + // isn't able to directly execute a string variable with a class + // method in the manner we are attempting it, so we'll + // turn it into an array. + $hook[1] = explode('::', $hook[1]); + } - if(is_callable($hook[1])) { - $func = $hook[1]; - if($hook[3]) - $func($data); - else - $func($a, $data); - } - else { - - // Don't do any DB write calls if we're currently logging a possibly failed DB call. - if(! DBA::$logging) { - // The hook should be removed so we don't process it. - q("DELETE FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s'", - dbesc($name), - dbesc($hook[0]), - dbesc($origfn) - ); - } - } - } - } + if (is_callable($hook[1])) { + $func = $hook[1]; + if ($hook[3]) { + $func($data); + } else { + $func($a, $data); + } + } else { + // Don't do any DB write calls if we're currently logging a possibly failed DB call. + if (! DBA::$logging) { + // The hook should be removed so we don't process it. + q( + "DELETE FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s'", + dbesc($name), + dbesc($hook[0]), + dbesc($origfn) + ); + } + } + } + } } @@ -528,47 +559,48 @@ function call_hooks($name, &$data = null) { * @param string $plugin the name of the plugin * @return array with the plugin information */ -function get_plugin_info($plugin){ - $m = []; - $info = array( - 'name' => $plugin, - 'description' => '', - 'author' => [], - 'maintainer' => [], - 'version' => '', - 'requires' => '' - ); +function get_plugin_info($plugin) +{ + $m = []; + $info = array( + 'name' => $plugin, + 'description' => '', + 'author' => [], + 'maintainer' => [], + 'version' => '', + 'requires' => '' + ); - if (!is_file("addon/$plugin/$plugin.php")) - return $info; + if (!is_file("addon/$plugin/$plugin.php")) { + return $info; + } - $f = file_get_contents("addon/$plugin/$plugin.php"); - $f = escape_tags($f); - $r = preg_match("|/\*.*\*/|msU", $f, $m); + $f = file_get_contents("addon/$plugin/$plugin.php"); + $f = escape_tags($f); + $r = preg_match("|/\*.*\*/|msU", $f, $m); - if ($r){ - $ll = explode("\n", $m[0]); - foreach( $ll as $l ) { - $l = trim($l, "\t\n\r */"); - if ($l != ""){ - list($k, $v) = array_map("trim", explode(":", $l, 2)); - $k = strtolower($k); - if ($k == 'author' || $k == 'maintainer'){ - $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m); - if ($r) { - $info[$k][] = array('name' => $m[1], 'link' => $m[2]); - } else { - $info[$k][] = array('name' => $v); - } - } - else { - $info[$k] = $v; - } - } - } - } + if ($r) { + $ll = explode("\n", $m[0]); + foreach ($ll as $l) { + $l = trim($l, "\t\n\r */"); + if ($l != "") { + list($k, $v) = array_map("trim", explode(":", $l, 2)); + $k = strtolower($k); + if ($k == 'author' || $k == 'maintainer') { + $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m); + if ($r) { + $info[$k][] = array('name' => $m[1], 'link' => $m[2]); + } else { + $info[$k][] = array('name' => $v); + } + } else { + $info[$k] = $v; + } + } + } + } - return $info; + return $info; } /** @@ -586,116 +618,123 @@ function get_plugin_info($plugin){ * @param string $widget the name of the widget * @return array with the information */ -function get_widget_info($widget){ - $m = []; - $info = array( - 'name' => $widget, - 'description' => '', - 'author' => [], - 'maintainer' => [], - 'version' => '', - 'requires' => '' - ); +function get_widget_info($widget) +{ + $m = []; + $info = array( + 'name' => $widget, + 'description' => '', + 'author' => [], + 'maintainer' => [], + 'version' => '', + 'requires' => '' + ); - $ucwidget = ucfirst($widget); + $ucwidget = ucfirst($widget); - $checkpaths = [ - "Zotlabs/SiteWidget/$ucwidget.php", - "Zotlabs/Widget/$ucwidget.php", - "addon/$ucwidget/$ucwidget.php", - "addon/$widget.php" - ]; + $checkpaths = [ + "Zotlabs/SiteWidget/$ucwidget.php", + "Zotlabs/Widget/$ucwidget.php", + "addon/$ucwidget/$ucwidget.php", + "addon/$widget.php" + ]; - $widget_found = false; + $widget_found = false; - foreach ($checkpaths as $path) { - if (is_file($path)) { - $widget_found = true; - $f = file_get_contents($path); - break; - } - } + foreach ($checkpaths as $path) { + if (is_file($path)) { + $widget_found = true; + $f = file_get_contents($path); + break; + } + } - if(! ($widget_found && $f)) - return $info; + if (! ($widget_found && $f)) { + return $info; + } - $f = escape_tags($f); - $r = preg_match("|/\*.*\*/|msU", $f, $m); + $f = escape_tags($f); + $r = preg_match("|/\*.*\*/|msU", $f, $m); - if ($r) { - $ll = explode("\n", $m[0]); - foreach( $ll as $l ) { - $l = trim($l, "\t\n\r */"); - if ($l != ""){ - list($k, $v) = array_map("trim", explode(":", $l, 2)); - $k = strtolower($k); - if ($k == 'author' || $k == 'maintainer'){ - $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m); - if ($r) { - $info[$k][] = array('name' => $m[1], 'link' => $m[2]); - } else { - $info[$k][] = array('name' => $v); - } - } - else { - $info[$k] = $v; - } - } - } - } + if ($r) { + $ll = explode("\n", $m[0]); + foreach ($ll as $l) { + $l = trim($l, "\t\n\r */"); + if ($l != "") { + list($k, $v) = array_map("trim", explode(":", $l, 2)); + $k = strtolower($k); + if ($k == 'author' || $k == 'maintainer') { + $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m); + if ($r) { + $info[$k][] = array('name' => $m[1], 'link' => $m[2]); + } else { + $info[$k][] = array('name' => $v); + } + } else { + $info[$k] = $v; + } + } + } + } - return $info; + return $info; } -function check_plugin_versions($info) { +function check_plugin_versions($info) +{ - if(! is_array($info)) - return true; + if (! is_array($info)) { + return true; + } - if(array_key_exists('minversion',$info) && $info['minversion']) { - if(! version_compare(STD_VERSION,trim($info['minversion']), '>=')) { - logger('minversion limit: ' . $info['name'],LOGGER_NORMAL,LOG_WARNING); - return false; - } - } - if(array_key_exists('maxversion',$info) && $info['maxversion']) { - if(! version_compare(STD_VERSION,trim($info['maxversion']), '<')) { - logger('maxversion limit: ' . $info['name'],LOGGER_NORMAL,LOG_WARNING); - return false; - } - } - if(array_key_exists('minphpversion',$info) && $info['minphpversion']) { - if(! version_compare(PHP_VERSION,trim($info['minphpversion']), '>=')) { - logger('minphpversion limit: ' . $info['name'],LOGGER_NORMAL,LOG_WARNING); - return false; - } - } + if (array_key_exists('minversion', $info) && $info['minversion']) { + if (! version_compare(STD_VERSION, trim($info['minversion']), '>=')) { + logger('minversion limit: ' . $info['name'], LOGGER_NORMAL, LOG_WARNING); + return false; + } + } + if (array_key_exists('maxversion', $info) && $info['maxversion']) { + if (! version_compare(STD_VERSION, trim($info['maxversion']), '<')) { + logger('maxversion limit: ' . $info['name'], LOGGER_NORMAL, LOG_WARNING); + return false; + } + } + if (array_key_exists('minphpversion', $info) && $info['minphpversion']) { + if (! version_compare(PHP_VERSION, trim($info['minphpversion']), '>=')) { + logger('minphpversion limit: ' . $info['name'], LOGGER_NORMAL, LOG_WARNING); + return false; + } + } - if(array_key_exists('requires',$info)) { - $arr = explode(',',$info['requires']); - $found = true; - if($arr) { - foreach($arr as $test) { - $test = trim($test); - if(! $test) - continue; - if(strpos($test,'.')) { - $conf = explode('.',$test); - if(get_config(trim($conf[0]),trim($conf[1]))) - return true; - else - return false; - } - if(! in_array($test,App::$plugins)) - $found = false; - } - } - if(! $found) - return false; - } + if (array_key_exists('requires', $info)) { + $arr = explode(',', $info['requires']); + $found = true; + if ($arr) { + foreach ($arr as $test) { + $test = trim($test); + if (! $test) { + continue; + } + if (strpos($test, '.')) { + $conf = explode('.', $test); + if (get_config(trim($conf[0]), trim($conf[1]))) { + return true; + } else { + return false; + } + } + if (! in_array($test, App::$plugins)) { + $found = false; + } + } + } + if (! $found) { + return false; + } + } - return true; + return true; } @@ -715,66 +754,69 @@ function check_plugin_versions($info) { * @param string $theme the name of the theme * @return array */ -function get_theme_info($theme){ - $m = []; - $info = array( - 'name' => $theme, - 'description' => '', - 'author' => [], - 'version' => '', - 'minversion' => '', - 'maxversion' => '', - 'compat' => '', - 'credits' => '', - 'maintainer' => [], - 'experimental' => false, - 'unsupported' => false - ); +function get_theme_info($theme) +{ + $m = []; + $info = array( + 'name' => $theme, + 'description' => '', + 'author' => [], + 'version' => '', + 'minversion' => '', + 'maxversion' => '', + 'compat' => '', + 'credits' => '', + 'maintainer' => [], + 'experimental' => false, + 'unsupported' => false + ); - if(file_exists("view/theme/$theme/experimental")) - $info['experimental'] = true; + if (file_exists("view/theme/$theme/experimental")) { + $info['experimental'] = true; + } - if(file_exists("view/theme/$theme/unsupported")) - $info['unsupported'] = true; + if (file_exists("view/theme/$theme/unsupported")) { + $info['unsupported'] = true; + } - if (!is_file("view/theme/$theme/php/theme.php")) - return $info; + if (!is_file("view/theme/$theme/php/theme.php")) { + return $info; + } - $f = file_get_contents("view/theme/$theme/php/theme.php"); - $r = preg_match("|/\*.*\*/|msU", $f, $m); + $f = file_get_contents("view/theme/$theme/php/theme.php"); + $r = preg_match("|/\*.*\*/|msU", $f, $m); - if ($r){ - $ll = explode("\n", $m[0]); - foreach( $ll as $l ) { - $l = trim($l, "\t\n\r */"); - if ($l != ""){ - list($k, $v) = array_map("trim", explode(":", $l, 2)); - $k = strtolower($k); - if ($k == 'author'){ - $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m); - if ($r) { - $info['author'][] = array('name' => $m[1], 'link' => $m[2]); - } else { - $info['author'][] = array('name' => $v); - } - } - elseif ($k == 'maintainer'){ - $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m); - if ($r) { - $info['maintainer'][] = array('name' => $m[1], 'link' => $m[2]); - } else { - $info['maintainer'][] = array('name' => $v); - } - } else { - if (array_key_exists($k, $info)){ - $info[$k] = $v; - } - } - } - } - } + if ($r) { + $ll = explode("\n", $m[0]); + foreach ($ll as $l) { + $l = trim($l, "\t\n\r */"); + if ($l != "") { + list($k, $v) = array_map("trim", explode(":", $l, 2)); + $k = strtolower($k); + if ($k == 'author') { + $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m); + if ($r) { + $info['author'][] = array('name' => $m[1], 'link' => $m[2]); + } else { + $info['author'][] = array('name' => $v); + } + } elseif ($k == 'maintainer') { + $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m); + if ($r) { + $info['maintainer'][] = array('name' => $m[1], 'link' => $m[2]); + } else { + $info['maintainer'][] = array('name' => $v); + } + } else { + if (array_key_exists($k, $info)) { + $info[$k] = $v; + } + } + } + } + } - return $info; + return $info; } /** @@ -785,15 +827,17 @@ function get_theme_info($theme){ * @param string $theme The name of the theme * @return string */ -function get_theme_screenshot($theme) { +function get_theme_screenshot($theme) +{ - $exts = array('.png', '.jpg'); - foreach($exts as $ext) { - if(file_exists('view/theme/' . $theme . '/img/screenshot' . $ext)) - return(z_root() . '/view/theme/' . $theme . '/img/screenshot' . $ext); - } + $exts = array('.png', '.jpg'); + foreach ($exts as $ext) { + if (file_exists('view/theme/' . $theme . '/img/screenshot' . $ext)) { + return(z_root() . '/view/theme/' . $theme . '/img/screenshot' . $ext); + } + } - return(z_root() . '/images/blank.png'); + return(z_root() . '/images/blank.png'); } /** @@ -802,77 +846,84 @@ function get_theme_screenshot($theme) { * @param string $src * @param string $media change media attribute (default to 'screen') */ -function head_add_css($src, $media = 'screen') { - App::$css_sources[] = array($src, $media); +function head_add_css($src, $media = 'screen') +{ + App::$css_sources[] = array($src, $media); } -function head_remove_css($src, $media = 'screen') { +function head_remove_css($src, $media = 'screen') +{ - $index = array_search(array($src, $media), App::$css_sources); - if($index !== false) - unset(App::$css_sources[$index]); + $index = array_search(array($src, $media), App::$css_sources); + if ($index !== false) { + unset(App::$css_sources[$index]); + } } -function head_get_css() { - $str = ''; - $sources = App::$css_sources; - if(count($sources)) { - foreach($sources as $source) - $str .= format_css_if_exists($source); - } +function head_get_css() +{ + $str = ''; + $sources = App::$css_sources; + if (count($sources)) { + foreach ($sources as $source) { + $str .= format_css_if_exists($source); + } + } - return $str; + return $str; } -function head_add_link($arr) { - if($arr) { - App::$linkrel[] = $arr; - } +function head_add_link($arr) +{ + if ($arr) { + App::$linkrel[] = $arr; + } } -function head_get_links() { - $str = ''; - $sources = App::$linkrel; - if(count($sources)) { - foreach($sources as $source) { - if(is_array($source) && count($source)) { - $str .= 'not implemented not implemented ' . Zotlabs\Lib\System::get_project_version() . ' ' . "\r\n"; - killme(); - } - elseif($type === 'json') { - header('Content-type: application/json'); - echo '"' . Zotlabs\Lib\System::get_project_version() . '"'; - killme(); - } - } - - function api_mast_instance($type) { - json_return_and_die(MastAPI::format_site()); - } - - - - /* - * basic channel export - */ - - function api_export_basic($type) { - if(api_user() === false) { - logger('api_export_basic: no user'); - return false; - } - $sections = (($_REQUEST['sections']) ? explode(',',$_REQUEST['sections']) : ''); - if($_REQUEST['posts']) { - $sections = get_default_export_sections(); - $sections[] = 'items'; - } - - json_return_and_die(identity_basic_export(api_user(),$sections)); - } - - function api_item_export_page($type) { - if(api_user() === false) { - logger('api_item_export_page: no user'); - return false; - } - $page = intval($_REQUEST['page']); - $records = intval($_REQUEST['records']); - if(! $records) { - $records = 50; - } - if(! $_REQUEST['since']) - $start = NULL_DATE; - else { - $start = datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['since']); - } - $finish = datetime_convert(date_default_timezone_get(),'UTC', (($_REQUEST['until']) ? $_REQUEST['until'] : 'now')); - - json_return_and_die(channel_export_items_page(api_user(),$start,$finish,$page,$records)); - } - - - function api_network_stream($type) { - if(api_user() === false) { - logger('api_channel_stream: no user'); - return false; - } - - $channel = channelx_by_n(api_user()); - if(! $channel) - return false; - - - if($_SERVER['REQUEST_METHOD'] == 'POST') { - // json_return_and_die(post_activity_item($_REQUEST)); - } - else { - if(array_key_exists('dbegin',$_REQUEST)) - $_REQUEST['datequery2'] = $_REQUEST['dbegin']; - if(array_key_exists('dend',$_REQUEST)) - $_REQUEST['datequery'] = $_REQUEST['dend']; - - $arr = $_REQUEST; - $ret = []; - $i = items_fetch($arr,App::get_channel(),get_observer_hash()); - if($i) { - foreach($i as $iv) { - $ret[] = encode_item($iv); - } - } - - json_return_and_die($ret); - } - } - - function api_channel_list($type) { - if(api_user() === false) { - logger('api_channel_stream: no user'); - return false; - } - - $channel = channelx_by_n(api_user()); - if(! $channel) - return false; - - $ret = []; - - $r = q("select channel_address from channel where channel_account_id = %d", - intval($channel['channel_account_id']) - ); - - if($r) { - foreach($r as $rv) { - $ret[] = $rv['channel_address']; - } - } - - json_return_and_die($ret); - - } - - - function api_channel_stream($type) { - if(api_user() === false) { - logger('api_channel_stream: no user'); - return false; - } - - $channel = channelx_by_n(api_user()); - if(! $channel) - return false; - - - if($_SERVER['REQUEST_METHOD'] == 'POST') { - json_return_and_die(post_activity_item($_REQUEST)); - } - else { - $mindate = (($_REQUEST['mindate']) ? datetime_convert(date_default_timezone_get(),'UTC',$_REQUEST['mindate']) : ''); - if(! $mindate) - $mindate = datetime_convert(date_default_timezone_get(),'UTC', 'now - 14 days'); - - json_return_and_die(zot_feed($channel['channel_id'],$channel['channel_hash'],[ 'mindate' => $mindate ])); - } - } - - function api_attach_list($type) { - if(api_user() === false) - return false; - - logger('api_user: ' . api_user()); - $hash = ((array_key_exists('filehash',$_REQUEST)) ? $_REQUEST['filehash'] : ''); - $filename = ((array_key_exists('filename',$_REQUEST)) ? $_REQUEST['filename'] : ''); - $filetype = ((array_key_exists('filetype',$_REQUEST)) ? $_REQUEST['filetype'] : ''); - $start = ((array_key_exists('start',$_REQUEST)) ? intval($_REQUEST['start']) : 0); - $records = ((array_key_exists('records',$_REQUEST)) ? intval($_REQUEST['records']) : 0); - - $since = ((array_key_exists('since',$_REQUEST)) ? datetime_convert(date_default_timezone_get(),'UTC',$_REQUEST['since']) : NULL_DATE); - $until = ((array_key_exists('until',$_REQUEST)) ? datetime_convert(date_default_timezone_get(),'UTC',$_REQUEST['until']) : datetime_convert()); - - $x = attach_list_files(api_user(),get_observer_hash(),$hash,$filename,$filetype,'created asc',$start,$records, $since, $until); - - if($start || $records) { - $x['start'] = $start; - $x['records'] = count($x['results']); - } - - json_return_and_die($x); - } - - - function api_file_meta($type) { - if(api_user() === false) - return false; - if(! $_REQUEST['file_id']) return false; - $r = q("select * from attach where uid = %d and hash = '%s' limit 1", - intval(api_user()), - dbesc($_REQUEST['file_id']) - ); - if($r) { - unset($r[0]['content']); - $ret = array('attach' => $r[0]); - json_return_and_die($ret); - } - killme(); - } - - - - function api_file_data($type) { - if(api_user() === false) - return false; - if(! $_REQUEST['file_id']) return false; - $start = (($_REQUEST['start']) ? intval($_REQUEST['start']) : 0); - $length = (($_REQUEST['length']) ? intval($_REQUEST['length']) : 0); - - $r = q("select * from attach where uid = %d and hash like '%s' limit 1", - intval(api_user()), - dbesc($_REQUEST['file_id'] . '%') - ); - if($r) { - $ptr = $r[0]; - if($length === 0) - $length = intval($ptr['filesize']); - - if($ptr['is_dir']) - $ptr['content'] = ''; - elseif(! intval($r[0]['os_storage'])) { - $ptr['start'] = $start; - $x = substr(dbunescbin($ptr['content']),$start,$length); - $ptr['length'] = strlen($x); - $ptr['content'] = base64_encode($x); - } - else { - $fp = fopen(dbunescbin($ptr['content']),'r'); - if($fp) { - $seek = fseek($fp,$start,SEEK_SET); - $x = fread($fp,$length); - $ptr['start'] = $start; - $ptr['length'] = strlen($x); - $ptr['content'] = base64_encode($x); - } - } - - $ret = array('attach' => $ptr); - json_return_and_die($ret); - } - killme(); - } - - - function api_file_export($type) { - if(api_user() === false) - return false; - if(! $_REQUEST['file_id']) - return false; - - $channel = channelx_by_n(api_user()); - - $ret = attach_export_data($channel,$_REQUEST['file_id']); - - if($ret) { - json_return_and_die($ret); - } - killme(); - } - - - function api_file_detail($type) { - if(api_user() === false) - return false; - if(! $_REQUEST['file_id']) return false; - $r = q("select * from attach where uid = %d and hash = '%s' limit 1", - intval(api_user()), - dbesc($_REQUEST['file_id']) - ); - if($r) { - if($r[0]['is_dir']) - $r[0]['content'] = ''; - elseif(intval($r[0]['os_storage'])) - $r[0]['content'] = base64_encode(file_get_contents(dbunescbin($r[0]['content']))); - else - $r[0]['content'] = base64_encode(dbunescbin($r[0]['content'])); - - $ret = array('attach' => $r[0]); - json_return_and_die($ret); - } - killme(); - } - - - - function api_albums($type) { - if(api_user() === false) - return false; - json_return_and_die(photos_albums_list(App::get_channel(),App::get_observer())); - } - - function api_photos($type) { - if(api_user() === false) - return false; - $album = $_REQUEST['album']; - json_return_and_die(photos_list_photos(App::get_channel(),App::get_observer(),$album)); - } - - function api_photo_detail($type) { - if(api_user() === false) - return false; - if(! $_REQUEST['photo_id']) return false; - $scale = ((array_key_exists('scale',$_REQUEST)) ? intval($_REQUEST['scale']) : 0); - $r = q("select * from photo where uid = %d and resource_id = '%s' and imgscale = %d limit 1", - intval(local_channel()), - dbesc($_REQUEST['photo_id']), - intval($scale) - ); - if($r) { - $data = dbunescbin($r[0]['content']); - if(array_key_exists('os_storage',$r[0]) && intval($r[0]['os_storage'])) - $data = file_get_contents($data); - $r[0]['content'] = base64_encode($data); - $ret = array('photo' => $r[0]); - $i = q("select id from item where uid = %d and resource_type = 'photo' and resource_id = '%s' limit 1", - intval(local_channel()), - dbesc($_REQUEST['photo_id']) - ); - if($i) { - $ii = q("select * from item where parent = %d order by id", - intval($i[0]['id']) - ); - if($ii) { - xchan_query($ii,true,0); - $ii = fetch_post_tags($ii,true); - if($ii) { - $ret['item'] = []; - foreach($ii as $iii) - $ret['item'][] = encode_item($iii,true); - } - } - } - - json_return_and_die($ret); - } - killme(); - } - - function api_group_members($type) { - if(api_user() === false) - return false; - - $r = null; - - if($_REQUEST['group_id']) { - $r = q("select * from pgrp where uid = %d and id = %d limit 1", - intval(api_user()), - intval($_REQUEST['group_id']) - ); - } - elseif($_REQUEST['group_name']) { - $r = q("select * from pgrp where uid = %d and gname = '%s' limit 1", - intval(api_user()), - dbesc($_REQUEST['group_name']) - ); - } - - if($r) { - $x = q("select * from pgrp_member left join abook on abook_xchan = xchan and abook_channel = pgrp_member.uid left join xchan on pgrp_member.xchan = xchan.xchan_hash +function zot_api_init() +{ + // mastodon API specific endpoints + api_register_func('api/v1/apps', 'api_client_register', false); + api_register_func('api/v1/instance', 'api_mast_instance', false); + + api_register_func('api/z/1.0/verify', 'api_verify', true); + api_register_func('api/red/version', 'api_zot_version', false); + api_register_func('api/z/1.0/version', 'api_zot_version', false); + api_register_func('api/export/basic', 'api_export_basic', true); + api_register_func('api/red/channel/export/basic', 'api_export_basic', true); + api_register_func('api/z/1.0/channel/export/basic', 'api_export_basic', true); + api_register_func('api/red/item/export_page', 'api_item_export_page', true); + api_register_func('api/z/1.0/item/export_page', 'api_item_export_page', true); + api_register_func('api/red/channel/list', 'api_channel_list', true); + api_register_func('api/z/1.0/channel/list', 'api_channel_list', true); + api_register_func('api/red/channel/stream', 'api_channel_stream', true); + api_register_func('api/z/1.0/channel/stream', 'api_channel_stream', true); + api_register_func('api/red/files', 'api_attach_list', true); + api_register_func('api/z/1.0/files', 'api_attach_list', true); + api_register_func('api/red/filemeta', 'api_file_meta', true); + api_register_func('api/z/1.0/filemeta', 'api_file_meta', true); + api_register_func('api/red/filedata', 'api_file_data', true); + api_register_func('api/z/1.0/filedata', 'api_file_data', true); + api_register_func('api/red/file/export', 'api_file_export', true); + api_register_func('api/z/1.0/file/export', 'api_file_export', true); + api_register_func('api/red/file', 'api_file_detail', true); + api_register_func('api/z/1.0/file', 'api_file_detail', true); + api_register_func('api/red/albums', 'api_albums', true); + api_register_func('api/z/1.0/albums', 'api_albums', true); + api_register_func('api/red/photos', 'api_photos', true); + api_register_func('api/z/1.0/photos', 'api_photos', true); + api_register_func('api/red/photo', 'api_photo_detail', true); + api_register_func('api/z/1.0/photo', 'api_photo_detail', true); + api_register_func('api/red/group_members', 'api_group_members', true); + api_register_func('api/z/1.0/group_members', 'api_group_members', true); + api_register_func('api/red/group', 'api_group', true); + api_register_func('api/z/1.0/group', 'api_group', true); + api_register_func('api/red/xchan', 'api_red_xchan', true); + api_register_func('api/z/1.0/xchan', 'api_red_xchan', true); + api_register_func('api/red/item/update', 'zot_item_update', true); + api_register_func('api/z/1.0/item/update', 'zot_item_update', true); + api_register_func('api/red/item/full', 'red_item', true); + api_register_func('api/z/1.0/item/full', 'red_item', true); + + api_register_func('api/z/1.0/network/stream', 'api_network_stream', true); + api_register_func('api/z/1.0/abook', 'api_zot_abook_xchan', true); + api_register_func('api/z/1.0/abconfig', 'api_zot_abconfig', true); + api_register_func('api/z/1.0/perm_allowed', 'api_zot_perm_allowed', true); + + return; +} + + +function api_verify($type) +{ + if (api_user() === false) { + logger('no channel'); + return false; + } + $channel = channelx_by_n(api_user()); + // logger('channel: ' . print_r($channel,true)); + + json_return_and_die($channel); +} + + +function api_zot_version($type) +{ + + if ($type === 'xml') { + header('Content-type: application/xml'); + echo '' . "\r\n" . '' . Zotlabs\Lib\System::get_project_version() . ' ' . "\r\n"; + killme(); + } elseif ($type === 'json') { + header('Content-type: application/json'); + echo '"' . Zotlabs\Lib\System::get_project_version() . '"'; + killme(); + } +} + +function api_mast_instance($type) +{ + json_return_and_die(MastAPI::format_site()); +} + + + + /* + * basic channel export + */ + +function api_export_basic($type) +{ + if (api_user() === false) { + logger('api_export_basic: no user'); + return false; + } + $sections = (($_REQUEST['sections']) ? explode(',', $_REQUEST['sections']) : ''); + if ($_REQUEST['posts']) { + $sections = get_default_export_sections(); + $sections[] = 'items'; + } + + json_return_and_die(identity_basic_export(api_user(), $sections)); +} + +function api_item_export_page($type) +{ + if (api_user() === false) { + logger('api_item_export_page: no user'); + return false; + } + $page = intval($_REQUEST['page']); + $records = intval($_REQUEST['records']); + if (! $records) { + $records = 50; + } + if (! $_REQUEST['since']) { + $start = NULL_DATE; + } else { + $start = datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['since']); + } + $finish = datetime_convert(date_default_timezone_get(), 'UTC', (($_REQUEST['until']) ? $_REQUEST['until'] : 'now')); + + json_return_and_die(channel_export_items_page(api_user(), $start, $finish, $page, $records)); +} + + +function api_network_stream($type) +{ + if (api_user() === false) { + logger('api_channel_stream: no user'); + return false; + } + + $channel = channelx_by_n(api_user()); + if (! $channel) { + return false; + } + + + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + // json_return_and_die(post_activity_item($_REQUEST)); + } else { + if (array_key_exists('dbegin', $_REQUEST)) { + $_REQUEST['datequery2'] = $_REQUEST['dbegin']; + } + if (array_key_exists('dend', $_REQUEST)) { + $_REQUEST['datequery'] = $_REQUEST['dend']; + } + + $arr = $_REQUEST; + $ret = []; + $i = items_fetch($arr, App::get_channel(), get_observer_hash()); + if ($i) { + foreach ($i as $iv) { + $ret[] = encode_item($iv); + } + } + + json_return_and_die($ret); + } +} + +function api_channel_list($type) +{ + if (api_user() === false) { + logger('api_channel_stream: no user'); + return false; + } + + $channel = channelx_by_n(api_user()); + if (! $channel) { + return false; + } + + $ret = []; + + $r = q( + "select channel_address from channel where channel_account_id = %d", + intval($channel['channel_account_id']) + ); + + if ($r) { + foreach ($r as $rv) { + $ret[] = $rv['channel_address']; + } + } + + json_return_and_die($ret); +} + + +function api_channel_stream($type) +{ + if (api_user() === false) { + logger('api_channel_stream: no user'); + return false; + } + + $channel = channelx_by_n(api_user()); + if (! $channel) { + return false; + } + + + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + json_return_and_die(post_activity_item($_REQUEST)); + } else { + $mindate = (($_REQUEST['mindate']) ? datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['mindate']) : ''); + if (! $mindate) { + $mindate = datetime_convert(date_default_timezone_get(), 'UTC', 'now - 14 days'); + } + + json_return_and_die(zot_feed($channel['channel_id'], $channel['channel_hash'], [ 'mindate' => $mindate ])); + } +} + +function api_attach_list($type) +{ + if (api_user() === false) { + return false; + } + + logger('api_user: ' . api_user()); + $hash = ((array_key_exists('filehash', $_REQUEST)) ? $_REQUEST['filehash'] : ''); + $filename = ((array_key_exists('filename', $_REQUEST)) ? $_REQUEST['filename'] : ''); + $filetype = ((array_key_exists('filetype', $_REQUEST)) ? $_REQUEST['filetype'] : ''); + $start = ((array_key_exists('start', $_REQUEST)) ? intval($_REQUEST['start']) : 0); + $records = ((array_key_exists('records', $_REQUEST)) ? intval($_REQUEST['records']) : 0); + + $since = ((array_key_exists('since', $_REQUEST)) ? datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['since']) : NULL_DATE); + $until = ((array_key_exists('until', $_REQUEST)) ? datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['until']) : datetime_convert()); + + $x = attach_list_files(api_user(), get_observer_hash(), $hash, $filename, $filetype, 'created asc', $start, $records, $since, $until); + + if ($start || $records) { + $x['start'] = $start; + $x['records'] = count($x['results']); + } + + json_return_and_die($x); +} + + +function api_file_meta($type) +{ + if (api_user() === false) { + return false; + } + if (! $_REQUEST['file_id']) { + return false; + } + $r = q( + "select * from attach where uid = %d and hash = '%s' limit 1", + intval(api_user()), + dbesc($_REQUEST['file_id']) + ); + if ($r) { + unset($r[0]['content']); + $ret = array('attach' => $r[0]); + json_return_and_die($ret); + } + killme(); +} + + + +function api_file_data($type) +{ + if (api_user() === false) { + return false; + } + if (! $_REQUEST['file_id']) { + return false; + } + $start = (($_REQUEST['start']) ? intval($_REQUEST['start']) : 0); + $length = (($_REQUEST['length']) ? intval($_REQUEST['length']) : 0); + + $r = q( + "select * from attach where uid = %d and hash like '%s' limit 1", + intval(api_user()), + dbesc($_REQUEST['file_id'] . '%') + ); + if ($r) { + $ptr = $r[0]; + if ($length === 0) { + $length = intval($ptr['filesize']); + } + + if ($ptr['is_dir']) { + $ptr['content'] = ''; + } elseif (! intval($r[0]['os_storage'])) { + $ptr['start'] = $start; + $x = substr(dbunescbin($ptr['content']), $start, $length); + $ptr['length'] = strlen($x); + $ptr['content'] = base64_encode($x); + } else { + $fp = fopen(dbunescbin($ptr['content']), 'r'); + if ($fp) { + $seek = fseek($fp, $start, SEEK_SET); + $x = fread($fp, $length); + $ptr['start'] = $start; + $ptr['length'] = strlen($x); + $ptr['content'] = base64_encode($x); + } + } + + $ret = array('attach' => $ptr); + json_return_and_die($ret); + } + killme(); +} + + +function api_file_export($type) +{ + if (api_user() === false) { + return false; + } + if (! $_REQUEST['file_id']) { + return false; + } + + $channel = channelx_by_n(api_user()); + + $ret = attach_export_data($channel, $_REQUEST['file_id']); + + if ($ret) { + json_return_and_die($ret); + } + killme(); +} + + +function api_file_detail($type) +{ + if (api_user() === false) { + return false; + } + if (! $_REQUEST['file_id']) { + return false; + } + $r = q( + "select * from attach where uid = %d and hash = '%s' limit 1", + intval(api_user()), + dbesc($_REQUEST['file_id']) + ); + if ($r) { + if ($r[0]['is_dir']) { + $r[0]['content'] = ''; + } elseif (intval($r[0]['os_storage'])) { + $r[0]['content'] = base64_encode(file_get_contents(dbunescbin($r[0]['content']))); + } else { + $r[0]['content'] = base64_encode(dbunescbin($r[0]['content'])); + } + + $ret = array('attach' => $r[0]); + json_return_and_die($ret); + } + killme(); +} + + + +function api_albums($type) +{ + if (api_user() === false) { + return false; + } + json_return_and_die(photos_albums_list(App::get_channel(), App::get_observer())); +} + +function api_photos($type) +{ + if (api_user() === false) { + return false; + } + $album = $_REQUEST['album']; + json_return_and_die(photos_list_photos(App::get_channel(), App::get_observer(), $album)); +} + +function api_photo_detail($type) +{ + if (api_user() === false) { + return false; + } + if (! $_REQUEST['photo_id']) { + return false; + } + $scale = ((array_key_exists('scale', $_REQUEST)) ? intval($_REQUEST['scale']) : 0); + $r = q( + "select * from photo where uid = %d and resource_id = '%s' and imgscale = %d limit 1", + intval(local_channel()), + dbesc($_REQUEST['photo_id']), + intval($scale) + ); + if ($r) { + $data = dbunescbin($r[0]['content']); + if (array_key_exists('os_storage', $r[0]) && intval($r[0]['os_storage'])) { + $data = file_get_contents($data); + } + $r[0]['content'] = base64_encode($data); + $ret = array('photo' => $r[0]); + $i = q( + "select id from item where uid = %d and resource_type = 'photo' and resource_id = '%s' limit 1", + intval(local_channel()), + dbesc($_REQUEST['photo_id']) + ); + if ($i) { + $ii = q( + "select * from item where parent = %d order by id", + intval($i[0]['id']) + ); + if ($ii) { + xchan_query($ii, true, 0); + $ii = fetch_post_tags($ii, true); + if ($ii) { + $ret['item'] = []; + foreach ($ii as $iii) { + $ret['item'][] = encode_item($iii, true); + } + } + } + } + + json_return_and_die($ret); + } + killme(); +} + +function api_group_members($type) +{ + if (api_user() === false) { + return false; + } + + $r = null; + + if ($_REQUEST['group_id']) { + $r = q( + "select * from pgrp where uid = %d and id = %d limit 1", + intval(api_user()), + intval($_REQUEST['group_id']) + ); + } elseif ($_REQUEST['group_name']) { + $r = q( + "select * from pgrp where uid = %d and gname = '%s' limit 1", + intval(api_user()), + dbesc($_REQUEST['group_name']) + ); + } + + if ($r) { + $x = q( + "select * from pgrp_member left join abook on abook_xchan = xchan and abook_channel = pgrp_member.uid left join xchan on pgrp_member.xchan = xchan.xchan_hash where gid = %d", - intval($r[0]['id']) - ); - json_return_and_die($x); - } + intval($r[0]['id']) + ); + json_return_and_die($x); + } +} - } +function api_group($type) +{ + if (api_user() === false) { + return false; + } - function api_group($type) { - if(api_user() === false) - return false; - - $r = q("select * from pgrp where uid = %d", - intval(api_user()) - ); - json_return_and_die($r); - } + $r = q( + "select * from pgrp where uid = %d", + intval(api_user()) + ); + json_return_and_die($r); +} - function api_red_xchan($type) { - if(api_user() === false) - return false; - logger('api_xchan'); +function api_red_xchan($type) +{ + if (api_user() === false) { + return false; + } + logger('api_xchan'); - if($_SERVER['REQUEST_METHOD'] === 'POST') { - logger('xchan_store called by ' . api_user()); - $r = xchan_store($_REQUEST); - } - $r = xchan_fetch($_REQUEST); - json_return_and_die($r); - }; + if ($_SERVER['REQUEST_METHOD'] === 'POST') { + logger('xchan_store called by ' . api_user()); + $r = xchan_store($_REQUEST); + } + $r = xchan_fetch($_REQUEST); + json_return_and_die($r); +} - function api_zot_abook_xchan($type) { - logger('api_abook_xchan'); +function api_zot_abook_xchan($type) +{ + logger('api_abook_xchan'); - if(api_user() === false) - return false; + if (api_user() === false) { + return false; + } - $sql_extra = ((array_key_exists('abook_id',$_REQUEST) && intval($_REQUEST['abook_id'])) ? ' and abook_id = ' . intval($_REQUEST['abook_id']) . ' ' : ''); - if($_SERVER['REQUEST_METHOD'] === 'POST') { - // update - } - $r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d $sql_extra ", - intval(api_user()) - ); + $sql_extra = ((array_key_exists('abook_id', $_REQUEST) && intval($_REQUEST['abook_id'])) ? ' and abook_id = ' . intval($_REQUEST['abook_id']) . ' ' : ''); + if ($_SERVER['REQUEST_METHOD'] === 'POST') { + // update + } + $r = q( + "select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d $sql_extra ", + intval(api_user()) + ); - json_return_and_die($r); - }; + json_return_and_die($r); +} - function api_zot_abconfig($type) { +function api_zot_abconfig($type) +{ - if(api_user() === false) - return false; + if (api_user() === false) { + return false; + } - $sql_extra = ((array_key_exists('abook_id',$_REQUEST) && intval($_REQUEST['abook_id'])) ? ' and abook_id = ' . intval($_REQUEST['abook_id']) . ' ' : ''); - if($_SERVER['REQUEST_METHOD'] === 'POST') { - // update - } - $r = q("select abconfig.* from abconfig left join abook on abook_xchan = abconfig.xchan and abook_channel = abconfig.chan where abconfig.chan = %d $sql_extra ", - intval(api_user()) - ); + $sql_extra = ((array_key_exists('abook_id', $_REQUEST) && intval($_REQUEST['abook_id'])) ? ' and abook_id = ' . intval($_REQUEST['abook_id']) . ' ' : ''); + if ($_SERVER['REQUEST_METHOD'] === 'POST') { + // update + } + $r = q( + "select abconfig.* from abconfig left join abook on abook_xchan = abconfig.xchan and abook_channel = abconfig.chan where abconfig.chan = %d $sql_extra ", + intval(api_user()) + ); - json_return_and_die($r); + json_return_and_die($r); +} - } +function api_zot_perm_allowed($type) +{ + if (api_user() === false) { + return false; + } - function api_zot_perm_allowed($type) { - if(api_user() === false) - return false; + $perm = ((array_key_exists('perm', $_REQUEST)) ? $_REQUEST['perm'] : ''); - $perm = ((array_key_exists('perm',$_REQUEST)) ? $_REQUEST['perm'] : ''); + if (array_key_exists('abook_id', $_REQUEST) && intval($_REQUEST['abook_id'])) { + $r = q( + "select abook_xchan as hash from abook where abook_id = %d and abook_channel = %d limit 1", + intval($_REQUEST['abook_id']), + intval(api_user()) + ); + } else { + $r = xchan_fetch($_REQUEST); + } - if(array_key_exists('abook_id',$_REQUEST) && intval($_REQUEST['abook_id'])) { - $r = q("select abook_xchan as hash from abook where abook_id = %d and abook_channel = %d limit 1", - intval($_REQUEST['abook_id']), - intval(api_user()) - ); - } - else { - $r = xchan_fetch($_REQUEST); - } + $x = false; - $x = false; + if ($r) { + if ($perm) { + $x = [ [ 'perm' => $perm, 'allowed' => perm_is_allowed(api_user(), $r[0]['hash'], $perm)] ]; + } else { + $x = []; + $p = get_all_perms(api_user(), $r[0]['hash']); + if ($p) { + foreach ($p as $k => $v) { + $x[] = [ 'perm' => $k, 'allowed' => $v ]; + } + } + } + } + + json_return_and_die($x); +} - if($r) { - if($perm) - $x = [ [ 'perm' => $perm, 'allowed' => perm_is_allowed(api_user(), $r[0]['hash'], $perm)] ]; - else { - $x = []; - $p = get_all_perms(api_user(),$r[0]['hash']); - if($p) { - foreach($p as $k => $v) - $x[] = [ 'perm' => $k, 'allowed' => $v ]; - } - } - } - - json_return_and_die($x); +function zot_item_update($type) +{ - } + if (api_user() === false) { + logger('api_red_item_store: no user'); + return false; + } - function zot_item_update($type) { - - if (api_user() === false) { - logger('api_red_item_store: no user'); - return false; - } - - logger('api_red_item_store: REQUEST ' . print_r($_REQUEST,true)); - logger('api_red_item_store: FILES ' . print_r($_FILES,true)); + logger('api_red_item_store: REQUEST ' . print_r($_REQUEST, true)); + logger('api_red_item_store: FILES ' . print_r($_FILES, true)); - // set this so that the item_post() function is quiet and doesn't redirect or emit json + // set this so that the item_post() function is quiet and doesn't redirect or emit json - $_REQUEST['api_source'] = true; - $_REQUEST['profile_uid'] = api_user(); + $_REQUEST['api_source'] = true; + $_REQUEST['profile_uid'] = api_user(); - if(x($_FILES,'media')) { - $_FILES['userfile'] = $_FILES['media']; - // upload the image if we have one - $mod = new Zotlabs\Module\Wall_attach(); - $media = $mod->post(); - if($media) - $_REQUEST['body'] .= "\n\n" . $media; - } + if (x($_FILES, 'media')) { + $_FILES['userfile'] = $_FILES['media']; + // upload the image if we have one + $mod = new Zotlabs\Module\Wall_attach(); + $media = $mod->post(); + if ($media) { + $_REQUEST['body'] .= "\n\n" . $media; + } + } - $mod = new Zotlabs\Module\Item(); - $x = $mod->post(); - json_return_and_die($x); - } + $mod = new Zotlabs\Module\Item(); + $x = $mod->post(); + json_return_and_die($x); +} - function red_item($type) { +function red_item($type) +{ - if (api_user() === false) { - logger('api_red_item_full: no user'); - return false; - } + if (api_user() === false) { + logger('api_red_item_full: no user'); + return false; + } - if($_REQUEST['mid']) { - $arr = array('mid' => $_REQUEST['mid']); - } - elseif($_REQUEST['item_id']) { - $arr = array('item_id' => $_REQUEST['item_id']); - } - else - json_return_and_die([]); + if ($_REQUEST['mid']) { + $arr = array('mid' => $_REQUEST['mid']); + } elseif ($_REQUEST['item_id']) { + $arr = array('item_id' => $_REQUEST['item_id']); + } else { + json_return_and_die([]); + } - $arr['start'] = 0; - $arr['records'] = 999999; - $arr['item_type'] = '*'; - - $i = items_fetch($arr,App::get_channel(),get_observer_hash()); - - if(! $i) - json_return_and_die([]); - - $ret = []; - $tmp = []; - foreach($i as $ii) { - $tmp[] = encode_item($ii,true); - } - $ret['item'] = $tmp; - - json_return_and_die($ret); - } + $arr['start'] = 0; + $arr['records'] = 999999; + $arr['item_type'] = '*'; + $i = items_fetch($arr, App::get_channel(), get_observer_hash()); + if (! $i) { + json_return_and_die([]); + } + $ret = []; + $tmp = []; + foreach ($i as $ii) { + $tmp[] = encode_item($ii, true); + } + $ret['item'] = $tmp; + + json_return_and_die($ret); +} diff --git a/include/attach.php b/include/attach.php index 91463573f..c75912518 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1,4 +1,5 @@ 'text/plain', - 'htm' => 'text/html', - 'html' => 'text/html', - 'css' => 'text/css', - 'md' => 'text/markdown', - 'bb' => 'text/bbcode', + 'txt' => 'text/plain', + 'htm' => 'text/html', + 'html' => 'text/html', + 'css' => 'text/css', + 'md' => 'text/markdown', + 'bb' => 'text/bbcode', 'mc' => 'text/x-multicode', 'abc' => 'text/vnd.abc', - 'csv' => 'text/csv', - 'js' => 'application/javascript', - 'json' => 'application/json', - 'xml' => 'application/xml', - 'swf' => 'application/x-shockwave-flash', - 'flv' => 'video/x-flv', - 'epub' => 'application/epub+zip', - 'c' => 'text/plain', - 'h' => 'text/plain', - 'sh' => 'text/plain', - 'py' => 'text/plain', - 'php' => 'text/plain', - 'rb' => 'text/plain', - 'pdl' => 'text/plain', - 'ics' => 'text/calendar', + 'csv' => 'text/csv', + 'js' => 'application/javascript', + 'json' => 'application/json', + 'xml' => 'application/xml', + 'swf' => 'application/x-shockwave-flash', + 'flv' => 'video/x-flv', + 'epub' => 'application/epub+zip', + 'c' => 'text/plain', + 'h' => 'text/plain', + 'sh' => 'text/plain', + 'py' => 'text/plain', + 'php' => 'text/plain', + 'rb' => 'text/plain', + 'pdl' => 'text/plain', + 'ics' => 'text/calendar', - // images + // images - 'png' => 'image/png', - 'jpe' => 'image/jpeg', - 'jpeg' => 'image/jpeg', - 'jpg' => 'image/jpeg', - 'gif' => 'image/gif', - 'bmp' => 'image/bmp', - 'webp' => 'image/webp', - 'ico' => 'image/vnd.microsoft.icon', - 'tiff' => 'image/tiff', - 'tif' => 'image/tiff', - 'svg' => 'image/svg+xml', - 'svgz' => 'image/svg+xml', + 'png' => 'image/png', + 'jpe' => 'image/jpeg', + 'jpeg' => 'image/jpeg', + 'jpg' => 'image/jpeg', + 'gif' => 'image/gif', + 'bmp' => 'image/bmp', + 'webp' => 'image/webp', + 'ico' => 'image/vnd.microsoft.icon', + 'tiff' => 'image/tiff', + 'tif' => 'image/tiff', + 'svg' => 'image/svg+xml', + 'svgz' => 'image/svg+xml', - // archives - 'zip' => 'application/zip', - 'rar' => 'application/x-rar-compressed', - 'exe' => 'application/x-msdownload', - 'msi' => 'application/x-msdownload', - 'cab' => 'application/vnd.ms-cab-compressed', + // archives + 'zip' => 'application/zip', + 'rar' => 'application/x-rar-compressed', + 'exe' => 'application/x-msdownload', + 'msi' => 'application/x-msdownload', + 'cab' => 'application/vnd.ms-cab-compressed', - // audio/video - 'mp3' => 'audio/mpeg', - 'wav' => 'audio/wav', - 'qt' => 'video/quicktime', - 'mov' => 'video/quicktime', - 'ogg' => 'audio/ogg', - 'ogv' => 'video/ogg', - 'ogx' => 'application/ogg', - 'flac' => 'audio/flac', - 'opus' => 'audio/ogg', - 'webm' => 'video/webm', - 'mp4' => 'video/mp4', - 'mkv' => 'video/x-matroska', + // audio/video + 'mp3' => 'audio/mpeg', + 'wav' => 'audio/wav', + 'qt' => 'video/quicktime', + 'mov' => 'video/quicktime', + 'ogg' => 'audio/ogg', + 'ogv' => 'video/ogg', + 'ogx' => 'application/ogg', + 'flac' => 'audio/flac', + 'opus' => 'audio/ogg', + 'webm' => 'video/webm', + 'mp4' => 'video/mp4', + 'mkv' => 'video/x-matroska', - // adobe - 'pdf' => 'application/pdf', - 'psd' => 'image/vnd.adobe.photoshop', - 'ai' => 'application/postscript', - 'eps' => 'application/postscript', - 'ps' => 'application/postscript', + // adobe + 'pdf' => 'application/pdf', + 'psd' => 'image/vnd.adobe.photoshop', + 'ai' => 'application/postscript', + 'eps' => 'application/postscript', + 'ps' => 'application/postscript', - // ms office - 'doc' => 'application/msword', - 'rtf' => 'application/rtf', - 'xls' => 'application/vnd.ms-excel', - 'ppt' => 'application/vnd.ms-powerpoint', + // ms office + 'doc' => 'application/msword', + 'rtf' => 'application/rtf', + 'xls' => 'application/vnd.ms-excel', + 'ppt' => 'application/vnd.ms-powerpoint', - // open office - 'odt' => 'application/vnd.oasis.opendocument.text', - 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', - 'odp' => 'application/vnd.oasis.opendocument.presentation', - 'odg' => 'application/vnd.oasis.opendocument.graphics', - 'odc' => 'application/vnd.oasis.opendocument.chart', - 'odf' => 'application/vnd.oasis.opendocument.formula', - 'odi' => 'application/vnd.oasis.opendocument.image', - 'odm' => 'application/vnd.oasis.opendocument.text-master', - 'odb' => 'application/vnd.oasis.opendocument.base', - 'odb' => 'application/vnd.oasis.opendocument.database', - 'ott' => 'application/vnd.oasis.opendocument.text-template', - 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template', - 'otp' => 'application/vnd.oasis.opendocument.presentation-template', - 'otg' => 'application/vnd.oasis.opendocument.graphics-template', - 'otc' => 'application/vnd.oasis.opendocument.chart-template', - 'otf' => 'application/vnd.oasis.opendocument.formula-template', - 'oti' => 'application/vnd.oasis.opendocument.image-template', - 'oth' => 'application/vnd.oasis.opendocument.text-web' - ); + // open office + 'odt' => 'application/vnd.oasis.opendocument.text', + 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', + 'odp' => 'application/vnd.oasis.opendocument.presentation', + 'odg' => 'application/vnd.oasis.opendocument.graphics', + 'odc' => 'application/vnd.oasis.opendocument.chart', + 'odf' => 'application/vnd.oasis.opendocument.formula', + 'odi' => 'application/vnd.oasis.opendocument.image', + 'odm' => 'application/vnd.oasis.opendocument.text-master', + 'odb' => 'application/vnd.oasis.opendocument.base', + 'odb' => 'application/vnd.oasis.opendocument.database', + 'ott' => 'application/vnd.oasis.opendocument.text-template', + 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template', + 'otp' => 'application/vnd.oasis.opendocument.presentation-template', + 'otg' => 'application/vnd.oasis.opendocument.graphics-template', + 'otc' => 'application/vnd.oasis.opendocument.chart-template', + 'otf' => 'application/vnd.oasis.opendocument.formula-template', + 'oti' => 'application/vnd.oasis.opendocument.image-template', + 'oth' => 'application/vnd.oasis.opendocument.text-web' + ); - $last_dot = strrpos($filename, '.'); - if ($last_dot !== false) { - $ext = strtolower(substr($filename, $last_dot + 1)); - if (array_key_exists($ext, $mime_types)) { - return $mime_types[$ext]; - } - } + $last_dot = strrpos($filename, '.'); + if ($last_dot !== false) { + $ext = strtolower(substr($filename, $last_dot + 1)); + if (array_key_exists($ext, $mime_types)) { + return $mime_types[$ext]; + } + } - return 'application/octet-stream'; + return 'application/octet-stream'; } /** @@ -150,35 +152,37 @@ function z_mime_content_type($filename) { * * \e int|boolean \b results amount of found results, or false * * \e string \b message with error messages if any */ -function attach_count_files($channel_id, $observer, $hash = '', $filename = '', $filetype = '') { +function attach_count_files($channel_id, $observer, $hash = '', $filename = '', $filetype = '') +{ - $ret = [ 'success' => false ]; + $ret = [ 'success' => false ]; - if (! perm_is_allowed($channel_id, $observer, 'read_storage')) { - $ret['message'] = t('Permission denied.'); - return $ret; - } + if (! perm_is_allowed($channel_id, $observer, 'read_storage')) { + $ret['message'] = t('Permission denied.'); + return $ret; + } - require_once('include/security.php'); - $sql_extra = permissions_sql($channel_id); + require_once('include/security.php'); + $sql_extra = permissions_sql($channel_id); - if ($hash) { - $sql_extra .= protect_sprintf(" and hash = '" . dbesc($hash) . "' "); - } - if ($filename) { - $sql_extra .= protect_sprintf(" and filename like '@" . dbesc($filename) . "@' "); - } - if ($filetype) { - $sql_extra .= protect_sprintf(" and filetype like '@" . dbesc($filetype) . "@' "); - } - $r = q("select id, uid, folder from attach where uid = %d $sql_extra", - intval($channel_id) - ); + if ($hash) { + $sql_extra .= protect_sprintf(" and hash = '" . dbesc($hash) . "' "); + } + if ($filename) { + $sql_extra .= protect_sprintf(" and filename like '@" . dbesc($filename) . "@' "); + } + if ($filetype) { + $sql_extra .= protect_sprintf(" and filetype like '@" . dbesc($filetype) . "@' "); + } + $r = q( + "select id, uid, folder from attach where uid = %d $sql_extra", + intval($channel_id) + ); - $ret['success'] = ((is_array($r)) ? true : false); - $ret['results'] = ((is_array($r)) ? count($r) : false); + $ret['success'] = ((is_array($r)) ? true : false); + $ret['results'] = ((is_array($r)) ? count($r) : false); - return $ret; + return $ret; } /** @@ -197,50 +201,52 @@ function attach_count_files($channel_id, $observer, $hash = '', $filename = '', * * \e array|boolean \b results array with results, or false * * \e string \b message with error messages if any */ -function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $filetype = '', $orderby = 'created desc', $start = 0, $entries = 0, $since = '', $until = '') { +function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $filetype = '', $orderby = 'created desc', $start = 0, $entries = 0, $since = '', $until = '') +{ - $ret = [ 'success' => false ]; + $ret = [ 'success' => false ]; - if (! perm_is_allowed($channel_id,$observer, 'view_storage')) { - $ret['message'] = t('Permission denied.'); - return $ret; - } + if (! perm_is_allowed($channel_id, $observer, 'view_storage')) { + $ret['message'] = t('Permission denied.'); + return $ret; + } - require_once('include/security.php'); - $sql_extra = permissions_sql($channel_id); + require_once('include/security.php'); + $sql_extra = permissions_sql($channel_id); - if ($hash) { - $sql_extra .= protect_sprintf(" and hash = '" . dbesc($hash) . "' "); - } - if ($filename) { - $sql_extra .= protect_sprintf(" and filename like '%" . dbesc($filename) . "%' "); - } - if ($filetype) { - $sql_extra .= protect_sprintf(" and filetype like '%" . dbesc($filetype) . "%' "); - } - if ($entries) { - $limit = " limit " . intval($start) . ", " . intval($entries) . " "; - } - if (! $since) { - $since = NULL_DATE; - } - if (! $until) { - $until = datetime_convert(); - } - - $sql_extra .= " and created >= '" . dbesc($since) . "' and created <= '" . dbesc($until) . "' "; + if ($hash) { + $sql_extra .= protect_sprintf(" and hash = '" . dbesc($hash) . "' "); + } + if ($filename) { + $sql_extra .= protect_sprintf(" and filename like '%" . dbesc($filename) . "%' "); + } + if ($filetype) { + $sql_extra .= protect_sprintf(" and filetype like '%" . dbesc($filetype) . "%' "); + } + if ($entries) { + $limit = " limit " . intval($start) . ", " . intval($entries) . " "; + } + if (! $since) { + $since = NULL_DATE; + } + if (! $until) { + $until = datetime_convert(); + } - // Retrieve all columns except 'content' + $sql_extra .= " and created >= '" . dbesc($since) . "' and created <= '" . dbesc($until) . "' "; - $r = q("select id, aid, uid, hash, filename, filetype, filesize, revision, folder, os_path, display_path, os_storage, is_dir, is_photo, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d $sql_extra ORDER BY $orderby $limit", - intval($channel_id) - ); + // Retrieve all columns except 'content' - $ret['success'] = ((is_array($r)) ? true : false); - $ret['results'] = ((is_array($r)) ? $r : []); + $r = q( + "select id, aid, uid, hash, filename, filetype, filesize, revision, folder, os_path, display_path, os_storage, is_dir, is_photo, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d $sql_extra ORDER BY $orderby $limit", + intval($channel_id) + ); - return $ret; + $ret['success'] = ((is_array($r)) ? true : false); + $ret['results'] = ((is_array($r)) ? $r : []); + + return $ret; } /** @@ -255,110 +261,115 @@ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $ * @param int $rev (optional) Revision default 0 * @return array */ -function attach_by_hash($hash, $observer_hash, $rev = 0) { +function attach_by_hash($hash, $observer_hash, $rev = 0) +{ - $ret = [ 'success' => false ]; + $ret = [ 'success' => false ]; - // Check for existence, which will also provide us the owner uid + // Check for existence, which will also provide us the owner uid - $sql_extra = ''; - if ($rev == (-1)) { - $sql_extra = " order by revision desc "; - } - elseif ($rev) { - $sql_extra = " and revision = " . intval($rev) . " "; - } - - $r = q("SELECT uid FROM attach WHERE hash = '%s' $sql_extra LIMIT 1", - dbesc($hash) - ); - if (! $r) { - $ret['message'] = t('Item was not found.'); - return $ret; - } + $sql_extra = ''; + if ($rev == (-1)) { + $sql_extra = " order by revision desc "; + } elseif ($rev) { + $sql_extra = " and revision = " . intval($rev) . " "; + } - if (! attach_can_view($r[0]['uid'], $observer_hash, $hash)) { - $ret['message'] = t('Permission denied.'); - return $ret; - } + $r = q( + "SELECT uid FROM attach WHERE hash = '%s' $sql_extra LIMIT 1", + dbesc($hash) + ); + if (! $r) { + $ret['message'] = t('Item was not found.'); + return $ret; + } - // We've already checked for existence and permissions + if (! attach_can_view($r[0]['uid'], $observer_hash, $hash)) { + $ret['message'] = t('Permission denied.'); + return $ret; + } - $r = q("SELECT * FROM attach WHERE hash = '%s' and uid = %d $sql_extra LIMIT 1", - dbesc($hash), - intval($r[0]['uid']) - ); + // We've already checked for existence and permissions - if (! $r) { - $ret['message'] = t('Unknown error.'); - return $ret; - } + $r = q( + "SELECT * FROM attach WHERE hash = '%s' and uid = %d $sql_extra LIMIT 1", + dbesc($hash), + intval($r[0]['uid']) + ); - $r[0]['content'] = dbunescbin($r[0]['content']); + if (! $r) { + $ret['message'] = t('Unknown error.'); + return $ret; + } - $ret['success'] = true; - $ret['data'] = array_shift($r); + $r[0]['content'] = dbunescbin($r[0]['content']); - return $ret; + $ret['success'] = true; + $ret['data'] = array_shift($r); + + return $ret; } -function attach_can_view($uid,$ob_hash,$resource,$token = EMPTY_STR) { +function attach_can_view($uid, $ob_hash, $resource, $token = EMPTY_STR) +{ - $sql_extra = permissions_sql($uid,$ob_hash,'',$token); - $hash = $resource; + $sql_extra = permissions_sql($uid, $ob_hash, '', $token); + $hash = $resource; - if (! $token) { - if (! perm_is_allowed($uid,$ob_hash,'view_storage')) { - return false; - } - } + if (! $token) { + if (! perm_is_allowed($uid, $ob_hash, 'view_storage')) { + return false; + } + } - $r = q("select folder from attach where hash = '%s' and uid = %d $sql_extra", - dbesc($hash), - intval($uid) - ); + $r = q( + "select folder from attach where hash = '%s' and uid = %d $sql_extra", + dbesc($hash), + intval($uid) + ); - if (! $r) { - return false; - } + if (! $r) { + return false; + } - // don't perform recursive folder check when using OCAP. Only when using ACL access. - // For OCAP if the token is valid they can see the thing. - - if ($token) { - return true; - } + // don't perform recursive folder check when using OCAP. Only when using ACL access. + // For OCAP if the token is valid they can see the thing. - return attach_can_view_folder($uid,$ob_hash,$r[0]['folder'],$token); + if ($token) { + return true; + } + return attach_can_view_folder($uid, $ob_hash, $r[0]['folder'], $token); } -function attach_can_view_folder($uid,$ob_hash,$folder_hash,$token = EMPTY_STR) { +function attach_can_view_folder($uid, $ob_hash, $folder_hash, $token = EMPTY_STR) +{ - $sql_extra = permissions_sql($uid,$ob_hash,'',$token); - $hash = $folder_hash; - $result = false; + $sql_extra = permissions_sql($uid, $ob_hash, '', $token); + $hash = $folder_hash; + $result = false; - if ((! $folder_hash) && (! $token)) { - return perm_is_allowed($uid,$ob_hash,'view_storage'); - } + if ((! $folder_hash) && (! $token)) { + return perm_is_allowed($uid, $ob_hash, 'view_storage'); + } - do { - $r = q("select folder from attach where hash = '%s' and uid = %d $sql_extra", - dbesc($hash), - intval($uid) - ); - if (! $r) { - return false; - } - $hash = $r[0]['folder']; - } while($hash); + do { + $r = q( + "select folder from attach where hash = '%s' and uid = %d $sql_extra", + dbesc($hash), + intval($uid) + ); + if (! $r) { + return false; + } + $hash = $r[0]['folder']; + } while ($hash); - return true; + return true; } @@ -376,59 +387,61 @@ function attach_can_view_folder($uid,$ob_hash,$folder_hash,$token = EMPTY_STR) { * * \e string \b message (optional) only when success is false * * \e array \b data array of attach DB entry without data component */ -function attach_by_hash_nodata($hash, $observer_hash, $rev = 0) { +function attach_by_hash_nodata($hash, $observer_hash, $rev = 0) +{ - $ret = [ 'success' => false ]; + $ret = [ 'success' => false ]; - // Check for existence, which will also provide us the owner uid + // Check for existence, which will also provide us the owner uid - $sql_extra = ''; - if ($rev == (-1)) { - $sql_extra = " order by revision desc "; - } - elseif ($rev) { - $sql_extra = " and revision = " . intval($rev) . " "; - } + $sql_extra = ''; + if ($rev == (-1)) { + $sql_extra = " order by revision desc "; + } elseif ($rev) { + $sql_extra = " and revision = " . intval($rev) . " "; + } - $r = q("SELECT uid FROM attach WHERE hash = '%s' $sql_extra LIMIT 1", - dbesc($hash) - ); - if (! $r) { - $ret['message'] = t('Item was not found.'); - return $ret; - } + $r = q( + "SELECT uid FROM attach WHERE hash = '%s' $sql_extra LIMIT 1", + dbesc($hash) + ); + if (! $r) { + $ret['message'] = t('Item was not found.'); + return $ret; + } - if (! perm_is_allowed($r[0]['uid'], $observer_hash, 'view_storage')) { - $ret['message'] = t('Permission denied.'); - return $ret; - } + if (! perm_is_allowed($r[0]['uid'], $observer_hash, 'view_storage')) { + $ret['message'] = t('Permission denied.'); + return $ret; + } - $sql_extra = permissions_sql($r[0]['uid'], $observer_hash); + $sql_extra = permissions_sql($r[0]['uid'], $observer_hash); - // Now we'll see if we can access the attachment + // Now we'll see if we can access the attachment - $a = q("select id, aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_storage, is_photo, os_path, display_path, is_dir, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d and hash = '%s' $sql_extra limit 1", - intval($r[0]['uid']), - dbesc($hash) - ); + $a = q( + "select id, aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_storage, is_photo, os_path, display_path, is_dir, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d and hash = '%s' $sql_extra limit 1", + intval($r[0]['uid']), + dbesc($hash) + ); - if (! $a) { - $ret['message'] = t('Permission denied.'); - return $ret; - } + if (! $a) { + $ret['message'] = t('Permission denied.'); + return $ret; + } - if ($a[0]['folder']) { - $x = attach_can_view_folder($a[0]['uid'], $observer_hash, $a[0]['folder']); - if (! $x) { - $ret['message'] = t('Permission denied.'); - return $ret; - } - } + if ($a[0]['folder']) { + $x = attach_can_view_folder($a[0]['uid'], $observer_hash, $a[0]['folder']); + if (! $x) { + $ret['message'] = t('Permission denied.'); + return $ret; + } + } - $ret['success'] = true; - $ret['data'] = array_shift($a); + $ret['success'] = true; + $ret['data'] = array_shift($a); - return $ret; + return $ret; } /** @@ -466,599 +479,633 @@ function attach_by_hash_nodata($hash, $observer_hash, $rev = 0) { * @param array $arr (optional) associative array * @return void|array */ -function attach_store($channel, $observer_hash, $options = '', $arr = null) { - - require_once('include/photos.php'); - - /** - * @hooks photo_upload_begin - * Called when attempting to upload a photo. - */ - call_hooks('photo_upload_begin', $arr); - - $ret = array('success' => false); - $channel_id = $channel['channel_id']; - $sql_options = ''; - $source = (($arr) ? $arr['source'] : ''); - $album = (($arr) ? $arr['album'] : ''); - $newalbum = (($arr) ? $arr['newalbum'] : ''); - $hash = (($arr && $arr['hash']) ? $arr['hash'] : null); - $upload_path = (($arr && $arr['directory']) ? $arr['directory'] : ''); - $visible = (($arr && $arr['visible']) ? $arr['visible'] : ''); - $notify = (($arr && $arr['notify']) ? $arr['notify'] : ''); - $flags = (($arr && array_key_exists('flags',$arr)) ? intval($arr['flags']) : 0); - $observer = []; - - $dosync = ((array_key_exists('nosync',$arr) && $arr['nosync']) ? 0 : 1); - - if($observer_hash) { - $observer = xchan_match([ 'xchan_hash' => $observer_hash ]); - } - - logger('arr: ' . print_r($arr,true), LOGGER_DATA); - - if(! perm_is_allowed($channel_id,$observer_hash, 'write_storage')) { - $ret['message'] = t('Permission denied.'); - return $ret; - } - - $str_group_allow = perms2str($arr['group_allow']); - $str_contact_allow = perms2str($arr['contact_allow']); - $str_group_deny = perms2str($arr['group_deny']); - $str_contact_deny = perms2str($arr['contact_deny']); - - - // The 'update' option sets db values without uploading a new attachment - // 'replace' replaces the existing uploaded data - // 'revision' creates a new revision with new upload data - // Default is to upload a new file - - // revise or update must provide $arr['hash'] of the thing to revise/update - - // By default remove $src when finished - - $remove_when_processed = true; - $import_replace = false; - - if($options === 'import') { - $src = $arr['src']; - $filename = $arr['filename']; - $filesize = @filesize($src); - - $hash = $arr['resource_id']; - - if(array_key_exists('hash',$arr)) - $hash = $arr['hash']; - if(array_key_exists('type',$arr)) - $type = $arr['type']; - - if($arr['preserve_original']) - $remove_when_processed = false; - - if($arr['replace']) - $import_replace = true; - - // if importing a directory, just do it now and go home - we're done. - - if(array_key_exists('is_dir',$arr) && intval($arr['is_dir'])) { - $x = attach_mkdir($channel,$observer_hash,$arr); - if($x['message']) - logger('import_directory: ' . $x['message']); - - return; - } - } - elseif($options !== 'update') { - $f = [ - 'src' => '', - 'filename' => '', - 'filesize' => 0, - 'type' => '' - ]; - - /** - * @hooks photo_upload_file - * Called to generate alternate filenames for an upload. - * * \e string \b src - return value, default empty - * * \e string \b filename - return value, default empty - * * \e number \b filesize - return value, default 0 - * * \e string \b type - return value, default empty - */ - call_hooks('photo_upload_file', $f); - /** - * @hooks attach_upload_file - * Called when uploading a file. - * * \e string \b src - return value, default empty - * * \e string \b filename - return value, default empty - * * \e number \b filesize - return value, default 0 - * * \e string \b type - return value, default empty - */ - call_hooks('attach_upload_file', $f); - - if (x($f,'src') && x($f,'filesize')) { - $src = $f['src']; - $filename = $f['filename']; - $filesize = $f['filesize']; - $type = $f['type']; - } else { - if(! x($_FILES,'userfile')) { - logger('No source file'); - $ret['message'] = t('No source file.'); - return $ret; - } - - $src = $_FILES['userfile']['tmp_name']; - $filename = basename($_FILES['userfile']['name']); - $filesize = intval($_FILES['userfile']['size']); - } - } - - // AndStatus sends jpegs with a non-standard mimetype - if($type === 'image/jpg') - $type = 'image/jpeg'; - - $existing_size = 0; - - if($options === 'replace') { - $x = q("select id, hash, filesize from attach where id = %d and uid = %d limit 1", - intval($arr['id']), - intval($channel_id) - ); - if(! $x) { - $ret['message'] = t('Cannot locate file to replace'); - return $ret; - } - $existing_id = $x[0]['id']; - $existing_size = intval($x[0]['filesize']); - $hash = $x[0]['hash']; - } - - if($options === 'revise' || $options === 'update') { - $sql_options = " order by revision desc "; - if($options === 'update' && $arr && array_key_exists('revision',$arr)) - $sql_options = " and revision = " . intval($arr['revision']) . " "; - - $x = q("select id, aid, uid, filename, filetype, filesize, hash, revision, folder, os_storage, is_photo, os_path, display_path, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where hash = '%s' and uid = %d $sql_options limit 1", - dbesc($arr['hash']), - intval($channel_id) - ); - if(! $x) { - logger('update file source not found'); - $ret['message'] = t('Cannot locate file to revise/update'); - return $ret; - } - $hash = $x[0]['hash']; - } - - $def_extension = ''; - $is_photo = 0; - $gis = false; - - if ($src) { - $gis = @getimagesize($src); - logger('getimagesize: ' . print_r($gis,true), LOGGER_DATA); - } - - if(($gis) && in_array($gis[2], [ IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_WEBP ])) { - $is_photo = 1; - if($gis[2] === IMAGETYPE_GIF) - $def_extension = '.gif'; - if($gis[2] === IMAGETYPE_JPEG) - $def_extension = '.jpg'; - if($gis[2] === IMAGETYPE_PNG) - $def_extension = '.png'; - if($gis[2] === IMAGETYPE_WEBP) - $def_extension = '.webp'; - } - - // If we know it's a photo, over-ride the type in case the source system could not determine what it was - - if($is_photo) { - $type = $gis['mime']; - } - - $pathname = ''; - - - // If we were called from the Photos module there is a slightly different mechanism - // for setting the parent path than if we were called from the Files (cloud) module. - - if ($source === 'photos') { - if ($newalbum) { - $pathname = filepath_macro($newalbum); - } - elseif (array_key_exists('folder',$arr)) { - $x = q("select filename from attach where hash = '%s' and uid = %d limit 1", - dbesc($arr['folder']), - intval($channel['channel_id']) - ); - if ($x) { - $pathname = $x[0]['filename']; - } - } - else { - $pathname = filepath_macro($album); - } - } - - if (! $pathname) { - $pathname = filepath_macro($upload_path); - } - - $darr = array('pathname' => $pathname); - - // if we need to create a directory, use the channel default permissions. - - $darr['allow_cid'] = $channel['allow_cid']; - $darr['allow_gid'] = $channel['allow_gid']; - $darr['deny_cid'] = $channel['deny_cid']; - $darr['deny_gid'] = $channel['deny_gid']; - - - $direct = null; - - if ($pathname) { - $x = attach_mkdirp($channel, $observer_hash, $darr); - $folder_hash = (($x['success']) ? $x['data']['hash'] : ''); - $direct = (($x['success']) ? $x['data'] : null); - if ((! $str_contact_allow) && (! $str_group_allow) && (! $str_contact_deny) && (! $str_group_deny)) { - $str_contact_allow = $x['data']['allow_cid']; - $str_group_allow = $x['data']['allow_gid']; - $str_contact_deny = $x['data']['deny_cid']; - $str_group_deny = $x['data']['deny_gid']; - } - } - else { - $folder_hash = ((($arr) && array_key_exists('folder',$arr)) ? $arr['folder'] : ''); - } - - if((! $options) || ($options === 'import')) { - - // A freshly uploaded file. Check for duplicate and resolve with the channel's overwrite settings. - - $r = q("select filename, id, hash, filesize from attach where uid = %d and filename = '%s' and folder = '%s' ", - intval($channel_id), - dbesc($filename), - dbesc($folder_hash) - ); - if($r) { - $overwrite = (($import_replace || get_pconfig($channel_id,'system','overwrite_dup_files')) ? true : false); - if(($overwrite) || ($options === 'import')) { - if(! array_key_exists('edited',$arr)) - $arr['edited'] = datetime_convert(); - $options = 'replace'; - $existing_id = $x[0]['id']; - $existing_size = intval($x[0]['filesize']); - $hash = $x[0]['hash']; - } - else { - if(strpos($filename,'.') !== false) { - $basename = substr($filename,0,strrpos($filename,'.')); - $ext = substr($filename,strrpos($filename,'.')); - } - else { - $basename = $filename; - $ext = $def_extension; - } - - $r = q("select filename from attach where uid = %d and ( filename = '%s' OR filename like '%s' ) and folder = '%s' ", - intval($channel_id), - dbesc($basename . $ext), - dbesc($basename . '(%)' . $ext), - dbesc($folder_hash) - ); - - if($r) { - $x = 1; - - do { - $found = false; - foreach($r as $rr) { - if($rr['filename'] === $basename . '(' . $x . ')' . $ext) { - $found = true; - break; - } - } - if($found) - $x++; - } while($found); - $filename = $basename . '(' . $x . ')' . $ext; - } - else - $filename = $basename . $ext; - } - } - } - - if(! $hash) - $hash = new_uuid(); - - // Check storage limits - if($options !== 'update') { - $maxfilesize = get_config('system','maxfilesize'); - - if(($maxfilesize) && ($filesize > $maxfilesize)) { - logger('quota_exceeded'); - $ret['message'] = sprintf( t('File exceeds size limit of %d'), $maxfilesize); - if($remove_when_processed) - @unlink($src); - - /** - * @hooks photo_upload_end - * Called when a photo upload has been processed. - */ - call_hooks('photo_upload_end', $ret); - - return $ret; - } - - $limit = engr_units_to_bytes(service_class_fetch($channel_id, 'attach_upload_limit')); - - if($limit !== false) { - $r = q("select sum(filesize) as total from attach where aid = %d ", - intval($channel['channel_account_id']) - ); - if(($r) && (($r[0]['total'] + $filesize) > ($limit - $existing_size))) { - logger('service_class limit exceeded'); - $ret['message'] = upgrade_message(true) . sprintf(t("You have reached your limit of %1$.0f Mbytes attachment storage."), $limit / 1024000); - if($remove_when_processed) - @unlink($src); - - /** - * @hooks photo_upload_end - * Called when a photo upload has been processed. - */ - call_hooks('photo_upload_end', $ret); - - return $ret; - } - } - $mimetype = ((isset($type) && $type) ? $type : z_mime_content_type($filename)); - } - - $os_basepath = 'store/' . $channel['channel_address'] . '/' ; - $os_relpath = ''; - - if($folder_hash) { - $curr = find_folder_hash_by_attach_hash($channel_id,$folder_hash,true); - if($curr) - $os_relpath .= $curr . '/'; - $os_relpath .= $folder_hash . '/'; - } - - $os_relpath .= $hash; - $os_relpath = ltrim($os_relpath,'/'); - - $os_path = $os_relpath; - $display_path = ltrim($pathname . '/' . $filename,'/'); - - if($src) { - $istream = @fopen($src,'rb'); - $ostream = @fopen($os_basepath . $os_relpath,'wb'); - if($istream && $ostream) { - pipe_streams($istream,$ostream,65535); - fclose($istream); - fclose($ostream); - } - } - - if(array_key_exists('created', $arr)) - $created = $arr['created']; - else - $created = datetime_convert(); - - if(array_key_exists('edited', $arr)) - $edited = $arr['edited']; - else - $edited = $created; - - if($options === 'replace') { - $r = q("update attach set filename = '%s', filetype = '%s', folder = '%s', filesize = %d, os_storage = %d, is_photo = %d, content = '%s', edited = '%s', os_path = '%s', display_path = '%s' where id = %d and uid = %d", - dbesc($filename), - dbesc($mimetype), - dbesc($folder_hash), - intval($filesize), - intval(1), - intval($is_photo), - dbescbin($os_basepath . $os_relpath), - dbesc($created), - dbesc($os_path), - dbesc($display_path), - intval($existing_id), - intval($channel_id) - ); - } - elseif($options === 'revise') { - $r = q("insert into attach ( aid, uid, hash, creator, filename, filetype, folder, filesize, revision, os_storage, is_photo, content, created, edited, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid ) +function attach_store($channel, $observer_hash, $options = '', $arr = null) +{ + + require_once('include/photos.php'); + + /** + * @hooks photo_upload_begin + * Called when attempting to upload a photo. + */ + call_hooks('photo_upload_begin', $arr); + + $ret = array('success' => false); + $channel_id = $channel['channel_id']; + $sql_options = ''; + $source = (($arr) ? $arr['source'] : ''); + $album = (($arr) ? $arr['album'] : ''); + $newalbum = (($arr) ? $arr['newalbum'] : ''); + $hash = (($arr && $arr['hash']) ? $arr['hash'] : null); + $upload_path = (($arr && $arr['directory']) ? $arr['directory'] : ''); + $visible = (($arr && $arr['visible']) ? $arr['visible'] : ''); + $notify = (($arr && $arr['notify']) ? $arr['notify'] : ''); + $flags = (($arr && array_key_exists('flags', $arr)) ? intval($arr['flags']) : 0); + $observer = []; + + $dosync = ((array_key_exists('nosync', $arr) && $arr['nosync']) ? 0 : 1); + + if ($observer_hash) { + $observer = xchan_match([ 'xchan_hash' => $observer_hash ]); + } + + logger('arr: ' . print_r($arr, true), LOGGER_DATA); + + if (! perm_is_allowed($channel_id, $observer_hash, 'write_storage')) { + $ret['message'] = t('Permission denied.'); + return $ret; + } + + $str_group_allow = perms2str($arr['group_allow']); + $str_contact_allow = perms2str($arr['contact_allow']); + $str_group_deny = perms2str($arr['group_deny']); + $str_contact_deny = perms2str($arr['contact_deny']); + + + // The 'update' option sets db values without uploading a new attachment + // 'replace' replaces the existing uploaded data + // 'revision' creates a new revision with new upload data + // Default is to upload a new file + + // revise or update must provide $arr['hash'] of the thing to revise/update + + // By default remove $src when finished + + $remove_when_processed = true; + $import_replace = false; + + if ($options === 'import') { + $src = $arr['src']; + $filename = $arr['filename']; + $filesize = @filesize($src); + + $hash = $arr['resource_id']; + + if (array_key_exists('hash', $arr)) { + $hash = $arr['hash']; + } + if (array_key_exists('type', $arr)) { + $type = $arr['type']; + } + + if ($arr['preserve_original']) { + $remove_when_processed = false; + } + + if ($arr['replace']) { + $import_replace = true; + } + + // if importing a directory, just do it now and go home - we're done. + + if (array_key_exists('is_dir', $arr) && intval($arr['is_dir'])) { + $x = attach_mkdir($channel, $observer_hash, $arr); + if ($x['message']) { + logger('import_directory: ' . $x['message']); + } + + return; + } + } elseif ($options !== 'update') { + $f = [ + 'src' => '', + 'filename' => '', + 'filesize' => 0, + 'type' => '' + ]; + + /** + * @hooks photo_upload_file + * Called to generate alternate filenames for an upload. + * * \e string \b src - return value, default empty + * * \e string \b filename - return value, default empty + * * \e number \b filesize - return value, default 0 + * * \e string \b type - return value, default empty + */ + call_hooks('photo_upload_file', $f); + /** + * @hooks attach_upload_file + * Called when uploading a file. + * * \e string \b src - return value, default empty + * * \e string \b filename - return value, default empty + * * \e number \b filesize - return value, default 0 + * * \e string \b type - return value, default empty + */ + call_hooks('attach_upload_file', $f); + + if (x($f, 'src') && x($f, 'filesize')) { + $src = $f['src']; + $filename = $f['filename']; + $filesize = $f['filesize']; + $type = $f['type']; + } else { + if (! x($_FILES, 'userfile')) { + logger('No source file'); + $ret['message'] = t('No source file.'); + return $ret; + } + + $src = $_FILES['userfile']['tmp_name']; + $filename = basename($_FILES['userfile']['name']); + $filesize = intval($_FILES['userfile']['size']); + } + } + + // AndStatus sends jpegs with a non-standard mimetype + if ($type === 'image/jpg') { + $type = 'image/jpeg'; + } + + $existing_size = 0; + + if ($options === 'replace') { + $x = q( + "select id, hash, filesize from attach where id = %d and uid = %d limit 1", + intval($arr['id']), + intval($channel_id) + ); + if (! $x) { + $ret['message'] = t('Cannot locate file to replace'); + return $ret; + } + $existing_id = $x[0]['id']; + $existing_size = intval($x[0]['filesize']); + $hash = $x[0]['hash']; + } + + if ($options === 'revise' || $options === 'update') { + $sql_options = " order by revision desc "; + if ($options === 'update' && $arr && array_key_exists('revision', $arr)) { + $sql_options = " and revision = " . intval($arr['revision']) . " "; + } + + $x = q( + "select id, aid, uid, filename, filetype, filesize, hash, revision, folder, os_storage, is_photo, os_path, display_path, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where hash = '%s' and uid = %d $sql_options limit 1", + dbesc($arr['hash']), + intval($channel_id) + ); + if (! $x) { + logger('update file source not found'); + $ret['message'] = t('Cannot locate file to revise/update'); + return $ret; + } + $hash = $x[0]['hash']; + } + + $def_extension = ''; + $is_photo = 0; + $gis = false; + + if ($src) { + $gis = @getimagesize($src); + logger('getimagesize: ' . print_r($gis, true), LOGGER_DATA); + } + + if (($gis) && in_array($gis[2], [ IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_WEBP ])) { + $is_photo = 1; + if ($gis[2] === IMAGETYPE_GIF) { + $def_extension = '.gif'; + } + if ($gis[2] === IMAGETYPE_JPEG) { + $def_extension = '.jpg'; + } + if ($gis[2] === IMAGETYPE_PNG) { + $def_extension = '.png'; + } + if ($gis[2] === IMAGETYPE_WEBP) { + $def_extension = '.webp'; + } + } + + // If we know it's a photo, over-ride the type in case the source system could not determine what it was + + if ($is_photo) { + $type = $gis['mime']; + } + + $pathname = ''; + + + // If we were called from the Photos module there is a slightly different mechanism + // for setting the parent path than if we were called from the Files (cloud) module. + + if ($source === 'photos') { + if ($newalbum) { + $pathname = filepath_macro($newalbum); + } elseif (array_key_exists('folder', $arr)) { + $x = q( + "select filename from attach where hash = '%s' and uid = %d limit 1", + dbesc($arr['folder']), + intval($channel['channel_id']) + ); + if ($x) { + $pathname = $x[0]['filename']; + } + } else { + $pathname = filepath_macro($album); + } + } + + if (! $pathname) { + $pathname = filepath_macro($upload_path); + } + + $darr = array('pathname' => $pathname); + + // if we need to create a directory, use the channel default permissions. + + $darr['allow_cid'] = $channel['allow_cid']; + $darr['allow_gid'] = $channel['allow_gid']; + $darr['deny_cid'] = $channel['deny_cid']; + $darr['deny_gid'] = $channel['deny_gid']; + + + $direct = null; + + if ($pathname) { + $x = attach_mkdirp($channel, $observer_hash, $darr); + $folder_hash = (($x['success']) ? $x['data']['hash'] : ''); + $direct = (($x['success']) ? $x['data'] : null); + if ((! $str_contact_allow) && (! $str_group_allow) && (! $str_contact_deny) && (! $str_group_deny)) { + $str_contact_allow = $x['data']['allow_cid']; + $str_group_allow = $x['data']['allow_gid']; + $str_contact_deny = $x['data']['deny_cid']; + $str_group_deny = $x['data']['deny_gid']; + } + } else { + $folder_hash = ((($arr) && array_key_exists('folder', $arr)) ? $arr['folder'] : ''); + } + + if ((! $options) || ($options === 'import')) { + // A freshly uploaded file. Check for duplicate and resolve with the channel's overwrite settings. + + $r = q( + "select filename, id, hash, filesize from attach where uid = %d and filename = '%s' and folder = '%s' ", + intval($channel_id), + dbesc($filename), + dbesc($folder_hash) + ); + if ($r) { + $overwrite = (($import_replace || get_pconfig($channel_id, 'system', 'overwrite_dup_files')) ? true : false); + if (($overwrite) || ($options === 'import')) { + if (! array_key_exists('edited', $arr)) { + $arr['edited'] = datetime_convert(); + } + $options = 'replace'; + $existing_id = $x[0]['id']; + $existing_size = intval($x[0]['filesize']); + $hash = $x[0]['hash']; + } else { + if (strpos($filename, '.') !== false) { + $basename = substr($filename, 0, strrpos($filename, '.')); + $ext = substr($filename, strrpos($filename, '.')); + } else { + $basename = $filename; + $ext = $def_extension; + } + + $r = q( + "select filename from attach where uid = %d and ( filename = '%s' OR filename like '%s' ) and folder = '%s' ", + intval($channel_id), + dbesc($basename . $ext), + dbesc($basename . '(%)' . $ext), + dbesc($folder_hash) + ); + + if ($r) { + $x = 1; + + do { + $found = false; + foreach ($r as $rr) { + if ($rr['filename'] === $basename . '(' . $x . ')' . $ext) { + $found = true; + break; + } + } + if ($found) { + $x++; + } + } while ($found); + $filename = $basename . '(' . $x . ')' . $ext; + } else { + $filename = $basename . $ext; + } + } + } + } + + if (! $hash) { + $hash = new_uuid(); + } + + // Check storage limits + if ($options !== 'update') { + $maxfilesize = get_config('system', 'maxfilesize'); + + if (($maxfilesize) && ($filesize > $maxfilesize)) { + logger('quota_exceeded'); + $ret['message'] = sprintf(t('File exceeds size limit of %d'), $maxfilesize); + if ($remove_when_processed) { + @unlink($src); + } + + /** + * @hooks photo_upload_end + * Called when a photo upload has been processed. + */ + call_hooks('photo_upload_end', $ret); + + return $ret; + } + + $limit = engr_units_to_bytes(service_class_fetch($channel_id, 'attach_upload_limit')); + + if ($limit !== false) { + $r = q( + "select sum(filesize) as total from attach where aid = %d ", + intval($channel['channel_account_id']) + ); + if (($r) && (($r[0]['total'] + $filesize) > ($limit - $existing_size))) { + logger('service_class limit exceeded'); + $ret['message'] = upgrade_message(true) . sprintf(t("You have reached your limit of %1$.0f Mbytes attachment storage."), $limit / 1024000); + if ($remove_when_processed) { + @unlink($src); + } + + /** + * @hooks photo_upload_end + * Called when a photo upload has been processed. + */ + call_hooks('photo_upload_end', $ret); + + return $ret; + } + } + $mimetype = ((isset($type) && $type) ? $type : z_mime_content_type($filename)); + } + + $os_basepath = 'store/' . $channel['channel_address'] . '/' ; + $os_relpath = ''; + + if ($folder_hash) { + $curr = find_folder_hash_by_attach_hash($channel_id, $folder_hash, true); + if ($curr) { + $os_relpath .= $curr . '/'; + } + $os_relpath .= $folder_hash . '/'; + } + + $os_relpath .= $hash; + $os_relpath = ltrim($os_relpath, '/'); + + $os_path = $os_relpath; + $display_path = ltrim($pathname . '/' . $filename, '/'); + + if ($src) { + $istream = @fopen($src, 'rb'); + $ostream = @fopen($os_basepath . $os_relpath, 'wb'); + if ($istream && $ostream) { + pipe_streams($istream, $ostream, 65535); + fclose($istream); + fclose($ostream); + } + } + + if (array_key_exists('created', $arr)) { + $created = $arr['created']; + } else { + $created = datetime_convert(); + } + + if (array_key_exists('edited', $arr)) { + $edited = $arr['edited']; + } else { + $edited = $created; + } + + if ($options === 'replace') { + $r = q( + "update attach set filename = '%s', filetype = '%s', folder = '%s', filesize = %d, os_storage = %d, is_photo = %d, content = '%s', edited = '%s', os_path = '%s', display_path = '%s' where id = %d and uid = %d", + dbesc($filename), + dbesc($mimetype), + dbesc($folder_hash), + intval($filesize), + intval(1), + intval($is_photo), + dbescbin($os_basepath . $os_relpath), + dbesc($created), + dbesc($os_path), + dbesc($display_path), + intval($existing_id), + intval($channel_id) + ); + } elseif ($options === 'revise') { + $r = q( + "insert into attach ( aid, uid, hash, creator, filename, filetype, folder, filesize, revision, os_storage, is_photo, content, created, edited, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid ) VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ", - intval($x[0]['aid']), - intval($channel_id), - dbesc($x[0]['hash']), - dbesc($observer_hash), - dbesc($filename), - dbesc($mimetype), - dbesc($folder_hash), - intval($filesize), - intval($x[0]['revision'] + 1), - intval(1), - intval($is_photo), - dbescbin($os_basepath . $os_relpath), - dbesc($created), - dbesc($created), - dbesc($os_path), - dbesc($display_path), - dbesc($x[0]['allow_cid']), - dbesc($x[0]['allow_gid']), - dbesc($x[0]['deny_cid']), - dbesc($x[0]['deny_gid']) - ); - } - elseif($options === 'update') { - $r = q("update attach set filename = '%s', filetype = '%s', folder = '%s', edited = '%s', os_storage = %d, is_photo = %d, os_path = '%s', + intval($x[0]['aid']), + intval($channel_id), + dbesc($x[0]['hash']), + dbesc($observer_hash), + dbesc($filename), + dbesc($mimetype), + dbesc($folder_hash), + intval($filesize), + intval($x[0]['revision'] + 1), + intval(1), + intval($is_photo), + dbescbin($os_basepath . $os_relpath), + dbesc($created), + dbesc($created), + dbesc($os_path), + dbesc($display_path), + dbesc($x[0]['allow_cid']), + dbesc($x[0]['allow_gid']), + dbesc($x[0]['deny_cid']), + dbesc($x[0]['deny_gid']) + ); + } elseif ($options === 'update') { + $r = q( + "update attach set filename = '%s', filetype = '%s', folder = '%s', edited = '%s', os_storage = %d, is_photo = %d, os_path = '%s', display_path = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where id = %d and uid = %d", - dbesc((array_key_exists('filename',$arr)) ? $arr['filename'] : $x[0]['filename']), - dbesc((array_key_exists('filetype',$arr)) ? $arr['filetype'] : $x[0]['filetype']), - dbesc(($folder_hash) ? $folder_hash : $x[0]['folder']), - dbesc($created), - dbesc((array_key_exists('os_storage',$arr)) ? $arr['os_storage'] : $x[0]['os_storage']), - dbesc((array_key_exists('is_photo',$arr)) ? $arr['is_photo'] : $x[0]['is_photo']), - dbesc((array_key_exists('os_path',$arr)) ? $arr['os_path'] : $x[0]['os_path']), - dbesc((array_key_exists('display_path',$arr)) ? $arr['display_path'] : $x[0]['display_path']), - dbesc((array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : $x[0]['allow_cid']), - dbesc((array_key_exists('allow_gid',$arr)) ? $arr['allow_gid'] : $x[0]['allow_gid']), - dbesc((array_key_exists('deny_cid',$arr)) ? $arr['deny_cid'] : $x[0]['deny_cid']), - dbesc((array_key_exists('deny_gid',$arr)) ? $arr['deny_gid'] : $x[0]['deny_gid']), - intval($x[0]['id']), - intval($x[0]['uid']) - ); - } - else { - - $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, filetype, folder, filesize, revision, os_storage, is_photo, flags, content, created, edited, os_path, display_path, allow_cid, allow_gid,deny_cid, deny_gid ) + dbesc((array_key_exists('filename', $arr)) ? $arr['filename'] : $x[0]['filename']), + dbesc((array_key_exists('filetype', $arr)) ? $arr['filetype'] : $x[0]['filetype']), + dbesc(($folder_hash) ? $folder_hash : $x[0]['folder']), + dbesc($created), + dbesc((array_key_exists('os_storage', $arr)) ? $arr['os_storage'] : $x[0]['os_storage']), + dbesc((array_key_exists('is_photo', $arr)) ? $arr['is_photo'] : $x[0]['is_photo']), + dbesc((array_key_exists('os_path', $arr)) ? $arr['os_path'] : $x[0]['os_path']), + dbesc((array_key_exists('display_path', $arr)) ? $arr['display_path'] : $x[0]['display_path']), + dbesc((array_key_exists('allow_cid', $arr)) ? $arr['allow_cid'] : $x[0]['allow_cid']), + dbesc((array_key_exists('allow_gid', $arr)) ? $arr['allow_gid'] : $x[0]['allow_gid']), + dbesc((array_key_exists('deny_cid', $arr)) ? $arr['deny_cid'] : $x[0]['deny_cid']), + dbesc((array_key_exists('deny_gid', $arr)) ? $arr['deny_gid'] : $x[0]['deny_gid']), + intval($x[0]['id']), + intval($x[0]['uid']) + ); + } else { + $r = q( + "INSERT INTO attach ( aid, uid, hash, creator, filename, filetype, folder, filesize, revision, os_storage, is_photo, flags, content, created, edited, os_path, display_path, allow_cid, allow_gid,deny_cid, deny_gid ) VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ", - intval($channel['channel_account_id']), - intval($channel_id), - dbesc($hash), - dbesc(get_observer_hash()), - dbesc($filename), - dbesc($mimetype), - dbesc($folder_hash), - intval($filesize), - intval(0), - intval(1), - intval($is_photo), - intval($flags), - dbescbin($os_basepath . $os_relpath), - dbesc($created), - dbesc($created), - dbesc($os_path), - dbesc($display_path), - dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : $str_contact_allow), - dbesc(($arr && array_key_exists('allow_gid',$arr)) ? $arr['allow_gid'] : $str_group_allow), - dbesc(($arr && array_key_exists('deny_cid',$arr)) ? $arr['deny_cid'] : $str_contact_deny), - dbesc(($arr && array_key_exists('deny_gid',$arr)) ? $arr['deny_gid'] : $str_group_deny) - ); - } + intval($channel['channel_account_id']), + intval($channel_id), + dbesc($hash), + dbesc(get_observer_hash()), + dbesc($filename), + dbesc($mimetype), + dbesc($folder_hash), + intval($filesize), + intval(0), + intval(1), + intval($is_photo), + intval($flags), + dbescbin($os_basepath . $os_relpath), + dbesc($created), + dbesc($created), + dbesc($os_path), + dbesc($display_path), + dbesc(($arr && array_key_exists('allow_cid', $arr)) ? $arr['allow_cid'] : $str_contact_allow), + dbesc(($arr && array_key_exists('allow_gid', $arr)) ? $arr['allow_gid'] : $str_group_allow), + dbesc(($arr && array_key_exists('deny_cid', $arr)) ? $arr['deny_cid'] : $str_contact_deny), + dbesc(($arr && array_key_exists('deny_gid', $arr)) ? $arr['deny_gid'] : $str_group_deny) + ); + } - if ($is_photo) { - - // Call the photos library to generate all the standard thumbnails. - // This may fail if the image format isn't supported by the image library *or* memory is exhausted during the attempt. - // That's why this is called at the end of the upload when all the important work to store as a normal file has been accomplished. - - $args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => $pathname, 'folder' => $folder_hash, 'os_syspath' => $os_basepath . $os_relpath, 'os_path' => $os_path, 'display_path' => $display_path, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct, 'options' => $options ); - if($arr['contact_allow']) - $args['contact_allow'] = $arr['contact_allow']; - if($arr['group_allow']) - $args['group_allow'] = $arr['group_allow']; - if($arr['contact_deny']) - $args['contact_deny'] = $arr['contact_deny']; - if($arr['group_deny']) - $args['group_deny'] = $arr['group_deny']; - if(array_key_exists('allow_cid',$arr)) - $args['allow_cid'] = $arr['allow_cid']; - if(array_key_exists('allow_gid',$arr)) - $args['allow_gid'] = $arr['allow_gid']; - if(array_key_exists('deny_cid',$arr)) - $args['deny_cid'] = $arr['deny_cid']; - if(array_key_exists('deny_gid',$arr)) - $args['deny_gid'] = $arr['deny_gid']; + if ($is_photo) { + // Call the photos library to generate all the standard thumbnails. + // This may fail if the image format isn't supported by the image library *or* memory is exhausted during the attempt. + // That's why this is called at the end of the upload when all the important work to store as a normal file has been accomplished. - $args['created'] = $created; - $args['edited'] = $edited; - if($arr['item']) - $args['item'] = $arr['item']; + $args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => $pathname, 'folder' => $folder_hash, 'os_syspath' => $os_basepath . $os_relpath, 'os_path' => $os_path, 'display_path' => $display_path, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct, 'options' => $options ); + if ($arr['contact_allow']) { + $args['contact_allow'] = $arr['contact_allow']; + } + if ($arr['group_allow']) { + $args['group_allow'] = $arr['group_allow']; + } + if ($arr['contact_deny']) { + $args['contact_deny'] = $arr['contact_deny']; + } + if ($arr['group_deny']) { + $args['group_deny'] = $arr['group_deny']; + } + if (array_key_exists('allow_cid', $arr)) { + $args['allow_cid'] = $arr['allow_cid']; + } + if (array_key_exists('allow_gid', $arr)) { + $args['allow_gid'] = $arr['allow_gid']; + } + if (array_key_exists('deny_cid', $arr)) { + $args['deny_cid'] = $arr['deny_cid']; + } + if (array_key_exists('deny_gid', $arr)) { + $args['deny_gid'] = $arr['deny_gid']; + } - if($arr['description']) - $args['description'] = $arr['description']; + $args['created'] = $created; + $args['edited'] = $edited; + if ($arr['item']) { + $args['item'] = $arr['item']; + } - if($arr['title']) - $args['title'] = $arr['title']; + if ($arr['description']) { + $args['description'] = $arr['description']; + } - if($arr['body']) - $args['body'] = $arr['body']; + if ($arr['title']) { + $args['title'] = $arr['title']; + } + + if ($arr['body']) { + $args['body'] = $arr['body']; + } - $args['deliver'] = $dosync; + $args['deliver'] = $dosync; - $p = photo_upload($channel,$observer,$args); - if($p['success']) { - $ret['body'] = $p['body']; - } - } + $p = photo_upload($channel, $observer, $args); + if ($p['success']) { + $ret['body'] = $p['body']; + } + } - if(($options !== 'update') && ($remove_when_processed)) - @unlink($src); + if (($options !== 'update') && ($remove_when_processed)) { + @unlink($src); + } - if(! $r) { - $ret['message'] = t('File upload failed. Possible system limit or action terminated.'); + if (! $r) { + $ret['message'] = t('File upload failed. Possible system limit or action terminated.'); - /** - * @hooks photo_upload_end - * Called when a photo upload has been processed. - */ - call_hooks('photo_upload_end', $ret); + /** + * @hooks photo_upload_end + * Called when a photo upload has been processed. + */ + call_hooks('photo_upload_end', $ret); - return $ret; - } + return $ret; + } - // Update the folder timestamp @todo recurse to the storage root folder + // Update the folder timestamp @todo recurse to the storage root folder - if($folder_hash) { - q("UPDATE attach set edited = '%s' where hash = '%s' and uid = %d and is_dir = 1", - dbesc($edited), - dbesc($folder_hash), - intval($channel_id) - ); - } + if ($folder_hash) { + q( + "UPDATE attach set edited = '%s' where hash = '%s' and uid = %d and is_dir = 1", + dbesc($edited), + dbesc($folder_hash), + intval($channel_id) + ); + } - // Caution: This re-uses $sql_options set further above + // Caution: This re-uses $sql_options set further above - $r = q("select * from attach where uid = %d and hash = '%s' $sql_options limit 1", - intval($channel_id), - dbesc($hash) - ); + $r = q( + "select * from attach where uid = %d and hash = '%s' $sql_options limit 1", + intval($channel_id), + dbesc($hash) + ); - if(! $r) { - $ret['message'] = t('Stored file could not be verified. Upload failed.'); + if (! $r) { + $ret['message'] = t('Stored file could not be verified. Upload failed.'); - /** - * @hooks photo_upload_end - * Called when a photo upload has been processed. - */ - call_hooks('photo_upload_end', $ret); + /** + * @hooks photo_upload_end + * Called when a photo upload has been processed. + */ + call_hooks('photo_upload_end', $ret); - return $ret; - } + return $ret; + } - $ret['success'] = true; - $ret['data'] = $r[0]; - if(! $is_photo) { - /** - * @hooks photo_upload_end - * Called when a photo upload has been processed. - * This would've been called already with a success result in photos_upload() if it was a photo. - */ - call_hooks('photo_upload_end', $ret); - } + $ret['success'] = true; + $ret['data'] = $r[0]; + if (! $is_photo) { + /** + * @hooks photo_upload_end + * Called when a photo upload has been processed. + * This would've been called already with a success result in photos_upload() if it was a photo. + */ + call_hooks('photo_upload_end', $ret); + } - Run::Summon([ 'Thumbnail' , $hash ]); + Run::Summon([ 'Thumbnail' , $hash ]); - if($dosync) { - $sync = attach_export_data($channel,$hash); + if ($dosync) { + $sync = attach_export_data($channel, $hash); - if($sync) - Libsync::build_sync_packet($channel['channel_id'],array('file' => array($sync))); - } + if ($sync) { + Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync))); + } + } - if($notify) { - $cloudPath = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['0']['display_path']; - $object = get_file_activity_object($channel['channel_id'], $r['0']['hash'], $cloudPath); - file_activity($channel['channel_id'], $object, $r['0']['allow_cid'], $r['0']['allow_gid'], $r['0']['deny_cid'], $r['0']['deny_gid'], 'post', $notify); - } + if ($notify) { + $cloudPath = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['0']['display_path']; + $object = get_file_activity_object($channel['channel_id'], $r['0']['hash'], $cloudPath); + file_activity($channel['channel_id'], $object, $r['0']['allow_cid'], $r['0']['allow_gid'], $r['0']['deny_cid'], $r['0']['deny_gid'], 'post', $notify); + } - return $ret; + return $ret; } /** @@ -1066,7 +1113,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { * * Also checking permissions of all parent components. * - * @param integer $channel_id + * @param int $channel_id * @param string $observer_hash hash of current observer * @param string $pathname * @param string $parent_hash (optional) @@ -1076,49 +1123,51 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { * * \e string \b message error message if success is false * * \e array \b data array of attach DB entries without data component */ -function z_readdir($channel_id, $observer_hash, $pathname, $parent_hash = '') { +function z_readdir($channel_id, $observer_hash, $pathname, $parent_hash = '') +{ - $ret = [ 'success' => false ]; + $ret = [ 'success' => false ]; - if (! perm_is_allowed($channel_id, $observer_hash, 'view_storage')) { - $ret['message'] = t('Permission denied.'); - return $ret; - } + if (! perm_is_allowed($channel_id, $observer_hash, 'view_storage')) { + $ret['message'] = t('Permission denied.'); + return $ret; + } - if (strpos($pathname, '/')) { - $paths = explode('/', $pathname); - if (count($paths) > 1) { - $curpath = array_shift($paths); + if (strpos($pathname, '/')) { + $paths = explode('/', $pathname); + if (count($paths) > 1) { + $curpath = array_shift($paths); - $r = q("select hash, id, is_dir from attach where uid = %d and filename = '%s' and is_dir != 0 " . permissions_sql($channel_id,$observer_hash) . " limit 1", - intval($channel_id), - dbesc($curpath) - ); - if (! $r) { - $ret['message'] = t('Path not available.'); - return $ret; - } - // recurse - return z_readdir($channel_id, $observer_hash, implode('/', $paths), $r[0]['hash']); - } - } - else { - $paths = array($pathname); - } - - $r = q("select id, aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_path, display_path, is_photo, is_dir, os_storage, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where id = %d and folder = '%s' and filename = '%s' and is_dir != 0 " . permissions_sql($channel_id), - intval($channel_id), - dbesc($parent_hash), - dbesc($paths[0]) - ); - if (! $r) { - $ret['message'] = t('Path not available.'); - return $ret; - } - $ret['success'] = true; - $ret['data'] = $r; + $r = q( + "select hash, id, is_dir from attach where uid = %d and filename = '%s' and is_dir != 0 " . permissions_sql($channel_id, $observer_hash) . " limit 1", + intval($channel_id), + dbesc($curpath) + ); + if (! $r) { + $ret['message'] = t('Path not available.'); + return $ret; + } + // recurse + return z_readdir($channel_id, $observer_hash, implode('/', $paths), $r[0]['hash']); + } + } else { + $paths = array($pathname); + } - return $ret; + $r = q( + "select id, aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_path, display_path, is_photo, is_dir, os_storage, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where id = %d and folder = '%s' and filename = '%s' and is_dir != 0 " . permissions_sql($channel_id), + intval($channel_id), + dbesc($parent_hash), + dbesc($paths[0]) + ); + if (! $r) { + $ret['message'] = t('Path not available.'); + return $ret; + } + $ret['success'] = true; + $ret['data'] = $r; + + return $ret; } /** @@ -1138,159 +1187,161 @@ function z_readdir($channel_id, $observer_hash, $pathname, $parent_hash = '') { * * \e string \b deny_gid * @return array */ -function attach_mkdir($channel, $observer_hash, $arr = null) { +function attach_mkdir($channel, $observer_hash, $arr = null) +{ - $ret = array('success' => false); - $channel_id = $channel['channel_id']; + $ret = array('success' => false); + $channel_id = $channel['channel_id']; - $sql_options = ''; + $sql_options = ''; - $os_basepath = 'store/' . $channel['channel_address']; + $os_basepath = 'store/' . $channel['channel_address']; - logger('basepath: ' . $os_basepath, LOGGER_DEBUG); + logger('basepath: ' . $os_basepath, LOGGER_DEBUG); - if (! is_dir($os_basepath)) { - os_mkdir($os_basepath,STORAGE_DEFAULT_PERMISSIONS, true); - } + if (! is_dir($os_basepath)) { + os_mkdir($os_basepath, STORAGE_DEFAULT_PERMISSIONS, true); + } - $os_basepath .= '/'; + $os_basepath .= '/'; - if (! perm_is_allowed($channel_id, $observer_hash, 'write_storage')) { - $ret['message'] = t('Permission denied.'); - return $ret; - } + if (! perm_is_allowed($channel_id, $observer_hash, 'write_storage')) { + $ret['message'] = t('Permission denied.'); + return $ret; + } - if (! $arr['filename']) { - $ret['message'] = t('Empty pathname'); - return $ret; - } + if (! $arr['filename']) { + $ret['message'] = t('Empty pathname'); + return $ret; + } - $arr['hash'] = (($arr['hash']) ? $arr['hash'] : new_uuid()); + $arr['hash'] = (($arr['hash']) ? $arr['hash'] : new_uuid()); - // Check for duplicate name. - // Check both the filename and the hash as we will be making use of both. + // Check for duplicate name. + // Check both the filename and the hash as we will be making use of both. - $r = q("select id, hash, is_dir, flags from attach where ( filename = '%s' or hash = '%s' ) and folder = '%s' and uid = %d limit 1", - dbesc($arr['filename']), - dbesc($arr['hash']), - dbesc($arr['folder']), - intval($channel['channel_id']) - ); - if ($r) { - if (array_key_exists('force',$arr) && intval($arr['force']) && (intval($r[0]['is_dir']))) { - $ret['success'] = true; - $r = q("select * from attach where id = %d limit 1", - intval($r[0]['id']) - ); - if ($r) { - $ret['data'] = $r[0]; - } - return $ret; - } - $ret['message'] = t('duplicate filename or path'); - return $ret; - } + $r = q( + "select id, hash, is_dir, flags from attach where ( filename = '%s' or hash = '%s' ) and folder = '%s' and uid = %d limit 1", + dbesc($arr['filename']), + dbesc($arr['hash']), + dbesc($arr['folder']), + intval($channel['channel_id']) + ); + if ($r) { + if (array_key_exists('force', $arr) && intval($arr['force']) && (intval($r[0]['is_dir']))) { + $ret['success'] = true; + $r = q( + "select * from attach where id = %d limit 1", + intval($r[0]['id']) + ); + if ($r) { + $ret['data'] = $r[0]; + } + return $ret; + } + $ret['message'] = t('duplicate filename or path'); + return $ret; + } - if ($arr['folder']) { + if ($arr['folder']) { + // Walk the directory tree from parent back to root to make sure the parent is valid and name is unique and we + // have permission to see this path. This implies the root directory itself is public since we won't have permissions + // set on the psuedo-directory. We can however set permissions for anything and everything contained within it. - // Walk the directory tree from parent back to root to make sure the parent is valid and name is unique and we - // have permission to see this path. This implies the root directory itself is public since we won't have permissions - // set on the psuedo-directory. We can however set permissions for anything and everything contained within it. + $lpath = ''; + $lfile = $arr['folder']; + $dpath = ''; - $lpath = ''; - $lfile = $arr['folder']; - $dpath = ''; - - $sql_options = permissions_sql($channel['channel_id']); + $sql_options = permissions_sql($channel['channel_id']); - do { - $r = q("select filename, hash, flags, is_dir, folder, display_path from attach where uid = %d and hash = '%s' and is_dir = 1 + do { + $r = q( + "select filename, hash, flags, is_dir, folder, display_path from attach where uid = %d and hash = '%s' and is_dir = 1 $sql_options limit 1", - intval($channel['channel_id']), - dbesc($lfile) - ); - if (! $r) { - logger('attach_mkdir: hash ' . $lfile . ' not found in ' . $lpath); - $ret['message'] = t('Path not found.'); - return $ret; - } + intval($channel['channel_id']), + dbesc($lfile) + ); + if (! $r) { + logger('attach_mkdir: hash ' . $lfile . ' not found in ' . $lpath); + $ret['message'] = t('Path not found.'); + return $ret; + } - $dpath = $r[0]['filename'] . (($dpath) ? '/' . $dpath : ''); + $dpath = $r[0]['filename'] . (($dpath) ? '/' . $dpath : ''); - if ($lfile) { - $lpath = $r[0]['hash'] . (($lpath) ? '/' . $lpath : ''); - } + if ($lfile) { + $lpath = $r[0]['hash'] . (($lpath) ? '/' . $lpath : ''); + } - $lfile = $r[0]['folder']; + $lfile = $r[0]['folder']; + } while (($r[0]['folder']) && intval($r[0]['is_dir'])); - } while ( ($r[0]['folder']) && intval($r[0]['is_dir'])) ; + $path = $lpath; + } else { + $path = ''; + } - $path = $lpath; - } - else { - $path = ''; - } + $created = datetime_convert(); - $created = datetime_convert(); - - $os_path = ltrim($path . '/' . $arr['hash'],'/'); - $display_path = ltrim($dpath . '/' . $arr['filename'],'/'); + $os_path = ltrim($path . '/' . $arr['hash'], '/'); + $display_path = ltrim($dpath . '/' . $arr['filename'], '/'); - $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_storage, is_dir, content, created, edited, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid ) + $r = q( + "INSERT INTO attach ( aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_storage, is_dir, content, created, edited, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid ) VALUES ( %d, %d, '%s', '%s', '%s', '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ", - intval($channel['channel_account_id']), - intval($channel_id), - dbesc($arr['hash']), - dbesc(get_observer_hash()), - dbesc($arr['filename']), - dbesc('multipart/mixed'), - intval(0), - intval(0), - dbesc($arr['folder']), - intval(1), - intval(1), - dbescbin($os_basepath . $os_path), - dbesc($created), - dbesc($created), - dbesc($os_path), - dbesc($display_path), - dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : $channel['channel_allow_cid']), - dbesc(($arr && array_key_exists('allow_gid',$arr)) ? $arr['allow_gid'] : $channel['channel_allow_gid']), - dbesc(($arr && array_key_exists('deny_cid',$arr)) ? $arr['deny_cid'] : $channel['channel_deny_cid']), - dbesc(($arr && array_key_exists('deny_gid',$arr)) ? $arr['deny_gid'] : $channel['channel_deny_gid']) - ); + intval($channel['channel_account_id']), + intval($channel_id), + dbesc($arr['hash']), + dbesc(get_observer_hash()), + dbesc($arr['filename']), + dbesc('multipart/mixed'), + intval(0), + intval(0), + dbesc($arr['folder']), + intval(1), + intval(1), + dbescbin($os_basepath . $os_path), + dbesc($created), + dbesc($created), + dbesc($os_path), + dbesc($display_path), + dbesc(($arr && array_key_exists('allow_cid', $arr)) ? $arr['allow_cid'] : $channel['channel_allow_cid']), + dbesc(($arr && array_key_exists('allow_gid', $arr)) ? $arr['allow_gid'] : $channel['channel_allow_gid']), + dbesc(($arr && array_key_exists('deny_cid', $arr)) ? $arr['deny_cid'] : $channel['channel_deny_cid']), + dbesc(($arr && array_key_exists('deny_gid', $arr)) ? $arr['deny_gid'] : $channel['channel_deny_gid']) + ); - if ($r) { - if (os_mkdir($os_basepath . $os_path, STORAGE_DEFAULT_PERMISSIONS, true)) { - $ret['success'] = true; + if ($r) { + if (os_mkdir($os_basepath . $os_path, STORAGE_DEFAULT_PERMISSIONS, true)) { + $ret['success'] = true; - // update the parent folder's lastmodified timestamp - $e = q("UPDATE attach SET edited = '%s' WHERE hash = '%s' AND uid = %d", - dbesc($created), - dbesc($arr['folder']), - intval($channel_id) - ); + // update the parent folder's lastmodified timestamp + $e = q( + "UPDATE attach SET edited = '%s' WHERE hash = '%s' AND uid = %d", + dbesc($created), + dbesc($arr['folder']), + intval($channel_id) + ); - $z = q("select * from attach where hash = '%s' and uid = %d and is_dir = 1 limit 1", - dbesc($arr['hash']), - intval($channel_id) - ); - if ($z) { - $ret['data'] = $z[0]; - } - } - else { - logger('attach_mkdir: ' . mkdir . ' ' . $os_basepath . $os_path . ' failed.'); - $ret['message'] = t('mkdir failed.'); - } - } - else { - $ret['message'] = t('database storage failed.'); - } + $z = q( + "select * from attach where hash = '%s' and uid = %d and is_dir = 1 limit 1", + dbesc($arr['hash']), + intval($channel_id) + ); + if ($z) { + $ret['data'] = $z[0]; + } + } else { + logger('attach_mkdir: ' . mkdir . ' ' . $os_basepath . $os_path . ' failed.'); + $ret['message'] = t('mkdir failed.'); + } + } else { + $ret['message'] = t('database storage failed.'); + } - return $ret; + return $ret; } /** @@ -1309,78 +1360,78 @@ function attach_mkdir($channel, $observer_hash, $arr = null) { * * \e string \b deny_gid * @return array */ -function attach_mkdirp($channel, $observer_hash, $arr = null) { +function attach_mkdirp($channel, $observer_hash, $arr = null) +{ - $ret = [ 'success' => false ]; - $channel_id = $channel['channel_id']; + $ret = [ 'success' => false ]; + $channel_id = $channel['channel_id']; - $sql_options = ''; + $sql_options = ''; - $basepath = 'store/' . $channel['channel_address']; + $basepath = 'store/' . $channel['channel_address']; - logger('basepath: ' . $basepath, LOGGER_DEBUG); + logger('basepath: ' . $basepath, LOGGER_DEBUG); - if (! is_dir($basepath)) { - os_mkdir($basepath,STORAGE_DEFAULT_PERMISSIONS, true); - } + if (! is_dir($basepath)) { + os_mkdir($basepath, STORAGE_DEFAULT_PERMISSIONS, true); + } - if (! perm_is_allowed($channel_id, $observer_hash, 'write_storage')) { - $ret['message'] = t('Permission denied.'); - return $ret; - } + if (! perm_is_allowed($channel_id, $observer_hash, 'write_storage')) { + $ret['message'] = t('Permission denied.'); + return $ret; + } - if (! $arr['pathname']) { - $ret['message'] = t('Empty pathname'); - return $ret; - } + if (! $arr['pathname']) { + $ret['message'] = t('Empty pathname'); + return $ret; + } - $paths = explode('/',$arr['pathname']); - if (! $paths) { - $ret['message'] = t('Empty path'); - return $ret; - } + $paths = explode('/', $arr['pathname']); + if (! $paths) { + $ret['message'] = t('Empty path'); + return $ret; + } - $current_parent = ''; + $current_parent = ''; - foreach ($paths as $p) { - if (! $p) { - continue; - } + foreach ($paths as $p) { + if (! $p) { + continue; + } - $arx = [ - 'filename' => $p, - 'folder' => $current_parent, - 'force' => 1 - ]; - - if (array_key_exists('allow_cid',$arr)) { - $arx['allow_cid'] = $arr['allow_cid']; - } - if (array_key_exists('deny_cid',$arr)) { - $arx['deny_cid'] = $arr['deny_cid']; - } - if (array_key_exists('allow_gid',$arr)) { - $arx['allow_gid'] = $arr['allow_gid']; - } - if (array_key_exists('deny_gid',$arr)) { - $arx['deny_gid'] = $arr['deny_gid']; - } + $arx = [ + 'filename' => $p, + 'folder' => $current_parent, + 'force' => 1 + ]; - $x = attach_mkdir($channel, $observer_hash, $arx); - if ($x['success']) { - $current_parent = $x['data']['hash']; - } - else { - $ret['message'] = $x['message']; - return $ret; - } - } - if (isset($x)) { - $ret['success'] = true; - $ret['data'] = $x['data']; - } + if (array_key_exists('allow_cid', $arr)) { + $arx['allow_cid'] = $arr['allow_cid']; + } + if (array_key_exists('deny_cid', $arr)) { + $arx['deny_cid'] = $arr['deny_cid']; + } + if (array_key_exists('allow_gid', $arr)) { + $arx['allow_gid'] = $arr['allow_gid']; + } + if (array_key_exists('deny_gid', $arr)) { + $arx['deny_gid'] = $arr['deny_gid']; + } - return $ret; + $x = attach_mkdir($channel, $observer_hash, $arx); + if ($x['success']) { + $current_parent = $x['data']['hash']; + } else { + $ret['message'] = $x['message']; + return $ret; + } + } + if (isset($x)) { + $ret['success'] = true; + $ret['data'] = $x['data']; + } + + return $ret; } @@ -1394,91 +1445,96 @@ function attach_mkdirp($channel, $observer_hash, $arr = null) { * @param string $allow_gid * @param string $deny_cid * @param string $deny_gid - * @param boolean $recurse (optional) default false - * @param boolean $sync (optional) default false + * @param bool $recurse (optional) default false + * @param bool $sync (optional) default false */ -function attach_change_permissions($channel_id, $resource, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $recurse = false, $sync = false) { +function attach_change_permissions($channel_id, $resource, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $recurse = false, $sync = false) +{ - $channel = channelx_by_n($channel_id); - if (! $channel) { - return; - } + $channel = channelx_by_n($channel_id); + if (! $channel) { + return; + } - $r = q("select hash, flags, is_dir, is_photo, allow_cid from attach where hash = '%s' and uid = %d limit 1", - dbesc($resource), - intval($channel_id) - ); + $r = q( + "select hash, flags, is_dir, is_photo, allow_cid from attach where hash = '%s' and uid = %d limit 1", + dbesc($resource), + intval($channel_id) + ); - if (! $r) { - return; - } + if (! $r) { + return; + } - $private = (($allow_cid || $allow_gid || $deny_cid || $deny_gid) ? true : false); + $private = (($allow_cid || $allow_gid || $deny_cid || $deny_gid) ? true : false); - // preserve any existing tokens that may have been set for this file - // @fixme - we need a way to unconditionally clear these if desired. - - if ($private) { - $token_matches = null; - if (preg_match_all('/\', $newbody); - $cnt++; - } -// logger('replace_images: ' . $newbody); - return $newbody; + foreach ($images as $image) { + // We're depending on the property of 'foreach' (specified on the PHP website) that + // it loops over the array starting from the first element and going sequentially + // to the last element + $newbody = str_replace('[$#saved_image' . $cnt . '#$]', '
', $newbody); + $cnt++; + } +// logger('replace_images: ' . $newbody); + return $newbody; } /** @@ -243,48 +269,55 @@ function bb_replace_images($body, $images) { * @return string HTML code */ -function bb_parse_crypt($match) { +function bb_parse_crypt($match) +{ - $matches = []; - $attributes = $match[1]; + $matches = []; + $attributes = $match[1]; - $algorithm = ""; + $algorithm = ""; - preg_match("/alg='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $algorithm = $matches[1]; + preg_match("/alg='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") { + $algorithm = $matches[1]; + } - preg_match("/alg=\"\;(.*?)\"\;/ism", $attributes, $matches); - if ($matches[1] != "") - $algorithm = $matches[1]; + preg_match("/alg=\"\;(.*?)\"\;/ism", $attributes, $matches); + if ($matches[1] != "") { + $algorithm = $matches[1]; + } - preg_match("/alg=\\\"(.*?)\\\"/ism", $attributes, $matches); - if ($matches[1] != "") - $algorithm = $matches[1]; + preg_match("/alg=\\\"(.*?)\\\"/ism", $attributes, $matches); + if ($matches[1] != "") { + $algorithm = $matches[1]; + } - $hint = ""; - $matches = []; - - preg_match("/hint='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $hint = $matches[1]; - preg_match("/hint=\"\;(.*?)\"\;/ism", $attributes, $matches); - if ($matches[1] != "") - $hint = $matches[1]; - preg_match("/hint=\\\"(.*?)\\\"/ism", $attributes, $matches); - if ($matches[1] != "") - $hint = $matches[1]; + $hint = ""; + $matches = []; - $x = random_string(); + preg_match("/hint='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") { + $hint = $matches[1]; + } + preg_match("/hint=\"\;(.*?)\"\;/ism", $attributes, $matches); + if ($matches[1] != "") { + $hint = $matches[1]; + } + preg_match("/hint=\\\"(.*?)\\\"/ism", $attributes, $matches); + if ($matches[1] != "") { + $hint = $matches[1]; + } - $f = 'hz_decrypt'; + $x = random_string(); - $onclick = 'onclick="' . $f . '(\'' . $algorithm . '\',\'' . $hint . '\',\'' . $match[2] . '\',\'#' . $x . '\');"'; - $label = t('Encrypted content'); + $f = 'hz_decrypt'; - $Text = '
 . '/images/lock_icon.svg "' . $label . '")
' . bb_parse_b64_crypt($match); + $onclick = 'onclick="' . $f . '(\'' . $algorithm . '\',\'' . $hint . '\',\'' . $match[2] . '\',\'#' . $x . '\');"'; + $label = t('Encrypted content'); - return $Text; + $Text = '
' . bb_parse_b64_crypt($match); + + return $Text; } /** @@ -293,357 +326,376 @@ function bb_parse_crypt($match) { * @param array $match * @return string */ -function bb_parse_b64_crypt($match) { +function bb_parse_b64_crypt($match) +{ - if(empty($match[2])) - return; + if (empty($match[2])) { + return; + } - $r .= '----- ENCRYPTED CONTENT -----' . "\n"; - $r .= base64_encode($match[1]) . "." . $match[2] . "\n"; - $r .= '----- END ENCRYPTED CONTENT -----' . "\n"; + $r .= '----- ENCRYPTED CONTENT -----' . "\n"; + $r .= base64_encode($match[1]) . "." . $match[2] . "\n"; + $r .= '----- END ENCRYPTED CONTENT -----' . "\n"; - $r = '' . str_replace("\n",''; - - return $r; + $r = '
',wordwrap($r,75,"\n",true)) . '' . str_replace("\n", ''; + return $r; } -function bb_parse_app($match) { +function bb_parse_app($match) +{ - $app = Apps::app_decode($match[1]); - if ($app) { - return Apps::app_render($app); - } + $app = Apps::app_decode($match[1]); + if ($app) { + return Apps::app_render($app); + } } -function bb_parse_app_ap($match) { +function bb_parse_app_ap($match) +{ - $app = Apps::app_decode($match[1]); - if ($app) { - return sprintf( t('(Embedded app \'%s\' could not be displayed).'), $app['name']); - } + $app = Apps::app_decode($match[1]); + if ($app) { + return sprintf(t('(Embedded app \'%s\' could not be displayed).'), $app['name']); + } } -function bb_svg($match) { +function bb_svg($match) +{ - $params = str_replace(['
', wordwrap($r, 75, "\n", true)) . '
', '"'], [ '', '"'],$match[1]); - $Text = str_replace([ '[',']' ], [ '<','>' ], $match[2]); - - $output = '
', '"', ' '], [ '', '"', ' '],$Text) . ''; + $params = str_replace(['
', '"'], [ '', '"'], $match[1]); + $Text = str_replace([ '[',']' ], [ '<','>' ], $match[2]); - $purify = new SvgSanitizer(); - $purify->loadXML($output); - $purify->sanitize(); - $output = $purify->saveSVG(); - $output = preg_replace("/\<\?xml(.*?)\?\>/",'',$output); - return $output; + $output = '
', '"', ' '], [ '', '"', ' '], $Text) . ''; + + $purify = new SvgSanitizer(); + $purify->loadXML($output); + $purify->sanitize(); + $output = $purify->saveSVG(); + $output = preg_replace("/\<\?xml(.*?)\?\>/", '', $output); + return $output; } -function bb_svg_export($match) { +function bb_svg_export($match) +{ - $params = str_replace(['
', '"'], [ '', '"'],$match[1]); - $Text = str_replace([ '[',']' ], [ '<','>' ], $match[2]); - - $output = '
', '"', ' '], [ '', '"', ' '],$Text) . ''; + $params = str_replace(['
', '"'], [ '', '"'], $match[1]); + $Text = str_replace([ '[',']' ], [ '<','>' ], $match[2]); - $purify = new SvgSanitizer(); - $purify->loadXML($output); - $purify->sanitize(); - $output = $purify->saveSVG(); - $output = preg_replace("/\<\?xml(.*?)\?\>/",'',$output); - $output = ' . ')
';
- return $output;
+ $output = '
', '"', ' '], [ '', '"', ' '], $Text) . ''; + + $purify = new SvgSanitizer(); + $purify->loadXML($output); + $purify->sanitize(); + $output = $purify->saveSVG(); + $output = preg_replace("/\<\?xml(.*?)\?\>/", '', $output); + $output = '';
+ return $output;
}
-function bb_parse_element($match) {
- $j = json_decode(base64url_decode($match[1]),true);
+function bb_parse_element($match)
+{
+ $j = json_decode(base64url_decode($match[1]), true);
- if ($j && local_channel()) {
- $text = sprintf( t('Install %1$s element %2$s'), translate_design_element($j['type']), $j['pagetitle']);
- $o = EOL . '' . EOL;
- }
- else {
- $text = sprintf( t('This post contains an installable %s element, however you lack permissions to install it on this site.' ), translate_design_element($j['type'])) . $j['pagetitle'];
- $o = EOL . $text . EOL;
- }
+ if ($j && local_channel()) {
+ $text = sprintf(t('Install %1$s element %2$s'), translate_design_element($j['type']), $j['pagetitle']);
+ $o = EOL . '' . EOL;
+ } else {
+ $text = sprintf(t('This post contains an installable %s element, however you lack permissions to install it on this site.'), translate_design_element($j['type'])) . $j['pagetitle'];
+ $o = EOL . $text . EOL;
+ }
- return $o;
+ return $o;
}
-function translate_design_element($type) {
- switch($type) {
- case 'webpage':
- $ret = t('webpage');
- break;
- case 'layout':
- $ret = t('layout');
- break;
- case 'block':
- $ret = t('block');
- break;
- case 'menu':
- $ret = t('menu');
- break;
- }
+function translate_design_element($type)
+{
+ switch ($type) {
+ case 'webpage':
+ $ret = t('webpage');
+ break;
+ case 'layout':
+ $ret = t('layout');
+ break;
+ case 'block':
+ $ret = t('block');
+ break;
+ case 'menu':
+ $ret = t('menu');
+ break;
+ }
- return $ret;
+ return $ret;
}
-function bb_format_attachdata($body) {
+function bb_format_attachdata($body)
+{
- $data = getAttachmentData($body);
-
-
- if($data) {
- $txt = '';
- if($data['url'] && $data['title']) {
- $txt .= "\n\n" . '[url=' . $data['url'] . ']' . $data['title'] . '[/url]';
- }
- else {
- if($data['url']) {
- $txt .= "\n\n" . $data['url'];
- }
- if($data['title']) {
- $txt .= "\n\n" . $data['title'];
- }
- }
- if($data['preview']) {
- $txt .= "\n\n" . '[img]' . $data['preview'] . '[/img]';
- }
- if($data['image']) {
- $txt .= "\n\n" . '[img]' . $data['image'] . '[/img]';
- }
+ $data = getAttachmentData($body);
- $txt .= "\n\n" . $data['text'];
- return preg_replace('/\[attachment(.*?)\](.*?)\[\/attachment\]/ism',$txt,$body);
- }
- return $body;
+ if ($data) {
+ $txt = '';
+ if ($data['url'] && $data['title']) {
+ $txt .= "\n\n" . '[url=' . $data['url'] . ']' . $data['title'] . '[/url]';
+ } else {
+ if ($data['url']) {
+ $txt .= "\n\n" . $data['url'];
+ }
+ if ($data['title']) {
+ $txt .= "\n\n" . $data['title'];
+ }
+ }
+ if ($data['preview']) {
+ $txt .= "\n\n" . '[img]' . $data['preview'] . '[/img]';
+ }
+ if ($data['image']) {
+ $txt .= "\n\n" . '[img]' . $data['image'] . '[/img]';
+ }
+
+
+ $txt .= "\n\n" . $data['text'];
+ return preg_replace('/\[attachment(.*?)\](.*?)\[\/attachment\]/ism', $txt, $body);
+ }
+ return $body;
}
-function getAttachmentData($body) {
- $data = [];
+function getAttachmentData($body)
+{
+ $data = [];
- if (! preg_match("/\[attachment(.*?)\](.*?)\[\/attachment\]/ism", $body, $match)) {
- return null;
- }
+ if (! preg_match("/\[attachment(.*?)\](.*?)\[\/attachment\]/ism", $body, $match)) {
+ return null;
+ }
- $attributes = $match[1];
+ $attributes = $match[1];
- $data["text"] = trim($match[2]);
+ $data["text"] = trim($match[2]);
- $type = "";
- preg_match("/type='(.*?)'/ism", $attributes, $matches);
+ $type = "";
+ preg_match("/type='(.*?)'/ism", $attributes, $matches);
- if (x($matches, 1)) {
- $type = strtolower($matches[1]);
- }
+ if (x($matches, 1)) {
+ $type = strtolower($matches[1]);
+ }
- preg_match('/type=\"\;(.*?)\"\;/ism', $attributes, $matches);
- if (x($matches, 1)) {
- $type = strtolower($matches[1]);
- }
+ preg_match('/type=\"\;(.*?)\"\;/ism', $attributes, $matches);
+ if (x($matches, 1)) {
+ $type = strtolower($matches[1]);
+ }
- preg_match('/type=\\\"(.*?)\\\"/ism', $attributes, $matches);
- if (x($matches, 1)) {
- $type = strtolower($matches[1]);
- }
+ preg_match('/type=\\\"(.*?)\\\"/ism', $attributes, $matches);
+ if (x($matches, 1)) {
+ $type = strtolower($matches[1]);
+ }
- if ($type == "") {
- return [];
- }
+ if ($type == "") {
+ return [];
+ }
- if (!in_array($type, ["link", "audio", "photo", "video"])) {
- return [];
- }
+ if (!in_array($type, ["link", "audio", "photo", "video"])) {
+ return [];
+ }
- if ($type != "") {
- $data["type"] = $type;
- }
- $url = "";
- preg_match("/url='(.*?)'/ism", $attributes, $matches);
- if (x($matches, 1)) {
- $url = $matches[1];
- }
+ if ($type != "") {
+ $data["type"] = $type;
+ }
+ $url = "";
+ preg_match("/url='(.*?)'/ism", $attributes, $matches);
+ if (x($matches, 1)) {
+ $url = $matches[1];
+ }
- preg_match('/url=\"\;(.*?)\"\;/ism', $attributes, $matches);
- if (x($matches, 1)) {
- $url = $matches[1];
- }
+ preg_match('/url=\"\;(.*?)\"\;/ism', $attributes, $matches);
+ if (x($matches, 1)) {
+ $url = $matches[1];
+ }
- preg_match('/url=\\\"(.*?)\\\"/ism', $attributes, $matches);
- if (x($matches, 1)) {
- $url = $matches[1];
- }
+ preg_match('/url=\\\"(.*?)\\\"/ism', $attributes, $matches);
+ if (x($matches, 1)) {
+ $url = $matches[1];
+ }
- if ($url != "") {
- $data["url"] = html_entity_decode($url, ENT_QUOTES, 'UTF-8');
- }
+ if ($url != "") {
+ $data["url"] = html_entity_decode($url, ENT_QUOTES, 'UTF-8');
+ }
- $title = "";
- preg_match("/title='(.*?)'/ism", $attributes, $matches);
- if (x($matches, 1)) {
- $title = $matches[1];
- }
+ $title = "";
+ preg_match("/title='(.*?)'/ism", $attributes, $matches);
+ if (x($matches, 1)) {
+ $title = $matches[1];
+ }
- preg_match('/title=\"\;(.*?)\"\;/ism', $attributes, $matches);
- if (x($matches, 1)) {
- $title = $matches[1];
- }
+ preg_match('/title=\"\;(.*?)\"\;/ism', $attributes, $matches);
+ if (x($matches, 1)) {
+ $title = $matches[1];
+ }
- preg_match('/title=\\\"(.*?)\\\"/ism', $attributes, $matches);
- if (x($matches, 1)) {
- $title = $matches[1];
- }
+ preg_match('/title=\\\"(.*?)\\\"/ism', $attributes, $matches);
+ if (x($matches, 1)) {
+ $title = $matches[1];
+ }
- if ($title != "") {
- $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
- $title = str_replace(["[", "]"], ["[", "]"], $title);
- $data["title"] = $title;
- }
+ if ($title != "") {
+ $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
+ $title = str_replace(["[", "]"], ["[", "]"], $title);
+ $data["title"] = $title;
+ }
- $image = "";
- preg_match("/image='(.*?)'/ism", $attributes, $matches);
- if (x($matches, 1)) {
- $image = $matches[1];
- }
+ $image = "";
+ preg_match("/image='(.*?)'/ism", $attributes, $matches);
+ if (x($matches, 1)) {
+ $image = $matches[1];
+ }
- preg_match('/image=\"\;(.*?)\"\;/ism', $attributes, $matches);
- if (x($matches, 1)) {
- $image = $matches[1];
- }
+ preg_match('/image=\"\;(.*?)\"\;/ism', $attributes, $matches);
+ if (x($matches, 1)) {
+ $image = $matches[1];
+ }
- preg_match('/image=\\\"(.*?)\\\"/ism', $attributes, $matches);
- if (x($matches, 1)) {
- $image = $matches[1];
- }
+ preg_match('/image=\\\"(.*?)\\\"/ism', $attributes, $matches);
+ if (x($matches, 1)) {
+ $image = $matches[1];
+ }
- if ($image != "") {
- $data["image"] = html_entity_decode($image, ENT_QUOTES, 'UTF-8');
- }
+ if ($image != "") {
+ $data["image"] = html_entity_decode($image, ENT_QUOTES, 'UTF-8');
+ }
- $preview = "";
- preg_match("/preview='(.*?)'/ism", $attributes, $matches);
- if (x($matches, 1)) {
- $preview = $matches[1];
- }
+ $preview = "";
+ preg_match("/preview='(.*?)'/ism", $attributes, $matches);
+ if (x($matches, 1)) {
+ $preview = $matches[1];
+ }
- preg_match('/preview=\"\;(.*?)\"\;/ism', $attributes, $matches);
- if (x($matches, 1)) {
- $preview = $matches[1];
- }
+ preg_match('/preview=\"\;(.*?)\"\;/ism', $attributes, $matches);
+ if (x($matches, 1)) {
+ $preview = $matches[1];
+ }
- preg_match('/preview=\\\"(.*?)\\\"/ism', $attributes, $matches);
- if (x($matches, 1)) {
- $preview = $matches[1];
- }
+ preg_match('/preview=\\\"(.*?)\\\"/ism', $attributes, $matches);
+ if (x($matches, 1)) {
+ $preview = $matches[1];
+ }
- if ($preview != "") {
- $data["preview"] = html_entity_decode($preview, ENT_QUOTES, 'UTF-8');
- }
+ if ($preview != "") {
+ $data["preview"] = html_entity_decode($preview, ENT_QUOTES, 'UTF-8');
+ }
- $data["description"] = trim($match[3]);
+ $data["description"] = trim($match[3]);
- $data["after"] = trim($match[4]);
+ $data["after"] = trim($match[4]);
- return $data;
+ return $data;
}
-function bb_ShareAttributes($match) {
+function bb_ShareAttributes($match)
+{
- $matches = [];
- $attributes = $match[1];
+ $matches = [];
+ $attributes = $match[1];
- $author = "";
- preg_match("/author='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $author = urldecode($matches[1]);
+ $author = "";
+ preg_match("/author='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "") {
+ $author = urldecode($matches[1]);
+ }
- $link = "";
- preg_match("/link='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $link = $matches[1];
+ $link = "";
+ preg_match("/link='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "") {
+ $link = $matches[1];
+ }
- $avatar = "";
- preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $avatar = $matches[1];
+ $avatar = "";
+ preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "") {
+ $avatar = $matches[1];
+ }
- $profile = "";
- preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $profile = $matches[1];
+ $profile = "";
+ preg_match("/profile='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "") {
+ $profile = $matches[1];
+ }
- $posted = "";
- preg_match("/posted='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $posted = $matches[1];
+ $posted = "";
+ preg_match("/posted='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "") {
+ $posted = $matches[1];
+ }
- $auth = "";
- preg_match("/auth='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
- if($matches[1] === 'true')
- $auth = true;
- else
- $auth = false;
- }
+ $auth = "";
+ preg_match("/auth='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "") {
+ if ($matches[1] === 'true') {
+ $auth = true;
+ } else {
+ $auth = false;
+ }
+ }
- if($auth === EMPTY_STR) {
- $auth = is_matrix_url($profile);
- }
+ if ($auth === EMPTY_STR) {
+ $auth = is_matrix_url($profile);
+ }
- // message_id is never used, do we still need it?
- $message_id = "";
- preg_match("/message_id='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $message_id = $matches[1];
+ // message_id is never used, do we still need it?
+ $message_id = "";
+ preg_match("/message_id='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "") {
+ $message_id = $matches[1];
+ }
- if(! $message_id) {
- preg_match("/guid='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
- $message_id = $matches[1];
- }
+ if (! $message_id) {
+ preg_match("/guid='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "") {
+ $message_id = $matches[1];
+ }
+ }
- $reldate = '' . datetime_convert('UTC', date_default_timezone_get(), $posted, 'r') . '';
+ $reldate = '' . datetime_convert('UTC', date_default_timezone_get(), $posted, 'r') . '';
- $headline = ''; + + return $text; } -function bb_location($match) { - // not yet implemented +function bb_location($match) +{ + // not yet implemented } /** @@ -652,135 +704,164 @@ function bb_location($match) { * @param array $match * @return string HTML iframe with content of $match[1] */ -function bb_iframe($match) { +function bb_iframe($match) +{ - $sandbox = ((strpos($match[1], App::get_hostname())) ? ' sandbox="allow-scripts" ' : ''); + $sandbox = ((strpos($match[1], App::get_hostname())) ? ' sandbox="allow-scripts" ' : ''); - return ''; + return ''; } -function bb_ShareAttributesSimple($match) { +function bb_ShareAttributesSimple($match) +{ - $matches = []; - $attributes = $match[1]; + $matches = []; + $attributes = $match[1]; - $author = ""; - preg_match("/author='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + $author = ""; + preg_match("/author='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") { + $author = html_entity_decode($matches[1], ENT_QUOTES, 'UTF-8'); + } - preg_match('/author="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $author = $matches[1]; + preg_match('/author="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") { + $author = $matches[1]; + } - $profile = ""; - preg_match("/profile='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $profile = $matches[1]; + $profile = ""; + preg_match("/profile='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") { + $profile = $matches[1]; + } - preg_match('/profile="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $profile = $matches[1]; + preg_match('/profile="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") { + $profile = $matches[1]; + } - $text = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . ' ' . $author . ':'; + $headline = ''; - return $text; + $text = $headline . ''; + $headline .= '' . $fmt . ''; - if ($avatar != "") { - $headline .= ''; + $fmt = sprintf( + t('%1$s wrote the following %2$s %3$s'), + '' . $author . '', + '' . $type . '', + $reldate + ); - $text = $headline . ''; - } - - if(strpos($link,'/cards/')) - $type = t('card'); - elseif(strpos($link,'/articles/')) - $type = t('article'); - else - $type = t('post'); + if ($avatar != "") { + $headline .= '
' . trim($match[2]) . '' . trim($match[2]) . '' . $match[2] . ''; + $text = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . ' ' . $author . ':' . $match[2] . ''; - return($text); + return($text); } -function rpost_callback($match) { - if ($match[2]) { - return str_replace($match[0], Libzot::get_rpost_path(App::get_observer()) . '&title=' . urlencode($match[2]) . '&body=' . urlencode($match[3]), $match[0]); - } else { - return str_replace($match[0], Libzot::get_rpost_path(App::get_observer()) . '&body=' . urlencode($match[3]), $match[0]); - } +function rpost_callback($match) +{ + if ($match[2]) { + return str_replace($match[0], Libzot::get_rpost_path(App::get_observer()) . '&title=' . urlencode($match[2]) . '&body=' . urlencode($match[3]), $match[0]); + } else { + return str_replace($match[0], Libzot::get_rpost_path(App::get_observer()) . '&body=' . urlencode($match[3]), $match[0]); + } } -function bb_map_coords($match) { - // the extra space in the following line is intentional - return str_replace($match[0],'' . generate_map(str_replace('/',' ',$match[1])) . '', $match[0]); +function bb_map_coords($match) +{ + // the extra space in the following line is intentional + return str_replace($match[0], '' . generate_map(str_replace('/', ' ', $match[1])) . '', $match[0]); } -function bb_map_location($match) { - // the extra space in the following line is intentional - return str_replace($match[0],'' . generate_named_map($match[1]) . '', $match[0]); +function bb_map_location($match) +{ + // the extra space in the following line is intentional + return str_replace($match[0], '' . generate_named_map($match[1]) . '', $match[0]); } -function bb_opentag($match) { - $openclose = (($match[2]) ? '' . $match[1] . '' : t('Click to open/close')); - $text = (($match[2]) ? $match[2] : $match[1]); - $rnd = mt_rand(); +function bb_opentag($match) +{ + $openclose = (($match[2]) ? '' . $match[1] . '' : t('Click to open/close')); + $text = (($match[2]) ? $match[2] : $match[1]); + $rnd = mt_rand(); - return '' . $openclose . ''; + return '' . $openclose . ''; } -function bb_spoilertag($match) { - $openclose = (($match[2]) ? '' . $match[1] . ' ' . t('spoiler') . '' : t('Click to open/close')); - $text = (($match[2]) ? $match[2] : $match[1]); - $rnd = mt_rand(); +function bb_spoilertag($match) +{ + $openclose = (($match[2]) ? '' . $match[1] . ' ' . t('spoiler') . '' : t('Click to open/close')); + $text = (($match[2]) ? $match[2] : $match[1]); + $rnd = mt_rand(); - return '' . $openclose . ''; + return '' . $openclose . ''; } -function bb_summary($match) { - $rnd1 = mt_rand(); - $rnd2 = mt_rand(); - $rnd3 = mt_rand(); - $rnd4 = mt_rand(); +function bb_summary($match) +{ + $rnd1 = mt_rand(); + $rnd2 = mt_rand(); + $rnd3 = mt_rand(); + $rnd4 = mt_rand(); - return $match[1] . $match[2] . EOL . EOL . $match[3]; + return $match[1] . $match[2] . EOL . EOL . $match[3]; -// return $match[1] . '' . $match[2] . '' . t('View article') . ''; +// return $match[1] . '' . $match[2] . '' . t('View article') . ''; } -function bb_definitionList($match) { - // $match[1] is the markup styles for the "terms" in the definition list. - // $match[2] is the content between the [dl]...[/dl] tags +function bb_definitionList($match) +{ + // $match[1] is the markup styles for the "terms" in the definition list. + // $match[2] is the content between the [dl]...[/dl] tags - $classes = ''; - if (stripos($match[1], "b") !== false) $classes .= 'dl-terms-bold '; - if (stripos($match[1], "i") !== false) $classes .= 'dl-terms-italic '; - if (stripos($match[1], "u") !== false) $classes .= 'dl-terms-underline '; - if (stripos($match[1], "l") !== false) $classes .= 'dl-terms-large '; - if (stripos($match[1], "m") !== false) $classes .= 'dl-terms-monospace '; - if (stripos($match[1], "h") !== false) $classes .= 'dl-horizontal '; // dl-horizontal is already provided by bootstrap - if (strlen($classes) === 0) $classes = "dl-terms-plain"; + $classes = ''; + if (stripos($match[1], "b") !== false) { + $classes .= 'dl-terms-bold '; + } + if (stripos($match[1], "i") !== false) { + $classes .= 'dl-terms-italic '; + } + if (stripos($match[1], "u") !== false) { + $classes .= 'dl-terms-underline '; + } + if (stripos($match[1], "l") !== false) { + $classes .= 'dl-terms-large '; + } + if (stripos($match[1], "m") !== false) { + $classes .= 'dl-terms-monospace '; + } + if (stripos($match[1], "h") !== false) { + $classes .= 'dl-horizontal '; // dl-horizontal is already provided by bootstrap + } + if (strlen($classes) === 0) { + $classes = "dl-terms-plain"; + } - // The bbcode transformation will be: - // [*=term-text] description-text =>- term-text
- description-text - // then after all replacements have been made, the extra
at the start of the - // first line can be removed. HTML5 allows the tag to be missing from the end of the last line. - // Using '(?\n"; - $eatLeadingSpaces = '(?: |[ \t])*'; // prevent spaces infront of [*= from adding another line to the previous element - $listElements = preg_replace('/^(\n|
)/', '', $match[2]); // ltrim the first newline - $listElements = preg_replace( - '/' . $eatLeadingSpaces . '\[\*=([[:print:]]*?)(?$1- ', - $listElements - ); - // Unescape any \] inside the
- tags - $listElements = preg_replace_callback('/
- (.*?)<\/dt>/ism', 'bb_definitionList_unescapeBraces', $listElements); - - // Remove the extra at the start of the string, if there is one. - $firstOpenTag = strpos($listElements, '
- '); - $firstCloseTag = strpos($listElements, $closeDescriptionTag); - if ($firstCloseTag !== false && ($firstOpenTag === false || ($firstCloseTag < $firstOpenTag))) { - $listElements = preg_replace( '/<\/dd>/ism', '', $listElements, 1); - } + // The bbcode transformation will be: + // [*=term-text] description-text =>
- term-text
- description-text + // then after all replacements have been made, the extra
at the start of the + // first line can be removed. HTML5 allows the tag to be missing from the end of the last line. + // Using '(?\n"; + $eatLeadingSpaces = '(?: |[ \t])*'; // prevent spaces infront of [*= from adding another line to the previous element + $listElements = preg_replace('/^(\n|
)/', '', $match[2]); // ltrim the first newline + $listElements = preg_replace( + '/' . $eatLeadingSpaces . '\[\*=([[:print:]]*?)(?$1- ', + $listElements + ); + // Unescape any \] inside the
- tags + $listElements = preg_replace_callback('/
- (.*?)<\/dt>/ism', 'bb_definitionList_unescapeBraces', $listElements); - return '
- ' . $listElements . '
- '); + $firstCloseTag = strpos($listElements, $closeDescriptionTag); + if ($firstCloseTag !== false && ($firstOpenTag === false || ($firstCloseTag < $firstOpenTag))) { + $listElements = preg_replace('/<\/dd>/ism', '', $listElements, 1); + } + + return '
- ' . $listElements . '
- ' . str_replace('\]', ']', $match[1]) . '
'; +function bb_definitionList_unescapeBraces($match) +{ + return '- ' . str_replace('\]', ']', $match[1]) . '
'; } -function bb_checklist($match) { - $str = $match[1]; - $str = str_replace("[]", "- ", $str); - $str = str_replace("[x]", "
- ", $str); - return '
- ' . $str . '
- ", $str); + $str = str_replace("[x]", "
- ", $str); + return '
- ' . $str . '
'; - - return $output; - + $x = preg_match("/height=\\\"(.*?)\\\"/ism", $attributes, $matches); + if ($x) { + $height = bb_xss($matches[1]); + } + + $x = preg_match("/style='(.*?)'/ism", $attributes, $matches); + if ($x) { + $style = bb_sanitize_style($matches[1]); + } + + $x = preg_match("/style=\"\;(.*?)\"\;/ism", $attributes, $matches); + if ($x) { + $style = bb_sanitize_style($matches[1]); + } + + $x = preg_match("/style=\\\"(.*?)\\\"/ism", $attributes, $matches); + if ($x) { + $style = bb_sanitize_style($matches[1]); + } + + // legacy img options + + if ($match[2] === '=') { + // pull out (optional) legacy size declarations first + if (preg_match("/([0-9]*)x([0-9]*)/ism", $match[3], $local_match)) { + $width = intval($local_match[1]); + } + $match[3] = substr($match[3], strpos($match[3], ' ')); + } + + // then (optional) legacy float specifiers + if ($n = strpos($match[3], 'float=left') !== false) { + $float = 'left'; + $match[3] = substr($match[3], $n + 10); + } + if ($n = strpos($match[3], 'float=right') !== false) { + $float = 'right'; + $match[3] = substr($match[3], $n + 11); + } + + // finally alt text which extends to the close of the tag + if ((! $alt) && ($n = strpos($match[3], 'alt=') !== false)) { + $alt = substr($match[3], $n + 4); + } + + // now assemble the resulting img tag from these components + + $output = '
'; + + return $output; } -function multicode_purify($s) { +function multicode_purify($s) +{ - $s = preg_replace_callback("/\[code(.*?)\](.*?)\[\/code\]/ism", function ($match) { - return '[code' . $match[1] . ']' . bb_code_protect($match[2]) . '[/code]'; - }, $s); + $s = preg_replace_callback("/\[code(.*?)\](.*?)\[\/code\]/ism", function ($match) { + return '[code' . $match[1] . ']' . bb_code_protect($match[2]) . '[/code]'; + }, $s); - $s = preg_replace_callback('#(^|\n)([`~]{3,})(?: *\.?([a-zA-Z0-9\-.]+))?\n+([\s\S]+?)\n+\2(\n|$)#', function ($match) { - return $match[1] . $match[2] . "\n" . bb_code_protect($match[4]) . "\n" . $match[2] . (($match[5]) ? $match[5] : "\n"); - }, $s); + $s = preg_replace_callback('#(^|\n)([`~]{3,})(?: *\.?([a-zA-Z0-9\-.]+))?\n+([\s\S]+?)\n+\2(\n|$)#', function ($match) { + return $match[1] . $match[2] . "\n" . bb_code_protect($match[4]) . "\n" . $match[2] . (($match[5]) ? $match[5] : "\n"); + }, $s); -// if (strpos($s,'<') !== false || strpos($s,'>') !== false) { - $s = purify_html($s, [ 'escape' ]); -// } - - return bb_code_unprotect($s); +// if (strpos($s,'<') !== false || strpos($s,'>') !== false) { + $s = purify_html($s, [ 'escape' ]); +// } + return bb_code_unprotect($s); } -function bb_code_preprotect($matches) { - return '[code' . $matches[1] . ']' . 'b64.^8e%.' . base64_encode(str_replace('
','|+br+|',$matches[2])) . '.b64.$8e%' . '[/code]'; +function bb_code_preprotect($matches) +{ + return '[code' . $matches[1] . ']' . 'b64.^8e%.' . base64_encode(str_replace('
', '|+br+|', $matches[2])) . '.b64.$8e%' . '[/code]'; } -function bb_code_preunprotect($s) { - return preg_replace_callback('|b64\.\^8e\%\.(.*?)\.b64\.\$8e\%|ism','bb_code_unprotect_sub',$s); +function bb_code_preunprotect($s) +{ + return preg_replace_callback('|b64\.\^8e\%\.(.*?)\.b64\.\$8e\%|ism', 'bb_code_unprotect_sub', $s); } -function bb_code_protect($s) { - return 'b64.^9e%.' . base64_encode(str_replace('
','|+br+|',$s)) . '.b64.$9e%'; +function bb_code_protect($s) +{ + return 'b64.^9e%.' . base64_encode(str_replace('
', '|+br+|', $s)) . '.b64.$9e%'; } -function bb_code_unprotect($s) { - return preg_replace_callback('|b64\.\^9e\%\.(.*?)\.b64\.\$9e\%|ism','bb_code_unprotect_sub',$s); +function bb_code_unprotect($s) +{ + return preg_replace_callback('|b64\.\^9e\%\.(.*?)\.b64\.\$9e\%|ism', 'bb_code_unprotect_sub', $s); } -function bb_code_unprotect_sub($match) { - $x = str_replace( [ '<', '>' ], [ '<', '>' ], base64_decode($match[1])); - return str_replace('|+br+|','
', $x); +function bb_code_unprotect_sub($match) +{ + $x = str_replace([ '<', '>' ], [ '<', '>' ], base64_decode($match[1])); + return str_replace('|+br+|', '
', $x); } -function bb_colorbox($match) { - if (strpos($match[1],'zrl')) { - $url = zid($match[2]); - } - else { - $url = $match[2]; - } - return ''; +function bb_colorbox($match) +{ + if (strpos($match[1], 'zrl')) { + $url = zid($match[2]); + } else { + $url = $match[2]; + } + return '
")) - return '
'; - else - return '' . bb_code_protect(trim($match[1])) . '' . bb_code_protect(trim($match[1])) . ''; +function bb_code($match) +{ + if (strpos($match[0], "
")) { + return '
'; + } else { + return '' . bb_code_protect(trim($match[1])) . '' . bb_code_protect(trim($match[1])) . ''; + } } -function bb_code_options($match) { - if(strpos($match[0], "
")) { - $class = ""; - $pre = true; - } else { - $class = "inline-code"; - $pre = false; - } - if(strpos($match[1], 'nowrap')) { - $style = "overflow-x: auto; white-space: pre;"; - } else { - $style = ""; - } - if($pre) { - return '
'; - } else { - return '' . bb_code_protect(trim($match[2])) . '' . bb_code_protect(trim($match[2])) . ''; - } +function bb_code_options($match) +{ + if (strpos($match[0], "
")) { + $class = ""; + $pre = true; + } else { + $class = "inline-code"; + $pre = false; + } + if (strpos($match[1], 'nowrap')) { + $style = "overflow-x: auto; white-space: pre;"; + } else { + $style = ""; + } + if ($pre) { + return '
'; + } else { + return '' . bb_code_protect(trim($match[2])) . '' . bb_code_protect(trim($match[2])) . ''; + } } -function md_protect($match) { - return bb_code_protect($match[1]); +function md_protect($match) +{ + return bb_code_protect($match[1]); } -function html_protect($match) { - return str_replace(['<','>'],['<','>'],$match[1]); +function html_protect($match) +{ + return str_replace(['<','>'], ['<','>'], $match[1]); } -function md_header($content) { +function md_header($content) +{ - $headingLevel = strlen($content[1]); - $header = trim($content[2]); - // Build anchor without space, numbers. + $headingLevel = strlen($content[1]); + $header = trim($content[2]); + // Build anchor without space, numbers. $anchor = preg_replace('#[^a-z?!]#', '', strtolower($header)); return sprintf('
', $content[4]); + $language = !empty($content[3]) ? filter_var($content[3], FILTER_SANITIZE_STRING) : ''; + $class = !empty($language) ? sprintf(' class="%s language-%s"', $language, $language) : ''; + // Build one block so that we not render each paragraph separately. + $content = str_replace("\n", '
', $content[4]); - return sprintf('
', $class, bb_code_protect($content)); + return sprintf('
', $class, bb_code_protect($content)); } -function md_italic($content) { +function md_italic($content) +{ - return '' . $content[1] . $content[3] . ''; + return '' . $content[1] . $content[3] . ''; } -function md_bold($content) { +function md_bold($content) +{ - return '' . $content[1] . $content[3] . ''; + return '' . $content[1] . $content[3] . ''; } -function md_bolditalic($content) { +function md_bolditalic($content) +{ - return '' . $content[1] . $content[3] . ''; + return '' . $content[1] . $content[3] . ''; } -function md_image($content) { - $url = filter_var($content[1], FILTER_SANITIZE_URL); - $alt = ''; - if (isset($content[2])) { - $content[2] = str_replace('"', '', $content[2]); - $alt = ' alt="' . filter_var($content[2], FILTER_SANITIZE_STRING) . '"'; - } +function md_image($content) +{ + $url = filter_var($content[1], FILTER_SANITIZE_URL); + $alt = ''; + if (isset($content[2])) { + $content[2] = str_replace('"', '', $content[2]); + $alt = ' alt="' . filter_var($content[2], FILTER_SANITIZE_STRING) . '"'; + } - return sprintf('', $url, $alt); + return sprintf('
' and turn your neatly crafted tables into a whole lot of - // empty space. - - $x = preg_replace("/\]\s+\[/",'][',$match[1]); - $x = str_replace("\\\n","\n",$x); - return '[table]' . $x . '[/table]'; + // bbcode version (1 arg) + // remove extraneous whitespace between table element tags since newlines will all + // be converted to '
' and turn your neatly crafted tables into a whole lot of + // empty space. + $x = preg_replace("/\]\s+\[/", '][', $match[1]); + $x = str_replace("\\\n", "\n", $x); + return '[table]' . $x . '[/table]'; } -function ht_fixtable_lf($match) { +function ht_fixtable_lf($match) +{ - // HTML version (2 args) - // remove extraneous whitespace between table element tags since newlines will all - // be converted to '
' and turn your neatly crafted tables into a whole lot of - // empty space. - - $x = preg_replace("/\>\s+\<',$match[2]); - return '
' and turn your neatly crafted tables into a whole lot of + // empty space. + $x = preg_replace("/\>\s+\<', $match[2]); + return '$3',$Text); - // markdown inline code blocks must be preceded by space or linebreak - $Text = preg_replace('#(^|\n| )(?$2', $Text); - // strip backslash escape for inline code - $Text = preg_replace('#(\\\)`#','`',$Text); - $Text = preg_replace('#<\/code><\/pre>\n
',$Text); - - // blockquotes - $Text = preg_replace('#^(>)+ +(.*?)$#m','$2
',$Text); - $Text = preg_replace('#^(\>)+ +(.*?)$#m','$2
',$Text); - $Text = preg_replace('#\n#',"\n", $Text); - - // links - $Text = preg_replace_callback('#!\[[^\]]*\]\((.*?)(?=\"|\))(\".*\")?\)(?!`)#','md_image',$Text); - $Text = preg_replace('#\[([^\[]+)\]\((?:javascript:)?([^\)]+)\)(?!`)#','$1',$Text); - - // unordered lists - $Text = preg_replace('#^(?
- $1
',$Text); - // strip the backslash escape if present - $Text = preg_replace('#^(\\\)([*\-+]) #m','$2',$Text); - // order lists - $Text = preg_replace('#^\d+[\.\)] +(.*?)$#m','- $1
tags - - $Text = str_replace(array("\r", "\n"), array('
', '
'), $Text); - $Text = str_replace(array("\t", " "), array(" ", " "), $Text); - - // Check for [code] text - if (strpos($Text,'[code]') !== false) { - $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism", 'bb_code', $Text); - } - - // Check for [code options] text - if (strpos($Text,'[code ') !== false) { - $Text = preg_replace_callback("/\[code(.*?)\](.*?)\[\/code\]/ism", 'bb_code_options', $Text); - } - - // Set up the parameters for a URL search string - $URLSearchString = "^\[\]"; - // Set up the parameters for a MAIL search string - $MAILSearchString = $URLSearchString; - - // replace [observer.baseurl] - if ($observer) { - $s1 = ''; - $s2 = ''; - $obsBaseURL = $observer['xchan_connurl']; - $obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL); - $Text = str_replace('[observer.baseurl]', $obsBaseURL, $Text); - $Text = str_replace('[observer.url]',$observer['xchan_url'], $Text); - $Text = str_replace('[observer.name]',$s1 . $observer['xchan_name'] . $s2, $Text); - $Text = str_replace('[observer.address]',$s1 . $observer['xchan_addr'] . $s2, $Text); - $Text = str_replace('[observer.webname]', substr($observer['xchan_addr'],0,strpos($observer['xchan_addr'],'@')), $Text); - $Text = str_replace('[observer.photo]',$s1 . '[zmg]'.$observer['xchan_photo_l'].'[/zmg]' . $s2, $Text); - $Text = str_replace('[observer.baseurl/]', $obsBaseURL, $Text); - $Text = str_replace('[observer.url/]',$observer['xchan_url'], $Text); - $Text = str_replace('[observer.name/]',$s1 . $observer['xchan_name'] . $s2, $Text); - $Text = str_replace('[observer.address/]',$s1 . $observer['xchan_addr'] . $s2, $Text); - $Text = str_replace('[observer.webname/]', substr($observer['xchan_addr'],0,strpos($observer['xchan_addr'],'@')), $Text); - $Text = str_replace('[observer.photo/]',$s1 . '[zmg]'.$observer['xchan_photo_l'].'[/zmg]' . $s2, $Text); - } else { - $Text = str_replace('[observer.baseurl]', '', $Text); - $Text = str_replace('[observer.url]','', $Text); - $Text = str_replace('[observer.name]','', $Text); - $Text = str_replace('[observer.address]','', $Text); - $Text = str_replace('[observer.webname]','',$Text); - $Text = str_replace('[observer.photo]','', $Text); - $Text = str_replace('[observer.baseurl/]', '', $Text); - $Text = str_replace('[observer.url/]','', $Text); - $Text = str_replace('[observer.name/]','', $Text); - $Text = str_replace('[observer.address/]','', $Text); - $Text = str_replace('[observer.webname/]','',$Text); - $Text = str_replace('[observer.photo/]','', $Text); - } - - - - // Perform URL Search - - $urlchars = '[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]'; - - if (strpos($Text,'http') !== false) { - $Text = preg_replace("/([^\]\='".'"'."\;\/])(https?\:\/\/$urlchars+)/ismu", '$1$2', $Text); - } - - $count = 0; - while (strpos($Text,'[/share]') !== false && $count < 10) { - $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism", 'bb_ShareAttributes', $Text); - $count ++; - } - - if (strpos($Text,'[/url]') !== false) { - $Text = preg_replace("/\#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '$1', $Text); - $Text = preg_replace("/\#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$2', $Text); - $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '$1', $Text); - $Text = preg_replace("/\@(\!?)\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '@$1$3', $Text); - $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$2', $Text); - } - - if (strpos($Text,'[/zrl]') !== false) { - // render hubzilla bookmarks as normal links - $Text = preg_replace("/\#\^\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '$1', $Text); - $Text = preg_replace("/\#\^\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '$2', $Text); - $Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '$1', $Text); - $Text = preg_replace("/\@(\!?)\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '@$1$3', $Text); - $Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '$2', $Text); - } - - // named anchors do not work well in conversational text, as it is often collapsed by a "showmore" script. - // Included here for completeness. - - if (strpos($Text,'[/anchor]') !== false) { - $Text = preg_replace("/\[anchor\](.*?)\[\/anchor\]/ism", '', $Text); - } - - if (strpos($Text,'[/goto]') !== false) { - $Text = preg_replace("/\[goto=(.*?)\](.*?)\[\/goto\]/ism", '$2', $Text); - } - - // Perform MAIL Search - if (strpos($Text,'[/mail]') !== false) { - $Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '$1', $Text); - $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '$2', $Text); - } - - - // leave open the posibility of [map=something] - // this is replaced in prepare_body() which has knowledge of the item location - - if ($export) { - $Text = str_replace( [ '[map]','[/map]' ], [ '','' ] , $Text); - $Text = preg_replace("/\[map=(.*?)[, ](.*?)\]/ism", 'geo:$1,$2', $Text); - } - else { - if (strpos($Text,'[/map]') !== false) { - $Text = preg_replace_callback("/\[map\](.*?)\[\/map\]/ism", 'bb_map_location', $Text); - } - if (strpos($Text,'[map=') !== false) { - $Text = preg_replace_callback("/\[map=(.*?)\/\]/ism", 'bb_map_coords', $Text); - $Text = preg_replace_callback("/\[map=(.*?)\]/ism", 'bb_map_coords', $Text); - } - if (strpos($Text,'[map]') !== false) { - $Text = preg_replace("/\[map\/\]/", '', $Text); - $Text = preg_replace("/\[map\]/", '', $Text); - } - } - - // Check for bold text - if (strpos($Text,'[b]') !== false) { - $Text = preg_replace("(\[b\](.*?)\[\/b\])ism", '$1', $Text); - } - // Check for Italics text - if (strpos($Text,'[i]') !== false) { - $Text = preg_replace("(\[i\](.*?)\[\/i\])ism", '$1', $Text); - } - // Check for Underline text - if (strpos($Text,'[u]') !== false) { - $Text = preg_replace("(\[u\](.*?)\[\/u\])ism", '$1', $Text); - } - // Check for strike-through text - if (strpos($Text,'[s]') !== false) { - $Text = preg_replace("(\[s\](.*?)\[\/s\])ism", '$1', $Text); - } - // Check for over-line text - if (strpos($Text,'[o]') !== false) { - $Text = preg_replace("(\[o\](.*?)\[\/o\])ism", '$1', $Text); - } - if (strpos($Text,'[sup]') !== false) { - $Text = preg_replace("(\[sup\](.*?)\[\/sup\])ism", '$1', $Text); - } - if (strpos($Text,'[sub]') !== false) { - $Text = preg_replace("(\[sub\](.*?)\[\/sub\])ism", '$1', $Text); - } - - // Check for colored text - if (strpos($Text,'[/color]') !== false) { - $Text = preg_replace_callback("(\[color=(.*?)\](.*?)\[\/color\])ism", 'bb_colortag', $Text); - } - // Check for highlighted text - if (strpos($Text,'[/hl]') !== false) { - $Text = preg_replace("(\[hl\](.*?)\[\/hl\])ism", "$1", $Text); - $Text = preg_replace_callback("(\[mark=(.*?)\](.*?)\[\/mark\])ism", 'bb_hltag', $Text); - } - // Check for highlighted text - if (strpos($Text,'[/mark]') !== false) { - $Text = preg_replace("(\[mark\](.*?)\[\/mark\])ism", "$1", $Text); - $Text = preg_replace_callback("(\[mark=(.*?)\](.*?)\[\/mark\])ism", 'bb_hltag', $Text); - } - - // Check for sized text - // [size=50] --> font-size: 50px (with the unit). - if (strpos($Text,'[/size]') !== false) { - $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism", "$2", $Text); - $Text = preg_replace_callback("(\[size=(.*?)\](.*?)\[\/size\])ism", 'bb_sizetag', $Text); - } - // Check for h1 - if (strpos($Text,'[h1]') !== false) { - $Text = preg_replace("(\[h1\](.*?)\[\/h1\])ism",'$1
',$Text); - $Text = str_replace('
', '', $Text); - } - // Check for h2 - if (strpos($Text,'[h2]') !== false) { - $Text = preg_replace("(\[h2\](.*?)\[\/h2\])ism",'$1
',$Text); - $Text = str_replace('
', '', $Text); - } - // Check for h3 - if (strpos($Text,'[h3]') !== false) { - $Text = preg_replace("(\[h3\](.*?)\[\/h3\])ism",'$1
',$Text); - $Text = str_replace('
', '', $Text); - } - // Check for h4 - if (strpos($Text,'[h4]') !== false) { - $Text = preg_replace("(\[h4\](.*?)\[\/h4\])ism",'$1
',$Text); - $Text = str_replace('
', '', $Text); - } - // Check for h5 - if (strpos($Text,'[h5]') !== false) { - $Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism",'$1
',$Text); - $Text = str_replace('
', '', $Text); - } - // Check for h6 - if (strpos($Text,'[h6]') !== false) { - $Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'$1
',$Text); - $Text = str_replace('
', '', $Text); - } - - // Check for table of content without params - while(strpos($Text,'[toc]') !== false) { - $toc_id = 'toc-' . random_string(10); - $Text = preg_replace("/\[toc\]/ism", '$1", $Text); - } - // Check for footer - if (strpos($Text,'[/footer]') !== false) { - $Text = preg_replace("(\[footer\](.*?)\[\/footer\])ism", "", $Text); - } - - // Check for bdi - if (strpos($Text,'[/bdi]') !== false) { - $Text = preg_replace("(\[bdi\](.*?)\[\/bdi\])ism", "$1", $Text); - } - - - // Check for list text - - $Text = preg_replace("/
\[\*\]/ism","[*]",$Text); - $Text = str_replace("[*]", "- ", $Text); - - // handle nested lists - $endlessloop = 0; - - while ((((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)) || - ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) || - ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false)) || - ((strpos($Text, "[/dl]") !== false) && (strpos($Text, "[dl") !== false)) || - ((strpos($Text, "[/li]") !== false) && (strpos($Text, "[li]") !== false))) && (++$endlessloop < 20)) { - $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '
- $1
- $1
- $1
- $2
- $2
- $2
- $2
- $1
- $1
\[li\]/ism",'[/li][li]',$Text); - $Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '- $1
', $Text); - - // [dl] tags have an optional [dl terms="bi"] form where bold/italic/underline/mono/large - // etc. style may be specified for the "terms" in the definition list. The quotation marks - // are also optional. The regex looks intimidating, but breaks down as: - // "[dl""]" "[/dl]" - // where optional-termStyles are: "terms=" - $Text = preg_replace_callback('/\[dl[[:space:]]*(?:terms=(?:"|")?([a-zA-Z]+)(?:"|")?)?\](.*?)\[\/dl\]/ism', 'bb_definitionList', $Text); - - } - - // Friendica generates this - if (strpos($Text,'[/abstract]') !== false) { - $Text = preg_replace("/\[abstract\](.*?)\[\/abstract\]/ism", ' $1
', $Text); - } - - if (strpos($Text,'[checklist]') !== false) { - $Text = preg_replace_callback("/\[checklist\](.*?)\[\/checklist\]/ism", 'bb_checklist', $Text); - } - - - $loop = 0; - while (strpos($Text,'[/table]') !== false && strpos($Text,"[table") !== false && ++$loop < 20) { - $Text = preg_replace("/\[table\](.*?)\[\/table\]/ism", '$1
', $Text); - $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/ism", '$1
', $Text); - $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/ism", '$1
', $Text); - } - if (strpos($Text,'[th]') !== false) { - $Text = preg_replace("/\[th\](.*?)\[\/th\]/ism", '$1 ', $Text); - } - if (strpos($Text,'[td]') !== false) { - $Text = preg_replace("/\[td\](.*?)\[\/td\]/ism", '$1 ', $Text); - } - if (strpos($Text,'[tr]') !== false) { - $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/ism", '$1 ', $Text); - } - if (strpos($Text,'[tbody]') !== false) { - $Text = preg_replace("/\[tbody\](.*?)\[\/tbody\]/ism", '$1', $Text); - } - - - $Text = str_replace('', " \n", $Text); - $Text = str_replace('[hr]', '
', $Text); - - // This is actually executed in prepare_body() - - $Text = str_replace('[nosmile]', '', $Text); - - // Check for font change text - if (strpos($Text,'[/font]') !== false) { - $Text = preg_replace_callback("/\[font=(.*?)\](.*?)\[\/font\]/sm", 'bb_fonttag', $Text); - } - - if(strpos($Text,'[/summary]') !== false) { - $Text = preg_replace_callback("/^(.*?)\[summary\](.*?)\[\/summary\](.*?)$/ism", 'bb_summary', $Text); - } - - // Check for [spoiler] text - $endlessloop = 0; - while ((strpos($Text, "[/spoiler]")!== false) && (strpos($Text, "[spoiler]") !== false) && (++$endlessloop < 20)) { - $Text = preg_replace_callback("/\[spoiler\](.*?)\[\/spoiler\]/ism", 'bb_spoilertag', $Text); - } - - // Check for [spoiler=Author] text - $endlessloop = 0; - while ((strpos($Text, "[/spoiler]")!== false) && (strpos($Text, "[spoiler=") !== false) && (++$endlessloop < 20)) { - $Text = preg_replace_callback("/\[spoiler=(.*?)\](.*?)\[\/spoiler\]/ism", 'bb_spoilertag', $Text); - } - - // Check for [open] text - $endlessloop = 0; - while ((strpos($Text, "[/open]")!== false) && (strpos($Text, "[open]") !== false) && (++$endlessloop < 20)) { - $Text = preg_replace_callback("/\[open\](.*?)\[\/open\]/ism", 'bb_opentag', $Text); - } - - // Check for [open=Title] text - $endlessloop = 0; - while ((strpos($Text, "[/open]")!== false) && (strpos($Text, "[open=") !== false) && (++$endlessloop < 20)) { - $Text = preg_replace_callback("/\[open=(.*?)\](.*?)\[\/open\]/ism", 'bb_opentag', $Text); - } - - - // Declare the format for [quote] layout - $QuoteLayout = '$1
'; - - - // Check for [quote] text - // handle nested quotes - $endlessloop = 0; - while ((strpos($Text, "[/quote]") !== false) && (strpos($Text, "[quote]") !== false) && (++$endlessloop < 20)) - $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism", "$QuoteLayout", $Text); - - // Check for [quote=Author] text - - $t_wrote = t('$1 wrote:'); - - // handle nested quotes - $endlessloop = 0; - while ((strpos($Text, "[/quote]")!== false) && (strpos($Text, "[quote=") !== false) && (++$endlessloop < 20)) - $Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", - "" . $t_wrote . "$2
", - $Text); - - if ($plain) { - $Text = str_replace([ '','
' ], [ '“', '”' ], $Text); - } - - - // Images - - // [img]pathtoimage[/img] - if (strpos($Text,'[/img]') !== false) { - $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '', $Text); - // Friendica's modified bbcode img tags - $Text = preg_replace("/\[img=http(.*?)\](.*?)\[\/img\]/ism", '
', $Text); - } - if (strpos($Text,'[/zmg]') !== false) { - $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '
", "
", $Text); - - // If we found an event earlier, strip out all the event code and replace with a reformatted version. - // Replace the event-start section with the entire formatted event. The other bbcode is stripped. - // Summary (e.g. title) is required, earlier revisions only required description (in addition to - // start which is always required). Allow desc with a missing summary for compatibility. - - if ((x($ev,'desc') || x($ev,'summary')) && x($ev,'dtstart')) { - - $sub = format_event_html($ev); - - $sub = str_replace('$',"\0",$sub); - - $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism",$sub,$Text); - - $Text = preg_replace("/\[event\](.*?)\[\/event\]/ism",'',$Text); - $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism",'',$Text); - $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism",'',$Text); - $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text); - $Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism",'',$Text); - $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism",'',$Text); - $Text = preg_replace("/\[event\-timezone\](.*?)\[\/event\-timezone\]/ism",'',$Text); - $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text); - - $Text = str_replace("\0",'$',$Text); - - } - - // Unhide all [noparse] contained bbtags unspacefying them - // and triming the [noparse] tag. - if (strpos($Text,'[noparse]') !== false) { - $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim', $Text); - } - if (strpos($Text,'[nobb]') !== false) { - $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim', $Text); - } - if (strpos($Text,'[pre]') !== false) { - $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text); - } - - // replace escaped links in code= blocks - $Text = str_replace('%eY9-!','http', $Text); - $Text = bb_code_unprotect($Text); - - // This lets you use HTML entities in posts - just wrap them in brackets. For instance [©] to display a copyright symbol. - - $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/', '&$1;', $Text); - - // fix any escaped ampersands that may have been converted into links - - if(strpos($Text,'&') !== false) - $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism", '<$1$2=$3&$4>', $Text); - - // This is subtle - it's an XSS filter. It only accepts links with a protocol scheme and where - // the scheme begins with z (zhttp), h (http(s)), f (ftp(s)), g (gemini), m (mailto|magnet), t (tel) and named anchors. - // data: urls are allowed if exporting to activitypub which allows inline svg to federate, but not - // to be used for local display - - if ($activitypub) { - $Text = preg_replace("/\<(.*?)(src|href)=\"[^dzghfmt#](.*?)\>/ism", '<$1$2="">', $Text); - } - else { - $Text = preg_replace("/\<(.*?)(src|href)=\"[^zhgfmt#](.*?)\>/ism", '<$1$2="">', $Text); - } - - $Text = bb_replace_images($Text, $saved_images); - - $args = [ 'text' => $Text, 'options' => $options ]; - call_hooks('bbcode', $args); - - return $args['text']; + // Quick but flawed fix for performance regression after purification + // was moved to rendering code to allow multiple code formats + // A proper fix would be to escape any code blocks before purification, + // restore them and store the resultant intermediate multicode. + // This is now accomplished using multicode_purify() + + // if (strpbrk($Text,'<>') !== false) { + // $Text = purify_html($Text, [ 'escape' ]); + // } + + // the bbcode tag 'nomd' will bypass markdown processing for any given text region + + $Text = preg_replace_callback('#\[nomd\](.*?)\[\/nomd\]#ism', 'md_protect', $Text); + + // and for completeness, there's 'nohtml' + + + $Text = preg_replace_callback('#\[nohtml\](.*?)\[\/nohtml\]#ism', 'html_protect', $Text); + + + // Perform some markdown conversions before translating linefeeds so as to keep the regexes manageable + // The preceding character check in bold/italic sequences is so we don't mistake underscore/asterisk in the middle of conversational text as an italic trigger. + + $Text = preg_replace_callback('#(^|\n| )(?$3',$Text); + // markdown inline code blocks must be preceded by space or linebreak + $Text = preg_replace('#(^|\n| )(?$2', $Text); + // strip backslash escape for inline code + $Text = preg_replace('#(\\\)`#', '`', $Text); + $Text = preg_replace('#<\/code><\/pre>\n
', $Text); + + // blockquotes + $Text = preg_replace('#^(>)+ +(.*?)$#m', '$2
', $Text); + $Text = preg_replace('#^(\>)+ +(.*?)$#m', '$2
', $Text); + $Text = preg_replace('#\n#', "\n", $Text); + + // links + $Text = preg_replace_callback('#!\[[^\]]*\]\((.*?)(?=\"|\))(\".*\")?\)(?!`)#', 'md_image', $Text); + $Text = preg_replace('#\[([^\[]+)\]\((?:javascript:)?([^\)]+)\)(?!`)#', '$1', $Text); + + // unordered lists + $Text = preg_replace('#^(?
- $1
', $Text); + // strip the backslash escape if present + $Text = preg_replace('#^(\\\)([*\-+]) #m', '$2', $Text); + // order lists + $Text = preg_replace('#^\d+[\.\)] +(.*?)$#m', '- $1
tags + + $Text = str_replace(array("\r", "\n"), array('
', '
'), $Text); + $Text = str_replace(array("\t", " "), array(" ", " "), $Text); + + // Check for [code] text + if (strpos($Text, '[code]') !== false) { + $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism", 'bb_code', $Text); + } + + // Check for [code options] text + if (strpos($Text, '[code ') !== false) { + $Text = preg_replace_callback("/\[code(.*?)\](.*?)\[\/code\]/ism", 'bb_code_options', $Text); + } + + // Set up the parameters for a URL search string + $URLSearchString = "^\[\]"; + // Set up the parameters for a MAIL search string + $MAILSearchString = $URLSearchString; + + // replace [observer.baseurl] + if ($observer) { + $s1 = ''; + $s2 = ''; + $obsBaseURL = $observer['xchan_connurl']; + $obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL); + $Text = str_replace('[observer.baseurl]', $obsBaseURL, $Text); + $Text = str_replace('[observer.url]', $observer['xchan_url'], $Text); + $Text = str_replace('[observer.name]', $s1 . $observer['xchan_name'] . $s2, $Text); + $Text = str_replace('[observer.address]', $s1 . $observer['xchan_addr'] . $s2, $Text); + $Text = str_replace('[observer.webname]', substr($observer['xchan_addr'], 0, strpos($observer['xchan_addr'], '@')), $Text); + $Text = str_replace('[observer.photo]', $s1 . '[zmg]' . $observer['xchan_photo_l'] . '[/zmg]' . $s2, $Text); + $Text = str_replace('[observer.baseurl/]', $obsBaseURL, $Text); + $Text = str_replace('[observer.url/]', $observer['xchan_url'], $Text); + $Text = str_replace('[observer.name/]', $s1 . $observer['xchan_name'] . $s2, $Text); + $Text = str_replace('[observer.address/]', $s1 . $observer['xchan_addr'] . $s2, $Text); + $Text = str_replace('[observer.webname/]', substr($observer['xchan_addr'], 0, strpos($observer['xchan_addr'], '@')), $Text); + $Text = str_replace('[observer.photo/]', $s1 . '[zmg]' . $observer['xchan_photo_l'] . '[/zmg]' . $s2, $Text); + } else { + $Text = str_replace('[observer.baseurl]', '', $Text); + $Text = str_replace('[observer.url]', '', $Text); + $Text = str_replace('[observer.name]', '', $Text); + $Text = str_replace('[observer.address]', '', $Text); + $Text = str_replace('[observer.webname]', '', $Text); + $Text = str_replace('[observer.photo]', '', $Text); + $Text = str_replace('[observer.baseurl/]', '', $Text); + $Text = str_replace('[observer.url/]', '', $Text); + $Text = str_replace('[observer.name/]', '', $Text); + $Text = str_replace('[observer.address/]', '', $Text); + $Text = str_replace('[observer.webname/]', '', $Text); + $Text = str_replace('[observer.photo/]', '', $Text); + } + + + + // Perform URL Search + + $urlchars = '[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]'; + + if (strpos($Text, 'http') !== false) { + $Text = preg_replace("/([^\]\='" . '"' . "\;\/])(https?\:\/\/$urlchars+)/ismu", '$1$2', $Text); + } + + $count = 0; + while (strpos($Text, '[/share]') !== false && $count < 10) { + $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism", 'bb_ShareAttributes', $Text); + $count++; + } + + if (strpos($Text, '[/url]') !== false) { + $Text = preg_replace("/\#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '$1', $Text); + $Text = preg_replace("/\#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$2', $Text); + $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '$1', $Text); + $Text = preg_replace("/\@(\!?)\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '@$1$3', $Text); + $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$2', $Text); + } + + if (strpos($Text, '[/zrl]') !== false) { + // render hubzilla bookmarks as normal links + $Text = preg_replace("/\#\^\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '$1', $Text); + $Text = preg_replace("/\#\^\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '$2', $Text); + $Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '$1', $Text); + $Text = preg_replace("/\@(\!?)\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '@$1$3', $Text); + $Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '$2', $Text); + } + + // named anchors do not work well in conversational text, as it is often collapsed by a "showmore" script. + // Included here for completeness. + + if (strpos($Text, '[/anchor]') !== false) { + $Text = preg_replace("/\[anchor\](.*?)\[\/anchor\]/ism", '', $Text); + } + + if (strpos($Text, '[/goto]') !== false) { + $Text = preg_replace("/\[goto=(.*?)\](.*?)\[\/goto\]/ism", '$2', $Text); + } + + // Perform MAIL Search + if (strpos($Text, '[/mail]') !== false) { + $Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '$1', $Text); + $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '$2', $Text); + } + + + // leave open the posibility of [map=something] + // this is replaced in prepare_body() which has knowledge of the item location + + if ($export) { + $Text = str_replace([ '[map]','[/map]' ], [ '','' ], $Text); + $Text = preg_replace("/\[map=(.*?)[, ](.*?)\]/ism", 'geo:$1,$2', $Text); + } else { + if (strpos($Text, '[/map]') !== false) { + $Text = preg_replace_callback("/\[map\](.*?)\[\/map\]/ism", 'bb_map_location', $Text); + } + if (strpos($Text, '[map=') !== false) { + $Text = preg_replace_callback("/\[map=(.*?)\/\]/ism", 'bb_map_coords', $Text); + $Text = preg_replace_callback("/\[map=(.*?)\]/ism", 'bb_map_coords', $Text); + } + if (strpos($Text, '[map]') !== false) { + $Text = preg_replace("/\[map\/\]/", '', $Text); + $Text = preg_replace("/\[map\]/", '', $Text); + } + } + + // Check for bold text + if (strpos($Text, '[b]') !== false) { + $Text = preg_replace("(\[b\](.*?)\[\/b\])ism", '$1', $Text); + } + // Check for Italics text + if (strpos($Text, '[i]') !== false) { + $Text = preg_replace("(\[i\](.*?)\[\/i\])ism", '$1', $Text); + } + // Check for Underline text + if (strpos($Text, '[u]') !== false) { + $Text = preg_replace("(\[u\](.*?)\[\/u\])ism", '$1', $Text); + } + // Check for strike-through text + if (strpos($Text, '[s]') !== false) { + $Text = preg_replace("(\[s\](.*?)\[\/s\])ism", '$1', $Text); + } + // Check for over-line text + if (strpos($Text, '[o]') !== false) { + $Text = preg_replace("(\[o\](.*?)\[\/o\])ism", '$1', $Text); + } + if (strpos($Text, '[sup]') !== false) { + $Text = preg_replace("(\[sup\](.*?)\[\/sup\])ism", '$1', $Text); + } + if (strpos($Text, '[sub]') !== false) { + $Text = preg_replace("(\[sub\](.*?)\[\/sub\])ism", '$1', $Text); + } + + // Check for colored text + if (strpos($Text, '[/color]') !== false) { + $Text = preg_replace_callback("(\[color=(.*?)\](.*?)\[\/color\])ism", 'bb_colortag', $Text); + } + // Check for highlighted text + if (strpos($Text, '[/hl]') !== false) { + $Text = preg_replace("(\[hl\](.*?)\[\/hl\])ism", "$1", $Text); + $Text = preg_replace_callback("(\[mark=(.*?)\](.*?)\[\/mark\])ism", 'bb_hltag', $Text); + } + // Check for highlighted text + if (strpos($Text, '[/mark]') !== false) { + $Text = preg_replace("(\[mark\](.*?)\[\/mark\])ism", "$1", $Text); + $Text = preg_replace_callback("(\[mark=(.*?)\](.*?)\[\/mark\])ism", 'bb_hltag', $Text); + } + + // Check for sized text + // [size=50] --> font-size: 50px (with the unit). + if (strpos($Text, '[/size]') !== false) { + $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism", "$2", $Text); + $Text = preg_replace_callback("(\[size=(.*?)\](.*?)\[\/size\])ism", 'bb_sizetag', $Text); + } + // Check for h1 + if (strpos($Text, '[h1]') !== false) { + $Text = preg_replace("(\[h1\](.*?)\[\/h1\])ism", '$1
', $Text); + $Text = str_replace('
', '', $Text); + } + // Check for h2 + if (strpos($Text, '[h2]') !== false) { + $Text = preg_replace("(\[h2\](.*?)\[\/h2\])ism", '$1
', $Text); + $Text = str_replace('
', '', $Text); + } + // Check for h3 + if (strpos($Text, '[h3]') !== false) { + $Text = preg_replace("(\[h3\](.*?)\[\/h3\])ism", '$1
', $Text); + $Text = str_replace('
', '', $Text); + } + // Check for h4 + if (strpos($Text, '[h4]') !== false) { + $Text = preg_replace("(\[h4\](.*?)\[\/h4\])ism", '$1
', $Text); + $Text = str_replace('
', '', $Text); + } + // Check for h5 + if (strpos($Text, '[h5]') !== false) { + $Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism", '$1
', $Text); + $Text = str_replace('
', '', $Text); + } + // Check for h6 + if (strpos($Text, '[h6]') !== false) { + $Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism", '$1
', $Text); + $Text = str_replace('
', '', $Text); + } + + // Check for table of content without params + while (strpos($Text, '[toc]') !== false) { + $toc_id = 'toc-' . random_string(10); + $Text = preg_replace("/\[toc\]/ism", '$1", $Text); + } + // Check for footer + if (strpos($Text, '[/footer]') !== false) { + $Text = preg_replace("(\[footer\](.*?)\[\/footer\])ism", "", $Text); + } + + // Check for bdi + if (strpos($Text, '[/bdi]') !== false) { + $Text = preg_replace("(\[bdi\](.*?)\[\/bdi\])ism", "$1", $Text); + } + + + // Check for list text + + $Text = preg_replace("/
\[\*\]/ism", "[*]", $Text); + $Text = str_replace("[*]", "- ", $Text); + + // handle nested lists + $endlessloop = 0; + + while ( + (((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)) || + ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) || + ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false)) || + ((strpos($Text, "[/dl]") !== false) && (strpos($Text, "[dl") !== false)) || + ((strpos($Text, "[/li]") !== false) && (strpos($Text, "[li]") !== false))) && (++$endlessloop < 20) + ) { + $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '
- $1
- $1
- $1
- $2
- $2
- $2
- $2
- $1
- $1
\[li\]/ism", '[/li][li]', $Text); + $Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '- $1
', $Text); + + // [dl] tags have an optional [dl terms="bi"] form where bold/italic/underline/mono/large + // etc. style may be specified for the "terms" in the definition list. The quotation marks + // are also optional. The regex looks intimidating, but breaks down as: + // "[dl""]" "[/dl]" + // where optional-termStyles are: "terms=" + $Text = preg_replace_callback('/\[dl[[:space:]]*(?:terms=(?:"|")?([a-zA-Z]+)(?:"|")?)?\](.*?)\[\/dl\]/ism', 'bb_definitionList', $Text); + } + + // Friendica generates this + if (strpos($Text, '[/abstract]') !== false) { + $Text = preg_replace("/\[abstract\](.*?)\[\/abstract\]/ism", ' $1
', $Text); + } + + if (strpos($Text, '[checklist]') !== false) { + $Text = preg_replace_callback("/\[checklist\](.*?)\[\/checklist\]/ism", 'bb_checklist', $Text); + } + + + $loop = 0; + while (strpos($Text, '[/table]') !== false && strpos($Text, "[table") !== false && ++$loop < 20) { + $Text = preg_replace("/\[table\](.*?)\[\/table\]/ism", '$1
', $Text); + $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/ism", '$1
', $Text); + $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/ism", '$1
', $Text); + } + if (strpos($Text, '[th]') !== false) { + $Text = preg_replace("/\[th\](.*?)\[\/th\]/ism", '$1 ', $Text); + } + if (strpos($Text, '[td]') !== false) { + $Text = preg_replace("/\[td\](.*?)\[\/td\]/ism", '$1 ', $Text); + } + if (strpos($Text, '[tr]') !== false) { + $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/ism", '$1 ', $Text); + } + if (strpos($Text, '[tbody]') !== false) { + $Text = preg_replace("/\[tbody\](.*?)\[\/tbody\]/ism", '$1', $Text); + } + + + $Text = str_replace('', " \n", $Text); + $Text = str_replace('[hr]', '
', $Text); + + // This is actually executed in prepare_body() + + $Text = str_replace('[nosmile]', '', $Text); + + // Check for font change text + if (strpos($Text, '[/font]') !== false) { + $Text = preg_replace_callback("/\[font=(.*?)\](.*?)\[\/font\]/sm", 'bb_fonttag', $Text); + } + + if (strpos($Text, '[/summary]') !== false) { + $Text = preg_replace_callback("/^(.*?)\[summary\](.*?)\[\/summary\](.*?)$/ism", 'bb_summary', $Text); + } + + // Check for [spoiler] text + $endlessloop = 0; + while ((strpos($Text, "[/spoiler]") !== false) && (strpos($Text, "[spoiler]") !== false) && (++$endlessloop < 20)) { + $Text = preg_replace_callback("/\[spoiler\](.*?)\[\/spoiler\]/ism", 'bb_spoilertag', $Text); + } + + // Check for [spoiler=Author] text + $endlessloop = 0; + while ((strpos($Text, "[/spoiler]") !== false) && (strpos($Text, "[spoiler=") !== false) && (++$endlessloop < 20)) { + $Text = preg_replace_callback("/\[spoiler=(.*?)\](.*?)\[\/spoiler\]/ism", 'bb_spoilertag', $Text); + } + + // Check for [open] text + $endlessloop = 0; + while ((strpos($Text, "[/open]") !== false) && (strpos($Text, "[open]") !== false) && (++$endlessloop < 20)) { + $Text = preg_replace_callback("/\[open\](.*?)\[\/open\]/ism", 'bb_opentag', $Text); + } + + // Check for [open=Title] text + $endlessloop = 0; + while ((strpos($Text, "[/open]") !== false) && (strpos($Text, "[open=") !== false) && (++$endlessloop < 20)) { + $Text = preg_replace_callback("/\[open=(.*?)\](.*?)\[\/open\]/ism", 'bb_opentag', $Text); + } + + + // Declare the format for [quote] layout + $QuoteLayout = '$1
'; + + + // Check for [quote] text + // handle nested quotes + $endlessloop = 0; + while ((strpos($Text, "[/quote]") !== false) && (strpos($Text, "[quote]") !== false) && (++$endlessloop < 20)) { + $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism", "$QuoteLayout", $Text); + } + + // Check for [quote=Author] text + + $t_wrote = t('$1 wrote:'); + + // handle nested quotes + $endlessloop = 0; + while ((strpos($Text, "[/quote]") !== false) && (strpos($Text, "[quote=") !== false) && (++$endlessloop < 20)) { + $Text = preg_replace( + "/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", + "" . $t_wrote . "$2
", + $Text + ); + } + + if ($plain) { + $Text = str_replace([ '','
' ], [ '“', '”' ], $Text); + } + + + // Images + + // [img]pathtoimage[/img] + if (strpos($Text, '[/img]') !== false) { + $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '
", "
", $Text); + + // If we found an event earlier, strip out all the event code and replace with a reformatted version. + // Replace the event-start section with the entire formatted event. The other bbcode is stripped. + // Summary (e.g. title) is required, earlier revisions only required description (in addition to + // start which is always required). Allow desc with a missing summary for compatibility. + + if ((x($ev, 'desc') || x($ev, 'summary')) && x($ev, 'dtstart')) { + $sub = format_event_html($ev); + + $sub = str_replace('$', "\0", $sub); + + $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism", $sub, $Text); + + $Text = preg_replace("/\[event\](.*?)\[\/event\]/ism", '', $Text); + $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism", '', $Text); + $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism", '', $Text); + $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism", '', $Text); + $Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism", '', $Text); + $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism", '', $Text); + $Text = preg_replace("/\[event\-timezone\](.*?)\[\/event\-timezone\]/ism", '', $Text); + $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism", '', $Text); + + $Text = str_replace("\0", '$', $Text); + } + + // Unhide all [noparse] contained bbtags unspacefying them + // and triming the [noparse] tag. + if (strpos($Text, '[noparse]') !== false) { + $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim', $Text); + } + if (strpos($Text, '[nobb]') !== false) { + $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim', $Text); + } + if (strpos($Text, '[pre]') !== false) { + $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text); + } + + // replace escaped links in code= blocks + $Text = str_replace('%eY9-!', 'http', $Text); + $Text = bb_code_unprotect($Text); + + // This lets you use HTML entities in posts - just wrap them in brackets. For instance [©] to display a copyright symbol. + + $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/', '&$1;', $Text); + + // fix any escaped ampersands that may have been converted into links + + if (strpos($Text, '&') !== false) { + $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism", '<$1$2=$3&$4>', $Text); + } + + // This is subtle - it's an XSS filter. It only accepts links with a protocol scheme and where + // the scheme begins with z (zhttp), h (http(s)), f (ftp(s)), g (gemini), m (mailto|magnet), t (tel) and named anchors. + // data: urls are allowed if exporting to activitypub which allows inline svg to federate, but not + // to be used for local display + + if ($activitypub) { + $Text = preg_replace("/\<(.*?)(src|href)=\"[^dzghfmt#](.*?)\>/ism", '<$1$2="">', $Text); + } else { + $Text = preg_replace("/\<(.*?)(src|href)=\"[^zhgfmt#](.*?)\>/ism", '<$1$2="">', $Text); + } + + $Text = bb_replace_images($Text, $saved_images); + + $args = [ 'text' => $Text, 'options' => $options ]; + call_hooks('bbcode', $args); + + return $args['text']; } - diff --git a/include/channel.php b/include/channel.php index 1779defd1..fb7d48b60 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1,10 +1,10 @@ false, 'message' => ''); +function identity_check_service_class($account_id) +{ + $ret = array('success' => false, 'message' => ''); - $r = q("select count(channel_id) as total from channel where channel_account_id = %d and channel_removed = 0 ", - intval($account_id) - ); - if(! ($r && count($r))) { - $ret['total_identities'] = 0; - $ret['message'] = t('Unable to obtain identity information from database'); - return $ret; - } + $r = q( + "select count(channel_id) as total from channel where channel_account_id = %d and channel_removed = 0 ", + intval($account_id) + ); + if (! ($r && count($r))) { + $ret['total_identities'] = 0; + $ret['message'] = t('Unable to obtain identity information from database'); + return $ret; + } - $ret['total_identities'] = intval($r[0]['total']); + $ret['total_identities'] = intval($r[0]['total']); - if (! account_service_class_allows($account_id, 'total_identities', $r[0]['total'])) { - $ret['message'] .= upgrade_message(); - return $ret; - } + if (! account_service_class_allows($account_id, 'total_identities', $r[0]['total'])) { + $ret['message'] .= upgrade_message(); + return $ret; + } - $ret['success'] = true; + $ret['success'] = true; - return $ret; + return $ret; } @@ -74,25 +76,29 @@ function identity_check_service_class($account_id) { * @param string $name * @return string describing the error state, or nil return if name is valid */ -function validate_channelname($name) { +function validate_channelname($name) +{ - if (! $name) - return t('Empty name'); + if (! $name) { + return t('Empty name'); + } - if (mb_strlen($name) > 191) - return t('Name too long'); + if (mb_strlen($name) > 191) { + return t('Name too long'); + } - $arr = ['name' => $name]; - /** - * @hooks validate_channelname - * Used to validate the names used by a channel. - * * \e string \b name - * * \e string \b message - return error message - */ - call_hooks('validate_channelname', $arr); + $arr = ['name' => $name]; + /** + * @hooks validate_channelname + * Used to validate the names used by a channel. + * * \e string \b name + * * \e string \b message - return error message + */ + call_hooks('validate_channelname', $arr); - if (x($arr, 'message')) - return $arr['message']; + if (x($arr, 'message')) { + return $arr['message']; + } } @@ -100,101 +106,107 @@ function validate_channelname($name) { * @brief Create a system channel - which has no account attached. * */ -function create_sys_channel() { +function create_sys_channel() +{ - // Ensure that there is a host keypair. + // Ensure that there is a host keypair. - if ((! get_config('system', 'pubkey')) || (! get_config('system', 'prvkey'))) { - $hostkey = Crypto::new_keypair(4096); - set_config('system', 'pubkey', $hostkey['pubkey']); - set_config('system', 'prvkey', $hostkey['prvkey']); - } + if ((! get_config('system', 'pubkey')) || (! get_config('system', 'prvkey'))) { + $hostkey = Crypto::new_keypair(4096); + set_config('system', 'pubkey', $hostkey['pubkey']); + set_config('system', 'prvkey', $hostkey['prvkey']); + } - $sys = get_sys_channel(); + $sys = get_sys_channel(); - if ($sys) { - if (isset($sys['channel_pubkey']) && $sys['channel_pubkey'] && $sys['channel_pubkey'] === get_config('system','pubkey')) { - return; - } - else { - // upgrade the sys channel and return - $pubkey = get_config('system','pubkey'); - $prvkey = get_config('system','prvkey'); - $guid_sig = Libzot::sign($sys['channel_guid'],$prvkey); - $hash = Libzot::make_xchan_hash($sys['channel_guid'],$pubkey); + if ($sys) { + if (isset($sys['channel_pubkey']) && $sys['channel_pubkey'] && $sys['channel_pubkey'] === get_config('system', 'pubkey')) { + return; + } else { + // upgrade the sys channel and return + $pubkey = get_config('system', 'pubkey'); + $prvkey = get_config('system', 'prvkey'); + $guid_sig = Libzot::sign($sys['channel_guid'], $prvkey); + $hash = Libzot::make_xchan_hash($sys['channel_guid'], $pubkey); - q("update channel set channel_guid_sig = '%s', channel_hash = '%s', channel_pubkey = '%s', channel_prvkey = '%s' where channel_id = %d", - dbesc($guid_sig), - dbesc($hash), - dbesc($pubkey), - dbesc($prvkey), - dbesc($sys['channel_id']) - ); + q( + "update channel set channel_guid_sig = '%s', channel_hash = '%s', channel_pubkey = '%s', channel_prvkey = '%s' where channel_id = %d", + dbesc($guid_sig), + dbesc($hash), + dbesc($pubkey), + dbesc($prvkey), + dbesc($sys['channel_id']) + ); - q("update xchan set xchan_guid_sig = '%s', xchan_hash = '%s', xchan_pubkey = '%s', xchan_url = '%s' where xchan_hash = '%s'", - dbesc($guid_sig), - dbesc($hash), - dbesc($pubkey), - dbesc(z_root()), - dbesc($sys['channel_hash']) - ); - q("update hubloc set hubloc_guid_sig = '%s', hubloc_hash = '%s', hubloc_id_url = '%s', hubloc_url_sig = '%s', hubloc_url = '%s', hubloc_callback = '%s', hubloc_site_id = '%s', hubloc_orphancheck = 0, hubloc_error = 0, hubloc_deleted = 0 where hubloc_hash = '%s'", - dbesc($guid_sig), - dbesc($hash), - dbesc(z_root()), - dbesc(Libzot::sign(z_root(),$prvkey)), - dbesc(z_root()), - dbesc(z_root() . '/zot'), - dbesc(Libzot::make_xchan_hash(z_root(),$pubkey)), - dbesc($sys['channel_hash']) - ); + q( + "update xchan set xchan_guid_sig = '%s', xchan_hash = '%s', xchan_pubkey = '%s', xchan_url = '%s' where xchan_hash = '%s'", + dbesc($guid_sig), + dbesc($hash), + dbesc($pubkey), + dbesc(z_root()), + dbesc($sys['channel_hash']) + ); + q( + "update hubloc set hubloc_guid_sig = '%s', hubloc_hash = '%s', hubloc_id_url = '%s', hubloc_url_sig = '%s', hubloc_url = '%s', hubloc_callback = '%s', hubloc_site_id = '%s', hubloc_orphancheck = 0, hubloc_error = 0, hubloc_deleted = 0 where hubloc_hash = '%s'", + dbesc($guid_sig), + dbesc($hash), + dbesc(z_root()), + dbesc(Libzot::sign(z_root(), $prvkey)), + dbesc(z_root()), + dbesc(z_root() . '/zot'), + dbesc(Libzot::make_xchan_hash(z_root(), $pubkey)), + dbesc($sys['channel_hash']) + ); - q("update abook set abook_xchan = '%s' where abook_xchan = '%s'", - dbesc($hash), - dbesc($sys['channel_hash']) - ); + q( + "update abook set abook_xchan = '%s' where abook_xchan = '%s'", + dbesc($hash), + dbesc($sys['channel_hash']) + ); - q("update abconfig set xchan = '%s' where xchan = '%s'", - dbesc($hash), - dbesc($sys['channel_hash']) - ); + q( + "update abconfig set xchan = '%s' where xchan = '%s'", + dbesc($hash), + dbesc($sys['channel_hash']) + ); - return; - } - } + return; + } + } - create_identity([ - 'account_id' => 'xxx', // Typecast trickery: account_id is required. This will create an identity with an (integer) account_id of 0 - 'nickname' => 'sys', - 'name' => 'System', - 'permissions_role' => 'social', - 'pageflags' => 0, - 'publish' => 0, - 'system' => 1 - ]); + create_identity([ + 'account_id' => 'xxx', // Typecast trickery: account_id is required. This will create an identity with an (integer) account_id of 0 + 'nickname' => 'sys', + 'name' => 'System', + 'permissions_role' => 'social', + 'pageflags' => 0, + 'publish' => 0, + 'system' => 1 + ]); } /** * @brief Returns the sys channel. * - * @return array|boolean + * @return array|bool */ -function get_sys_channel() { +function get_sys_channel() +{ - // App::$sys_channel caches this lookup - - if (is_array(App::$sys_channel)) { - return App::$sys_channel; - } - - $r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_system = 1 limit 1"); + // App::$sys_channel caches this lookup - if ($r) { - App::$sys_channel = array_shift($r); - return App::$sys_channel; - } - return false; + if (is_array(App::$sys_channel)) { + return App::$sys_channel; + } + + $r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_system = 1 limit 1"); + + if ($r) { + App::$sys_channel = array_shift($r); + return App::$sys_channel; + } + return false; } @@ -202,14 +214,15 @@ function get_sys_channel() { * @brief Checks if $channel_id is sys channel. * * @param int $channel_id - * @return boolean + * @return bool */ -function is_sys_channel($channel_id) { - $s = get_sys_channel(); - if ($s) { - return (intval($s['channel_id']) === intval($channel_id)); - } - return false; +function is_sys_channel($channel_id) +{ + $s = get_sys_channel(); + if ($s) { + return (intval($s['channel_id']) === intval($channel_id)); + } + return false; } @@ -221,13 +234,15 @@ function is_sys_channel($channel_id) { * @returns int|booleean * on error returns boolean false */ -function channel_total() { - $r = q("select channel_id from channel where channel_removed = 0"); +function channel_total() +{ + $r = q("select channel_id from channel where channel_removed = 0"); - if (is_array($r)) - return count($r); + if (is_array($r)) { + return count($r); + } - return false; + return false; } @@ -248,544 +263,571 @@ function channel_total() { * 'message' => optional error text if success is false * 'channel' => if successful the created channel array */ -function create_identity($arr) { +function create_identity($arr) +{ - $ret = array('success' => false); + $ret = array('success' => false); - if(! $arr['account_id']) { - $ret['message'] = t('No account identifier'); - return $ret; - } - $ret = identity_check_service_class($arr['account_id']); - if (!$ret['success']) { - return $ret; - } - // save this for auto_friending - $total_identities = $ret['total_identities']; + if (! $arr['account_id']) { + $ret['message'] = t('No account identifier'); + return $ret; + } + $ret = identity_check_service_class($arr['account_id']); + if (!$ret['success']) { + return $ret; + } + // save this for auto_friending + $total_identities = $ret['total_identities']; - $nick = mb_strtolower(trim($arr['nickname'])); - if(! $nick) { - $ret['message'] = t('Nickname is required.'); - return $ret; - } + $nick = mb_strtolower(trim($arr['nickname'])); + if (! $nick) { + $ret['message'] = t('Nickname is required.'); + return $ret; + } - $name = escape_tags($arr['name']); - $pageflags = ((x($arr,'pageflags')) ? intval($arr['pageflags']) : PAGE_NORMAL); - $system = ((x($arr,'system')) ? intval($arr['system']) : 0); - $name_error = validate_channelname($arr['name']); - if($name_error) { - $ret['message'] = $name_error; - return $ret; - } + $name = escape_tags($arr['name']); + $pageflags = ((x($arr, 'pageflags')) ? intval($arr['pageflags']) : PAGE_NORMAL); + $system = ((x($arr, 'system')) ? intval($arr['system']) : 0); + $name_error = validate_channelname($arr['name']); + if ($name_error) { + $ret['message'] = $name_error; + return $ret; + } - if($nick === 'sys' && (! $system)) { - $ret['message'] = t('Reserved nickname. Please choose another.'); - return $ret; - } + if ($nick === 'sys' && (! $system)) { + $ret['message'] = t('Reserved nickname. Please choose another.'); + return $ret; + } - if(check_webbie(array($nick)) !== $nick) { - $ret['message'] = t('Nickname has unsupported characters or is already being used on this site.'); - return $ret; - } + if (check_webbie(array($nick)) !== $nick) { + $ret['message'] = t('Nickname has unsupported characters or is already being used on this site.'); + return $ret; + } - $guid = Libzot::new_uid($nick); + $guid = Libzot::new_uid($nick); - if ($system) { - $key = [ 'pubkey' => get_config('system','pubkey'), 'prvkey' => get_config('system','prvkey') ]; - } - else { - $key = Crypto::new_keypair(4096); - } - - $sig = Libzot::sign($guid,$key['prvkey']); - $hash = Libzot::make_xchan_hash($guid,$key['pubkey']); + if ($system) { + $key = [ 'pubkey' => get_config('system', 'pubkey'), 'prvkey' => get_config('system', 'prvkey') ]; + } else { + $key = Crypto::new_keypair(4096); + } - // Force a few things on the short term until we can provide a theme or app with choice + $sig = Libzot::sign($guid, $key['prvkey']); + $hash = Libzot::make_xchan_hash($guid, $key['pubkey']); - $publish = 1; + // Force a few things on the short term until we can provide a theme or app with choice - if(array_key_exists('publish', $arr)) - $publish = intval($arr['publish']); + $publish = 1; - $role_permissions = null; - $parent_channel_hash = EMPTY_STR; + if (array_key_exists('publish', $arr)) { + $publish = intval($arr['publish']); + } - if(array_key_exists('permissions_role',$arr) && $arr['permissions_role']) { - $role_permissions = PermissionRoles::role_perms($arr['permissions_role']); - if(isset($role_permissions['channel_type']) && $role_permissions['channel_type'] === 'collection') { - $parent_channel_hash = $arr['parent_hash']; - } - } + $role_permissions = null; + $parent_channel_hash = EMPTY_STR; - if($role_permissions && array_key_exists('directory_publish',$role_permissions)) - $publish = intval($role_permissions['directory_publish']); + if (array_key_exists('permissions_role', $arr) && $arr['permissions_role']) { + $role_permissions = PermissionRoles::role_perms($arr['permissions_role']); + if (isset($role_permissions['channel_type']) && $role_permissions['channel_type'] === 'collection') { + $parent_channel_hash = $arr['parent_hash']; + } + } - $primary = true; + if ($role_permissions && array_key_exists('directory_publish', $role_permissions)) { + $publish = intval($role_permissions['directory_publish']); + } - if(array_key_exists('primary', $arr)) - $primary = intval($arr['primary']); + $primary = true; - $expire = 0; + if (array_key_exists('primary', $arr)) { + $primary = intval($arr['primary']); + } - $r = channel_store_lowlevel( - [ - 'channel_account_id' => intval($arr['account_id']), - 'channel_primary' => intval($primary), - 'channel_name' => $name, - 'channel_parent' => $parent_channel_hash, - 'channel_address' => $nick, - 'channel_guid' => $guid, - 'channel_guid_sig' => $sig, - 'channel_hash' => $hash, - 'channel_prvkey' => $key['prvkey'], - 'channel_pubkey' => $key['pubkey'], - 'channel_pageflags' => intval($pageflags), - 'channel_system' => intval($system), - 'channel_expire_days' => intval($expire), - 'channel_timezone' => App::$timezone - ] - ); + $expire = 0; - $r = q("select * from channel where channel_account_id = %d + $r = channel_store_lowlevel( + [ + 'channel_account_id' => intval($arr['account_id']), + 'channel_primary' => intval($primary), + 'channel_name' => $name, + 'channel_parent' => $parent_channel_hash, + 'channel_address' => $nick, + 'channel_guid' => $guid, + 'channel_guid_sig' => $sig, + 'channel_hash' => $hash, + 'channel_prvkey' => $key['prvkey'], + 'channel_pubkey' => $key['pubkey'], + 'channel_pageflags' => intval($pageflags), + 'channel_system' => intval($system), + 'channel_expire_days' => intval($expire), + 'channel_timezone' => App::$timezone + ] + ); + + $r = q( + "select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1", - intval($arr['account_id']), - dbesc($guid) - ); + intval($arr['account_id']), + dbesc($guid) + ); - if(! $r) { - $ret['message'] = t('Unable to retrieve created identity'); - return $ret; - } + if (! $r) { + $ret['message'] = t('Unable to retrieve created identity'); + return $ret; + } - $a = q("select * from account where account_id = %d", - intval($arr['account_id']) - ); + $a = q( + "select * from account where account_id = %d", + intval($arr['account_id']) + ); - $photo_type = null; + $photo_type = null; - $z = [ - 'account' => $a[0], - 'channel' => $r[0], - 'photo_url' => '' - ]; - /** - * @hooks create_channel_photo - * * \e array \b account - * * \e array \b channel - * * \e string \b photo_url - Return value - */ - call_hooks('create_channel_photo', $z); + $z = [ + 'account' => $a[0], + 'channel' => $r[0], + 'photo_url' => '' + ]; + /** + * @hooks create_channel_photo + * * \e array \b account + * * \e array \b channel + * * \e string \b photo_url - Return value + */ + call_hooks('create_channel_photo', $z); - if($z['photo_url']) { - $photo_type = import_channel_photo_from_url($z['photo_url'],$arr['account_id'],$r[0]['channel_id']); - } + if ($z['photo_url']) { + $photo_type = import_channel_photo_from_url($z['photo_url'], $arr['account_id'], $r[0]['channel_id']); + } - if($role_permissions && array_key_exists('limits',$role_permissions)) - $perm_limits = $role_permissions['limits']; - else - $perm_limits = site_default_perms(); + if ($role_permissions && array_key_exists('limits', $role_permissions)) { + $perm_limits = $role_permissions['limits']; + } else { + $perm_limits = site_default_perms(); + } - foreach($perm_limits as $p => $v) - PermissionLimits::Set($r[0]['channel_id'],$p,$v); + foreach ($perm_limits as $p => $v) { + PermissionLimits::Set($r[0]['channel_id'], $p, $v); + } - if($role_permissions && array_key_exists('perms_auto',$role_permissions)) - set_pconfig($r[0]['channel_id'],'system','autoperms',intval($role_permissions['perms_auto'])); + if ($role_permissions && array_key_exists('perms_auto', $role_permissions)) { + set_pconfig($r[0]['channel_id'], 'system', 'autoperms', intval($role_permissions['perms_auto'])); + } - $ret['channel'] = $r[0]; + $ret['channel'] = $r[0]; - if(intval($arr['account_id'])) - set_default_login_identity($arr['account_id'],$ret['channel']['channel_id'],false); + if (intval($arr['account_id'])) { + set_default_login_identity($arr['account_id'], $ret['channel']['channel_id'], false); + } - // Create a verified hub location pointing to this site. + // Create a verified hub location pointing to this site. - $r = hubloc_store_lowlevel( - [ - 'hubloc_guid' => $guid, - 'hubloc_guid_sig' => $sig, - 'hubloc_id_url' => (($system) ? z_root() : channel_url($ret['channel'])), - 'hubloc_hash' => $hash, - 'hubloc_addr' => channel_reddress($ret['channel']), - 'hubloc_primary' => intval($primary), - 'hubloc_url' => z_root(), - 'hubloc_url_sig' => Libzot::sign(z_root(),$ret['channel']['channel_prvkey']), - 'hubloc_site_id' => Libzot::make_xchan_hash(z_root(),get_config('system','pubkey')), - 'hubloc_host' => App::get_hostname(), - 'hubloc_callback' => z_root() . '/zot', - 'hubloc_sitekey' => get_config('system','pubkey'), - 'hubloc_network' => 'nomad', - 'hubloc_updated' => datetime_convert() - ] - ); - if(! $r) - logger('Unable to store hub location'); + $r = hubloc_store_lowlevel( + [ + 'hubloc_guid' => $guid, + 'hubloc_guid_sig' => $sig, + 'hubloc_id_url' => (($system) ? z_root() : channel_url($ret['channel'])), + 'hubloc_hash' => $hash, + 'hubloc_addr' => channel_reddress($ret['channel']), + 'hubloc_primary' => intval($primary), + 'hubloc_url' => z_root(), + 'hubloc_url_sig' => Libzot::sign(z_root(), $ret['channel']['channel_prvkey']), + 'hubloc_site_id' => Libzot::make_xchan_hash(z_root(), get_config('system', 'pubkey')), + 'hubloc_host' => App::get_hostname(), + 'hubloc_callback' => z_root() . '/zot', + 'hubloc_sitekey' => get_config('system', 'pubkey'), + 'hubloc_network' => 'nomad', + 'hubloc_updated' => datetime_convert() + ] + ); + if (! $r) { + logger('Unable to store hub location'); + } - $newuid = $ret['channel']['channel_id']; + $newuid = $ret['channel']['channel_id']; - $r = xchan_store_lowlevel( - [ - 'xchan_hash' => $hash, - 'xchan_guid' => $guid, - 'xchan_guid_sig' => $sig, - 'xchan_pubkey' => $key['pubkey'], - 'xchan_photo_mimetype' => (($photo_type) ? $photo_type : 'image/png'), - 'xchan_photo_l' => z_root() . "/photo/profile/l/{$newuid}", - 'xchan_photo_m' => z_root() . "/photo/profile/m/{$newuid}", - 'xchan_photo_s' => z_root() . "/photo/profile/s/{$newuid}", - 'xchan_addr' => channel_reddress($ret['channel']), - 'xchan_url' => (($system) ? z_root() : channel_url($ret['channel'])), - 'xchan_follow' => z_root() . '/follow?f=&url=%s', - 'xchan_connurl' => z_root() . '/poco/' . $ret['channel']['channel_address'], - 'xchan_name' => $ret['channel']['channel_name'], - 'xchan_network' => 'nomad', - 'xchan_updated' => datetime_convert(), - 'xchan_photo_date' => datetime_convert(), - 'xchan_name_date' => datetime_convert(), - 'xchan_system' => $system - ] - ); + $r = xchan_store_lowlevel( + [ + 'xchan_hash' => $hash, + 'xchan_guid' => $guid, + 'xchan_guid_sig' => $sig, + 'xchan_pubkey' => $key['pubkey'], + 'xchan_photo_mimetype' => (($photo_type) ? $photo_type : 'image/png'), + 'xchan_photo_l' => z_root() . "/photo/profile/l/{$newuid}", + 'xchan_photo_m' => z_root() . "/photo/profile/m/{$newuid}", + 'xchan_photo_s' => z_root() . "/photo/profile/s/{$newuid}", + 'xchan_addr' => channel_reddress($ret['channel']), + 'xchan_url' => (($system) ? z_root() : channel_url($ret['channel'])), + 'xchan_follow' => z_root() . '/follow?f=&url=%s', + 'xchan_connurl' => z_root() . '/poco/' . $ret['channel']['channel_address'], + 'xchan_name' => $ret['channel']['channel_name'], + 'xchan_network' => 'nomad', + 'xchan_updated' => datetime_convert(), + 'xchan_photo_date' => datetime_convert(), + 'xchan_name_date' => datetime_convert(), + 'xchan_system' => $system + ] + ); - // Not checking return value. - // It's ok for this to fail if it's an imported channel, and therefore the hash is a duplicate + // Not checking return value. + // It's ok for this to fail if it's an imported channel, and therefore the hash is a duplicate - $r = profile_store_lowlevel( - [ - 'aid' => intval($ret['channel']['channel_account_id']), - 'uid' => intval($newuid), - 'profile_guid' => new_uuid(), - 'profile_name' => t('Default Profile'), - 'is_default' => 1, - 'publish' => $publish, - 'fullname' => $ret['channel']['channel_name'], - 'photo' => z_root() . "/photo/profile/l/{$newuid}", - 'thumb' => z_root() . "/photo/profile/m/{$newuid}" - ] - ); + $r = profile_store_lowlevel( + [ + 'aid' => intval($ret['channel']['channel_account_id']), + 'uid' => intval($newuid), + 'profile_guid' => new_uuid(), + 'profile_name' => t('Default Profile'), + 'is_default' => 1, + 'publish' => $publish, + 'fullname' => $ret['channel']['channel_name'], + 'photo' => z_root() . "/photo/profile/l/{$newuid}", + 'thumb' => z_root() . "/photo/profile/m/{$newuid}" + ] + ); - if($role_permissions) { - $myperms = ((array_key_exists('perms_connect',$role_permissions)) ? $role_permissions['perms_connect'] : [] ); - } - else { - $x = PermissionRoles::role_perms('social'); - $myperms = $x['perms_connect']; - } + if ($role_permissions) { + $myperms = ((array_key_exists('perms_connect', $role_permissions)) ? $role_permissions['perms_connect'] : [] ); + } else { + $x = PermissionRoles::role_perms('social'); + $myperms = $x['perms_connect']; + } - $r = abook_store_lowlevel( - [ - 'abook_account' => intval($ret['channel']['channel_account_id']), - 'abook_channel' => intval($newuid), - 'abook_xchan' => $hash, - 'abook_closeness' => 0, - 'abook_created' => datetime_convert(), - 'abook_updated' => datetime_convert(), - 'abook_self' => 1 - ] - ); + $r = abook_store_lowlevel( + [ + 'abook_account' => intval($ret['channel']['channel_account_id']), + 'abook_channel' => intval($newuid), + 'abook_xchan' => $hash, + 'abook_closeness' => 0, + 'abook_created' => datetime_convert(), + 'abook_updated' => datetime_convert(), + 'abook_self' => 1 + ] + ); - $x = Permissions::serialise(Permissions::FilledPerms($myperms)); - set_abconfig($newuid,$hash,'system','my_perms',$x); + $x = Permissions::serialise(Permissions::FilledPerms($myperms)); + set_abconfig($newuid, $hash, 'system', 'my_perms', $x); - if(intval($ret['channel']['channel_account_id'])) { + if (intval($ret['channel']['channel_account_id'])) { + // Save our permissions role so we can perhaps call it up and modify it later. - // Save our permissions role so we can perhaps call it up and modify it later. + if ($role_permissions) { + set_pconfig($newuid, 'system', 'permissions_role', $arr['permissions_role']); + if (array_key_exists('online', $role_permissions)) { + set_pconfig($newuid, 'system', 'hide_presence', 1 - intval($role_permissions['online'])); + } + if (array_key_exists('perms_auto', $role_permissions)) { + $autoperms = intval($role_permissions['perms_auto']); + set_pconfig($newuid, 'system', 'autoperms', $autoperms); + } + } - if($role_permissions) { - set_pconfig($newuid,'system','permissions_role',$arr['permissions_role']); - if(array_key_exists('online',$role_permissions)) - set_pconfig($newuid,'system','hide_presence',1-intval($role_permissions['online'])); - if(array_key_exists('perms_auto',$role_permissions)) { - $autoperms = intval($role_permissions['perms_auto']); - set_pconfig($newuid,'system','autoperms',$autoperms); - } - } + // Create a group with yourself as a member. This allows somebody to use it + // right away as a default group for new contacts. - // Create a group with yourself as a member. This allows somebody to use it - // right away as a default group for new contacts. + $group_hash = AccessList::add($newuid, t('Friends')); + if ($group_hash) { + AccessList::member_add($newuid, t('Friends'), $ret['channel']['channel_hash']); - $group_hash = AccessList::add($newuid, t('Friends')); - if ($group_hash) { - AccessList::member_add($newuid,t('Friends'),$ret['channel']['channel_hash']); + // if our role_permissions indicate that we're using a default collection ACL, add it. - // if our role_permissions indicate that we're using a default collection ACL, add it. + if (is_array($role_permissions) && $role_permissions['default_collection']) { + $default_collection_str = '<' . $group_hash . '>'; + } + q( + "update channel set channel_default_group = '%s', channel_allow_gid = '%s' where channel_id = %d", + dbesc($group_hash), + dbesc(($default_collection_str) ? $default_collection_str : EMPTY_STR), + intval($newuid) + ); + } - if(is_array($role_permissions) && $role_permissions['default_collection']) { - $default_collection_str = '<' . $group_hash . '>'; - } - q("update channel set channel_default_group = '%s', channel_allow_gid = '%s' where channel_id = %d", - dbesc($group_hash), - dbesc(($default_collection_str) ? $default_collection_str : EMPTY_STR), - intval($newuid) - ); - } + set_pconfig($ret['channel']['channel_id'], 'system', 'photo_path', '%Y/%Y-%m'); + set_pconfig($ret['channel']['channel_id'], 'system', 'attach_path', '%Y/%Y-%m'); - set_pconfig($ret['channel']['channel_id'],'system','photo_path', '%Y/%Y-%m'); - set_pconfig($ret['channel']['channel_id'],'system','attach_path','%Y/%Y-%m'); - - // If this channel has a parent, auto follow them. + // If this channel has a parent, auto follow them. - if($parent_channel_hash) { - $ch = channelx_by_hash($parent_channel_hash); - if($ch) { - connect_and_sync($ret['channel'],channel_reddress($ch), true); - } - } + if ($parent_channel_hash) { + $ch = channelx_by_hash($parent_channel_hash); + if ($ch) { + connect_and_sync($ret['channel'], channel_reddress($ch), true); + } + } - // auto-follow any of the hub's pre-configured channel choices. - // Only do this if it's the first channel for this account; - // otherwise it could get annoying. Don't make this list too big - // or it will impact registration time. + // auto-follow any of the hub's pre-configured channel choices. + // Only do this if it's the first channel for this account; + // otherwise it could get annoying. Don't make this list too big + // or it will impact registration time. - $accts = get_config('system','auto_follow'); - if(($accts) && (! $total_identities)) { - if(! is_array($accts)) - $accts = array($accts); + $accts = get_config('system', 'auto_follow'); + if (($accts) && (! $total_identities)) { + if (! is_array($accts)) { + $accts = array($accts); + } - foreach($accts as $acct) { - if(trim($acct)) { - $f = connect_and_sync($ret['channel'],trim($acct)); - if($f['success']) { + foreach ($accts as $acct) { + if (trim($acct)) { + $f = connect_and_sync($ret['channel'], trim($acct)); + if ($f['success']) { + $can_view_stream = their_perms_contains($ret['channel']['channel_id'], $f['abook']['abook_xchan'], 'view_stream'); - $can_view_stream = their_perms_contains($ret['channel']['channel_id'],$f['abook']['abook_xchan'],'view_stream'); + // If we can view their stream, pull in some posts - // If we can view their stream, pull in some posts + if (($can_view_stream) || ($f['abook']['xchan_network'] === 'rss')) { + Run::Summon([ 'Onepoll',$f['abook']['abook_id'] ]); + } + } + } + } + } - if(($can_view_stream) || ($f['abook']['xchan_network'] === 'rss')) { - Run::Summon([ 'Onepoll',$f['abook']['abook_id'] ]); - } - } - } - } + /** + * @hooks create_identity + * Called when creating a channel. + * * \e int - The UID of the created identity + */ - } + call_hooks('create_identity', $newuid); - /** - * @hooks create_identity - * Called when creating a channel. - * * \e int - The UID of the created identity - */ + Run::Summon([ 'Directory', $ret['channel']['channel_id'] ]); + } - call_hooks('create_identity', $newuid); - - Run::Summon( [ 'Directory', $ret['channel']['channel_id'] ] ); - } - - $ret['success'] = true; - return $ret; + $ret['success'] = true; + return $ret; } -function connect_and_sync($channel,$address, $sub_channel = false) { +function connect_and_sync($channel, $address, $sub_channel = false) +{ - if ((! $channel) || (! $address)) { - return false; - } + if ((! $channel) || (! $address)) { + return false; + } - $f = Connect::connect($channel,$address, $sub_channel); - if ($f['success']) { - $clone = []; - foreach ($f['abook'] as $k => $v) { - if (strpos($k,'abook_') === 0) { - $clone[$k] = $v; - } - } - unset($clone['abook_id']); - unset($clone['abook_account']); - unset($clone['abook_channel']); - - $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); - if ($abconfig) { - $clone['abconfig'] = $abconfig; - } + $f = Connect::connect($channel, $address, $sub_channel); + if ($f['success']) { + $clone = []; + foreach ($f['abook'] as $k => $v) { + if (strpos($k, 'abook_') === 0) { + $clone[$k] = $v; + } + } + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); - Libsync::build_sync_packet($channel['channel_id'], [ 'abook' => [ $clone ] ], true); - return $f; - } - return false; -} + $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']); + if ($abconfig) { + $clone['abconfig'] = $abconfig; + } - -function change_channel_keys($channel) { - - $ret = array('success' => false); - - $stored = []; - - $key = Crypto::new_keypair(4096); - - $sig = Libzot::sign($channel['channel_guid'],$key['prvkey']); - $hash = Libzot::make_xchan_hash($channel['channel_guid'],$channel['channel_pubkey']); - - $stored['old_guid'] = $channel['channel_guid']; - $stored['old_guid_sig'] = $channel['channel_guid_sig']; - $stored['old_key'] = $channel['channel_pubkey']; - $stored['old_hash'] = $channel['channel_hash']; - - $stored['new_key'] = $key['pubkey']; - $stored['new_sig'] = Libzot::sign($key['pubkey'],$channel['channel_prvkey']); - - // Save this info for the notifier to collect - - set_pconfig($channel['channel_id'],'system','keychange',$stored); - - $r = q("update channel set channel_prvkey = '%s', channel_pubkey = '%s', channel_guid_sig = '%s', channel_hash = '%s' where channel_id = %d", - dbesc($key['prvkey']), - dbesc($key['pubkey']), - dbesc($sig), - dbesc($hash), - intval($channel['channel_id']) - ); - if (! $r) { - return $ret; - } - - $r = q("select * from channel where channel_id = %d", - intval($channel['channel_id']) - ); - - if (! $r) { - $ret['message'] = t('Unable to retrieve modified identity'); - return $ret; - } - - $modified = $r[0]; - - $h = q("select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ", - dbesc($stored['old_hash']), - dbesc(z_root()) - ); - - if($h) { - foreach($h as $hv) { - $hv['hubloc_guid_sig'] = $sig; - $hv['hubloc_hash'] = $hash; - $hv['hubloc_url_sig'] = Libzot::sign(z_root(),$modifed['channel_prvkey']); - hubloc_store_lowlevel($hv); - } - } - - $x = q("select * from xchan where xchan_hash = '%s' ", - dbesc($stored['old_hash']) - ); - - $check = q("select * from xchan where xchan_hash = '%s'", - dbesc($hash) - ); - - if (($x) && (! $check)) { - $oldxchan = $x[0]; - foreach ($x as $xv) { - $xv['xchan_guid_sig'] = $sig; - $xv['xchan_hash'] = $hash; - $xv['xchan_pubkey'] = $key['pubkey']; - $xv['xchan_updated'] = datetime_convert(); - xchan_store_lowlevel($xv); - $newxchan = $xv; - } - } - - Libsync::build_sync_packet($channel['channel_id'], [ 'keychange' => $stored ]); - - $a = q("select * from abook where abook_xchan = '%s' and abook_self = 1", - dbesc($stored['old_hash']) - ); - - if ($a) { - q("update abook set abook_xchan = '%s' where abook_id = %d", - dbesc($hash), - intval($a[0]['abook_id']) - ); - } - - xchan_change_key($oldxchan,$newxchan,$stored); - - Run::Summon([ 'Notifier', 'keychange', $channel['channel_id'] ]); - - $ret['success'] = true; - return $ret; + Libsync::build_sync_packet($channel['channel_id'], [ 'abook' => [ $clone ] ], true); + return $f; + } + return false; } -function channel_change_address($channel,$new_address) { - $ret = array('success' => false); +function change_channel_keys($channel) +{ - $old_address = $channel['channel_address']; + $ret = array('success' => false); - if ($new_address === 'sys') { - $ret['message'] = t('Reserved nickname. Please choose another.'); - return $ret; - } + $stored = []; - if (check_webbie(array($new_address)) !== $new_address) { - $ret['message'] = t('Nickname has unsupported characters or is already being used on this site.'); - return $ret; - } + $key = Crypto::new_keypair(4096); - $r = q("update channel set channel_address = '%s' where channel_id = %d", - dbesc($new_address), - intval($channel['channel_id']) - ); - if (! $r) { - return $ret; - } + $sig = Libzot::sign($channel['channel_guid'], $key['prvkey']); + $hash = Libzot::make_xchan_hash($channel['channel_guid'], $channel['channel_pubkey']); - $r = q("select * from channel where channel_id = %d", - intval($channel['channel_id']) - ); + $stored['old_guid'] = $channel['channel_guid']; + $stored['old_guid_sig'] = $channel['channel_guid_sig']; + $stored['old_key'] = $channel['channel_pubkey']; + $stored['old_hash'] = $channel['channel_hash']; - if (! $r) { - $ret['message'] = t('Unable to retrieve modified identity'); - return $ret; - } + $stored['new_key'] = $key['pubkey']; + $stored['new_sig'] = Libzot::sign($key['pubkey'], $channel['channel_prvkey']); - $r = q("update xchan set xchan_addr = '%s' where xchan_hash = '%s'", - dbesc($new_address . '@' . App::get_hostname()), - dbesc($channel['channel_hash']) - ); + // Save this info for the notifier to collect - $h = q("select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ", - dbesc($channel['channel_hash']), - dbesc(z_root()) - ); + set_pconfig($channel['channel_id'], 'system', 'keychange', $stored); - if ($h) { - foreach ($h as $hv) { - if ($hv['hubloc_primary']) { - q("update hubloc set hubloc_primary = 0 where hubloc_id = %d", - intval($hv['hubloc_id']) - ); - } - q("update hubloc set hubloc_deleted = 1 where hubloc_id = %d", - intval($hv['hubloc_id']) - ); + $r = q( + "update channel set channel_prvkey = '%s', channel_pubkey = '%s', channel_guid_sig = '%s', channel_hash = '%s' where channel_id = %d", + dbesc($key['prvkey']), + dbesc($key['pubkey']), + dbesc($sig), + dbesc($hash), + intval($channel['channel_id']) + ); + if (! $r) { + return $ret; + } - unset($hv['hubloc_id']); - $hv['hubloc_addr'] = $new_address . '@' . App::get_hostname(); - hubloc_store_lowlevel($hv); - } - } + $r = q( + "select * from channel where channel_id = %d", + intval($channel['channel_id']) + ); - // fix apps which were stored with the actual name rather than a macro + if (! $r) { + $ret['message'] = t('Unable to retrieve modified identity'); + return $ret; + } - $r = q("select * from app where app_channel = %d and app_system = 1", - intval($channel['channel_id']) - ); - if ($r) { - foreach ($r as $rv) { - $replace = preg_replace('/([\=\/])(' . $old_address . ')($|[\%\/])/ism','$1' . $new_address . '$3',$rv['app_url']); - if ($replace != $rv['app_url']) { - q("update app set app_url = '%s' where id = %d", - dbesc($replace), - intval($rv['id']) - ); - } - } - } + $modified = $r[0]; - Run::Summon( [ 'Notifier', 'refresh_all', $channel['channel_id'] ] ); + $h = q( + "select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ", + dbesc($stored['old_hash']), + dbesc(z_root()) + ); - $ret['success'] = true; - return $ret; + if ($h) { + foreach ($h as $hv) { + $hv['hubloc_guid_sig'] = $sig; + $hv['hubloc_hash'] = $hash; + $hv['hubloc_url_sig'] = Libzot::sign(z_root(), $modifed['channel_prvkey']); + hubloc_store_lowlevel($hv); + } + } + + $x = q( + "select * from xchan where xchan_hash = '%s' ", + dbesc($stored['old_hash']) + ); + + $check = q( + "select * from xchan where xchan_hash = '%s'", + dbesc($hash) + ); + + if (($x) && (! $check)) { + $oldxchan = $x[0]; + foreach ($x as $xv) { + $xv['xchan_guid_sig'] = $sig; + $xv['xchan_hash'] = $hash; + $xv['xchan_pubkey'] = $key['pubkey']; + $xv['xchan_updated'] = datetime_convert(); + xchan_store_lowlevel($xv); + $newxchan = $xv; + } + } + + Libsync::build_sync_packet($channel['channel_id'], [ 'keychange' => $stored ]); + + $a = q( + "select * from abook where abook_xchan = '%s' and abook_self = 1", + dbesc($stored['old_hash']) + ); + + if ($a) { + q( + "update abook set abook_xchan = '%s' where abook_id = %d", + dbesc($hash), + intval($a[0]['abook_id']) + ); + } + + xchan_change_key($oldxchan, $newxchan, $stored); + + Run::Summon([ 'Notifier', 'keychange', $channel['channel_id'] ]); + + $ret['success'] = true; + return $ret; +} + +function channel_change_address($channel, $new_address) +{ + + $ret = array('success' => false); + + $old_address = $channel['channel_address']; + + if ($new_address === 'sys') { + $ret['message'] = t('Reserved nickname. Please choose another.'); + return $ret; + } + + if (check_webbie(array($new_address)) !== $new_address) { + $ret['message'] = t('Nickname has unsupported characters or is already being used on this site.'); + return $ret; + } + + $r = q( + "update channel set channel_address = '%s' where channel_id = %d", + dbesc($new_address), + intval($channel['channel_id']) + ); + if (! $r) { + return $ret; + } + + $r = q( + "select * from channel where channel_id = %d", + intval($channel['channel_id']) + ); + + if (! $r) { + $ret['message'] = t('Unable to retrieve modified identity'); + return $ret; + } + + $r = q( + "update xchan set xchan_addr = '%s' where xchan_hash = '%s'", + dbesc($new_address . '@' . App::get_hostname()), + dbesc($channel['channel_hash']) + ); + + $h = q( + "select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ", + dbesc($channel['channel_hash']), + dbesc(z_root()) + ); + + if ($h) { + foreach ($h as $hv) { + if ($hv['hubloc_primary']) { + q( + "update hubloc set hubloc_primary = 0 where hubloc_id = %d", + intval($hv['hubloc_id']) + ); + } + q( + "update hubloc set hubloc_deleted = 1 where hubloc_id = %d", + intval($hv['hubloc_id']) + ); + + unset($hv['hubloc_id']); + $hv['hubloc_addr'] = $new_address . '@' . App::get_hostname(); + hubloc_store_lowlevel($hv); + } + } + + // fix apps which were stored with the actual name rather than a macro + + $r = q( + "select * from app where app_channel = %d and app_system = 1", + intval($channel['channel_id']) + ); + if ($r) { + foreach ($r as $rv) { + $replace = preg_replace('/([\=\/])(' . $old_address . ')($|[\%\/])/ism', '$1' . $new_address . '$3', $rv['app_url']); + if ($replace != $rv['app_url']) { + q( + "update app set app_url = '%s' where id = %d", + dbesc($replace), + intval($rv['id']) + ); + } + } + } + + Run::Summon([ 'Notifier', 'refresh_all', $channel['channel_id'] ]); + + $ret['success'] = true; + return $ret; } @@ -796,22 +838,25 @@ function channel_change_address($channel,$new_address) { * login account * @param int $channel_id * channel id to set as default for this account - * @param boolean $force (optional) default true + * @param bool $force (optional) default true * - if true, set this default unconditionally * - if $force is false only do this if there is no existing default */ -function set_default_login_identity($account_id, $channel_id, $force = true) { - $r = q("select account_default_channel from account where account_id = %d limit 1", - intval($account_id) - ); - if ($r) { - if ((intval($r[0]['account_default_channel']) == 0) || ($force)) { - $r = q("update account set account_default_channel = %d where account_id = %d", - intval($channel_id), - intval($account_id) - ); - } - } +function set_default_login_identity($account_id, $channel_id, $force = true) +{ + $r = q( + "select account_default_channel from account where account_id = %d limit 1", + intval($account_id) + ); + if ($r) { + if ((intval($r[0]['account_default_channel']) == 0) || ($force)) { + $r = q( + "update account set account_default_channel = %d where account_id = %d", + intval($channel_id), + intval($account_id) + ); + } + } } /** @@ -819,25 +864,26 @@ function set_default_login_identity($account_id, $channel_id, $force = true) { * * @return array with default section names to export */ -function get_default_export_sections() { - $sections = [ - 'channel', - 'connections', - 'config', - 'apps', - 'chatrooms', - 'events' - ]; +function get_default_export_sections() +{ + $sections = [ + 'channel', + 'connections', + 'config', + 'apps', + 'chatrooms', + 'events' + ]; - $cb = [ 'sections' => $sections ]; - /** - * @hooks get_default_export_sections - * Called to get the default list of functional data groups to export in identity_basic_export(). - * * \e array \b sections - return value - */ - call_hooks('get_default_export_sections', $cb); + $cb = [ 'sections' => $sections ]; + /** + * @hooks get_default_export_sections + * Called to get the default list of functional data groups to export in identity_basic_export(). + * * \e array \b sections - return value + */ + call_hooks('get_default_export_sections', $cb); - return $cb['sections']; + return $cb['sections']; } @@ -853,273 +899,293 @@ function get_default_export_sections() { * @return array * See function for details */ -function identity_basic_export($channel_id, $sections = null) { +function identity_basic_export($channel_id, $sections = null) +{ - /* - * basic channel export - */ + /* + * basic channel export + */ - if(! $sections) { - $sections = get_default_export_sections(); - } + if (! $sections) { + $sections = get_default_export_sections(); + } - $ret = []; + $ret = []; - // use constants here as otherwise we will have no idea if we can import from a site - // with a non-standard platform and version. + // use constants here as otherwise we will have no idea if we can import from a site + // with a non-standard platform and version. - $ret['compatibility'] = [ - 'project' => PLATFORM_NAME, - 'codebase' => 'zap', - 'version' => STD_VERSION, - 'database' => DB_UPDATE_VERSION - ]; + $ret['compatibility'] = [ + 'project' => PLATFORM_NAME, + 'codebase' => 'zap', + 'version' => STD_VERSION, + 'database' => DB_UPDATE_VERSION + ]; - /* - * Process channel information regardless of it is one of the sections desired - * because we need the channel relocation information in all export files/streams. - */ + /* + * Process channel information regardless of it is one of the sections desired + * because we need the channel relocation information in all export files/streams. + */ - $r = q("select * from channel where channel_id = %d limit 1", - intval($channel_id) - ); - if ($r) { - $ret['relocate'] = [ 'channel_address' => $r[0]['channel_address'], 'url' => z_root()]; - if (in_array('channel',$sections)) { - $ret['channel'] = $r[0]; - unset($ret['channel']['channel_password']); - unset($ret['channel']['channel_salt']); - } - } + $r = q( + "select * from channel where channel_id = %d limit 1", + intval($channel_id) + ); + if ($r) { + $ret['relocate'] = [ 'channel_address' => $r[0]['channel_address'], 'url' => z_root()]; + if (in_array('channel', $sections)) { + $ret['channel'] = $r[0]; + unset($ret['channel']['channel_password']); + unset($ret['channel']['channel_salt']); + } + } - if (in_array('channel',$sections) || in_array('profile',$sections)) { - $r = q("select * from profile where uid = %d", - intval($channel_id) - ); - if ($r) { - $ret['profile'] = $r; - } + if (in_array('channel', $sections) || in_array('profile', $sections)) { + $r = q( + "select * from profile where uid = %d", + intval($channel_id) + ); + if ($r) { + $ret['profile'] = $r; + } - $r = q("select mimetype, content, os_storage from photo + $r = q( + "select mimetype, content, os_storage from photo where imgscale = 4 and photo_usage = %d and uid = %d limit 1", - intval(PHOTO_PROFILE), - intval($channel_id) - ); + intval(PHOTO_PROFILE), + intval($channel_id) + ); - if ($r) { - $ret['photo'] = [ - 'type' => $r[0]['mimetype'], - 'data' => (($r[0]['os_storage']) - ? base64url_encode(file_get_contents($r[0]['content'])) : base64url_encode(dbunescbin($r[0]['content']))) - ]; - } - } + if ($r) { + $ret['photo'] = [ + 'type' => $r[0]['mimetype'], + 'data' => (($r[0]['os_storage']) + ? base64url_encode(file_get_contents($r[0]['content'])) : base64url_encode(dbunescbin($r[0]['content']))) + ]; + } + } - if (in_array('connections',$sections)) { - $r = q("select * from atoken where atoken_uid = %d", - intval($channel_id) - ); - if ($r) { - $ret['atoken'] = $r; - } - - $xchans = []; - $r = q("select * from abook where abook_channel = %d ", - intval($channel_id) - ); - if ($r) { - $ret['abook'] = $r; + if (in_array('connections', $sections)) { + $r = q( + "select * from atoken where atoken_uid = %d", + intval($channel_id) + ); + if ($r) { + $ret['atoken'] = $r; + } - for ($x = 0; $x < count($ret['abook']); $x ++) { - $xchans[] = $ret['abook'][$x]['abook_xchan']; - $abconfig = load_abconfig($channel_id,$ret['abook'][$x]['abook_xchan']); - if ($abconfig) { - $ret['abook'][$x]['abconfig'] = $abconfig; - } - } - stringify_array_elms($xchans); - } + $xchans = []; + $r = q( + "select * from abook where abook_channel = %d ", + intval($channel_id) + ); + if ($r) { + $ret['abook'] = $r; - if($xchans) { - $r = q("select * from xchan where xchan_hash in ( " . implode(',',$xchans) . " ) "); - if ($r) { - $ret['xchan'] = $r; - } + for ($x = 0; $x < count($ret['abook']); $x++) { + $xchans[] = $ret['abook'][$x]['abook_xchan']; + $abconfig = load_abconfig($channel_id, $ret['abook'][$x]['abook_xchan']); + if ($abconfig) { + $ret['abook'][$x]['abconfig'] = $abconfig; + } + } + stringify_array_elms($xchans); + } - $r = q("select * from hubloc where hubloc_hash in ( " . implode(',',$xchans) . " ) "); - if ($r) { - $ret['hubloc'] = $r; - } - } + if ($xchans) { + $r = q("select * from xchan where xchan_hash in ( " . implode(',', $xchans) . " ) "); + if ($r) { + $ret['xchan'] = $r; + } - $r = q("select * from pgrp where uid = %d ", - intval($channel_id) - ); + $r = q("select * from hubloc where hubloc_hash in ( " . implode(',', $xchans) . " ) "); + if ($r) { + $ret['hubloc'] = $r; + } + } - if ($r) { - $ret['group'] = $r; - } + $r = q( + "select * from pgrp where uid = %d ", + intval($channel_id) + ); - $r = q("select * from pgrp_member where uid = %d ", - intval($channel_id) - ); - if ($r) { - $ret['group_member'] = $r; - } + if ($r) { + $ret['group'] = $r; + } - $r = q("select * from xign where uid = %d ", - intval($channel_id) - ); - if ($r) { - $ret['xign'] = $r; - } + $r = q( + "select * from pgrp_member where uid = %d ", + intval($channel_id) + ); + if ($r) { + $ret['group_member'] = $r; + } - $r = q("select * from block where block_channel_id = %d ", - intval($channel_id) - ); - if ($r) { - $ret['block'] = $r; - } + $r = q( + "select * from xign where uid = %d ", + intval($channel_id) + ); + if ($r) { + $ret['xign'] = $r; + } + $r = q( + "select * from block where block_channel_id = %d ", + intval($channel_id) + ); + if ($r) { + $ret['block'] = $r; + } + } - } + if (in_array('config', $sections)) { + $r = q( + "select * from pconfig where uid = %d", + intval($channel_id) + ); + if ($r) { + $ret['config'] = $r; + } - if (in_array('config',$sections)) { - $r = q("select * from pconfig where uid = %d", - intval($channel_id) - ); - if ($r) { - $ret['config'] = $r; - } + // All other term types will be included in items, if requested. - // All other term types will be included in items, if requested. + $r = q( + "select * from term where ttype in (%d,%d) and uid = %d", + intval(TERM_SAVEDSEARCH), + intval(TERM_THING), + intval($channel_id) + ); + if ($r) { + $ret['term'] = $r; + } + // add psuedo-column obj_baseurl to aid in relocations - $r = q("select * from term where ttype in (%d,%d) and uid = %d", - intval(TERM_SAVEDSEARCH), - intval(TERM_THING), - intval($channel_id) - ); - if ($r) { - $ret['term'] = $r; - } - // add psuedo-column obj_baseurl to aid in relocations + $r = q( + "select obj.*, '%s' as obj_baseurl from obj where obj_channel = %d", + dbesc(z_root()), + intval($channel_id) + ); - $r = q("select obj.*, '%s' as obj_baseurl from obj where obj_channel = %d", - dbesc(z_root()), - intval($channel_id) - ); + if ($r) { + $ret['obj'] = $r; + } - if ($r) { - $ret['obj'] = $r; - } + $r = q( + "select * from likes where channel_id = %d", + intval($channel_id) + ); - $r = q("select * from likes where channel_id = %d", - intval($channel_id) - ); + if ($r) { + $ret['likes'] = $r; + } + } - if ($r) { - $ret['likes'] = $r; - } - } + if (in_array('apps', $sections)) { + $r = q( + "select * from app where app_channel = %d and app_system = 0", + intval($channel_id) + ); + if ($r) { + for ($x = 0; $x < count($r); $x++) { + $r[$x]['term'] = q( + "select * from term where otype = %d and oid = %d", + intval(TERM_OBJ_APP), + intval($r[$x]['id']) + ); + } + $ret['app'] = $r; + } + $r = q( + "select * from app where app_channel = %d and app_system = 1", + intval($channel_id) + ); + if ($r) { + for ($x = 0; $x < count($r); $x++) { + $r[$x]['term'] = q( + "select * from term where otype = %d and oid = %d", + intval(TERM_OBJ_APP), + intval($r[$x]['id']) + ); + } + $ret['sysapp'] = $r; + } + } - if (in_array('apps',$sections)) { - $r = q("select * from app where app_channel = %d and app_system = 0", - intval($channel_id) - ); - if ($r) { - for ($x = 0; $x < count($r); $x ++) { - $r[$x]['term'] = q("select * from term where otype = %d and oid = %d", - intval(TERM_OBJ_APP), - intval($r[$x]['id']) - ); - } - $ret['app'] = $r; - } - $r = q("select * from app where app_channel = %d and app_system = 1", - intval($channel_id) - ); - if ($r) { - for ($x = 0; $x < count($r); $x ++) { - $r[$x]['term'] = q("select * from term where otype = %d and oid = %d", - intval(TERM_OBJ_APP), - intval($r[$x]['id']) - ); - } - $ret['sysapp'] = $r; - } - } + if (in_array('chatrooms', $sections)) { + $r = q( + "select * from chatroom where cr_uid = %d", + intval($channel_id) + ); + if ($r) { + $ret['chatroom'] = $r; + } + } - if (in_array('chatrooms',$sections)) { - $r = q("select * from chatroom where cr_uid = %d", - intval($channel_id) - ); - if ($r) { - $ret['chatroom'] = $r; - } - } + if (in_array('events', $sections)) { + $r = q( + "select * from event where uid = %d", + intval($channel_id) + ); + if ($r) { + $ret['event'] = $r; + } - if (in_array('events',$sections)) { - $r = q("select * from event where uid = %d", - intval($channel_id) - ); - if ($r) { - $ret['event'] = $r; - } + $r = q( + "select * from item where resource_type = 'event' and uid = %d", + intval($channel_id) + ); + if ($r) { + $ret['event_item'] = []; + xchan_query($r); + $r = fetch_post_tags($r, true); + foreach ($r as $rr) { + $ret['event_item'][] = encode_item($rr, true); + } + } + } - $r = q("select * from item where resource_type = 'event' and uid = %d", - intval($channel_id) - ); - if ($r) { - $ret['event_item'] = []; - xchan_query($r); - $r = fetch_post_tags($r,true); - foreach ($r as $rr) { - $ret['event_item'][] = encode_item($rr,true); - } - } - } + if (in_array('items', $sections)) { + /** @warning this may run into memory limits on smaller systems */ - if (in_array('items', $sections)) { - /** @warning this may run into memory limits on smaller systems */ + /** export three months of posts. If you want to export and import all posts you have to start with + * the first year and export/import them in ascending order. + * + * Don't export linked resource items. we'll have to pull those out separately. + */ - /** export three months of posts. If you want to export and import all posts you have to start with - * the first year and export/import them in ascending order. - * - * Don't export linked resource items. we'll have to pull those out separately. - */ - - $r = q("select * from item where item_wall = 1 and item_deleted = 0 and uid = %d + $r = q( + "select * from item where item_wall = 1 and item_deleted = 0 and uid = %d and created > %s - INTERVAL %s and resource_type = '' order by created", - intval($channel_id), - db_utcnow(), - db_quoteinterval('3 MONTH') - ); - if ($r) { - $ret['item'] = []; - xchan_query($r); - $r = fetch_post_tags($r,true); - foreach ($r as $rr) { - $ret['item'][] = encode_item($rr,true); - } - } - } + intval($channel_id), + db_utcnow(), + db_quoteinterval('3 MONTH') + ); + if ($r) { + $ret['item'] = []; + xchan_query($r); + $r = fetch_post_tags($r, true); + foreach ($r as $rr) { + $ret['item'][] = encode_item($rr, true); + } + } + } - $addon = [ - 'channel_id' => $channel_id, - 'sections' => $sections, - 'data' => $ret - ]; - /** - * @hooks identity_basic_export - * Called when exporting a channel's basic information for backup or transfer. - * * \e number \b channel_id - The channel ID - * * \e array \b sections - * * \e array \b data - The data will get returned - */ - call_hooks('identity_basic_export', $addon); - $ret = $addon['data']; + $addon = [ + 'channel_id' => $channel_id, + 'sections' => $sections, + 'data' => $ret + ]; + /** + * @hooks identity_basic_export + * Called when exporting a channel's basic information for backup or transfer. + * * \e number \b channel_id - The channel ID + * * \e array \b sections + * * \e array \b data - The data will get returned + */ + call_hooks('identity_basic_export', $addon); + $ret = $addon['data']; - return $ret; + return $ret; } /** @@ -1132,30 +1198,28 @@ function identity_basic_export($channel_id, $sections = null) { * * \e array \b relocate - (optional) * * \e array \b item - array with items encoded_item() */ -function identity_export_year($channel_id, $year, $month = 0) { +function identity_export_year($channel_id, $year, $month = 0) +{ - if (! $year) { - return []; - } + if (! $year) { + return []; + } - if ($month && $month <= 12) { - $target_month = sprintf('%02d', $month); - $target_month_plus = sprintf('%02d', $month+1); - } - else { - $target_month = '01'; - } + if ($month && $month <= 12) { + $target_month = sprintf('%02d', $month); + $target_month_plus = sprintf('%02d', $month + 1); + } else { + $target_month = '01'; + } - $mindate = datetime_convert('UTC', 'UTC', $year . '-' . $target_month . '-01 00:00:00'); - if ($month && $month < 12) { - $maxdate = datetime_convert('UTC', 'UTC', $year . '-' . $target_month_plus . '-01 00:00:00'); - } - else { - $maxdate = datetime_convert('UTC', 'UTC', $year+1 . '-01-01 00:00:00'); - } - - return channel_export_items_date($channel_id,$mindate,$maxdate); + $mindate = datetime_convert('UTC', 'UTC', $year . '-' . $target_month . '-01 00:00:00'); + if ($month && $month < 12) { + $maxdate = datetime_convert('UTC', 'UTC', $year . '-' . $target_month_plus . '-01 00:00:00'); + } else { + $maxdate = datetime_convert('UTC', 'UTC', $year + 1 . '-01-01 00:00:00'); + } + return channel_export_items_date($channel_id, $mindate, $maxdate); } /** @@ -1169,46 +1233,47 @@ function identity_export_year($channel_id, $year, $month = 0) { * @return array */ -function channel_export_items_date($channel_id, $start, $finish) { +function channel_export_items_date($channel_id, $start, $finish) +{ - if (! $start) { - return []; - } - else { - $start = datetime_convert('UTC', 'UTC', $start); - } - - $finish = datetime_convert('UTC', 'UTC', (($finish) ? $finish : 'now')); - if ($finish < $start) { - return []; - } + if (! $start) { + return []; + } else { + $start = datetime_convert('UTC', 'UTC', $start); + } - $ret = []; + $finish = datetime_convert('UTC', 'UTC', (($finish) ? $finish : 'now')); + if ($finish < $start) { + return []; + } - $ch = channelx_by_n($channel_id); - if ($ch) { - $ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()]; - } + $ret = []; - $ret['compatibility']['codebase'] = 'zap'; + $ch = channelx_by_n($channel_id); + if ($ch) { + $ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()]; + } - $r = q("select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and created >= '%s' and created <= '%s' and resource_type = '' order by created", - intval(ITEM_TYPE_POST), - intval($channel_id), - dbesc($start), - dbesc($finish) - ); + $ret['compatibility']['codebase'] = 'zap'; - if ($r) { - $ret['item'] = []; - xchan_query($r); - $r = fetch_post_tags($r, true); - foreach ($r as $rr) { - $ret['item'][] = encode_item($rr, true); - } - } + $r = q( + "select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and created >= '%s' and created <= '%s' and resource_type = '' order by created", + intval(ITEM_TYPE_POST), + intval($channel_id), + dbesc($start), + dbesc($finish) + ); - return $ret; + if ($r) { + $ret['item'] = []; + xchan_query($r); + $r = fetch_post_tags($r, true); + foreach ($r as $rr) { + $ret['item'][] = encode_item($rr, true); + } + } + + return $ret; } @@ -1223,87 +1288,90 @@ function channel_export_items_date($channel_id, $start, $finish) { * @return array */ -function channel_export_items_page($channel_id, $start, $finish, $page = 0, $limit = 50) { +function channel_export_items_page($channel_id, $start, $finish, $page = 0, $limit = 50) +{ - if (intval($page) < 1) { - $page = 0; - } + if (intval($page) < 1) { + $page = 0; + } - if (intval($limit) < 1) { - $limit = 1; - } + if (intval($limit) < 1) { + $limit = 1; + } - if (intval($limit) > 5000) { - $limit = 5000; - } + if (intval($limit) > 5000) { + $limit = 5000; + } - if (! $start) { - $start = NULL_DATE; - } - else { - $start = datetime_convert('UTC', 'UTC', $start); - } - - $finish = datetime_convert('UTC', 'UTC', (($finish) ? $finish : 'now')); - if ($finish < $start) { - return []; - } + if (! $start) { + $start = NULL_DATE; + } else { + $start = datetime_convert('UTC', 'UTC', $start); + } - $offset = intval($limit) * intval($page); + $finish = datetime_convert('UTC', 'UTC', (($finish) ? $finish : 'now')); + if ($finish < $start) { + return []; + } - $ret = []; + $offset = intval($limit) * intval($page); - $ch = channelx_by_n($channel_id); - if ($ch) { - $ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()]; - } + $ret = []; - $ret['compatibility']['codebase'] = 'zap'; + $ch = channelx_by_n($channel_id); + if ($ch) { + $ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()]; + } + + $ret['compatibility']['codebase'] = 'zap'; - $r = q("select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and resource_type = '' and created >= '%s' and created <= '%s' order by created limit %d offset %d", - intval(ITEM_TYPE_POST), - intval($channel_id), - dbesc($start), - dbesc($finish), - intval($limit), - intval($offset) - ); + $r = q( + "select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and resource_type = '' and created >= '%s' and created <= '%s' order by created limit %d offset %d", + intval(ITEM_TYPE_POST), + intval($channel_id), + dbesc($start), + dbesc($finish), + intval($limit), + intval($offset) + ); - if ($r) { - $ret['item'] = []; - xchan_query($r); - $r = fetch_post_tags($r, true); - foreach ($r as $rr) { - $ret['item'][] = encode_item($rr, true); - } - } + if ($r) { + $ret['item'] = []; + xchan_query($r); + $r = fetch_post_tags($r, true); + foreach ($r as $rr) { + $ret['item'][] = encode_item($rr, true); + } + } - return $ret; + return $ret; } -function get_my_url() { - if (x($_SESSION, 'zrl_override')) { - return $_SESSION['zrl_override']; - } - if (x($_SESSION, 'my_url')) { - return $_SESSION['my_url']; - } +function get_my_url() +{ + if (x($_SESSION, 'zrl_override')) { + return $_SESSION['zrl_override']; + } + if (x($_SESSION, 'my_url')) { + return $_SESSION['my_url']; + } - return false; + return false; } -function get_my_address() { - if (x($_SESSION, 'zid_override')) { - return $_SESSION['zid_override']; - } - if (x($_SESSION, 'my_address')) { - return $_SESSION['my_address']; - } +function get_my_address() +{ + if (x($_SESSION, 'zid_override')) { + return $_SESSION['zid_override']; + } + if (x($_SESSION, 'my_address')) { + return $_SESSION['my_address']; + } - return false; + return false; } /** @@ -1313,75 +1381,81 @@ function get_my_address() { * don't have it already. * And if they aren't already authenticated here, attempt reverse magic auth. */ -function zid_init() { - $tmp_str = get_my_address(); - if (validate_email($tmp_str)) { - $arr = [ - 'zid' => $tmp_str, - 'url' => App::$cmd - ]; - /** - * @hooks zid_init - * * \e string \b zid - their zid - * * \e string \b url - the destination url - */ - call_hooks('zid_init', $arr); +function zid_init() +{ + $tmp_str = get_my_address(); + if (validate_email($tmp_str)) { + $arr = [ + 'zid' => $tmp_str, + 'url' => App::$cmd + ]; + /** + * @hooks zid_init + * * \e string \b zid - their zid + * * \e string \b url - the destination url + */ + call_hooks('zid_init', $arr); - if (! local_channel()) { - $r = q("select * from hubloc where hubloc_addr = '%s' order by hubloc_connected desc limit 1", - dbesc($tmp_str) - ); - if (! $r) { - Run::Summon( [ 'Gprobe', bin2hex($tmp_str) ] ); - } - if ($r && remote_channel() && remote_channel() === $r[0]['hubloc_hash']) { - return; - } + if (! local_channel()) { + $r = q( + "select * from hubloc where hubloc_addr = '%s' order by hubloc_connected desc limit 1", + dbesc($tmp_str) + ); + if (! $r) { + Run::Summon([ 'Gprobe', bin2hex($tmp_str) ]); + } + if ($r && remote_channel() && remote_channel() === $r[0]['hubloc_hash']) { + return; + } - logger('Not authenticated. Invoking reverse magic-auth for ' . $tmp_str); - // try to avoid recursion - but send them home to do a proper magic auth - $query = App::$query_string; - $query = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$query); - $dest = '/' . $query; - if ($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) { - goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&owa=1&bdest=' . bin2hex(z_root() . $dest)); - } - else - logger('No hubloc found.'); - } - } + logger('Not authenticated. Invoking reverse magic-auth for ' . $tmp_str); + // try to avoid recursion - but send them home to do a proper magic auth + $query = App::$query_string; + $query = str_replace(array('?zid=','&zid='), array('?rzid=','&rzid='), $query); + $dest = '/' . $query; + if ($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest, '/magic')) && (! strstr($dest, '/rmagic'))) { + goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&owa=1&bdest=' . bin2hex(z_root() . $dest)); + } else { + logger('No hubloc found.'); + } + } + } } /** * @brief If somebody arrives at our site using a zat, authenticate them. * */ -function zat_init() { - if (local_channel() || remote_channel()) { - return; - } +function zat_init() +{ + if (local_channel() || remote_channel()) { + return; + } - $r = q("select * from atoken where atoken_token = '%s' limit 1", - dbesc($_REQUEST['zat']) - ); - if ($r) { - $xchan = atoken_xchan($r[0]); -// atoken_create_xchan($xchan); - atoken_login($xchan); - } + $r = q( + "select * from atoken where atoken_token = '%s' limit 1", + dbesc($_REQUEST['zat']) + ); + if ($r) { + $xchan = atoken_xchan($r[0]); +// atoken_create_xchan($xchan); + atoken_login($xchan); + } } -function atoken_delete_and_sync($channel_id,$atoken_guid) { - $r = q("select * from atoken where atoken_guid = '%s' and atoken_uid = %d", - dbesc($atoken_guid), - intval($channel_id) - ); - if ($r) { - $atok = array_shift($r); - $atok['deleted'] = true; - atoken_delete($atok['atoken_id']); - Libsync::build_sync_packet($channel_id, [ 'atoken' => [ $atok ] ] ); - } +function atoken_delete_and_sync($channel_id, $atoken_guid) +{ + $r = q( + "select * from atoken where atoken_guid = '%s' and atoken_uid = %d", + dbesc($atoken_guid), + intval($channel_id) + ); + if ($r) { + $atok = array_shift($r); + $atok['deleted'] = true; + atoken_delete($atok['atoken_id']); + Libsync::build_sync_packet($channel_id, [ 'atoken' => [ $atok ] ]); + } } /** @@ -1394,21 +1468,22 @@ function atoken_delete_and_sync($channel_id,$atoken_guid) { * * @return int */ -function get_theme_uid() { - $uid = ((isset($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0); - if (local_channel()) { - if ((get_pconfig(local_channel(),'system','always_my_theme')) || (! $uid)) { - return local_channel(); - } - } - if (! $uid) { - $x = get_sys_channel(); - if ($x) { - return $x['channel_id']; - } - } +function get_theme_uid() +{ + $uid = ((isset($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0); + if (local_channel()) { + if ((get_pconfig(local_channel(), 'system', 'always_my_theme')) || (! $uid)) { + return local_channel(); + } + } + if (! $uid) { + $x = get_sys_channel(); + if ($x) { + return $x['channel_id']; + } + } - return $uid; + return $uid; } /** @@ -1419,24 +1494,24 @@ function get_theme_uid() { * one of (300, 80, 48) * @return string with path to profile photo */ -function get_default_profile_photo($size = 300) { - $scheme = get_config('system','default_profile_photo'); - if (! $scheme) { - $scheme = 'rainbow_man'; - } +function get_default_profile_photo($size = 300) +{ + $scheme = get_config('system', 'default_profile_photo'); + if (! $scheme) { + $scheme = 'rainbow_man'; + } - if (! is_dir('images/default_profile_photos/' . $scheme)) { - $x = [ 'scheme' => $scheme, 'size' => $size, 'url' => '' ]; - call_hooks('default_profile_photo',$x); - if ($x['url']) { - return $x['url']; - } - else { - $scheme = 'rainbow_man'; - } - } + if (! is_dir('images/default_profile_photos/' . $scheme)) { + $x = [ 'scheme' => $scheme, 'size' => $size, 'url' => '' ]; + call_hooks('default_profile_photo', $x); + if ($x['url']) { + return $x['url']; + } else { + $scheme = 'rainbow_man'; + } + } - return 'images/default_profile_photos/' . $scheme . '/' . $size . '.png'; + return 'images/default_profile_photos/' . $scheme . '/' . $size . '.png'; } /** @@ -1444,10 +1519,11 @@ function get_default_profile_photo($size = 300) { * * @param string $s * xchan_hash of the identity in question - * @return boolean true or false + * @return bool true or false */ -function is_foreigner($s) { - return((strpbrk($s, '.:@')) ? true : false); +function is_foreigner($s) +{ + return((strpbrk($s, '.:@')) ? true : false); } /** @@ -1455,10 +1531,11 @@ function is_foreigner($s) { * * @param string $s * xchan_hash of the identity in question - * @return boolean true or false + * @return bool true or false */ -function is_member($s) { - return((is_foreigner($s)) ? false : true); +function is_member($s) +{ + return((is_foreigner($s)) ? false : true); } /** @@ -1468,31 +1545,34 @@ function is_member($s) { * @return array An associative array with * * \e bool \b result */ -function get_online_status($nick) { +function get_online_status($nick) +{ - $ret = array('result' => false); + $ret = array('result' => false); - if (observer_prohibited()) { - return $ret; - } + if (observer_prohibited()) { + return $ret; + } - $r = q("select channel_id, channel_hash from channel where channel_address = '%s' limit 1", - dbesc($nick) - ); - if ($r) { - $hide = get_pconfig($r[0]['channel_id'],'system','hide_online_status'); - if ($hide) { - return $ret; - } - $x = q("select cp_status from chatpresence where cp_xchan = '%s' and cp_room = 0 limit 1", - dbesc($r[0]['channel_hash']) - ); - if ($x) { - $ret['result'] = $x[0]['cp_status']; - } - } + $r = q( + "select channel_id, channel_hash from channel where channel_address = '%s' limit 1", + dbesc($nick) + ); + if ($r) { + $hide = get_pconfig($r[0]['channel_id'], 'system', 'hide_online_status'); + if ($hide) { + return $ret; + } + $x = q( + "select cp_status from chatpresence where cp_xchan = '%s' and cp_room = 0 limit 1", + dbesc($r[0]['channel_hash']) + ); + if ($x) { + $ret['result'] = $x[0]['cp_status']; + } + } - return $ret; + return $ret; } @@ -1500,28 +1580,30 @@ function get_online_status($nick) { * @brief * * @param string $webbie - * @return array|boolean|string + * @return array|bool|string */ -function remote_online_status($webbie) { +function remote_online_status($webbie) +{ - $result = false; - $r = q("select * from hubloc where hubloc_addr = '%s' limit 1", - dbesc($webbie) - ); - if (! $r) { - return $result; - } - $url = $r[0]['hubloc_url'] . '/online/' . substr($webbie,0,strpos($webbie,'@')); + $result = false; + $r = q( + "select * from hubloc where hubloc_addr = '%s' limit 1", + dbesc($webbie) + ); + if (! $r) { + return $result; + } + $url = $r[0]['hubloc_url'] . '/online/' . substr($webbie, 0, strpos($webbie, '@')); - $x = z_fetch_url($url); - if ($x['success']) { - $j = json_decode($x['body'],true); - if ($j) { - $result = (($j['result']) ? $j['result'] : false); - } - } + $x = z_fetch_url($url); + if ($x['success']) { + $j = json_decode($x['body'], true); + if ($j) { + $result = (($j['result']) ? $j['result'] : false); + } + } - return $result; + return $result; } @@ -1530,82 +1612,89 @@ function remote_online_status($webbie) { * * @return string with parsed HTML channel_id_selet template */ -function identity_selector() { - if (local_channel()) { - $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ", - intval(get_account_id()) - ); - if ($r && count($r) > 1) { - $o = replace_macros(get_markup_template('channel_id_select.tpl'), array( - '$channels' => $r, - '$selected' => local_channel() - )); +function identity_selector() +{ + if (local_channel()) { + $r = q( + "select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ", + intval(get_account_id()) + ); + if ($r && count($r) > 1) { + $o = replace_macros(get_markup_template('channel_id_select.tpl'), array( + '$channels' => $r, + '$selected' => local_channel() + )); - return $o; - } - } + return $o; + } + } - return ''; + return ''; } -function is_public_profile() { - if (! local_channel()) { - return false; - } +function is_public_profile() +{ + if (! local_channel()) { + return false; + } - if (intval(get_config('system','block_public'))) { - return false; - } + if (intval(get_config('system', 'block_public'))) { + return false; + } - $channel = App::get_channel(); - if ($channel) { - $perm = PermissionLimits::Get($channel['channel_id'],'view_profile'); - if ($perm == PERMS_PUBLIC) { - return true; - } - } + $channel = App::get_channel(); + if ($channel) { + $perm = PermissionLimits::Get($channel['channel_id'], 'view_profile'); + if ($perm == PERMS_PUBLIC) { + return true; + } + } - return false; + return false; } -function get_profile_fields_basic($filter = 0) { +function get_profile_fields_basic($filter = 0) +{ - $profile_fields_basic = (($filter == 0) ? get_config('system','profile_fields_basic') : null); + $profile_fields_basic = (($filter == 0) ? get_config('system', 'profile_fields_basic') : null); - if (! $profile_fields_basic) { - $profile_fields_basic = array('fullname','pdesc','chandesc','basic_gender','pronouns','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact'); - } - - $x = []; - if ($profile_fields_basic) - foreach ($profile_fields_basic as $f) - $x[$f] = 1; + if (! $profile_fields_basic) { + $profile_fields_basic = array('fullname','pdesc','chandesc','basic_gender','pronouns','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact'); + } - return $x; + $x = []; + if ($profile_fields_basic) { + foreach ($profile_fields_basic as $f) { + $x[$f] = 1; + } + } + + return $x; } -function get_profile_fields_advanced($filter = 0) { - $basic = get_profile_fields_basic($filter); - $profile_fields_advanced = (($filter == 0) ? get_config('system','profile_fields_advanced') : null); - if (! $profile_fields_advanced) { - $profile_fields_advanced = array('comms', 'address','locality','postal_code','advanced_gender', 'partner','howlong','politic','religion','likes','dislikes','interest','channels','music','book','film','tv','romance','employment','education'); - } - $x = []; - if ($basic) { - foreach ($basic as $f => $v) { - $x[$f] = $v; - } - } +function get_profile_fields_advanced($filter = 0) +{ + $basic = get_profile_fields_basic($filter); + $profile_fields_advanced = (($filter == 0) ? get_config('system', 'profile_fields_advanced') : null); + if (! $profile_fields_advanced) { + $profile_fields_advanced = array('comms', 'address','locality','postal_code','advanced_gender', 'partner','howlong','politic','religion','likes','dislikes','interest','channels','music','book','film','tv','romance','employment','education'); + } + $x = []; + if ($basic) { + foreach ($basic as $f => $v) { + $x[$f] = $v; + } + } - if ($profile_fields_advanced) { - foreach ($profile_fields_advanced as $f) { - $x[$f] = 1; - } - } + if ($profile_fields_advanced) { + foreach ($profile_fields_advanced as $f) { + $x[$f] = 1; + } + } - return $x; + return $x; } /** @@ -1620,132 +1709,150 @@ function get_profile_fields_advanced($filter = 0) { * Current notification flag value. Send this to notifications_on() to restore the channel settings when finished * with the activity requiring notifications_off(); */ -function notifications_off($channel_id) { - $r = q("select channel_notifyflags from channel where channel_id = %d limit 1", - intval($channel_id) - ); - q("update channel set channel_notifyflags = 0 where channel_id = %d", - intval($channel_id) - ); +function notifications_off($channel_id) +{ + $r = q( + "select channel_notifyflags from channel where channel_id = %d limit 1", + intval($channel_id) + ); + q( + "update channel set channel_notifyflags = 0 where channel_id = %d", + intval($channel_id) + ); - return intval($r[0]['channel_notifyflags']); + return intval($r[0]['channel_notifyflags']); } -function notifications_on($channel_id, $value) { - $x = q("update channel set channel_notifyflags = %d where channel_id = %d", - intval($value), - intval($channel_id) - ); +function notifications_on($channel_id, $value) +{ + $x = q( + "update channel set channel_notifyflags = %d where channel_id = %d", + intval($value), + intval($channel_id) + ); - return $x; + return $x; } -function get_channel_default_perms($uid) { +function get_channel_default_perms($uid) +{ - $ret = []; + $ret = []; - $r = q("select abook_xchan from abook where abook_channel = %d and abook_self = 1 limit 1", - intval($uid) - ); - if ($r) { - $ret = Permissions::FilledPerms(get_abconfig($uid,$r[0]['abook_xchan'],'system','my_perms',EMPTY_STR)); - } + $r = q( + "select abook_xchan from abook where abook_channel = %d and abook_self = 1 limit 1", + intval($uid) + ); + if ($r) { + $ret = Permissions::FilledPerms(get_abconfig($uid, $r[0]['abook_xchan'], 'system', 'my_perms', EMPTY_STR)); + } - return $ret; + return $ret; } -function profiles_build_sync($channel_id,$send = true) { - $r = q("select * from profile where uid = %d", - intval($channel_id) - ); - if ($r) { - if($send) { - Libsync::build_sync_packet($channel_id,array('profile' => $r)); - } - else { - return $r; - } - } +function profiles_build_sync($channel_id, $send = true) +{ + $r = q( + "select * from profile where uid = %d", + intval($channel_id) + ); + if ($r) { + if ($send) { + Libsync::build_sync_packet($channel_id, array('profile' => $r)); + } else { + return $r; + } + } } -function auto_channel_create($account_id) { +function auto_channel_create($account_id) +{ - if (! $account_id) { - return false; - } + if (! $account_id) { + return false; + } - $arr = []; - $arr['account_id'] = $account_id; - $arr['name'] = get_aconfig($account_id,'register','channel_name'); - $arr['nickname'] = legal_webbie(get_aconfig($account_id,'register','channel_address')); - $arr['permissions_role'] = get_aconfig($account_id,'register','permissions_role'); + $arr = []; + $arr['account_id'] = $account_id; + $arr['name'] = get_aconfig($account_id, 'register', 'channel_name'); + $arr['nickname'] = legal_webbie(get_aconfig($account_id, 'register', 'channel_address')); + $arr['permissions_role'] = get_aconfig($account_id, 'register', 'permissions_role'); - del_aconfig($account_id,'register','channel_name'); - del_aconfig($account_id,'register','channel_address'); - del_aconfig($account_id,'register','permissions_role'); + del_aconfig($account_id, 'register', 'channel_name'); + del_aconfig($account_id, 'register', 'channel_address'); + del_aconfig($account_id, 'register', 'permissions_role'); - if((! $arr['name']) || (! $arr['nickname'])) { - $x = q("select * from account where account_id = %d limit 1", - intval($account_id) - ); - if($x) { - if(! $arr['name']) - $arr['name'] = substr($x[0]['account_email'],0,strpos($x[0]['account_email'],'@')); - if(! $arr['nickname']) - $arr['nickname'] = legal_webbie(substr($x[0]['account_email'],0,strpos($x[0]['account_email'],'@'))); - } - } - if(! $arr['permissions_role']) - $arr['permissions_role'] = 'social'; + if ((! $arr['name']) || (! $arr['nickname'])) { + $x = q( + "select * from account where account_id = %d limit 1", + intval($account_id) + ); + if ($x) { + if (! $arr['name']) { + $arr['name'] = substr($x[0]['account_email'], 0, strpos($x[0]['account_email'], '@')); + } + if (! $arr['nickname']) { + $arr['nickname'] = legal_webbie(substr($x[0]['account_email'], 0, strpos($x[0]['account_email'], '@'))); + } + } + } + if (! $arr['permissions_role']) { + $arr['permissions_role'] = 'social'; + } - if(validate_channelname($arr['name'])) - return false; - if($arr['nickname'] === 'sys') - $arr['nickname'] = $arr['nickname'] . mt_rand(1000,9999); + if (validate_channelname($arr['name'])) { + return false; + } + if ($arr['nickname'] === 'sys') { + $arr['nickname'] = $arr['nickname'] . mt_rand(1000, 9999); + } - $arr['nickname'] = check_webbie(array($arr['nickname'], $arr['nickname'] . mt_rand(1000,9999))); + $arr['nickname'] = check_webbie(array($arr['nickname'], $arr['nickname'] . mt_rand(1000, 9999))); - return create_identity($arr); + return create_identity($arr); } -function get_cover_photo($channel_id,$format = 'bbcode', $res = PHOTO_RES_COVER_1200) { +function get_cover_photo($channel_id, $format = 'bbcode', $res = PHOTO_RES_COVER_1200) +{ - $r = q("select height, width, resource_id, edited, mimetype from photo where uid = %d and imgscale = %d and photo_usage = %d", - intval($channel_id), - intval($res), - intval(PHOTO_COVER) - ); - if(! $r) - return false; + $r = q( + "select height, width, resource_id, edited, mimetype from photo where uid = %d and imgscale = %d and photo_usage = %d", + intval($channel_id), + intval($res), + intval(PHOTO_COVER) + ); + if (! $r) { + return false; + } - $output = false; + $output = false; - $url = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $res ; + $url = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $res ; - switch($format) { - case 'bbcode': - $output = '[zrl=' . $r[0]['width'] . 'x' . $r[0]['height'] . ']' . $url . '[/zrl]'; - break; - case 'html': - $output = '' . $name . '' + : '' . $name . '' + ); - if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { + if (! $item['thr_parent']) { + $item['thr_parent'] = $item['parent_mid']; + } - $name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown')); - $url = (($item['author_xchan'] && $item['author']['xchan_photo_s']) - ? '' . '
'; - $o .= "
' . "\r\n"; - return $o; + return $o; } /** @@ -477,26 +532,29 @@ function cal($y = 0, $m = 0, $links = false, $class='') { * @param string $format * @return string */ -function z_birthday($dob, $tz, $format="Y-m-d H:i:s") { +function z_birthday($dob, $tz, $format = "Y-m-d H:i:s") +{ - if (! strlen($tz)) - $tz = 'UTC'; + if (! strlen($tz)) { + $tz = 'UTC'; + } - $birthday = ''; - $tmp_dob = substr($dob,5); - $tmp_d = substr($dob,8); - if (intval($tmp_dob) && intval($tmp_d)) { - $y = datetime_convert($tz,$tz,'now','Y'); - $bd = $y . '-' . $tmp_dob . ' 00:00'; - $t_dob = strtotime($bd); - $now = strtotime(datetime_convert($tz,$tz,'now')); - if ($t_dob < $now) - $bd = $y + 1 . '-' . $tmp_dob . ' 00:00'; + $birthday = ''; + $tmp_dob = substr($dob, 5); + $tmp_d = substr($dob, 8); + if (intval($tmp_dob) && intval($tmp_d)) { + $y = datetime_convert($tz, $tz, 'now', 'Y'); + $bd = $y . '-' . $tmp_dob . ' 00:00'; + $t_dob = strtotime($bd); + $now = strtotime(datetime_convert($tz, $tz, 'now')); + if ($t_dob < $now) { + $bd = $y + 1 . '-' . $tmp_dob . ' 00:00'; + } - $birthday = datetime_convert($tz,'UTC',$bd,$format); - } + $birthday = datetime_convert($tz, 'UTC', $bd, $format); + } - return $birthday; + return $birthday; } /** @@ -504,41 +562,47 @@ function z_birthday($dob, $tz, $format="Y-m-d H:i:s") { * * Update the year so that we don't create another event until next year. */ -function update_birthdays() { +function update_birthdays() +{ - require_once('include/event.php'); - require_once('include/permissions.php'); + require_once('include/event.php'); + require_once('include/permissions.php'); - $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash + $r = q( + "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_dob > %s + interval %s and abook_dob < %s + interval %s", - db_utcnow(), db_quoteinterval('7 day'), - db_utcnow(), db_quoteinterval('14 day') - ); - if ($r) { - foreach ($r as $rr) { - if (! perm_is_allowed($rr['abook_channel'], $rr['xchan_hash'], 'send_stream')) - continue; + db_utcnow(), + db_quoteinterval('7 day'), + db_utcnow(), + db_quoteinterval('14 day') + ); + if ($r) { + foreach ($r as $rr) { + if (! perm_is_allowed($rr['abook_channel'], $rr['xchan_hash'], 'send_stream')) { + continue; + } - $ev = [ - 'uid' => $rr['abook_channel'], - 'account' => $rr['abook_account'], - 'event_xchan' => $rr['xchan_hash'], - 'dtstart' => datetime_convert('UTC', 'UTC', $rr['abook_dob']), - 'dtend' => datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day '), - 'adjust' => intval(feature_enabled($rr['abook_channel'],'smart_birthdays')), - 'summary' => sprintf( t('%1$s\'s birthday'), $rr['xchan_name']), - 'description' => sprintf( t('Happy Birthday %1$s'), '[zrl=' . $rr['xchan_url'] . ']' . $rr['xchan_name'] . '[/zrl]'), - 'etype' => 'birthday', - ]; + $ev = [ + 'uid' => $rr['abook_channel'], + 'account' => $rr['abook_account'], + 'event_xchan' => $rr['xchan_hash'], + 'dtstart' => datetime_convert('UTC', 'UTC', $rr['abook_dob']), + 'dtend' => datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day '), + 'adjust' => intval(feature_enabled($rr['abook_channel'], 'smart_birthdays')), + 'summary' => sprintf(t('%1$s\'s birthday'), $rr['xchan_name']), + 'description' => sprintf(t('Happy Birthday %1$s'), '[zrl=' . $rr['xchan_url'] . ']' . $rr['xchan_name'] . '[/zrl]'), + 'etype' => 'birthday', + ]; - $z = event_store_event($ev); - if ($z) { - $item_id = event_store_item($ev, $z); - q("update abook set abook_dob = '%s' where abook_id = %d", - dbesc(intval($rr['abook_dob']) + 1 . substr($rr['abook_dob'], 4)), - intval($rr['abook_id']) - ); - } - } - } + $z = event_store_event($ev); + if ($z) { + $item_id = event_store_item($ev, $z); + q( + "update abook set abook_dob = '%s' where abook_id = %d", + dbesc(intval($rr['abook_dob']) + 1 . substr($rr['abook_dob'], 4)), + intval($rr['abook_id']) + ); + } + } + } } diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index fce48bce0..32506293d 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -7,6 +7,8 @@ * database class DBA and some functions for working with databases. */ +use Zotlabs\Lib\System; + /** * @brief Database classs with database factory method. * @@ -14,67 +16,68 @@ * abstract dba_driver class. */ -class DBA { +class DBA +{ - static public $dba = null; - static public $dbtype = null; - static public $scheme = 'mysql'; - static public $logging = false; + public static $dba = null; + public static $dbtype = null; + public static $scheme = 'mysql'; + public static $logging = false; - static public $install_script = 'schema_mysql.sql'; - static public $null_date = '0001-01-01 00:00:00'; - static public $utc_now = 'UTC_TIMESTAMP()'; - static public $tquot = "`"; + public static $install_script = 'schema_mysql.sql'; + public static $null_date = '0001-01-01 00:00:00'; + public static $utc_now = 'UTC_TIMESTAMP()'; + public static $tquot = "`"; - /** - * @brief Returns the database driver object. - * - * @param string $server DB server name (or PDO dsn - e.g. mysqli:foobar.com;) - * @param string $port DB port - * @param string $user DB username - * @param string $pass DB password - * @param string $db database name - * @param string $dbtype 0 for mysql, 1 for postgres - * @param bool $install Defaults to false - * @return null|dba_driver A database driver object (dba_pdo) or null if no driver found. - */ - static public function dba_factory($server,$port,$user,$pass,$db,$dbtype,$install = false) { + /** + * @brief Returns the database driver object. + * + * @param string $server DB server name (or PDO dsn - e.g. mysqli:foobar.com;) + * @param string $port DB port + * @param string $user DB username + * @param string $pass DB password + * @param string $db database name + * @param string $dbtype 0 for mysql, 1 for postgres + * @param bool $install Defaults to false + * @return null|dba_driver A database driver object (dba_pdo) or null if no driver found. + */ + public static function dba_factory($server, $port, $user, $pass, $db, $dbtype, $install = false) + { - self::$dba = null; - self::$dbtype = intval($dbtype); + self::$dba = null; + self::$dbtype = intval($dbtype); - if(self::$dbtype == DBTYPE_POSTGRES) { - if(!($port)) - $port = 5432; + if (self::$dbtype == DBTYPE_POSTGRES) { + if (!($port)) { + $port = 5432; + } - self::$install_script = 'schema_postgres.sql'; - self::$utc_now = "now() at time zone 'UTC'"; - self::$tquot = '"'; - self::$scheme = 'pgsql'; - } - else { + self::$install_script = 'schema_postgres.sql'; + self::$utc_now = "now() at time zone 'UTC'"; + self::$tquot = '"'; + self::$scheme = 'pgsql'; + } else { + // attempt to use the pdo driver compiled-in mysqli socket + // if using 'localhost' with no port configured. + // If this is wrong you'll need to set the socket path specifically + // using a server name of 'mysql:unix_socket=/socket/path', setting /socket/path + // as needed for your platform - // attempt to use the pdo driver compiled-in mysqli socket - // if using 'localhost' with no port configured. - // If this is wrong you'll need to set the socket path specifically - // using a server name of 'mysql:unix_socket=/socket/path', setting /socket/path - // as needed for your platform + if ((!($port)) && ($server !== 'localhost')) { + $port = 3306; + } + } - if((!($port)) && ($server !== 'localhost')) - $port = 3306; - } + require_once('include/dba/dba_pdo.php'); + self::$dba = new dba_pdo($server, self::$scheme, $port, $user, $pass, $db, $install); - require_once('include/dba/dba_pdo.php'); - self::$dba = new dba_pdo($server,self::$scheme,$port,$user,$pass,$db,$install); - - define('NULL_DATE', self::$null_date); - define('ACTIVE_DBTYPE', self::$dbtype); - define('TQUOT', self::$tquot); - - return self::$dba; - } + define('NULL_DATE', self::$null_date); + define('ACTIVE_DBTYPE', self::$dbtype); + define('TQUOT', self::$tquot); + return self::$dba; + } } /** @@ -84,143 +87,157 @@ class DBA { * dba_mysql, dba_mysqli or dba_postgres, but we moved to PDO and the only * implemented driver is dba_pdo. */ -abstract class dba_driver { - // legacy behavior +abstract class dba_driver +{ + // legacy behavior - public $db; + public $db; - public $debug = 0; - public $connected = false; - public $error = false; + public $debug = 0; + public $connected = false; + public $error = false; - /** - * @brief Connect to the database. - * - * This abstract function needs to be implemented in the real driver. - * - * @param string $server DB server name - * @param string $scheme DB scheme - * @param string $port DB port - * @param string $user DB username - * @param string $pass DB password - * @param string $db database name - * @return bool - */ - abstract function connect($server, $scheme, $port, $user, $pass, $db); + /** + * @brief Connect to the database. + * + * This abstract function needs to be implemented in the real driver. + * + * @param string $server DB server name + * @param string $scheme DB scheme + * @param string $port DB port + * @param string $user DB username + * @param string $pass DB password + * @param string $db database name + * @return bool + */ + abstract public function connect($server, $scheme, $port, $user, $pass, $db); - /** - * @brief Perform a DB query with the SQL statement $sql. - * - * This abstract function needs to be implemented in the real driver. - * - * @param string $sql The SQL query to execute - */ - abstract function q($sql); + /** + * @brief Perform a DB query with the SQL statement $sql. + * + * This abstract function needs to be implemented in the real driver. + * + * @param string $sql The SQL query to execute + */ + abstract public function q($sql); - /** - * @brief Escape a string before being passed to a DB query. - * - * This abstract function needs to be implemented in the real driver. - * - * @param string $str The string to escape. - */ - abstract function escape($str); + /** + * @brief Escape a string before being passed to a DB query. + * + * This abstract function needs to be implemented in the real driver. + * + * @param string $str The string to escape. + */ + abstract public function escape($str); - /** - * @brief Close the database connection. - * - * This abstract function needs to be implemented in the real driver. - */ - abstract function close(); + /** + * @brief Close the database connection. + * + * This abstract function needs to be implemented in the real driver. + */ + abstract public function close(); - /** - * @brief Return text name for db driver - * - * This abstract function needs to be implemented in the real driver. - */ - abstract function getdriver(); + /** + * @brief Return text name for db driver + * + * This abstract function needs to be implemented in the real driver. + */ + abstract public function getdriver(); - function __construct($server, $scheme, $port, $user,$pass,$db,$install = false) { - if(($install) && (! $this->install($server, $scheme, $port, $user, $pass, $db))) { - return; - } - $this->connect($server, $scheme, $port, $user, $pass, $db); - } + public function __construct($server, $scheme, $port, $user, $pass, $db, $install = false) + { + if (($install) && (!$this->install($server, $scheme, $port, $user, $pass, $db))) { + return; + } + $this->connect($server, $scheme, $port, $user, $pass, $db); + } - function get_null_date() { - return \DBA::$null_date; - } + public function get_null_date() + { + return DBA::$null_date; + } - function get_install_script() { - $platform_name = \Zotlabs\Lib\System::get_platform_name(); - if(file_exists('install/' . $platform_name . '/' . \DBA::$install_script)) - return 'install/' . $platform_name . '/' . \DBA::$install_script; + public function get_install_script() + { + $platform_name = System::get_platform_name(); + if (file_exists('install/' . $platform_name . '/' . DBA::$install_script)) { + return 'install/' . $platform_name . '/' . DBA::$install_script; + } - return 'install/' . \DBA::$install_script; - } + return 'install/' . DBA::$install_script; + } - function get_table_quote() { - return \DBA::$tquot; - } + public function get_table_quote() + { + return DBA::$tquot; + } - function utcnow() { - return \DBA::$utc_now; - } + public function utcnow() + { + return DBA::$utc_now; + } - function install($server,$scheme,$port,$user,$pass,$db) { - if (!(strlen($server) && strlen($user))){ - $this->connected = false; - $this->db = null; - return false; - } + public function install($server, $scheme, $port, $user, $pass, $db) + { + if (!(strlen($server) && strlen($user))) { + $this->connected = false; + $this->db = null; + return false; + } - if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1') && (! strpbrk($server,':;'))) { - if(! z_dns_check($server)) { - $this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server); - $this->connected = false; - $this->db = null; - return false; - } - } + if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1') && (!strpbrk($server, ':;'))) { + if (!z_dns_check($server)) { + $this->error = sprintf(t('Cannot locate DNS info for database server \'%s\''), $server); + $this->connected = false; + $this->db = null; + return false; + } + } - return true; - } + return true; + } - /** - * @brief Sets the database driver's debugging state. - * - * @param int $dbg 0 to disable debugging - */ - function dbg($dbg) { - $this->debug = $dbg; - } + /** + * @brief Sets the database driver's debugging state. + * + * @param int $dbg 0 to disable debugging + */ + public function dbg($dbg) + { + $this->debug = $dbg; + } - function __destruct() { - if($this->db && $this->connected) { - $this->close(); - } - } + public function __destruct() + { + if ($this->db && $this->connected) { + $this->close(); + } + } - function quote_interval($txt) { - return $txt; - } + public function quote_interval($txt) + { + return $txt; + } - function optimize_table($table) { - q('OPTIMIZE TABLE '.$table); - } + public function optimize_table($table) + { + q('OPTIMIZE TABLE ' . $table); + } - function concat($fld, $sep) { - return 'GROUP_CONCAT(DISTINCT '.$fld.' SEPARATOR \''.$sep.'\')'; - } + public function concat($fld, $sep) + { + return 'GROUP_CONCAT(DISTINCT ' . $fld . ' SEPARATOR \'' . $sep . '\')'; + } - function escapebin($str) { - return $this->escape($str); - } - - function unescapebin($str) { - return $str; - } + public function escapebin($str) + { + return $this->escape($str); + } + public function unescapebin($str) + { + return $str; + } } // end abstract dba_driver class @@ -228,14 +245,15 @@ abstract class dba_driver { // Procedural functions // -function printable($s, $escape = true) { - $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s); - $s = str_replace("\x00",'.',$s); - if ($escape) { - $s = escape_tags($s); - } +function printable($s, $escape = true) +{ + $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~", ".", $s); + $s = str_replace("\x00", '.', $s); + if ($escape) { + $s = escape_tags($s); + } - return $s; + return $s; } /** @@ -243,11 +261,13 @@ function printable($s, $escape = true) { * * @param int $state 0 to disable debugging */ -function dbg($state) { - global $db; +function dbg($state) +{ + global $db; - if(\DBA::$dba) - \DBA::$dba->dbg($state); + if (DBA::$dba) { + DBA::$dba->dbg($state); + } } /** @@ -260,53 +280,66 @@ function dbg($state) { * @param string $str A string to pass to a DB query * @return string Return an escaped string of the value to pass to a DB query. */ -function dbesc($str) { +function dbesc($str) +{ - if(is_null_date($str)) - $str = NULL_DATE; + if (is_null_date($str)) { + $str = NULL_DATE; + } - if(\DBA::$dba && \DBA::$dba->connected) - return(\DBA::$dba->escape($str)); - else - return(str_replace("'", "\\'", $str)); + if (DBA::$dba && DBA::$dba->connected) { + return(DBA::$dba->escape($str)); + } else { + return(str_replace("'", "\\'", $str)); + } } -function dbescbin($str) { - return \DBA::$dba->escapebin($str); +function dbescbin($str) +{ + return DBA::$dba->escapebin($str); } -function dbunescbin($str) { - return \DBA::$dba->unescapebin($str); +function dbunescbin($str) +{ + return DBA::$dba->unescapebin($str); } -function dbescdate($date) { - if(is_null_date($date)) - return \DBA::$dba->escape(NULL_DATE); +function dbescdate($date) +{ + if (is_null_date($date)) { + return DBA::$dba->escape(NULL_DATE); + } - return \DBA::$dba->escape($date); + return DBA::$dba->escape($date); } -function db_quoteinterval($txt) { - return \DBA::$dba->quote_interval($txt); +function db_quoteinterval($txt) +{ + return DBA::$dba->quote_interval($txt); } -function dbesc_identifier($str) { - return \DBA::$dba->escape_identifier($str); +function dbesc_identifier($str) +{ + return DBA::$dba->escape_identifier($str); } -function db_utcnow() { - return \DBA::$dba->utcnow(); +function db_utcnow() +{ + return DBA::$dba->utcnow(); } -function db_optimizetable($table) { - \DBA::$dba->optimize_table($table); +function db_optimizetable($table) +{ + DBA::$dba->optimize_table($table); } -function db_concat($fld, $sep) { - return \DBA::$dba->concat($fld, $sep); +function db_concat($fld, $sep) +{ + return DBA::$dba->concat($fld, $sep); } -function db_use_index($str) { - return \DBA::$dba->use_index($str); +function db_use_index($str) +{ + return DBA::$dba->use_index($str); } /** @@ -325,31 +358,33 @@ function db_use_index($str) { * @param string $sql The SQL query to execute * @return bool|array */ -function q($sql) { +function q($sql) +{ - $args = func_get_args(); - array_shift($args); + $args = func_get_args(); + array_shift($args); - if(\DBA::$dba && \DBA::$dba->connected) { - $stmt = vsprintf($sql, $args); - if($stmt === false) { - db_logger('dba: vsprintf error: ' . - print_r(debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 1), true),LOGGER_NORMAL,LOG_CRIT); - } - if(\DBA::$dba->debug) - db_logger('Sql: ' . $stmt, LOGGER_DEBUG, LOG_INFO); + if (DBA::$dba && DBA::$dba->connected) { + $stmt = vsprintf($sql, $args); + if ($stmt === false) { + db_logger('dba: vsprintf error: ' . + print_r(debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 1), true), LOGGER_NORMAL, LOG_CRIT); + } + if (DBA::$dba->debug) { + db_logger('Sql: ' . $stmt, LOGGER_DEBUG, LOG_INFO); + } - return \DBA::$dba->q($stmt); - } + return DBA::$dba->q($stmt); + } - /* - * This will happen occasionally trying to store the - * session data after abnormal program termination - */ + /* + * This will happen occasionally trying to store the + * session data after abnormal program termination + */ - db_logger('dba: no database: ' . print_r($args,true),LOGGER_NORMAL,LOG_CRIT); + db_logger('dba: no database: ' . print_r($args, true), LOGGER_NORMAL, LOG_CRIT); - return false; + return false; } /** @@ -359,14 +394,16 @@ function q($sql) { * * @param string $sql The SQL query to execute */ -function dbq($sql) { +function dbq($sql) +{ - if(\DBA::$dba && \DBA::$dba->connected) - $ret = \DBA::$dba->q($sql); - else - $ret = false; + if (DBA::$dba && DBA::$dba->connected) { + $ret = DBA::$dba->q($sql); + } else { + $ret = false; + } - return $ret; + return $ret; } @@ -376,72 +413,78 @@ function dbq($sql) { // SQL injection vectors. All integer array elements should be specifically // cast to int to avoid trouble. -function dbesc_array_cb(&$item, $key) { - if(is_string($item)) { - if(is_null_date($item)) - $item = NULL_DATE; - $item = dbesc($item); - } +function dbesc_array_cb(&$item, $key) +{ + if (is_string($item)) { + if (is_null_date($item)) { + $item = NULL_DATE; + } + $item = dbesc($item); + } } -function dbesc_array(&$arr) { - $bogus_key = false; - if(is_array($arr) && count($arr)) { - $matches = false; - foreach($arr as $k => $v) { - if(preg_match('/([^a-zA-Z0-9\-\_\.])/',$k,$matches)) { - logger('bogus key: ' . $k); - $bogus_key = true; - } - } - array_walk($arr,'dbesc_array_cb'); - if($bogus_key) { - $arr['BOGUS.KEY'] = 1; - return false; - } - } - return true; +function dbesc_array(&$arr) +{ + $bogus_key = false; + if (is_array($arr) && count($arr)) { + $matches = false; + foreach ($arr as $k => $v) { + if (preg_match('/([^a-zA-Z0-9\-\_\.])/', $k, $matches)) { + logger('bogus key: ' . $k); + $bogus_key = true; + } + } + array_walk($arr, 'dbesc_array_cb'); + if ($bogus_key) { + $arr['BOGUS.KEY'] = 1; + return false; + } + } + return true; } -function db_getfunc($f) { - $lookup = array( - 'rand'=>array( - DBTYPE_MYSQL=>'RAND()', - DBTYPE_POSTGRES=>'RANDOM()' - ), - 'utc_timestamp'=>array( - DBTYPE_MYSQL=>'UTC_TIMESTAMP()', - DBTYPE_POSTGRES=>"now() at time zone 'UTC'" - ), - 'regexp'=>array( - DBTYPE_MYSQL=>'REGEXP', - DBTYPE_POSTGRES=>'~' - ), - '^'=>array( - DBTYPE_MYSQL=>'^', - DBTYPE_POSTGRES=>'#' - ) - ); - $f = strtolower($f); - if(isset($lookup[$f]) && isset($lookup[$f][ACTIVE_DBTYPE])) - return $lookup[$f][ACTIVE_DBTYPE]; +function db_getfunc($f) +{ + $lookup = array( + 'rand'=>array( + DBTYPE_MYSQL=>'RAND()', + DBTYPE_POSTGRES=>'RANDOM()' + ), + 'utc_timestamp'=>array( + DBTYPE_MYSQL=>'UTC_TIMESTAMP()', + DBTYPE_POSTGRES=>"now() at time zone 'UTC'" + ), + 'regexp'=>array( + DBTYPE_MYSQL=>'REGEXP', + DBTYPE_POSTGRES=>'~' + ), + '^'=>array( + DBTYPE_MYSQL=>'^', + DBTYPE_POSTGRES=>'#' + ) + ); + $f = strtolower($f); + if (isset($lookup[$f]) && isset($lookup[$f][ACTIVE_DBTYPE])) { + return $lookup[$f][ACTIVE_DBTYPE]; + } - db_logger('Unable to abstract DB function "'. $f . '" for dbtype ' . ACTIVE_DBTYPE, LOGGER_DEBUG, LOG_ERR); - return $f; + db_logger('Unable to abstract DB function "'. $f . '" for dbtype ' . ACTIVE_DBTYPE, LOGGER_DEBUG, LOG_ERR); + return $f; } -function db_load_file($f) { - // db errors should get logged to the logfile - $str = @file_get_contents($f); - $arr = explode(';', $str); - if($arr) { - foreach($arr as $a) { - if(strlen(trim($a))) { - $r = dbq(trim($a)); - } - } - } +function db_load_file($f) +{ + // db errors should get logged to the logfile + $str = @file_get_contents($f); + $arr = explode(';', $str); + if ($arr) { + foreach ($arr as $a) { + if (strlen(trim($a))) { + $r = dbq(trim($a)); + } + } + } } @@ -450,65 +493,71 @@ function db_load_file($f) { // So this function preserves the current database debugging state and then turns it off // temporarily while doing the logger() call -function db_logger($s,$level = LOGGER_NORMAL,$syslog = LOG_INFO) { +function db_logger($s, $level = LOGGER_NORMAL, $syslog = LOG_INFO) +{ - if(\DBA::$logging || ! \DBA::$dba) - return; + if (DBA::$logging || ! DBA::$dba) { + return; + } - $saved = \DBA::$dba->debug; - \DBA::$dba->debug = false; - \DBA::$logging = true; - logger($s,$level,$syslog); - \DBA::$logging = false; - \DBA::$dba->debug = $saved; + $saved = DBA::$dba->debug; + DBA::$dba->debug = false; + DBA::$logging = true; + logger($s, $level, $syslog); + DBA::$logging = false; + DBA::$dba->debug = $saved; } -function db_columns($table) { +function db_columns($table) +{ - if($table) { - if(ACTIVE_DBTYPE === DBTYPE_POSTGRES) { - $r = q("SELECT column_name as field FROM information_schema.columns WHERE table_schema = 'public' AND table_name = '%s'", - dbesc($table) - ); - if($r) { - return ids_to_array($r,'field'); - } - } - else { - $r = q("show columns in %s", - dbesc($table) - ); - if($r) { - return ids_to_array($r,'Field'); - } - } - } + if ($table) { + if (ACTIVE_DBTYPE === DBTYPE_POSTGRES) { + $r = q( + "SELECT column_name as field FROM information_schema.columns WHERE table_schema = 'public' AND table_name = '%s'", + dbesc($table) + ); + if ($r) { + return ids_to_array($r, 'field'); + } + } else { + $r = q( + "show columns in %s", + dbesc($table) + ); + if ($r) { + return ids_to_array($r, 'Field'); + } + } + } - return []; + return []; } -function db_indexes($table) { +function db_indexes($table) +{ - if($table) { - if(ACTIVE_DBTYPE === DBTYPE_POSTGRES) { - $r = q("SELECT indexname from pg_indexes where tablename = '%s'", - dbesc($table) - ); - if($r) { - return ids_to_array($r,'indexname'); - } - } - else { - $r = q("show index from %s", - dbesc($table) - ); - if($r) { - return ids_to_array($r,'Key_name'); - } - } - } + if ($table) { + if (ACTIVE_DBTYPE === DBTYPE_POSTGRES) { + $r = q( + "SELECT indexname from pg_indexes where tablename = '%s'", + dbesc($table) + ); + if ($r) { + return ids_to_array($r, 'indexname'); + } + } else { + $r = q( + "show index from %s", + dbesc($table) + ); + if ($r) { + return ids_to_array($r, 'Key_name'); + } + } + } - return []; + return []; } diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php index de301a800..9009c03d2 100755 --- a/include/dba/dba_pdo.php +++ b/include/dba/dba_pdo.php @@ -6,180 +6,183 @@ require_once 'include/dba/dba_driver.php'; * @brief PDO based database driver. * */ -class dba_pdo extends dba_driver { +class dba_pdo extends dba_driver +{ - public $driver_dbtype = null; + public $driver_dbtype = null; - /** - * {@inheritDoc} - * @see dba_driver::connect() - */ - function connect($server, $scheme, $port, $user, $pass, $db) { + /** + * {@inheritDoc} + * @see dba_driver::connect() + */ + public function connect($server, $scheme, $port, $user, $pass, $db) + { - $this->driver_dbtype = $scheme; + $this->driver_dbtype = $scheme; - if(strpbrk($server,':;')) { - $dsn = $server; - } - else { - $dsn = $this->driver_dbtype . ':host=' . $server . (intval($port) ? ';port=' . $port : ''); - } + if (strpbrk($server, ':;')) { + $dsn = $server; + } else { + $dsn = $this->driver_dbtype . ':host=' . $server . (intval($port) ? ';port=' . $port : ''); + } - $dsn .= ';dbname=' . $db; + $dsn .= ';dbname=' . $db; - try { - $this->db = new PDO($dsn,$user,$pass); - $this->db->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_EXCEPTION); - } - catch(PDOException $e) { - if(file_exists('dbfail.out')) { - file_put_contents('dbfail.out', datetime_convert() . "\nConnect: " . $e->getMessage() . "\n", FILE_APPEND); - } + try { + $this->db = new PDO($dsn, $user, $pass); + $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + } catch (PDOException $e) { + if (file_exists('dbfail.out')) { + file_put_contents('dbfail.out', datetime_convert() . "\nConnect: " . $e->getMessage() . "\n", FILE_APPEND); + } - return false; - } + return false; + } - if($this->driver_dbtype === 'pgsql') - $this->q("SET standard_conforming_strings = 'off'; SET backslash_quote = 'on';"); + if ($this->driver_dbtype === 'pgsql') { + $this->q("SET standard_conforming_strings = 'off'; SET backslash_quote = 'on';"); + } - $this->connected = true; + $this->connected = true; - return true; - } + return true; + } - /** - * {@inheritDoc} - * @see dba_driver::q() - * - * @return bool|array|PDOStatement - * - \b false if not connected or PDOException occured on query - * - \b array with results on a SELECT query - * - \b PDOStatement on a non SELECT SQL query - */ - function q($sql) { - if((! $this->db) || (! $this->connected)) - return false; + /** + * {@inheritDoc} + * @return bool|array|PDOStatement + * - \b false if not connected or PDOException occured on query + * - \b array with results on a SELECT query + * - \b PDOStatement on a non SELECT SQL query + * @see dba_driver::q() + * + */ + public function q($sql) + { + if ((!$this->db) || (!$this->connected)) { + return false; + } - if($this->driver_dbtype === 'pgsql') { - if(substr(rtrim($sql),-1,1) !== ';') { - $sql .= ';'; - } - } + if ($this->driver_dbtype === 'pgsql') { + if (substr(rtrim($sql), -1, 1) !== ';') { + $sql .= ';'; + } + } - $result = null; - $this->error = ''; - $select = ((stripos($sql, 'select') === 0) ? true : false); + $result = null; + $this->error = ''; + $select = ((stripos($sql, 'select') === 0) ? true : false); - try { - $result = $this->db->query($sql, PDO::FETCH_ASSOC); - } - catch(PDOException $e) { + try { + $result = $this->db->query($sql, PDO::FETCH_ASSOC); + } catch (PDOException $e) { + $this->error = $e->getMessage(); + if ($this->error) { + db_logger('dba_pdo: ERROR: ' . printable($sql) . "\n" . $this->error, LOGGER_NORMAL, LOG_ERR); + if (file_exists('dbfail.out')) { + file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . "\n" . $this->error . "\n", FILE_APPEND); + } + } + } - $this->error = $e->getMessage(); - if($this->error) { - db_logger('dba_pdo: ERROR: ' . printable($sql) . "\n" . $this->error, LOGGER_NORMAL, LOG_ERR); - if(file_exists('dbfail.out')) { - file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . "\n" . $this->error . "\n", FILE_APPEND); - } - } - } + if (!($select)) { + if ($this->debug) { + db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returns ' . (($result) ? 'true' : 'false'), LOGGER_NORMAL, (($result) ? LOG_INFO : LOG_ERR)); + } + return $result; + } - if(!($select)) { - if($this->debug) { - db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returns ' . (($result) ? 'true' : 'false'), LOGGER_NORMAL,(($result) ? LOG_INFO : LOG_ERR)); - } - return $result; - } + $r = []; + if ($result) { + foreach ($result as $x) { + $r[] = $x; + } + } - $r = []; - if($result) { - foreach($result as $x) { - $r[] = $x; - } - } + if ($this->debug) { + db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returned ' . count($r) . ' results.', LOGGER_NORMAL, LOG_INFO); + if (intval($this->debug) > 1) { + db_logger('dba_pdo: ' . printable(print_r($r, true)), LOGGER_NORMAL, LOG_INFO); + } + } - if($this->debug) { - db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returned ' . count($r) . ' results.', LOGGER_NORMAL, LOG_INFO); - if(intval($this->debug) > 1) { - db_logger('dba_pdo: ' . printable(print_r($r,true)), LOGGER_NORMAL, LOG_INFO); - } - } + return (($this->error) ? false : $r); + } - return (($this->error) ? false : $r); - } + public function escape($str) + { + if ($this->db && $this->connected) { + return substr(substr(@$this->db->quote($str), 1), 0, -1); + } + } - function escape($str) { - if($this->db && $this->connected) { - return substr(substr(@$this->db->quote($str),1),0,-1); - } - } + public function close() + { + if ($this->db) { + $this->db = null; + } - function close() { - if($this->db) - $this->db = null; + $this->connected = false; + } - $this->connected = false; - } + public function concat($fld, $sep) + { + if ($this->driver_dbtype === 'pgsql') { + return 'string_agg(' . $fld . ',\'' . $sep . '\')'; + } else { + return 'GROUP_CONCAT(DISTINCT ' . $fld . ' SEPARATOR \'' . $sep . '\')'; + } + } - function concat($fld,$sep) { - if($this->driver_dbtype === 'pgsql') { - return 'string_agg(' . $fld . ',\'' . $sep . '\')'; - } - else { - return 'GROUP_CONCAT(DISTINCT ' . $fld . ' SEPARATOR \'' . $sep . '\')'; - } - } + public function use_index($str) + { + if ($this->driver_dbtype === 'pgsql') { + return ''; + } else { + return 'USE INDEX( ' . $str . ')'; + } + } - function use_index($str) { - if($this->driver_dbtype === 'pgsql') { - return ''; - } - else { - return 'USE INDEX( ' . $str . ')'; - } - } + public function quote_interval($txt) + { + if ($this->driver_dbtype === 'pgsql') { + return "'$txt'"; + } else { + return $txt; + } + } - function quote_interval($txt) { - if($this->driver_dbtype === 'pgsql') { - return "'$txt'"; - } - else { - return $txt; - } - } + // These two functions assume that postgres standard_conforming_strings is set to off; + // which we perform during DB open. - // These two functions assume that postgres standard_conforming_strings is set to off; - // which we perform during DB open. + public function escapebin($str) + { + if ($this->driver_dbtype === 'pgsql') { + return "\\\\x" . bin2hex($str); + } else { + return $this->escape($str); + } + } - function escapebin($str) { - if($this->driver_dbtype === 'pgsql') { - return "\\\\x" . bin2hex($str); - } - else { - return $this->escape($str); - } - } - - function unescapebin($str) { - if(gettype($str) === 'resource') { - $x = ''; - while(! feof($str)) { - $x .= fread($str,8192); - } - if(substr($x,0,2) === '\\x') { - $x = hex2bin(substr($x,2)); - } - return $x; - - } - else { - return $str; - } - } + public function unescapebin($str) + { + if (gettype($str) === 'resource') { + $x = ''; + while (!feof($str)) { + $x .= fread($str, 8192); + } + if (substr($x, 0, 2) === '\\x') { + $x = hex2bin(substr($x, 2)); + } + return $x; + } else { + return $str; + } + } - function getdriver() { - return 'pdo'; - } - + public function getdriver() + { + return 'pdo'; + } } diff --git a/include/event.php b/include/event.php index 4136abcd5..1a6d5784e 100644 --- a/include/event.php +++ b/include/event.php @@ -1,4 +1,5 @@ ' . "\r\n"; + $o = '$str_month $y "; - for ($a = 0; $a < 7; $a ++) - $o .= ' ' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . ' '; + $str_month = day_translate($mtab[$m]); + $o = ''; + $o .= "
'."\r\n"; + $o .= '$str_month $y "; + for ($a = 0; $a < 7; $a++) { + $o .= ' ' . mb_substr(day_translate($dn[$a]), 0, 3, 'UTF-8') . ' '; + } - $o .= ''; + $o .= ' '; - while ($d <= $l) { - if (($dow == $f) && (! $started)) - $started = true; + while ($d <= $l) { + if (($dow == $f) && (! $started)) { + $started = true; + } - $today = (((isset($tddate)) && ($tddate == $d)) ? "class=\"today\" " : ''); - $o .= " "; - $day = str_replace(' ',' ',sprintf('%2.2d', $d)); - if ($started) { - if (is_array($links) && isset($links[$d])) - $o .= "$day"; - else - $o .= $day; + $today = (((isset($tddate)) && ($tddate == $d)) ? "class=\"today\" " : ''); + $o .= " "; + $day = str_replace(' ', ' ', sprintf('%2.2d', $d)); + if ($started) { + if (is_array($links) && isset($links[$d])) { + $o .= "$day"; + } else { + $o .= $day; + } - $d ++; - } else { - $o .= ' '; - } + $d++; + } else { + $o .= ' '; + } - $o .= ' '; - $dow ++; - if (($dow == 7) && ($d <= $l)) { - $dow = 0; - $o .= ''; - } - } - if ($dow) - for ($a = $dow; $a < 7; $a ++) - $o .= ' '; + } + } + if ($dow) { + for ($a = $dow; $a < 7; $a++) { + $o .= ' ' . zidify_links(smilies(bbcode($ev['summary']))) . '
' . "\r\n"; - $o .= '' . zidify_links(smilies(bbcode($ev['summary']))) . '
' . t('Starts:') . ' ' - . (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), - $ev['dtstart'] , $bd_format )) - : day_translate(datetime_convert('UTC', 'UTC', - $ev['dtstart'] , $bd_format))) - . '' . "\r\n"; + $o .= '' . t('Starts:') . ' ' + . (($ev['adjust']) ? day_translate(datetime_convert( + 'UTC', + date_default_timezone_get(), + $ev['dtstart'], + $bd_format + )) + : day_translate(datetime_convert( + 'UTC', + 'UTC', + $ev['dtstart'], + $bd_format + ))) + . '' . "\r\n"; - if(! $ev['nofinish']) - $o .= '' . t('Finishes:') . ' ' - . (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), - $ev['dtend'] , $bd_format )) - : day_translate(datetime_convert('UTC', 'UTC', - $ev['dtend'] , $bd_format ))) - . '' . "\r\n"; + if (! $ev['nofinish']) { + $o .= '' . t('Finishes:') . ' ' + . (($ev['adjust']) ? day_translate(datetime_convert( + 'UTC', + date_default_timezone_get(), + $ev['dtend'], + $bd_format + )) + : day_translate(datetime_convert( + 'UTC', + 'UTC', + $ev['dtend'], + $bd_format + ))) + . '' . "\r\n"; + } - $o .= '' . zidify_links(smilies(bbcode($ev['description']))) . '' . "\r\n"; + $o .= '' . zidify_links(smilies(bbcode($ev['description']))) . '' . "\r\n"; - if(isset($ev['location']) && strlen($ev['location'])) - $o .= '' . t('Location:') . ' ' - . zidify_links(smilies(bbcode($ev['location']))) - . '' . "\r\n"; + if (isset($ev['location']) && strlen($ev['location'])) { + $o .= '' . t('Location:') . ' ' + . zidify_links(smilies(bbcode($ev['location']))) + . '' . "\r\n"; + } - $o .= '$name \r\n"; - $o .= "$uri \r\n"; - $o .= ' ' . "\r\n"; - $o .= ' ' . "\r\n"; + $o .= "<$tag>\r\n"; + $o .= "$name \r\n"; + $o .= "$uri \r\n"; + $o .= ' ' . "\r\n"; + $o .= ' ' . "\r\n"; - /** - * @hooks atom_author - * Possibility to add further tags to returned XML string - * * \e string - The created XML tag as a string without closing tag - */ - call_hooks('atom_author', $o); + /** + * @hooks atom_author + * Possibility to add further tags to returned XML string + * * \e string - The created XML tag as a string without closing tag + */ + call_hooks('atom_author', $o); - $o .= "\r\n"; + $o .= "\r\n"; - return $o; + return $o; } @@ -216,56 +227,58 @@ function atom_author($tag, $nick, $name, $uri, $h, $w, $type, $photo) { * @param array $xchan * @return string */ -function atom_render_author($tag, $xchan) { +function atom_render_author($tag, $xchan) +{ - $nick = xmlify(substr($xchan['xchan_addr'], 0, strpos($xchan['xchan_addr'], '@'))); - $id = xmlify($xchan['xchan_url']); - $name = xmlify($xchan['xchan_name']); - $photo = xmlify($xchan['xchan_photo_l']); - $type = xmlify($xchan['xchan_photo_mimetype']); - $w = $h = 300; + $nick = xmlify(substr($xchan['xchan_addr'], 0, strpos($xchan['xchan_addr'], '@'))); + $id = xmlify($xchan['xchan_url']); + $name = xmlify($xchan['xchan_name']); + $photo = xmlify($xchan['xchan_photo_l']); + $type = xmlify($xchan['xchan_photo_mimetype']); + $w = $h = 300; - $o = "<$tag>\r\n"; - $o .= "$name \r\n"; - $o .= "$id \r\n"; - $o .= ' ' . "\r\n"; - $o .= ' ' . "\r\n"; + $o = "<$tag>\r\n"; + $o .= "$name \r\n"; + $o .= "$id \r\n"; + $o .= ' ' . "\r\n"; + $o .= ' ' . "\r\n"; - /** - * @hooks atom_render_author - * Possibility to add further tags to returned XML string. - * * \e string The created XML tag as a string without closing tag - */ - call_hooks('atom_render_author', $o); + /** + * @hooks atom_render_author + * Possibility to add further tags to returned XML string. + * * \e string The created XML tag as a string without closing tag + */ + call_hooks('atom_render_author', $o); - $o .= "\r\n"; + $o .= "\r\n"; - return $o; + return $o; } -function compat_photos_list($s) { +function compat_photos_list($s) +{ - $ret = []; + $ret = []; - $found = preg_match_all('/\[[zi]mg(.*?)\](.*?)\[/ism',$s,$matches,PREG_SET_ORDER); + $found = preg_match_all('/\[[zi]mg(.*?)\](.*?)\[/ism', $s, $matches, PREG_SET_ORDER); - if($found) { - foreach($matches as $match) { - $entry = [ - 'href' => $match[2], - 'type' => guess_image_type($match[2]) - ]; - $sizer = new \Zotlabs\Lib\Img_filesize($match[2]); - $size = $sizer->getSize(); - if(intval($size)) { - $entry['length'] = intval($size); - } + if ($found) { + foreach ($matches as $match) { + $entry = [ + 'href' => $match[2], + 'type' => guess_image_type($match[2]) + ]; + $sizer = new Img_filesize($match[2]); + $size = $sizer->getSize(); + if (intval($size)) { + $entry['length'] = intval($size); + } - $ret[] = $entry; - } - } + $ret[] = $entry; + } + } - return $ret; + return $ret; } @@ -280,131 +293,134 @@ function compat_photos_list($s) { * @param array $owner * @param string $comment default false * @param number $cid default 0 - * @param boolean $compat default false + * @param bool $compat default false * @return void|string */ -function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0, $compat = false) { +function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0, $compat = false) +{ - if(! $item['parent']) - return; + if (! $item['parent']) { + return; + } - if($item['deleted']) - return '\r\n"; + $o = "\r\n\r\n ' . "\r\n"; - - // build array to pass to hook - $x = [ - 'item' => $item, - 'type' => $type, - 'author' => $author, - 'owner' => $owner, - 'comment' => $comment, - 'abook_id' => $cid, - 'entry' => $o - ]; - /** - * @hooks atom_entry - * * \e array \b item - * * \e string \b type - * * \e array \b author - * * \e array \b owner - * * \e string \b comment - * * \e number \b abook_id - * * \e string \b entry - The generated entry and what will get returned - */ - call_hooks('atom_entry', $x); - - return $x['entry']; + return $x['entry']; } -function get_mentions($item,$tags) { - $o = ''; +function get_mentions($item, $tags) +{ + $o = ''; - if(! count($tags)) - return $o; + if (! count($tags)) { + return $o; + } - foreach($tags as $x) { - if($x['ttype'] == TERM_MENTION) { - $o .= "\t\t" . '' . "\r\n"; - } - } - return $o; + foreach ($tags as $x) { + if ($x['ttype'] == TERM_MENTION) { + $o .= "\t\t" . '' . "\r\n"; + } + } + return $o; } diff --git a/include/help.php b/include/help.php index 78ce709e2..4a67f2603 100644 --- a/include/help.php +++ b/include/help.php @@ -1,6 +1,5 @@ 1) { - for ($x = 1; $x < argc(); $x ++) { - if ($path) { - $path .= '/'; - } - $path .= App::$argv[$x]; - } - } + $path = ''; + if (argc() > 1) { + for ($x = 1; $x < argc(); $x++) { + if ($path) { + $path .= '/'; + } + $path .= App::$argv[$x]; + } + } - $fullpath = get_help_fullpath($path); + $fullpath = get_help_fullpath($path); - $text = load_doc_file($fullpath); + $text = load_doc_file($fullpath); - App::$page['title'] = t('Help'); + App::$page['title'] = t('Help'); - $content = bbcode($text); + $content = bbcode($text); - return translate_projectname($content); + return translate_projectname($content); } -function preg_callback_help_include($matches) { - - if($matches[1]) { - $include = str_replace($matches[0],load_doc_file($matches[1]),$matches[0]); - if(preg_match('/\.bb$/', $matches[1]) || preg_match('/\.txt$/', $matches[1])) { - require_once('include/bbcode.php'); - $include = zidify_links(bbcode($include)); - $include = str_replace(' target="_blank"','',$include); - } - elseif(preg_match('/\.md$/', $matches[1])) { - $include = MarkdownExtra::defaultTransform($include); - } - return $include; - } +function preg_callback_help_include($matches) +{ + if ($matches[1]) { + $include = str_replace($matches[0], load_doc_file($matches[1]), $matches[0]); + if (preg_match('/\.bb$/', $matches[1]) || preg_match('/\.txt$/', $matches[1])) { + require_once('include/bbcode.php'); + $include = zidify_links(bbcode($include)); + $include = str_replace(' target="_blank"', '', $include); + } elseif (preg_match('/\.md$/', $matches[1])) { + $include = MarkdownExtra::defaultTransform($include); + } + return $include; + } } /** * @brief * - * @return boolean|array + * @return bool|array */ -function determine_help_language() { +function determine_help_language() +{ - require_once('library/text_languagedetect/Text/LanguageDetect.php'); + require_once('library/text_languagedetect/Text/LanguageDetect.php'); - $lang_detect = new Text_LanguageDetect(); - // Set this mode to recognize language by the short code like "en", "ru", etc. - $lang_detect->setNameMode(2); - // If the language was specified in the URL, override the language preference - // of the browser. Default to English if both of these are absent. - if($lang_detect->languageExists(argv(1))) { - $lang = argv(1); - $from_url = true; - } else { - $lang = \App::$language; - if(! isset($lang)) - $lang = 'en'; + $lang_detect = new Text_LanguageDetect(); + // Set this mode to recognize language by the short code like "en", "ru", etc. + $lang_detect->setNameMode(2); + // If the language was specified in the URL, override the language preference + // of the browser. Default to English if both of these are absent. + if ($lang_detect->languageExists(argv(1))) { + $lang = argv(1); + $from_url = true; + } else { + $lang = App::$language; + if (! isset($lang)) { + $lang = 'en'; + } - $from_url = false; - } + $from_url = false; + } - return array('language' => $lang, 'from_url' => $from_url); + return array('language' => $lang, 'from_url' => $from_url); } -function load_doc_file($s) { +function load_doc_file($s) +{ - $c = find_doc_file($s); - if($c) - return $c; - return ''; + $c = find_doc_file($s); + if ($c) { + return $c; + } + return ''; } -function find_doc_file($s) { - if(file_exists($s)) { - return file_get_contents($s); - } - return ''; +function find_doc_file($s) +{ + if (file_exists($s)) { + return file_get_contents($s); + } + return ''; } /** * @brief * * @param string $s - * @return number|mixed|unknown|boolean + * @return number|mixed|unknown|bool */ -function search_doc_files($s) { +function search_doc_files($s) +{ - App::set_pager_itemspage(60); - $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start'])); + App::set_pager_itemspage(60); + $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); - $regexop = db_getfunc('REGEXP'); + $regexop = db_getfunc('REGEXP'); - $r = q("select iconfig.v, item.* from item left join iconfig on item.id = iconfig.iid + $r = q( + "select iconfig.v, item.* from item left join iconfig on item.id = iconfig.iid where iconfig.cat = 'system' and iconfig.k = 'docfile' and body $regexop '%s' and item_type = %d $pager_sql", - dbesc($s), - intval(ITEM_TYPE_DOC) - ); + dbesc($s), + intval(ITEM_TYPE_DOC) + ); - $r = fetch_post_tags($r, true); + $r = fetch_post_tags($r, true); - for($x = 0; $x < count($r); $x ++) { - $position = stripos($r[$x]['body'], $s); - $dislen = 300; - $start = $position-floor($dislen/2); - if ( $start < 0) { - $start = 0; - } - $r[$x]['text'] = substr($r[$x]['body'], $start, $dislen); + for ($x = 0; $x < count($r); $x++) { + $position = stripos($r[$x]['body'], $s); + $dislen = 300; + $start = $position - floor($dislen / 2); + if ($start < 0) { + $start = 0; + } + $r[$x]['text'] = substr($r[$x]['body'], $start, $dislen); - $r[$x]['rank'] = 0; - if($r[$x]['term']) { - foreach($r[$x]['term'] as $t) { - if(stristr($t['term'],$s)) { - $r[$x]['rank'] ++; - } - } - } - if(stristr($r[$x]['v'], $s)) - $r[$x]['rank'] ++; - $r[$x]['rank'] += substr_count(strtolower($r[$x]['text']), strtolower($s)); - // bias the results to the observer's native language - if($r[$x]['lang'] === App::$language) - $r[$x]['rank'] = $r[$x]['rank'] + 10; + $r[$x]['rank'] = 0; + if ($r[$x]['term']) { + foreach ($r[$x]['term'] as $t) { + if (stristr($t['term'], $s)) { + $r[$x]['rank'] ++; + } + } + } + if (stristr($r[$x]['v'], $s)) { + $r[$x]['rank'] ++; + } + $r[$x]['rank'] += substr_count(strtolower($r[$x]['text']), strtolower($s)); + // bias the results to the observer's native language + if ($r[$x]['lang'] === App::$language) { + $r[$x]['rank'] = $r[$x]['rank'] + 10; + } + } + usort($r, 'doc_rank_sort'); - } - usort($r,'doc_rank_sort'); - - return $r; + return $r; } -function doc_rank_sort($s1, $s2) { - if($s1['rank'] == $s2['rank']) - return 0; +function doc_rank_sort($s1, $s2) +{ + if ($s1['rank'] == $s2['rank']) { + return 0; + } - return (($s1['rank'] < $s2['rank']) ? 1 : (-1)); + return (($s1['rank'] < $s2['rank']) ? 1 : (-1)); } /** @@ -198,78 +209,82 @@ function doc_rank_sort($s1, $s2) { * @return string */ -function load_context_help() { +function load_context_help() +{ - $path = App::$cmd; - $args = App::$argv; - $lang = App::$language; + $path = App::$cmd; + $args = App::$argv; + $lang = App::$language; - if(! isset($lang) || !is_dir('doc/context/' . $lang . '/')) { - $lang = 'en'; - } - while($path) { - $context_help = load_doc_file('doc/context/' . $lang . '/' . $path . '/help.html'); - if(!$context_help) { - // Fallback to English if the translation is absent - $context_help = load_doc_file('doc/context/en/' . $path . '/help.html'); - } - if($context_help) - break; + if (! isset($lang) || !is_dir('doc/context/' . $lang . '/')) { + $lang = 'en'; + } + while ($path) { + $context_help = load_doc_file('doc/context/' . $lang . '/' . $path . '/help.html'); + if (!$context_help) { + // Fallback to English if the translation is absent + $context_help = load_doc_file('doc/context/en/' . $path . '/help.html'); + } + if ($context_help) { + break; + } - array_pop($args); - $path = implode('/',$args); - } + array_pop($args); + $path = implode('/', $args); + } - return $context_help; + return $context_help; } /** * @brief * * @param string $s - * @return void|boolean[]|number[]|string[]|unknown[] + * @return void|bool|number[]|string[]|unknown[] */ -function store_doc_file($s) { +function store_doc_file($s) +{ - if(is_dir($s)) - return; + if (is_dir($s)) { + return; + } - $item = []; - $sys = get_sys_channel(); + $item = []; + $sys = get_sys_channel(); - $item['aid'] = 0; - $item['uid'] = $sys['channel_id']; + $item['aid'] = 0; + $item['uid'] = $sys['channel_id']; - $mimetype = 'text/x-multicode'; + $mimetype = 'text/x-multicode'; - require_once('include/html2plain.php'); + require_once('include/html2plain.php'); - $item['body'] = html2plain(prepare_text(file_get_contents($s),$mimetype, [ 'cache' => true ])); - $item['mimetype'] = 'text/plain'; + $item['body'] = html2plain(prepare_text(file_get_contents($s), $mimetype, [ 'cache' => true ])); + $item['mimetype'] = 'text/plain'; - $item['plink'] = z_root() . '/' . str_replace('doc','help',$s); - $item['owner_xchan'] = $item['author_xchan'] = $sys['channel_hash']; - $item['item_type'] = ITEM_TYPE_DOC; + $item['plink'] = z_root() . '/' . str_replace('doc', 'help', $s); + $item['owner_xchan'] = $item['author_xchan'] = $sys['channel_hash']; + $item['item_type'] = ITEM_TYPE_DOC; - $r = q("select item.* from item left join iconfig on item.id = iconfig.iid + $r = q( + "select item.* from item left join iconfig on item.id = iconfig.iid where iconfig.cat = 'system' and iconfig.k = 'docfile' and iconfig.v = '%s' and item_type = %d limit 1", - dbesc($s), - intval(ITEM_TYPE_DOC) - ); + dbesc($s), + intval(ITEM_TYPE_DOC) + ); - IConfig::Set($item,'system','docfile',$s); + IConfig::Set($item, 'system', 'docfile', $s); - if($r) { - $item['id'] = $r[0]['id']; - $item['mid'] = $item['parent_mid'] = $r[0]['mid']; - $x = item_store_update($item); - } - else { - $item['uuid'] = new_uuid(); - $item['mid'] = $item['parent_mid'] = z_root() . '/item/' . $item['uuid']; - $x = item_store($item); - } + if ($r) { + $item['id'] = $r[0]['id']; + $item['mid'] = $item['parent_mid'] = $r[0]['mid']; + $x = item_store_update($item); + } else { + $item['uuid'] = new_uuid(); + $item['mid'] = $item['parent_mid'] = z_root() . '/item/' . $item['uuid']; + $x = item_store($item); + } - return $x; + return $x; } diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 1901d991c..e4533d2d7 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -1,320 +1,332 @@ -query("//".$oldnode); - foreach ($list as $oldNode) { + $list = $xpath->query("//" . $oldnode); + foreach ($list as $oldNode) { + $attr = []; + if ($oldNode->attributes->length) { + foreach ($oldNode->attributes as $attribute) { + $attr[$attribute->name] = $attribute->value; + } + } - $attr = []; - if ($oldNode->attributes->length) - foreach ($oldNode->attributes as $attribute) - $attr[$attribute->name] = $attribute->value; + $replace = true; - $replace = true; + $startbb = $savestart; - $startbb = $savestart; + $i = 0; - $i = 0; + foreach ($attributes as $attribute => $value) { + $startbb = str_replace('\x01' . ++$i, '$1', $startbb); - foreach ($attributes as $attribute => $value) { + if (strpos('*' . $startbb, '$1') > 0) { + if ($replace and (@$attr[$attribute] != '')) { + $startbb = preg_replace($value, $startbb, $attr[$attribute], -1, $count); - $startbb = str_replace('\x01'.++$i, '$1', $startbb); + // If nothing could be changed + if ($count == 0) { + $replace = false; + } + } else { + $replace = false; + } + } else { + if (@$attr[$attribute] != $value) { + $replace = false; + } + } + } - if (strpos('*'.$startbb, '$1') > 0) { + if ($replace) { + $StartCode = $oldNode->ownerDocument->createTextNode($startbb); + $EndCode = $oldNode->ownerDocument->createTextNode($endbb); - if ($replace and (@$attr[$attribute] != '')) { + $oldNode->parentNode->insertBefore($StartCode, $oldNode); - $startbb = preg_replace($value, $startbb, $attr[$attribute], -1, $count); + if ($oldNode->hasChildNodes()) { + foreach ($oldNode->childNodes as $child) { + $newNode = $child->cloneNode(true); + $oldNode->parentNode->insertBefore($newNode, $oldNode); + } + } - // If nothing could be changed - if ($count == 0) - $replace = false; - } else - $replace = false; - } else { - if (@$attr[$attribute] != $value) - $replace = false; - } - } - - if ($replace) { - $StartCode = $oldNode->ownerDocument->createTextNode($startbb); - $EndCode = $oldNode->ownerDocument->createTextNode($endbb); - - $oldNode->parentNode->insertBefore($StartCode, $oldNode); - - if ($oldNode->hasChildNodes()) { - foreach ($oldNode->childNodes as $child) { - $newNode = $child->cloneNode(true); - $oldNode->parentNode->insertBefore($newNode, $oldNode); - } - } - - $oldNode->parentNode->insertBefore($EndCode, $oldNode); - $oldNode->parentNode->removeChild($oldNode); - } - } - return($replace); + $oldNode->parentNode->insertBefore($EndCode, $oldNode); + $oldNode->parentNode->removeChild($oldNode); + } + } + return($replace); } function deletenode(&$doc, $node) { - $xpath = new DomXPath($doc); - $list = $xpath->query("//".$node); - foreach ($list as $child) - $child->parentNode->removeChild($child); + $xpath = new DomXPath($doc); + $list = $xpath->query("//" . $node); + foreach ($list as $child) { + $child->parentNode->removeChild($child); + } } -function svg2bbcode($match) { +function svg2bbcode($match) +{ - $params = $match[1]; - $s = $match[2]; - - $output = '\r\n"; - if(is_array($author)) { - $o .= atom_render_author('author',$author); - } - else { - $o .= atom_render_author('author',$item['author']); - } + if (is_array($author)) { + $o .= atom_render_author('author', $author); + } else { + $o .= atom_render_author('author', $item['author']); + } - if(($item['parent'] != $item['id']) || ($item['parent_mid'] !== $item['mid']) || (($item['thr_parent'] !== '') && ($item['thr_parent'] !== $item['mid']))) { - $parent_item = (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']); + if (($item['parent'] != $item['id']) || ($item['parent_mid'] !== $item['mid']) || (($item['thr_parent'] !== '') && ($item['thr_parent'] !== $item['mid']))) { + $parent_item = (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']); - $o .= ' ' . "\r\n"; - if($item['attach']) { - $enclosures = json_decode($item['attach'], true); - if($enclosures) { - foreach($enclosures as $enc) { - $o .= '' . "\r\n"; - } - } - } + // build array to pass to hook + $x = [ + 'item' => $item, + 'type' => $type, + 'author' => $author, + 'owner' => $owner, + 'comment' => $comment, + 'abook_id' => $cid, + 'entry' => $o + ]; + /** + * @hooks atom_entry + * * \e array \b item + * * \e string \b type + * * \e array \b author + * * \e array \b owner + * * \e string \b comment + * * \e number \b abook_id + * * \e string \b entry - The generated entry and what will get returned + */ + call_hooks('atom_entry', $x); - if($item['term']) { - foreach($item['term'] as $term) { - $scheme = ''; - $label = ''; - switch($term['ttype']) { - case TERM_HASHTAG: - $scheme = NAMESPACE_ZOT . '/term/hashtag'; - $label = '#' . str_replace('"','',$term['term']); - break; - case TERM_CATEGORY: - $scheme = NAMESPACE_ZOT . '/term/category'; - $label = str_replace('"','',$term['term']); - break; - default: - break; - } - if(! $scheme) - continue; - - $o .= '' . xmlify($item['title']) . ' ' . "\r\n"; + if ($summary) { + $o .= '' . xmlify(prepare_text($summary, $item['mimetype'])) . ' ' . "\r\n"; + } + $o .= '' . xmlify(prepare_text($body, $item['mimetype'])) . ' ' . "\r\n"; + } + + $o .= '' . xmlify($item['mid']) . ' ' . "\r\n"; + $o .= '' . xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00', ATOM_TIME)) . ' ' . "\r\n"; + $o .= '' . xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00', ATOM_TIME)) . ' ' . "\r\n"; + + $o .= '' . "\r\n"; - else { - $o .= '' . xmlify($item['title']) . ' ' . "\r\n"; - if($summary) - $o .= '' . xmlify(prepare_text($summary,$item['mimetype'])) . ' ' . "\r\n"; - $o .= '' . xmlify(prepare_text($body,$item['mimetype'])) . ' ' . "\r\n"; - } + if ($item['attach']) { + $enclosures = json_decode($item['attach'], true); + if ($enclosures) { + foreach ($enclosures as $enc) { + $o .= '' . "\r\n"; + } + } + } - $o .= '' . xmlify($item['mid']) . ' ' . "\r\n"; - $o .= '' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . ' ' . "\r\n"; - $o .= '' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . ' ' . "\r\n"; + if ($item['term']) { + foreach ($item['term'] as $term) { + $scheme = ''; + $label = ''; + switch ($term['ttype']) { + case TERM_HASHTAG: + $scheme = NAMESPACE_ZOT . '/term/hashtag'; + $label = '#' . str_replace('"', '', $term['term']); + break; + case TERM_CATEGORY: + $scheme = NAMESPACE_ZOT . '/term/category'; + $label = str_replace('"', '', $term['term']); + break; + default: + break; + } + if (! $scheme) { + continue; + } - $o .= '' . "\r\n"; + $o .= '' . "\r\n"; + } + } + $o .= ' ' . "\r\n"; - } - } - - $o .= ' ", - "
- ", - "
"), - $message); + $message = str_replace( + array( + "", + "
- ", + "
"), + $message + ); - // remove namespaces - $message = preg_replace('=<(\w+):(.+?)>=', '', $message); - $message = preg_replace('==', ' ', $message); + // remove namespaces + $message = preg_replace('=<(\w+):(.+?)>=', '', $message); + $message = preg_replace('==', ' ', $message); - $doc = new DOMDocument(); - $doc->preserveWhiteSpace = false; + $doc = new DOMDocument(); + $doc->preserveWhiteSpace = false; - $tmp_message = mb_convert_encoding($message, 'HTML-ENTITIES', "UTF-8"); + $tmp_message = mb_convert_encoding($message, 'HTML-ENTITIES', "UTF-8"); - if (! $tmp_message) { - logger('mb_convert_encoding failed: ' . $message); - return EMPTY_STR; - } + if (! $tmp_message) { + logger('mb_convert_encoding failed: ' . $message); + return EMPTY_STR; + } - @$doc->loadHTML($tmp_message); + @$doc->loadHTML($tmp_message); - deletenode($doc, 'style'); - deletenode($doc, 'head'); - deletenode($doc, 'title'); - deletenode($doc, 'meta'); - deletenode($doc, 'xml'); - deletenode($doc, 'removeme'); + deletenode($doc, 'style'); + deletenode($doc, 'head'); + deletenode($doc, 'title'); + deletenode($doc, 'meta'); + deletenode($doc, 'xml'); + deletenode($doc, 'removeme'); - $xpath = new DomXPath($doc); - $list = $xpath->query("//pre"); - foreach ($list as $node) - $node->nodeValue = str_replace("\n", "\r", $node->nodeValue); + $xpath = new DomXPath($doc); + $list = $xpath->query("//pre"); + foreach ($list as $node) { + $node->nodeValue = str_replace("\n", "\r", $node->nodeValue); + } - $message = $doc->saveHTML(); - $message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "
", " ", ""), $message); - $message = preg_replace('= [\s]*=i', " ", $message); - @$doc->loadHTML($message); + $message = $doc->saveHTML(); + $message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "
", " ", ""), $message); + $message = preg_replace('= [\s]*=i', " ", $message); + @$doc->loadHTML($message); - node2bbcode($doc, 'html', [], "", ""); - node2bbcode($doc, 'body', [], "", ""); + node2bbcode($doc, 'html', [], "", ""); + node2bbcode($doc, 'body', [], "", ""); - // Outlook-Quote - Variant 1 - node2bbcode($doc, 'p', array('class'=>'MsoNormal', 'style'=>'margin-left:35.4pt'), '[quote]', '[/quote]'); + // Outlook-Quote - Variant 1 + node2bbcode($doc, 'p', array('class' => 'MsoNormal', 'style' => 'margin-left:35.4pt'), '[quote]', '[/quote]'); - // Outlook-Quote - Variant 2 - node2bbcode($doc, 'div', array('style'=>'border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 4.0pt'), '[quote]', '[/quote]'); + // Outlook-Quote - Variant 2 + node2bbcode($doc, 'div', array('style' => 'border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 4.0pt'), '[quote]', '[/quote]'); - // MyBB-Stuff - node2bbcode($doc, 'span', array('style'=>'text-decoration: underline;'), '[u]', '[/u]'); - node2bbcode($doc, 'span', array('style'=>'font-style: italic;'), '[i]', '[/i]'); - node2bbcode($doc, 'span', array('style'=>'font-weight: bold;'), '[b]', '[/b]'); + // MyBB-Stuff + node2bbcode($doc, 'span', array('style' => 'text-decoration: underline;'), '[u]', '[/u]'); + node2bbcode($doc, 'span', array('style' => 'font-style: italic;'), '[i]', '[/i]'); + node2bbcode($doc, 'span', array('style' => 'font-weight: bold;'), '[b]', '[/b]'); - /*node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[font=$1][size=$2][color=$3]', '[/color][/size][/font]'); - node2bbcode($doc, 'font', array('size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[size=$1][color=$2]', '[/color][/size]'); - node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(.+)/'), '[font=$1][size=$2]', '[/size][/font]'); - node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'color'=>'/(.+)/'), '[font=$1][color=$3]', '[/color][/font]'); - node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/'), '[font=$1]', '[/font]'); - node2bbcode($doc, 'font', array('size'=>'/(\d+)/'), '[size=$1]', '[/size]'); - node2bbcode($doc, 'font', array('color'=>'/(.+)/'), '[color=$1]', '[/color]'); + /*node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[font=$1][size=$2][color=$3]', '[/color][/size][/font]'); + node2bbcode($doc, 'font', array('size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[size=$1][color=$2]', '[/color][/size]'); + node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(.+)/'), '[font=$1][size=$2]', '[/size][/font]'); + node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'color'=>'/(.+)/'), '[font=$1][color=$3]', '[/color][/font]'); + node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/'), '[font=$1]', '[/font]'); + node2bbcode($doc, 'font', array('size'=>'/(\d+)/'), '[size=$1]', '[/size]'); + node2bbcode($doc, 'font', array('color'=>'/(.+)/'), '[color=$1]', '[/color]'); */ - // Untested - //node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(.+?)[,;].*font-family:\s*(.+?)[,;].*color:\s*(.+?)[,;].*/'), '[size=$1][font=$2][color=$3]', '[/color][/font][/size]'); - //node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(\d+)[,;].*/'), '[size=$1]', '[/size]'); - //node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(.+?)[,;].*/'), '[size=$1]', '[/size]'); + // Untested + //node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(.+?)[,;].*font-family:\s*(.+?)[,;].*color:\s*(.+?)[,;].*/'), '[size=$1][font=$2][color=$3]', '[/color][/font][/size]'); + //node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(\d+)[,;].*/'), '[size=$1]', '[/size]'); + //node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(.+?)[,;].*/'), '[size=$1]', '[/size]'); - node2bbcode($doc, 'span', array('style'=>'/.*color:\s*(.+?)[,;].*/'), '[color="$1"]', '[/color]'); - //node2bbcode($doc, 'span', array('style'=>'/.*font-family:\s*(.+?)[,;].*/'), '[font=$1]', '[/font]'); + node2bbcode($doc, 'span', array('style' => '/.*color:\s*(.+?)[,;].*/'), '[color="$1"]', '[/color]'); + //node2bbcode($doc, 'span', array('style'=>'/.*font-family:\s*(.+?)[,;].*/'), '[font=$1]', '[/font]'); - //node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*font-size:\s*(\d+?)pt.*/'), '[font=$1][size=$2]', '[/size][/font]'); - //node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*font-size:\s*(\d+?)px.*/'), '[font=$1][size=$2]', '[/size][/font]'); - //node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*/'), '[font=$1]', '[/font]'); + //node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*font-size:\s*(\d+?)pt.*/'), '[font=$1][size=$2]', '[/size][/font]'); + //node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*font-size:\s*(\d+?)px.*/'), '[font=$1][size=$2]', '[/size][/font]'); + //node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*/'), '[font=$1]', '[/font]'); - node2bbcode($doc, 'strong', [], '[b]', '[/b]'); - node2bbcode($doc, 'em', [], '[i]', '[/i]'); - node2bbcode($doc, 'b', [], '[b]', '[/b]'); - node2bbcode($doc, 'i', [], '[i]', '[/i]'); - node2bbcode($doc, 'u', [], '[u]', '[/u]'); - node2bbcode($doc, 's', [], '[s]', '[/s]'); + node2bbcode($doc, 'strong', [], '[b]', '[/b]'); + node2bbcode($doc, 'em', [], '[i]', '[/i]'); + node2bbcode($doc, 'b', [], '[b]', '[/b]'); + node2bbcode($doc, 'i', [], '[i]', '[/i]'); + node2bbcode($doc, 'u', [], '[u]', '[/u]'); + node2bbcode($doc, 's', [], '[s]', '[/s]'); - node2bbcode($doc, 'big', [], "[size=large]", "[/size]"); - node2bbcode($doc, 'small', [], "[size=small]", "[/size]"); + node2bbcode($doc, 'big', [], "[size=large]", "[/size]"); + node2bbcode($doc, 'small', [], "[size=small]", "[/size]"); - node2bbcode($doc, 'blockquote', [], '[quote]', '[/quote]'); + node2bbcode($doc, 'blockquote', [], '[quote]', '[/quote]'); - node2bbcode($doc, 'br', [], "\n", ''); + node2bbcode($doc, 'br', [], "\n", ''); - node2bbcode($doc, 'p', array('class'=>'MsoNormal'), "\n", ""); - node2bbcode($doc, 'div', array('class'=>'MsoNormal'), "\r", ""); + node2bbcode($doc, 'p', array('class' => 'MsoNormal'), "\n", ""); + node2bbcode($doc, 'div', array('class' => 'MsoNormal'), "\r", ""); - node2bbcode($doc, 'span', [], "", ""); + node2bbcode($doc, 'span', [], "", ""); - node2bbcode($doc, 'span', [], "", ""); - node2bbcode($doc, 'pre', [], "", ""); - node2bbcode($doc, 'div', [], "\r", "\r"); - node2bbcode($doc, 'p', [], "\n", "\n"); + node2bbcode($doc, 'span', [], "", ""); + node2bbcode($doc, 'pre', [], "", ""); + node2bbcode($doc, 'div', [], "\r", "\r"); + node2bbcode($doc, 'p', [], "\n", "\n"); - node2bbcode($doc, 'ul', [], "[list]", "[/list]"); - node2bbcode($doc, 'ol', [], "[list=1]", "[/list]"); - node2bbcode($doc, 'li', [], "[*]", ""); + node2bbcode($doc, 'ul', [], "[list]", "[/list]"); + node2bbcode($doc, 'ol', [], "[list=1]", "[/list]"); + node2bbcode($doc, 'li', [], "[*]", ""); - node2bbcode($doc, 'hr', [], "[hr]", ""); + node2bbcode($doc, 'hr', [], "[hr]", ""); -// node2bbcode($doc, 'table', [], "", ""); -// node2bbcode($doc, 'tr', [], "\n", ""); -// node2bbcode($doc, 'td', [], "\t", ""); +// node2bbcode($doc, 'table', [], "", ""); +// node2bbcode($doc, 'tr', [], "\n", ""); +// node2bbcode($doc, 'td', [], "\t", ""); - node2bbcode($doc, 'table', [], "[table]", "[/table]"); - node2bbcode($doc, 'th', [], "[th]", "[/th]"); - node2bbcode($doc, 'tr', [], "[tr]", "[/tr]"); - node2bbcode($doc, 'td', [], "[td]", "[/td]"); + node2bbcode($doc, 'table', [], "[table]", "[/table]"); + node2bbcode($doc, 'th', [], "[th]", "[/th]"); + node2bbcode($doc, 'tr', [], "[tr]", "[/tr]"); + node2bbcode($doc, 'td', [], "[td]", "[/td]"); - node2bbcode($doc, 'h1', [], "\n\n[h1]", "[/h1]\n"); - node2bbcode($doc, 'h2', [], "\n\n[h2]", "[/h2]\n"); - node2bbcode($doc, 'h3', [], "\n\n[h3]", "[/h3]\n"); - node2bbcode($doc, 'h4', [], "\n\n[h4]", "[/h4]\n"); - node2bbcode($doc, 'h5', [], "\n\n[h5]", "[/h5]\n"); - node2bbcode($doc, 'h6', [], "\n\n[h6]", "[/h6]\n"); + node2bbcode($doc, 'h1', [], "\n\n[h1]", "[/h1]\n"); + node2bbcode($doc, 'h2', [], "\n\n[h2]", "[/h2]\n"); + node2bbcode($doc, 'h3', [], "\n\n[h3]", "[/h3]\n"); + node2bbcode($doc, 'h4', [], "\n\n[h4]", "[/h4]\n"); + node2bbcode($doc, 'h5', [], "\n\n[h5]", "[/h5]\n"); + node2bbcode($doc, 'h6', [], "\n\n[h6]", "[/h6]\n"); - node2bbcode($doc, 'a', array('href'=>'/(.+)/'), '[url=$1]', '[/url]'); + node2bbcode($doc, 'a', array('href' => '/(.+)/'), '[url=$1]', '[/url]'); - node2bbcode($doc, 'img', array('src'=>'/(.+)/', 'width'=>'/(\d+)/', 'height'=>'/(\d+)/'), '[img=$2x$3]$1', '[/img]'); - node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '[img]$1', '[/img]'); + node2bbcode($doc, 'img', array('src' => '/(.+)/', 'width' => '/(\d+)/', 'height' => '/(\d+)/'), '[img=$2x$3]$1', '[/img]'); + node2bbcode($doc, 'img', array('src' => '/(.+)/'), '[img]$1', '[/img]'); - node2bbcode($doc, 'video', array('src'=>'/(.+)/', 'poster'=>'/(.+)/'), '[video poster="$2"]$1', '[/video]'); - node2bbcode($doc, 'video', array('src'=>'/(.+)/'), '[video]$1', '[/video]'); - node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]'); -// node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]'); + node2bbcode($doc, 'video', array('src' => '/(.+)/', 'poster' => '/(.+)/'), '[video poster="$2"]$1', '[/video]'); + node2bbcode($doc, 'video', array('src' => '/(.+)/'), '[video]$1', '[/video]'); + node2bbcode($doc, 'audio', array('src' => '/(.+)/'), '[audio]$1', '[/audio]'); +// node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]'); - node2bbcode($doc, 'code', [], '[code]', '[/code]'); + node2bbcode($doc, 'code', [], '[code]', '[/code]'); - $message = $doc->saveHTML(); + $message = $doc->saveHTML(); - // I'm removing something really disturbing - // Don't know exactly what it is - $message = str_replace(chr(194).chr(160), ' ', $message); + // I'm removing something really disturbing + // Don't know exactly what it is + $message = str_replace(chr(194) . chr(160), ' ', $message); - $message = str_replace(" ", " ", $message); + $message = str_replace(" ", " ", $message); - // removing multiple DIVs - $message = preg_replace('=\r *\r=i', "\n", $message); - $message = str_replace("\r", "\n", $message); + // removing multiple DIVs + $message = preg_replace('=\r *\r=i', "\n", $message); + $message = str_replace("\r", "\n", $message); - call_hooks('html2bbcode', $message); + call_hooks('html2bbcode', $message); - $message = strip_tags($message); + $message = strip_tags($message); - $message = html_entity_decode($message, ENT_QUOTES, 'UTF-8'); + $message = html_entity_decode($message, ENT_QUOTES, 'UTF-8'); - $message = str_replace(array("<"), array("<"), $message); + $message = str_replace(array("<"), array("<"), $message); - // remove quotes if they don't make sense - $message = preg_replace('=\[/quote\][\s]*\[quote\]=i', "\n", $message); + // remove quotes if they don't make sense + $message = preg_replace('=\[/quote\][\s]*\[quote\]=i', "\n", $message); - $message = preg_replace('=\[quote\]\s*=i', "[quote]", $message); - $message = preg_replace('=\s*\[/quote\]=i', "[/quote]", $message); + $message = preg_replace('=\[quote\]\s*=i', "[quote]", $message); + $message = preg_replace('=\s*\[/quote\]=i', "[/quote]", $message); - do { - $oldmessage = $message; - $message = str_replace("\n \n", "\n\n", $message); - } while ($oldmessage != $message); + do { + $oldmessage = $message; + $message = str_replace("\n \n", "\n\n", $message); + } while ($oldmessage != $message); - do { - $oldmessage = $message; - $message = str_replace("\n\n\n", "\n\n", $message); - } while ($oldmessage != $message); + do { + $oldmessage = $message; + $message = str_replace("\n\n\n", "\n\n", $message); + } while ($oldmessage != $message); - do { - $oldmessage = $message; - $message = str_replace(array( - "[/size]\n\n", - "\n[hr]", - "[hr]\n", - "\n[list", - "[/list]\n", - "\n[/", - "[list]\n", - "[list=1]\n", - "\n[*]"), - array( - "[/size]\n", - "[hr]", - "[hr]", - "[list", - "[/list]", - "[/", - "[list]", - "[list=1]", - "[*]"), - $message); - } while ($message != $oldmessage); + do { + $oldmessage = $message; + $message = str_replace( + array( + "[/size]\n\n", + "\n[hr]", + "[hr]\n", + "\n[list", + "[/list]\n", + "\n[/", + "[list]\n", + "[list=1]\n", + "\n[*]"), + array( + "[/size]\n", + "[hr]", + "[hr]", + "[list", + "[/list]", + "[/", + "[list]", + "[list=1]", + "[*]"), + $message + ); + } while ($message != $oldmessage); - $message = str_replace(array('[b][b]', '[/b][/b]', '[i][i]', '[/i][/i]'), - array('[b]', '[/b]', '[i]', '[/i]'), $message); + $message = str_replace( + array('[b][b]', '[/b][/b]', '[i][i]', '[/i][/i]'), + array('[b]', '[/b]', '[i]', '[/i]'), + $message + ); - // Handling Yahoo style of mails - // $message = str_replace('[hr][b]From:[/b]', '[quote][b]From:[/b]', $message); + // Handling Yahoo style of mails + // $message = str_replace('[hr][b]From:[/b]', '[quote][b]From:[/b]', $message); - $message = htmlspecialchars($message,ENT_COMPAT,'UTF-8',false); - return(trim($message)); + $message = htmlspecialchars($message, ENT_COMPAT, 'UTF-8', false); + return(trim($message)); } - diff --git a/include/html2plain.php b/include/html2plain.php index 8ad537242..65697c6f9 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -1,230 +1,246 @@ - 0) and strlen($line) > $wraplen) { - $newline = trim(substr($line, 0, $pos)); - if ($level > 0) - $newline = str_repeat(">", $level).' '.$newline; + if (($pos > 0) and strlen($line) > $wraplen) { + $newline = trim(substr($line, 0, $pos)); + if ($level > 0) { + $newline = str_repeat(">", $level) . ' ' . $newline; + } - $newlines[] = $newline." "; - $line = substr($line, $pos+1); - } + $newlines[] = $newline . " "; + $line = substr($line, $pos + 1); + } + } while ((strlen($line) > $wraplen) and !($oldline == $line)); - } while ((strlen($line) > $wraplen) and !($oldline == $line)); + if ($level > 0) { + $line = str_repeat(">", $level) . ' ' . $line; + } - if ($level > 0) - $line = str_repeat(">", $level).' '.$line; - - $newlines[] = $line; + $newlines[] = $line; - return(implode("\n", $newlines)); + return(implode("\n", $newlines)); } function quotelevel($message, $wraplength = 75) { - $lines = explode("\n", $message); + $lines = explode("\n", $message); - $newlines = []; - $level = 0; - foreach($lines as $line) {; - $line = trim($line); - $startquote = false; - while (strpos("*".$line, '[quote]') > 0) { - $level++; - $pos = strpos($line, '[quote]'); - $line = substr($line, 0, $pos).substr($line, $pos+7); - $startquote = true; - } + $newlines = []; + $level = 0; + foreach ($lines as $line) { + $line = trim($line); + $startquote = false; + while (strpos("*" . $line, '[quote]') > 0) { + $level++; + $pos = strpos($line, '[quote]'); + $line = substr($line, 0, $pos) . substr($line, $pos + 7); + $startquote = true; + } - $currlevel = $level; + $currlevel = $level; - while (strpos("*".$line, '[/quote]') > 0) { - $level--; - if ($level < 0) - $level = 0; + while (strpos("*" . $line, '[/quote]') > 0) { + $level--; + if ($level < 0) { + $level = 0; + } - $pos = strpos($line, '[/quote]'); - $line = substr($line, 0, $pos).substr($line, $pos+8); - } + $pos = strpos($line, '[/quote]'); + $line = substr($line, 0, $pos) . substr($line, $pos + 8); + } - if (!$startquote or ($line != '')) - $newlines[] = breaklines($line, $currlevel, $wraplength); - } - return(implode("\n", $newlines)); + if (!$startquote or ($line != '')) { + $newlines[] = breaklines($line, $currlevel, $wraplength); + } + } + return(implode("\n", $newlines)); } -function collecturls($message) { - $pattern = '/
", " ", ""), $message); - $message = preg_replace('= [\s]*=i', " ", $message); + $xpath = new DOMXPath($doc); + $list = $xpath->query("//pre"); + foreach ($list as $node) { + $node->nodeValue = str_replace("\n", "\r", htmlspecialchars($node->nodeValue)); + } - // Collecting all links - $urls = collecturls($message); + $message = $doc->saveHTML(); + $message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "
", " ", ""), $message); + $message = preg_replace('= [\s]*=i', " ", $message); - @$doc->loadHTML($message); + // Collecting all links + $urls = collecturls($message); - node2bbcode($doc, 'html', [], '', ''); - node2bbcode($doc, 'body', [], '', ''); + @$doc->loadHTML($message); - // MyBB-Auszeichnungen - /* - node2bbcode($doc, 'span', array('style'=>'text-decoration: underline;'), '_', '_'); - node2bbcode($doc, 'span', array('style'=>'font-style: italic;'), '/', '/'); - node2bbcode($doc, 'span', array('style'=>'font-weight: bold;'), '*', '*'); + node2bbcode($doc, 'html', [], '', ''); + node2bbcode($doc, 'body', [], '', ''); - node2bbcode($doc, 'strong', [], '*', '*'); - node2bbcode($doc, 'b', [], '*', '*'); - node2bbcode($doc, 'i', [], '/', '/'); - node2bbcode($doc, 'u', [], '_', '_'); - */ + // MyBB-Auszeichnungen + /* + node2bbcode($doc, 'span', array('style'=>'text-decoration: underline;'), '_', '_'); + node2bbcode($doc, 'span', array('style'=>'font-style: italic;'), '/', '/'); + node2bbcode($doc, 'span', array('style'=>'font-weight: bold;'), '*', '*'); - if ($compact) - node2bbcode($doc, 'blockquote', [], "»", "«"); - else - node2bbcode($doc, 'blockquote', [], '[quote]', "[/quote]\n"); + node2bbcode($doc, 'strong', [], '*', '*'); + node2bbcode($doc, 'b', [], '*', '*'); + node2bbcode($doc, 'i', [], '/', '/'); + node2bbcode($doc, 'u', [], '_', '_'); + */ - node2bbcode($doc, 'br', [], "\n", ''); + if ($compact) { + node2bbcode($doc, 'blockquote', [], "»", "«"); + } else { + node2bbcode($doc, 'blockquote', [], '[quote]', "[/quote]\n"); + } - node2bbcode($doc, 'span', [], "", ""); - node2bbcode($doc, 'pre', [], "", ""); - node2bbcode($doc, 'div', [], "\r", "\r"); - node2bbcode($doc, 'p', [], "\n", "\n"); + node2bbcode($doc, 'br', [], "\n", ''); - //node2bbcode($doc, 'ul', [], "\n[list]", "[/list]\n"); - //node2bbcode($doc, 'ol', [], "\n[list=1]", "[/list]\n"); - node2bbcode($doc, 'li', [], "\n* ", "\n"); + node2bbcode($doc, 'span', [], "", ""); + node2bbcode($doc, 'pre', [], "", ""); + node2bbcode($doc, 'div', [], "\r", "\r"); + node2bbcode($doc, 'p', [], "\n", "\n"); - node2bbcode($doc, 'hr', [], "\n".str_repeat("-", 70)."\n", ""); + //node2bbcode($doc, 'ul', [], "\n[list]", "[/list]\n"); + //node2bbcode($doc, 'ol', [], "\n[list=1]", "[/list]\n"); + node2bbcode($doc, 'li', [], "\n* ", "\n"); - node2bbcode($doc, 'tr', [], "\n", ""); - node2bbcode($doc, 'td', [], "\t", ""); + node2bbcode($doc, 'hr', [], "\n" . str_repeat("-", 70) . "\n", ""); - node2bbcode($doc, 'h1', [], "\n\n*", "*\n"); - node2bbcode($doc, 'h2', [], "\n\n*", "*\n"); - node2bbcode($doc, 'h3', [], "\n\n*", "*\n"); - node2bbcode($doc, 'h4', [], "\n\n*", "*\n"); - node2bbcode($doc, 'h5', [], "\n\n*", "*\n"); - node2bbcode($doc, 'h6', [], "\n\n*", "*\n"); + node2bbcode($doc, 'tr', [], "\n", ""); + node2bbcode($doc, 'td', [], "\t", ""); - // Problem: there is no reliable way to detect if it is a link to a tag or profile - //node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1 ', '', true); - node2bbcode($doc, 'a', array('href'=>'/(.+)/', 'rel'=>'oembed'), ' $1 ', '', true); - //node2bbcode($doc, 'img', array('alt'=>'/(.+)/'), '$1', ''); - //node2bbcode($doc, 'img', array('title'=>'/(.+)/'), '$1', ''); - //node2bbcode($doc, 'img', [], '', ''); - if (!$compact) - node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '[img]$1', '[/img]'); - else - node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '', ''); + node2bbcode($doc, 'h1', [], "\n\n*", "*\n"); + node2bbcode($doc, 'h2', [], "\n\n*", "*\n"); + node2bbcode($doc, 'h3', [], "\n\n*", "*\n"); + node2bbcode($doc, 'h4', [], "\n\n*", "*\n"); + node2bbcode($doc, 'h5', [], "\n\n*", "*\n"); + node2bbcode($doc, 'h6', [], "\n\n*", "*\n"); - node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), ' $1 ', '', true); + // Problem: there is no reliable way to detect if it is a link to a tag or profile + //node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1 ', '', true); + node2bbcode($doc, 'a', array('href' => '/(.+)/', 'rel' => 'oembed'), ' $1 ', '', true); + //node2bbcode($doc, 'img', array('alt'=>'/(.+)/'), '$1', ''); + //node2bbcode($doc, 'img', array('title'=>'/(.+)/'), '$1', ''); + //node2bbcode($doc, 'img', [], '', ''); + if (!$compact) { + node2bbcode($doc, 'img', array('src' => '/(.+)/'), '[img]$1', '[/img]'); + } else { + node2bbcode($doc, 'img', array('src' => '/(.+)/'), '', ''); + } - $message = $doc->saveHTML(); + node2bbcode($doc, 'iframe', array('src' => '/(.+)/'), ' $1 ', '', true); - if (!$compact) { - $message = str_replace("[img]", "", $message); - $message = str_replace("[/img]", "", $message); - } + $message = $doc->saveHTML(); - // was ersetze ich da? - // Irgendein stoerrisches UTF-Zeug - $message = str_replace(chr(194).chr(160), ' ', $message); + if (!$compact) { + $message = str_replace("[img]", "", $message); + $message = str_replace("[/img]", "", $message); + } - $message = str_replace(" ", " ", $message); + // was ersetze ich da? + // Irgendein stoerrisches UTF-Zeug + $message = str_replace(chr(194) . chr(160), ' ', $message); - // Aufeinanderfolgende DIVs - $message = preg_replace('=\r *\r=i', "\n", $message); - $message = str_replace("\r", "\n", $message); + $message = str_replace(" ", " ", $message); - $message = strip_tags($message); + // Aufeinanderfolgende DIVs + $message = preg_replace('=\r *\r=i', "\n", $message); + $message = str_replace("\r", "\n", $message); - $message = html_entity_decode($message, ENT_QUOTES, 'UTF-8'); + $message = strip_tags($message); - if (!$compact) { - $counter = 1; - foreach ($urls as $id=>$url) - if ($url && strpos($message, $url) === false) - $message .= "\n".$url." "; - //$message .= "\n[".($counter++)."] ".$url; - } + $message = html_entity_decode($message, ENT_QUOTES, 'UTF-8'); - do { - $oldmessage = $message; - $message = str_replace("\n\n\n", "\n\n", $message); - } while ($oldmessage != $message); + if (!$compact) { + $counter = 1; + foreach ($urls as $id => $url) { + if ($url && strpos($message, $url) === false) { + $message .= "\n" . $url . " "; + } + } + //$message .= "\n[".($counter++)."] ".$url; + } - $message = quotelevel(trim($message), $wraplength); + do { + $oldmessage = $message; + $message = str_replace("\n\n\n", "\n\n", $message); + } while ($oldmessage != $message); - return(trim($message)); + $message = quotelevel(trim($message), $wraplength); + + return(trim($message)); } - diff --git a/include/hubloc.php b/include/hubloc.php index 7a9a65708..53ad35ccb 100644 --- a/include/hubloc.php +++ b/include/hubloc.php @@ -1,4 +1,5 @@ ((array_key_exists('hubloc_guid',$arr)) ? $arr['hubloc_guid'] : ''), - 'hubloc_guid_sig' => ((array_key_exists('hubloc_guid_sig',$arr)) ? $arr['hubloc_guid_sig'] : ''), - 'hubloc_id_url' => ((array_key_exists('hubloc_id_url',$arr)) ? $arr['hubloc_id_url'] : ''), - 'hubloc_hash' => ((array_key_exists('hubloc_hash',$arr)) ? $arr['hubloc_hash'] : ''), - 'hubloc_addr' => ((array_key_exists('hubloc_addr',$arr)) ? $arr['hubloc_addr'] : ''), - 'hubloc_network' => ((array_key_exists('hubloc_network',$arr)) ? $arr['hubloc_network'] : ''), - 'hubloc_flags' => ((array_key_exists('hubloc_flags',$arr)) ? $arr['hubloc_flags'] : 0), - 'hubloc_status' => ((array_key_exists('hubloc_status',$arr)) ? $arr['hubloc_status'] : 0), - 'hubloc_url' => ((array_key_exists('hubloc_url',$arr)) ? $arr['hubloc_url'] : ''), - 'hubloc_url_sig' => ((array_key_exists('hubloc_url_sig',$arr)) ? $arr['hubloc_url_sig'] : ''), - 'hubloc_site_id' => ((array_key_exists('hubloc_site_id',$arr)) ? $arr['hubloc_site_id'] : ''), - 'hubloc_host' => ((array_key_exists('hubloc_host',$arr)) ? $arr['hubloc_host'] : ''), - 'hubloc_callback' => ((array_key_exists('hubloc_callback',$arr)) ? $arr['hubloc_callback'] : ''), - 'hubloc_connect' => ((array_key_exists('hubloc_connect',$arr)) ? $arr['hubloc_connect'] : ''), - 'hubloc_sitekey' => ((array_key_exists('hubloc_sitekey',$arr)) ? $arr['hubloc_sitekey'] : ''), - 'hubloc_updated' => ((array_key_exists('hubloc_updated',$arr)) ? $arr['hubloc_updated'] : NULL_DATE), - 'hubloc_connected' => ((array_key_exists('hubloc_connected',$arr)) ? $arr['hubloc_connected'] : NULL_DATE), - 'hubloc_primary' => ((array_key_exists('hubloc_primary',$arr)) ? $arr['hubloc_primary'] : 0), - 'hubloc_orphancheck' => ((array_key_exists('hubloc_orphancheck',$arr)) ? $arr['hubloc_orphancheck'] : 0), - 'hubloc_error' => ((array_key_exists('hubloc_error',$arr)) ? $arr['hubloc_error'] : 0), - 'hubloc_deleted' => ((array_key_exists('hubloc_deleted',$arr)) ? $arr['hubloc_deleted'] : 0) - ]; + $store = [ + 'hubloc_guid' => ((array_key_exists('hubloc_guid', $arr)) ? $arr['hubloc_guid'] : ''), + 'hubloc_guid_sig' => ((array_key_exists('hubloc_guid_sig', $arr)) ? $arr['hubloc_guid_sig'] : ''), + 'hubloc_id_url' => ((array_key_exists('hubloc_id_url', $arr)) ? $arr['hubloc_id_url'] : ''), + 'hubloc_hash' => ((array_key_exists('hubloc_hash', $arr)) ? $arr['hubloc_hash'] : ''), + 'hubloc_addr' => ((array_key_exists('hubloc_addr', $arr)) ? $arr['hubloc_addr'] : ''), + 'hubloc_network' => ((array_key_exists('hubloc_network', $arr)) ? $arr['hubloc_network'] : ''), + 'hubloc_flags' => ((array_key_exists('hubloc_flags', $arr)) ? $arr['hubloc_flags'] : 0), + 'hubloc_status' => ((array_key_exists('hubloc_status', $arr)) ? $arr['hubloc_status'] : 0), + 'hubloc_url' => ((array_key_exists('hubloc_url', $arr)) ? $arr['hubloc_url'] : ''), + 'hubloc_url_sig' => ((array_key_exists('hubloc_url_sig', $arr)) ? $arr['hubloc_url_sig'] : ''), + 'hubloc_site_id' => ((array_key_exists('hubloc_site_id', $arr)) ? $arr['hubloc_site_id'] : ''), + 'hubloc_host' => ((array_key_exists('hubloc_host', $arr)) ? $arr['hubloc_host'] : ''), + 'hubloc_callback' => ((array_key_exists('hubloc_callback', $arr)) ? $arr['hubloc_callback'] : ''), + 'hubloc_connect' => ((array_key_exists('hubloc_connect', $arr)) ? $arr['hubloc_connect'] : ''), + 'hubloc_sitekey' => ((array_key_exists('hubloc_sitekey', $arr)) ? $arr['hubloc_sitekey'] : ''), + 'hubloc_updated' => ((array_key_exists('hubloc_updated', $arr)) ? $arr['hubloc_updated'] : NULL_DATE), + 'hubloc_connected' => ((array_key_exists('hubloc_connected', $arr)) ? $arr['hubloc_connected'] : NULL_DATE), + 'hubloc_primary' => ((array_key_exists('hubloc_primary', $arr)) ? $arr['hubloc_primary'] : 0), + 'hubloc_orphancheck' => ((array_key_exists('hubloc_orphancheck', $arr)) ? $arr['hubloc_orphancheck'] : 0), + 'hubloc_error' => ((array_key_exists('hubloc_error', $arr)) ? $arr['hubloc_error'] : 0), + 'hubloc_deleted' => ((array_key_exists('hubloc_deleted', $arr)) ? $arr['hubloc_deleted'] : 0) + ]; - return create_table_from_array('hubloc', $store); + return create_table_from_array('hubloc', $store); } -function site_store_lowlevel($arr) { +function site_store_lowlevel($arr) +{ - $store = [ - 'site_url' => ((array_key_exists('site_url',$arr)) ? $arr['site_url'] : ''), - 'site_access' => ((array_key_exists('site_access',$arr)) ? $arr['site_access'] : 0), - 'site_flags' => ((array_key_exists('site_flags',$arr)) ? $arr['site_flags'] : 0), - 'site_update' => ((array_key_exists('site_update',$arr)) ? $arr['site_update'] : NULL_DATE), - 'site_pull' => ((array_key_exists('site_pull',$arr)) ? $arr['site_pull'] : NULL_DATE), - 'site_sync' => ((array_key_exists('site_sync',$arr)) ? $arr['site_sync'] : NULL_DATE), - 'site_directory' => ((array_key_exists('site_directory',$arr)) ? $arr['site_directory'] : ''), - 'site_register' => ((array_key_exists('site_register',$arr)) ? $arr['site_register'] : 0), - 'site_sellpage' => ((array_key_exists('site_sellpage',$arr)) ? $arr['site_sellpage'] : ''), - 'site_location' => ((array_key_exists('site_location',$arr)) ? $arr['site_location'] : ''), - 'site_realm' => ((array_key_exists('site_realm',$arr)) ? $arr['site_realm'] : ''), - 'site_valid' => ((array_key_exists('site_valid',$arr)) ? $arr['site_valid'] : 0), - 'site_dead' => ((array_key_exists('site_dead',$arr)) ? $arr['site_dead'] : 0), - 'site_type' => ((array_key_exists('site_type',$arr)) ? $arr['site_type'] : 0), - 'site_project' => ((array_key_exists('site_project',$arr)) ? $arr['site_project'] : ''), - 'site_version' => ((array_key_exists('site_version',$arr)) ? $arr['site_version'] : ''), - 'site_crypto' => ((array_key_exists('site_crypto',$arr)) ? $arr['site_crypto'] : '') - ]; + $store = [ + 'site_url' => ((array_key_exists('site_url', $arr)) ? $arr['site_url'] : ''), + 'site_access' => ((array_key_exists('site_access', $arr)) ? $arr['site_access'] : 0), + 'site_flags' => ((array_key_exists('site_flags', $arr)) ? $arr['site_flags'] : 0), + 'site_update' => ((array_key_exists('site_update', $arr)) ? $arr['site_update'] : NULL_DATE), + 'site_pull' => ((array_key_exists('site_pull', $arr)) ? $arr['site_pull'] : NULL_DATE), + 'site_sync' => ((array_key_exists('site_sync', $arr)) ? $arr['site_sync'] : NULL_DATE), + 'site_directory' => ((array_key_exists('site_directory', $arr)) ? $arr['site_directory'] : ''), + 'site_register' => ((array_key_exists('site_register', $arr)) ? $arr['site_register'] : 0), + 'site_sellpage' => ((array_key_exists('site_sellpage', $arr)) ? $arr['site_sellpage'] : ''), + 'site_location' => ((array_key_exists('site_location', $arr)) ? $arr['site_location'] : ''), + 'site_realm' => ((array_key_exists('site_realm', $arr)) ? $arr['site_realm'] : ''), + 'site_valid' => ((array_key_exists('site_valid', $arr)) ? $arr['site_valid'] : 0), + 'site_dead' => ((array_key_exists('site_dead', $arr)) ? $arr['site_dead'] : 0), + 'site_type' => ((array_key_exists('site_type', $arr)) ? $arr['site_type'] : 0), + 'site_project' => ((array_key_exists('site_project', $arr)) ? $arr['site_project'] : ''), + 'site_version' => ((array_key_exists('site_version', $arr)) ? $arr['site_version'] : ''), + 'site_crypto' => ((array_key_exists('site_crypto', $arr)) ? $arr['site_crypto'] : '') + ]; - return create_table_from_array('site', $store); + return create_table_from_array('site', $store); } -function prune_hub_reinstalls() { +function prune_hub_reinstalls() +{ - $r = q("select site_url from site where site_type = %d", - intval(SITE_TYPE_ZOT) - ); - if($r) { - foreach($r as $rr) { - $x = q("select count(*) as t, hubloc_sitekey, max(hubloc_connected) as c from hubloc where hubloc_url = '%s' group by hubloc_sitekey order by c", - dbesc($rr['site_url']) - ); + $r = q( + "select site_url from site where site_type = %d", + intval(SITE_TYPE_ZOT) + ); + if ($r) { + foreach ($r as $rr) { + $x = q( + "select count(*) as t, hubloc_sitekey, max(hubloc_connected) as c from hubloc where hubloc_url = '%s' group by hubloc_sitekey order by c", + dbesc($rr['site_url']) + ); - // see if this url has more than one sitekey, indicating it has been re-installed. + // see if this url has more than one sitekey, indicating it has been re-installed. - if(count($x) > 1) { - $d1 = datetime_convert('UTC', 'UTC', $x[0]['c']); - $d2 = datetime_convert('UTC', 'UTC', 'now - 3 days'); + if (count($x) > 1) { + $d1 = datetime_convert('UTC', 'UTC', $x[0]['c']); + $d2 = datetime_convert('UTC', 'UTC', 'now - 3 days'); - // allow some slop period, say 3 days - just in case this is a glitch or transient occurrence - // Then remove any hublocs pointing to the oldest entry. + // allow some slop period, say 3 days - just in case this is a glitch or transient occurrence + // Then remove any hublocs pointing to the oldest entry. - if(($d1 < $d2) && ($x[0]['hubloc_sitekey'])) { - logger('prune_hub_reinstalls: removing dead hublocs at ' . $rr['site_url']); - $y = q("delete from hubloc where hubloc_sitekey = '%s'", - dbesc($x[0]['hubloc_sitekey']) - ); - } - } - } - } + if (($d1 < $d2) && ($x[0]['hubloc_sitekey'])) { + logger('prune_hub_reinstalls: removing dead hublocs at ' . $rr['site_url']); + $y = q( + "delete from hubloc where hubloc_sitekey = '%s'", + dbesc($x[0]['hubloc_sitekey']) + ); + } + } + } + } } @@ -116,60 +123,70 @@ function prune_hub_reinstalls() { * of an old bug or maybe a regression in some newer code. In any event, they * mess up communications and we have to take action if we find any. */ -function remove_obsolete_hublocs() { +function remove_obsolete_hublocs() +{ - logger('remove_obsolete_hublocs', LOGGER_DEBUG); + logger('remove_obsolete_hublocs', LOGGER_DEBUG); - // First make sure we have any hublocs (at all) with this URL and sitekey. - // We don't want to perform this operation while somebody is in the process - // of renaming their hub or installing certs. + // First make sure we have any hublocs (at all) with this URL and sitekey. + // We don't want to perform this operation while somebody is in the process + // of renaming their hub or installing certs. - $r = q("select hubloc_id from hubloc where hubloc_url = '%s' and hubloc_sitekey = '%s'", - dbesc(z_root()), - dbesc(get_config('system', 'pubkey')) - ); - if((! $r) || (! count($r))) - return; + $r = q( + "select hubloc_id from hubloc where hubloc_url = '%s' and hubloc_sitekey = '%s'", + dbesc(z_root()), + dbesc(get_config('system', 'pubkey')) + ); + if ((! $r) || (! count($r))) { + return; + } - // Good. We have at least one *valid* hubloc. + // Good. We have at least one *valid* hubloc. - // Do we have any invalid ones? + // Do we have any invalid ones? - $r = q("select hubloc_id from hubloc where hubloc_sitekey = '%s' and hubloc_url != '%s'", - dbesc(get_config('system', 'pubkey')), - dbesc(z_root()) - ); - $p = q("select hubloc_id from hubloc where hubloc_sitekey != '%s' and hubloc_url = '%s'", - dbesc(get_config('system', 'pubkey')), - dbesc(z_root()) - ); - if(is_array($r) && is_array($p)) - $r = array_merge($r, $p); + $r = q( + "select hubloc_id from hubloc where hubloc_sitekey = '%s' and hubloc_url != '%s'", + dbesc(get_config('system', 'pubkey')), + dbesc(z_root()) + ); + $p = q( + "select hubloc_id from hubloc where hubloc_sitekey != '%s' and hubloc_url = '%s'", + dbesc(get_config('system', 'pubkey')), + dbesc(z_root()) + ); + if (is_array($r) && is_array($p)) { + $r = array_merge($r, $p); + } - if(! $r) - return; + if (! $r) { + return; + } - // We've got invalid hublocs. Get rid of them. + // We've got invalid hublocs. Get rid of them. - logger('remove_obsolete_hublocs: removing ' . count($r) . ' hublocs.'); + logger('remove_obsolete_hublocs: removing ' . count($r) . ' hublocs.'); - $interval = ((get_config('system', 'delivery_interval') !== false) - ? intval(get_config('system', 'delivery_interval')) : 2 ); + $interval = ((get_config('system', 'delivery_interval') !== false) + ? intval(get_config('system', 'delivery_interval')) : 2 ); - foreach($r as $rr) { - q("update hubloc set hubloc_deleted = 1 where hubloc_id = %d", - intval($rr['hubloc_id']) - ); + foreach ($r as $rr) { + q( + "update hubloc set hubloc_deleted = 1 where hubloc_id = %d", + intval($rr['hubloc_id']) + ); - $x = q("select channel_id from channel where channel_hash = '%s' limit 1", - dbesc($rr['hubloc_hash']) - ); - if($x) { - Run::Summon( [ 'Notifier', 'refresh_all', $x[0]['channel_id'] ] ); - if($interval) - @time_sleep_until(microtime(true) + (float) $interval); - } - } + $x = q( + "select channel_id from channel where channel_hash = '%s' limit 1", + dbesc($rr['hubloc_hash']) + ); + if ($x) { + Run::Summon([ 'Notifier', 'refresh_all', $x[0]['channel_id'] ]); + if ($interval) { + @time_sleep_until(microtime(true) + (float) $interval); + } + } + } } @@ -180,67 +197,73 @@ function remove_obsolete_hublocs() { * hubloc primary selection. * * @param array $hubloc - * @return boolean + * @return bool */ -function hubloc_change_primary($hubloc) { +function hubloc_change_primary($hubloc) +{ - if(! is_array($hubloc)) { - logger('no hubloc'); - return false; - } + if (! is_array($hubloc)) { + logger('no hubloc'); + return false; + } - logger('setting primary: ' . $hubloc['hubloc_url'] . ((intval($hubloc['hubloc_primary'])) ? ' true' : ' false')); + logger('setting primary: ' . $hubloc['hubloc_url'] . ((intval($hubloc['hubloc_primary'])) ? ' true' : ' false')); - // See if this is a local hubloc and if so update the primary for the corresponding channel record. + // See if this is a local hubloc and if so update the primary for the corresponding channel record. - if($hubloc['hubloc_url'] === z_root()) { - $r = q("select channel_id from channel where channel_hash = '%s' limit 1", - dbesc($hubloc['hubloc_hash']) - ); - if($r) { - q("update channel set channel_primary = %d where channel_id = %d", - intval($hubloc['hubloc_primary']), - intval($r[0]['channel_id']) - ); - } - } + if ($hubloc['hubloc_url'] === z_root()) { + $r = q( + "select channel_id from channel where channel_hash = '%s' limit 1", + dbesc($hubloc['hubloc_hash']) + ); + if ($r) { + q( + "update channel set channel_primary = %d where channel_id = %d", + intval($hubloc['hubloc_primary']), + intval($r[0]['channel_id']) + ); + } + } - // we only need to proceed further if this particular hubloc is now primary + // we only need to proceed further if this particular hubloc is now primary - if(! (intval($hubloc['hubloc_primary']))) { - logger('not primary: ' . $hubloc['hubloc_url']); - return false; - } + if (! (intval($hubloc['hubloc_primary']))) { + logger('not primary: ' . $hubloc['hubloc_url']); + return false; + } - // do we even have an xchan for this hubloc and if so is it already set as primary? + // do we even have an xchan for this hubloc and if so is it already set as primary? - $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($hubloc['hubloc_hash']) - ); - if(! $r) { - logger('xchan not found'); - return false; - } - if($r[0]['xchan_addr'] === $hubloc['hubloc_addr']) { - logger('xchan already changed'); - return false; - } + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($hubloc['hubloc_hash']) + ); + if (! $r) { + logger('xchan not found'); + return false; + } + if ($r[0]['xchan_addr'] === $hubloc['hubloc_addr']) { + logger('xchan already changed'); + return false; + } - $url = $hubloc['hubloc_url']; - $lwebbie = substr($hubloc['hubloc_addr'], 0, strpos($hubloc['hubloc_addr'], '@')); + $url = $hubloc['hubloc_url']; + $lwebbie = substr($hubloc['hubloc_addr'], 0, strpos($hubloc['hubloc_addr'], '@')); - $r = q("update xchan set xchan_addr = '%s', xchan_url = '%s', xchan_follow = '%s', xchan_connurl = '%s' where xchan_hash = '%s'", - dbesc($hubloc['hubloc_addr']), - dbesc($url . '/channel/' . $lwebbie), - dbesc($url . '/follow?f=&url=%s'), - dbesc($url . '/poco/' . $lwebbie), - dbesc($hubloc['hubloc_hash']) - ); - if(! $r) - logger('xchan_update failed.'); + $r = q( + "update xchan set xchan_addr = '%s', xchan_url = '%s', xchan_follow = '%s', xchan_connurl = '%s' where xchan_hash = '%s'", + dbesc($hubloc['hubloc_addr']), + dbesc($url . '/channel/' . $lwebbie), + dbesc($url . '/follow?f=&url=%s'), + dbesc($url . '/poco/' . $lwebbie), + dbesc($hubloc['hubloc_hash']) + ); + if (! $r) { + logger('xchan_update failed.'); + } - logger('primary hubloc changed.' . print_r($hubloc, true), LOGGER_DEBUG); - return true; + logger('primary hubloc changed.' . print_r($hubloc, true), LOGGER_DEBUG); + return true; } @@ -253,17 +276,20 @@ function hubloc_change_primary($hubloc) { * * @param string $posturl Hubloc callback url which to disable */ -function hubloc_mark_as_down($posturl) { - $r = q("update hubloc set hubloc_status = ( hubloc_status | %d ) where hubloc_callback = '%s'", - intval(HUBLOC_OFFLINE), - dbesc($posturl) - ); - // extract the baseurl and set site.site_dead to match - $m = parse_url($posturl); - $h = $m['scheme'] . '://' . $m['host']; - $r = q("update site set site_dead = 1 where site_url = '%s'", - dbesc($h) - ); +function hubloc_mark_as_down($posturl) +{ + $r = q( + "update hubloc set hubloc_status = ( hubloc_status | %d ) where hubloc_callback = '%s'", + intval(HUBLOC_OFFLINE), + dbesc($posturl) + ); + // extract the baseurl and set site.site_dead to match + $m = parse_url($posturl); + $h = $m['scheme'] . '://' . $m['host']; + $r = q( + "update site set site_dead = 1 where site_url = '%s'", + dbesc($h) + ); } @@ -272,40 +298,44 @@ function hubloc_mark_as_down($posturl) { * * @param string $netid network identity (typically xchan_hash or hubloc_hash) * @return string - */ + */ -function locations_by_netid($netid) { +function locations_by_netid($netid) +{ - $locs = q("select hubloc_addr as location from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and hubloc_deleted = 0 and site_dead = 0", - dbesc($netid) - ); + $locs = q( + "select hubloc_addr as location from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and hubloc_deleted = 0 and site_dead = 0", + dbesc($netid) + ); - - return array_elm_to_str($locs,'location',', ','trim_and_unpunify'); + return array_elm_to_str($locs, 'location', ', ', 'trim_and_unpunify'); } -function ping_site($url) { +function ping_site($url) +{ - $ret = array('success' => false); + $ret = array('success' => false); - $r = Zotlabs\Lib\Zotfinger::exec($url); + $r = Zotlabs\Lib\Zotfinger::exec($url); - if(! $r['data']) { - $ret['message'] = 'no answer from ' . $url; - return $ret; - } + if (! $r['data']) { + $ret['message'] = 'no answer from ' . $url; + return $ret; + } - $ret['success'] = true; - return $ret; + $ret['success'] = true; + return $ret; } -function get_hubloc_addrs_by_hash($hash) { +function get_hubloc_addrs_by_hash($hash) +{ - return q("select hubloc_addr from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0", - dbesc($hash) - ); -} \ No newline at end of file + return q( + "select hubloc_addr from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0", + dbesc($hash) + ); +} diff --git a/include/import.php b/include/import.php index 55702c28d..1b40f517b 100644 --- a/include/import.php +++ b/include/import.php @@ -10,7 +10,6 @@ use Zotlabs\Daemon\Run; use Zotlabs\Access\PermissionRoles; use Zotlabs\Access\PermissionLimits; - require_once('include/menu.php'); @@ -20,137 +19,142 @@ require_once('include/menu.php'); * @param array $channel * @param int $account_id * @param int $seize - * @return boolean|array + * @return bool|array */ -function import_channel($channel, $account_id, $seize, $newname = '') { +function import_channel($channel, $account_id, $seize, $newname = '') +{ - if (! array_key_exists('channel_system',$channel)) { - $channel['channel_system'] = (($channel['channel_pageflags'] & 0x1000) ? 1 : 0); - $channel['channel_removed'] = (($channel['channel_pageflags'] & 0x8000) ? 1 : 0); - } + if (! array_key_exists('channel_system', $channel)) { + $channel['channel_system'] = (($channel['channel_pageflags'] & 0x1000) ? 1 : 0); + $channel['channel_removed'] = (($channel['channel_pageflags'] & 0x8000) ? 1 : 0); + } - if (isset($channel['channel_removed']) && intval($channel['channel_removed'])) { - notice( t('Unable to import a removed channel.') . EOL); - return false; - } + if (isset($channel['channel_removed']) && intval($channel['channel_removed'])) { + notice(t('Unable to import a removed channel.') . EOL); + return false; + } - // Ignore the hash provided and re-calculate + // Ignore the hash provided and re-calculate - $channel['channel_hash'] = Libzot::make_xchan_hash($channel['channel_guid'],$channel['channel_pubkey']); + $channel['channel_hash'] = Libzot::make_xchan_hash($channel['channel_guid'], $channel['channel_pubkey']); - if ($newname) { - $channel['channel_address'] = $newname; - } + if ($newname) { + $channel['channel_address'] = $newname; + } - // Check for duplicate channels + // Check for duplicate channels - $r = q("select * from channel where (channel_guid = '%s' or channel_hash = '%s' or channel_address = '%s' ) limit 1", - dbesc($channel['channel_guid']), - dbesc($channel['channel_hash']), - dbesc($channel['channel_address']) - ); - if ($r && $r[0]['channel_guid'] == $channel['channel_guid'] && $r[0]['channel_pubkey'] === $channel['channel_pubkey'] && $r[0]['channel_hash'] === $channel['channel_hash']) { - // do not return a dead or deleted or system channel - if ($r[0]['channel_deleted'] > NULL_DATE - || intval($r[0]['channel_removed']) - || intval($r[0]['channel_moved']) - || intval($r[0]['channel_system'])) { - logger('attempt to import to a channel that was removed. ', print_r($channel,true)); - notice( t('A channel with these settings was discovered and is not usable as it was removed or reserved for system use. Import failed.') . EOL); - return false; - } - return $r[0]; - } + $r = q( + "select * from channel where (channel_guid = '%s' or channel_hash = '%s' or channel_address = '%s' ) limit 1", + dbesc($channel['channel_guid']), + dbesc($channel['channel_hash']), + dbesc($channel['channel_address']) + ); + if ($r && $r[0]['channel_guid'] == $channel['channel_guid'] && $r[0]['channel_pubkey'] === $channel['channel_pubkey'] && $r[0]['channel_hash'] === $channel['channel_hash']) { + // do not return a dead or deleted or system channel + if ( + $r[0]['channel_deleted'] > NULL_DATE + || intval($r[0]['channel_removed']) + || intval($r[0]['channel_moved']) + || intval($r[0]['channel_system']) + ) { + logger('attempt to import to a channel that was removed. ', print_r($channel, true)); + notice(t('A channel with these settings was discovered and is not usable as it was removed or reserved for system use. Import failed.') . EOL); + return false; + } + return $r[0]; + } - if (($r) || (check_webbie(array($channel['channel_address'])) !== $channel['channel_address'])) { - if ($r[0]['channel_guid'] === $channel['channel_guid'] || $r[0]['channel_hash'] === $channel['channel_hash']) { - logger('mod_import: duplicate channel. ', print_r($channel,true)); - notice( t('Cannot create a duplicate channel identifier on this system. Import failed.') . EOL); - return false; - } - else { - // try at most ten times to generate a unique address. - $x = 0; - $found_unique = false; - do { - $tmp = $channel['channel_address'] . mt_rand(1000,9999); - $r = q("select * from channel where channel_address = '%s' limit 1", - dbesc($tmp) - ); - if (! $r) { - $channel['channel_address'] = $tmp; - $found_unique = true; - break; - } - $x ++; - } while ($x < 10); - if (! $found_unique) { - logger('mod_import: duplicate channel. randomisation failed.', print_r($channel,true)); - notice( t('Unable to create a unique channel address. Import failed.') . EOL); - return false; - } - } - } + if (($r) || (check_webbie(array($channel['channel_address'])) !== $channel['channel_address'])) { + if ($r[0]['channel_guid'] === $channel['channel_guid'] || $r[0]['channel_hash'] === $channel['channel_hash']) { + logger('mod_import: duplicate channel. ', print_r($channel, true)); + notice(t('Cannot create a duplicate channel identifier on this system. Import failed.') . EOL); + return false; + } else { + // try at most ten times to generate a unique address. + $x = 0; + $found_unique = false; + do { + $tmp = $channel['channel_address'] . mt_rand(1000, 9999); + $r = q( + "select * from channel where channel_address = '%s' limit 1", + dbesc($tmp) + ); + if (! $r) { + $channel['channel_address'] = $tmp; + $found_unique = true; + break; + } + $x++; + } while ($x < 10); + if (! $found_unique) { + logger('mod_import: duplicate channel. randomisation failed.', print_r($channel, true)); + notice(t('Unable to create a unique channel address. Import failed.') . EOL); + return false; + } + } + } - unset($channel['channel_id']); - $channel['channel_account_id'] = $account_id; - $channel['channel_primary'] = (($seize) ? 1 : 0); + unset($channel['channel_id']); + $channel['channel_account_id'] = $account_id; + $channel['channel_primary'] = (($seize) ? 1 : 0); - if ($channel['channel_pageflags'] & PAGE_ALLOWCODE) { - if (! is_site_admin()) { - $channel['channel_pageflags'] = $channel['channel_pageflags'] ^ PAGE_ALLOWCODE; - } - } + if ($channel['channel_pageflags'] & PAGE_ALLOWCODE) { + if (! is_site_admin()) { + $channel['channel_pageflags'] = $channel['channel_pageflags'] ^ PAGE_ALLOWCODE; + } + } - // remove all the permissions related settings, we will import/upgrade them after the channel - // is created. + // remove all the permissions related settings, we will import/upgrade them after the channel + // is created. - $disallowed = [ - 'channel_id', 'channel_r_stream', 'channel_r_profile', 'channel_r_abook', - 'channel_r_storage', 'channel_r_pages', 'channel_w_stream', 'channel_w_wall', - 'channel_w_comment', 'channel_w_mail', 'channel_w_like', 'channel_w_tagwall', - 'channel_w_chat', 'channel_w_storage', 'channel_w_pages', 'channel_a_republish', - 'channel_a_delegate', 'perm_limits', 'channel_password', 'channel_salt', - 'channel_moved', 'channel_removed', 'channel_deleted', 'channel_system' - ]; + $disallowed = [ + 'channel_id', 'channel_r_stream', 'channel_r_profile', 'channel_r_abook', + 'channel_r_storage', 'channel_r_pages', 'channel_w_stream', 'channel_w_wall', + 'channel_w_comment', 'channel_w_mail', 'channel_w_like', 'channel_w_tagwall', + 'channel_w_chat', 'channel_w_storage', 'channel_w_pages', 'channel_a_republish', + 'channel_a_delegate', 'perm_limits', 'channel_password', 'channel_salt', + 'channel_moved', 'channel_removed', 'channel_deleted', 'channel_system' + ]; - $clean = []; - foreach ($channel as $k => $v) { - if (in_array($k,$disallowed)) { - continue; - } - $clean[$k] = $v; - } + $clean = []; + foreach ($channel as $k => $v) { + if (in_array($k, $disallowed)) { + continue; + } + $clean[$k] = $v; + } - if ($clean) { - channel_store_lowlevel($clean); - } + if ($clean) { + channel_store_lowlevel($clean); + } - $r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1", - intval($account_id), - dbesc($channel['channel_guid']) - ); - if (! $r) { - logger('mod_import: channel not found. ' . print_r($channel,true)); - notice( t('Cloned channel not found. Import failed.') . EOL); - return false; - } + $r = q( + "select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1", + intval($account_id), + dbesc($channel['channel_guid']) + ); + if (! $r) { + logger('mod_import: channel not found. ' . print_r($channel, true)); + notice(t('Cloned channel not found. Import failed.') . EOL); + return false; + } - // extract the permissions from the original imported array and use our new channel_id to set them - // These could be in the old channel permission stule or the new pconfig. We have a function to - // translate and store them no matter which they throw at us. + // extract the permissions from the original imported array and use our new channel_id to set them + // These could be in the old channel permission stule or the new pconfig. We have a function to + // translate and store them no matter which they throw at us. - $channel['channel_id'] = $r[0]['channel_id']; + $channel['channel_id'] = $r[0]['channel_id']; - // reset - $channel = $r[0]; + // reset + $channel = $r[0]; - set_default_login_identity($account_id,$channel['channel_id'],false); - logger('import step 1'); - $_SESSION['import_step'] = 1; + set_default_login_identity($account_id, $channel['channel_id'], false); + logger('import step 1'); + $_SESSION['import_step'] = 1; - return $channel; + return $channel; } /** @@ -159,168 +163,177 @@ function import_channel($channel, $account_id, $seize, $newname = '') { * @param array $channel * @param array $configs */ -function import_config($channel, $configs) { +function import_config($channel, $configs) +{ - if ($channel && $configs) { - foreach ($configs as $config) { - unset($config['id']); - $config['uid'] = $channel['channel_id']; - if ($config['cat'] === 'system' && $config['k'] === 'import_system_apps') { - continue; - } - set_pconfig($channel['channel_id'],$config['cat'],$config['k'],$config['v']); - } + if ($channel && $configs) { + foreach ($configs as $config) { + unset($config['id']); + $config['uid'] = $channel['channel_id']; + if ($config['cat'] === 'system' && $config['k'] === 'import_system_apps') { + continue; + } + set_pconfig($channel['channel_id'], $config['cat'], $config['k'], $config['v']); + } - load_pconfig($channel['channel_id']); - $permissions_role = get_pconfig($channel['channel_id'],'system','permissions_role'); - if ($permissions_role === 'social_federation') { - // Convert Hubzilla's social_federation role to 'social' with relaxed comment permissions - set_pconfig($channel['channel_id'],'systems','permissions_role','social'); - PermissionLimits::Set($channel['channel_id'],'post_comments', PERMS_AUTHED); - } - else { - // If the requested permissions_role doesn't exist on this system, - // convert it to 'social' - - $role_permissions = PermissionRoles::role_perms($permissions_role); + load_pconfig($channel['channel_id']); + $permissions_role = get_pconfig($channel['channel_id'], 'system', 'permissions_role'); + if ($permissions_role === 'social_federation') { + // Convert Hubzilla's social_federation role to 'social' with relaxed comment permissions + set_pconfig($channel['channel_id'], 'systems', 'permissions_role', 'social'); + PermissionLimits::Set($channel['channel_id'], 'post_comments', PERMS_AUTHED); + } else { + // If the requested permissions_role doesn't exist on this system, + // convert it to 'social' - if (! $role_permissions) { - set_pconfig($channel['channel_id'],'system','permissions_role','social'); - } - } + $role_permissions = PermissionRoles::role_perms($permissions_role); - } + if (! $role_permissions) { + set_pconfig($channel['channel_id'], 'system', 'permissions_role', 'social'); + } + } + } } -function import_atoken($channel, $atokens) { - if ($channel && $atokens) { - foreach ($atokens as $atoken) { - unset($atoken['atoken_id']); - $atoken['atoken_aid'] = $channel['channel_account_id']; - $atoken['atoken_uid'] = $channel['channel_id']; - create_table_from_array('atoken', $atoken); - } - } +function import_atoken($channel, $atokens) +{ + if ($channel && $atokens) { + foreach ($atokens as $atoken) { + unset($atoken['atoken_id']); + $atoken['atoken_aid'] = $channel['channel_account_id']; + $atoken['atoken_uid'] = $channel['channel_id']; + create_table_from_array('atoken', $atoken); + } + } } -function sync_atoken($channel, $atokens) { +function sync_atoken($channel, $atokens) +{ - if ($channel && $atokens) { - foreach ($atokens as $atoken) { - unset($atoken['atoken_id']); - $atoken['atoken_aid'] = $channel['channel_account_id']; - $atoken['atoken_uid'] = $channel['channel_id']; + if ($channel && $atokens) { + foreach ($atokens as $atoken) { + unset($atoken['atoken_id']); + $atoken['atoken_aid'] = $channel['channel_account_id']; + $atoken['atoken_uid'] = $channel['channel_id']; - if ($atoken['deleted']) { - q("delete from atoken where atoken_uid = %d and atoken_guid = '%s' ", - intval($atoken['atoken_uid']), - dbesc($atoken['atoken_guid']) - ); - continue; - } + if ($atoken['deleted']) { + q( + "delete from atoken where atoken_uid = %d and atoken_guid = '%s' ", + intval($atoken['atoken_uid']), + dbesc($atoken['atoken_guid']) + ); + continue; + } - $r = q("select * from atoken where atoken_uid = %d and atoken_guid = '%s' ", - intval($atoken['atoken_uid']), - dbesc($atoken['atoken_guid']) - ); - if (! $r) { - create_table_from_array('atoken', $atoken); - } - else { - $columns = db_columns('atoken'); - foreach ($atoken as $k => $v) { - if (! in_array($k,$columns)) { - continue; - } - - if (in_array($k, ['atoken_guid','atoken_uid','atoken_aid'])) { - continue; - } - - $r = q("UPDATE atoken SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE atoken_guid = '%s' AND atoken_uid = %d", - dbesc($k), - dbesc($v), - dbesc($atoken['atoken_guid']), - intval($channel['channel_id']) - ); - } - } - } - } + $r = q( + "select * from atoken where atoken_uid = %d and atoken_guid = '%s' ", + intval($atoken['atoken_uid']), + dbesc($atoken['atoken_guid']) + ); + if (! $r) { + create_table_from_array('atoken', $atoken); + } else { + $columns = db_columns('atoken'); + foreach ($atoken as $k => $v) { + if (! in_array($k, $columns)) { + continue; + } + + if (in_array($k, ['atoken_guid','atoken_uid','atoken_aid'])) { + continue; + } + + $r = q( + "UPDATE atoken SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE atoken_guid = '%s' AND atoken_uid = %d", + dbesc($k), + dbesc($v), + dbesc($atoken['atoken_guid']), + intval($channel['channel_id']) + ); + } + } + } + } } -function import_xign($channel, $xigns) { +function import_xign($channel, $xigns) +{ - if ($channel && $xigns) { - foreach ($xigns as $xign) { - unset($xign['id']); - $xign['uid'] = $channel['channel_id']; - create_table_from_array('xign', $xign); - } - } + if ($channel && $xigns) { + foreach ($xigns as $xign) { + unset($xign['id']); + $xign['uid'] = $channel['channel_id']; + create_table_from_array('xign', $xign); + } + } } -function sync_xign($channel, $xigns) { +function sync_xign($channel, $xigns) +{ - if ($channel && $xigns) { - foreach ($xigns as $xign) { - unset($xign['id']); - $xign['uid'] = $channel['channel_id']; - if (! $xign['xchan']) { - continue; - } - if ($xign['deleted']) { - q("delete from xign where uid = %d and xchan = '%s' ", - intval($xign['uid']), - dbesc($xign['xchan']) - ); - continue; - } + if ($channel && $xigns) { + foreach ($xigns as $xign) { + unset($xign['id']); + $xign['uid'] = $channel['channel_id']; + if (! $xign['xchan']) { + continue; + } + if ($xign['deleted']) { + q( + "delete from xign where uid = %d and xchan = '%s' ", + intval($xign['uid']), + dbesc($xign['xchan']) + ); + continue; + } - $r = q("select * from xign where uid = %d and xchan = '%s' ", - intval($xign['uid']), - dbesc($xign['xchan']) - ); - if (! $r) { - create_table_from_array('xign', $xign); - } - } - } + $r = q( + "select * from xign where uid = %d and xchan = '%s' ", + intval($xign['uid']), + dbesc($xign['xchan']) + ); + if (! $r) { + create_table_from_array('xign', $xign); + } + } + } } -function import_block($channel, $blocks) { +function import_block($channel, $blocks) +{ - if ($channel && $blocks) { - foreach ($blocks as $block) { - unset($block['block_id']); - $block['block_channel_id'] = $channel['channel_id']; - LibBlock::store($block); - } - } + if ($channel && $blocks) { + foreach ($blocks as $block) { + unset($block['block_id']); + $block['block_channel_id'] = $channel['channel_id']; + LibBlock::store($block); + } + } } -function sync_block($channel, $blocks) { +function sync_block($channel, $blocks) +{ - if ($channel && $blocks) { - foreach ($blocks as $block) { - unset($block['block_id']); - $block['block_channel_id'] = $channel['channel_id']; - if (! $block['block_entity']) { - continue; - } - if ($block['deleted']) { - LibBlock::remove($channel['channel_id'],$block['block_entity']); - continue; - } - LibBlock::store($channel['channel_id'],$block); - } - } + if ($channel && $blocks) { + foreach ($blocks as $block) { + unset($block['block_id']); + $block['block_channel_id'] = $channel['channel_id']; + if (! $block['block_entity']) { + continue; + } + if ($block['deleted']) { + LibBlock::remove($channel['channel_id'], $block['block_entity']); + continue; + } + LibBlock::store($channel['channel_id'], $block); + } + } } @@ -332,34 +345,34 @@ function sync_block($channel, $blocks) { * @param array $channel * @param array $profiles */ -function import_profiles($channel, $profiles) { +function import_profiles($channel, $profiles) +{ - if ($channel && $profiles) { - foreach ($profiles as $profile) { - unset($profile['id']); - $profile['aid'] = get_account_id(); - $profile['uid'] = $channel['channel_id']; + if ($channel && $profiles) { + foreach ($profiles as $profile) { + unset($profile['id']); + $profile['aid'] = get_account_id(); + $profile['uid'] = $channel['channel_id']; - convert_oldfields($profile,'name','fullname'); - convert_oldfields($profile,'with','partner'); - convert_oldfields($profile,'work','employment'); + convert_oldfields($profile, 'name', 'fullname'); + convert_oldfields($profile, 'with', 'partner'); + convert_oldfields($profile, 'work', 'employment'); - /** - * @TODO put all the applicable photos into the export. - */ + /** + * @TODO put all the applicable photos into the export. + */ - if ((strpos($profile['thumb'],'/photo/profile/l/') !== false) || intval($profile['is_default'])) { - $profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id']; - $profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id']; - } - else { - $profile['photo'] = z_root() . '/photo/' . basename($profile['photo']); - $profile['thumb'] = z_root() . '/photo/' . basename($profile['thumb']); - } + if ((strpos($profile['thumb'], '/photo/profile/l/') !== false) || intval($profile['is_default'])) { + $profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id']; + $profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id']; + } else { + $profile['photo'] = z_root() . '/photo/' . basename($profile['photo']); + $profile['thumb'] = z_root() . '/photo/' . basename($profile['thumb']); + } - profile_store_lowlevel($profile); - } - } + profile_store_lowlevel($profile); + } + } } /** @@ -367,70 +380,71 @@ function import_profiles($channel, $profiles) { * * @param array $channel * @param array $hublocs - * @param boolean $seize - * @param boolean $moving (optional) default false + * @param bool $seize + * @param bool $moving (optional) default false */ - -function import_hublocs($channel, $hublocs, $seize, $moving = false) { - if ($channel && $hublocs) { - foreach ($hublocs as $hubloc) { +function import_hublocs($channel, $hublocs, $seize, $moving = false) +{ - // Provide backward compatibility for zot11 based projects - - if ($hubloc['hubloc_network'] === 'nomad' && version_compare(ZOT_REVISION, '10.0') <= 0) { - $hubloc['hubloc_network'] = 'zot6'; - } + if ($channel && $hublocs) { + foreach ($hublocs as $hubloc) { + // Provide backward compatibility for zot11 based projects - // verify the hash. We can only do this if we already stored the xchan corresponding to this hubloc - // as we need the public key from there + if ($hubloc['hubloc_network'] === 'nomad' && version_compare(ZOT_REVISION, '10.0') <= 0) { + $hubloc['hubloc_network'] = 'zot6'; + } - if (in_array($hubloc['hubloc_network'],['nomad','zot6'])) { - $x = q("select xchan_pubkey from xchan where xchan_guid = '%s' and xchan_hash = '%s'", - dbesc($hubloc['hubloc_guid']), - dbesc($hubloc['hubloc_hash']) - ); + // verify the hash. We can only do this if we already stored the xchan corresponding to this hubloc + // as we need the public key from there - if (! $x) { - logger('hubloc could not be verified. ' . print_r($hubloc,true)); - continue; - } - $hash = Libzot::make_xchan_hash($hubloc['hubloc_guid'],$x[0]['xchan_pubkey']); - if ($hash !== $hubloc['hubloc_hash']) { - logger('forged hubloc: ' . print_r($hubloc,true)); - continue; - } - } + if (in_array($hubloc['hubloc_network'], ['nomad','zot6'])) { + $x = q( + "select xchan_pubkey from xchan where xchan_guid = '%s' and xchan_hash = '%s'", + dbesc($hubloc['hubloc_guid']), + dbesc($hubloc['hubloc_hash']) + ); - if ($moving && $hubloc['hubloc_hash'] === $channel['channel_hash'] && $hubloc['hubloc_url'] !== z_root()) { - $hubloc['hubloc_deleted'] = 1; - } + if (! $x) { + logger('hubloc could not be verified. ' . print_r($hubloc, true)); + continue; + } + $hash = Libzot::make_xchan_hash($hubloc['hubloc_guid'], $x[0]['xchan_pubkey']); + if ($hash !== $hubloc['hubloc_hash']) { + logger('forged hubloc: ' . print_r($hubloc, true)); + continue; + } + } - $arr = [ - 'id' => $hubloc['hubloc_guid'], - 'id_sig' => $hubloc['hubloc_guid_sig'], - 'location' => $hubloc['hubloc_url'], - 'location_sig' => $hubloc['hubloc_url_sig'], - 'site_id' => $hubloc['hubloc_site_id'] - ]; + if ($moving && $hubloc['hubloc_hash'] === $channel['channel_hash'] && $hubloc['hubloc_url'] !== z_root()) { + $hubloc['hubloc_deleted'] = 1; + } - if (($hubloc['hubloc_hash'] === $channel['channel_hash']) && intval($hubloc['hubloc_primary']) && ($seize)) { - $hubloc['hubloc_primary'] = 0; - } + $arr = [ + 'id' => $hubloc['hubloc_guid'], + 'id_sig' => $hubloc['hubloc_guid_sig'], + 'location' => $hubloc['hubloc_url'], + 'location_sig' => $hubloc['hubloc_url_sig'], + 'site_id' => $hubloc['hubloc_site_id'] + ]; - if (($x = Libzot::gethub($arr,false)) === false) { - unset($hubloc['hubloc_id']); - hubloc_store_lowlevel($hubloc); - } - else { - q("UPDATE hubloc set hubloc_primary = %d, hubloc_deleted = %d where hubloc_id = %d", - intval($hubloc['hubloc_primary']), - intval($hubloc['hubloc_deleted']), - intval($x['hubloc_id']) - ); - } - } - } + if (($hubloc['hubloc_hash'] === $channel['channel_hash']) && intval($hubloc['hubloc_primary']) && ($seize)) { + $hubloc['hubloc_primary'] = 0; + } + + if (($x = Libzot::gethub($arr, false)) === false) { + unset($hubloc['hubloc_id']); + hubloc_store_lowlevel($hubloc); + } else { + q( + "UPDATE hubloc set hubloc_primary = %d, hubloc_deleted = %d where hubloc_id = %d", + intval($hubloc['hubloc_primary']), + intval($hubloc['hubloc_deleted']), + intval($x['hubloc_id']) + ); + } + } + } } /** @@ -439,31 +453,31 @@ function import_hublocs($channel, $hublocs, $seize, $moving = false) { * @param array $channel * @param array $objs */ -function import_objs($channel, $objs) { +function import_objs($channel, $objs) +{ - if ($channel && $objs) { - foreach ($objs as $obj) { + if ($channel && $objs) { + foreach ($objs as $obj) { + $baseurl = $obj['obj_baseurl']; + unset($obj['obj_id']); + unset($obj['obj_baseurl']); - $baseurl = $obj['obj_baseurl']; - unset($obj['obj_id']); - unset($obj['obj_baseurl']); + $obj['obj_channel'] = $channel['channel_id']; - $obj['obj_channel'] = $channel['channel_id']; + if ($baseurl && (strpos($obj['obj_url'], $baseurl . '/thing/') !== false)) { + $obj['obj_url'] = str_replace($baseurl, z_root(), $obj['obj_url']); + } - if ($baseurl && (strpos($obj['obj_url'], $baseurl . '/thing/') !== false)) { - $obj['obj_url'] = str_replace($baseurl, z_root(), $obj['obj_url']); - } + if ($obj['obj_imgurl']) { + $x = import_remote_xchan_photo($obj['obj_imgurl'], $channel['channel_hash'], true); + if ($x) { + $obj['obj_imgurl'] = $x[0]; + } + } - if ($obj['obj_imgurl']) { - $x = import_remote_xchan_photo($obj['obj_imgurl'], $channel['channel_hash'], true); - if ($x) { - $obj['obj_imgurl'] = $x[0]; - } - } - - create_table_from_array('obj', $obj); - } - } + create_table_from_array('obj', $obj); + } + } } /** @@ -472,76 +486,78 @@ function import_objs($channel, $objs) { * @param array $channel * @param array $objs */ -function sync_objs($channel, $objs) { +function sync_objs($channel, $objs) +{ - if ($channel && $objs) { - $columns = db_columns('obj'); + if ($channel && $objs) { + $columns = db_columns('obj'); - foreach ($objs as $obj) { + foreach ($objs as $obj) { + if (array_key_exists('obj_deleted', $obj) && $obj['obj_deleted'] && $obj['obj_obj']) { + q( + "delete from obj where obj_obj = '%s' and obj_channel = %d", + dbesc($obj['obj_obj']), + intval($channel['channel_id']) + ); + continue; + } - if (array_key_exists('obj_deleted',$obj) && $obj['obj_deleted'] && $obj['obj_obj']) { - q("delete from obj where obj_obj = '%s' and obj_channel = %d", - dbesc($obj['obj_obj']), - intval($channel['channel_id']) - ); - continue; - } + $baseurl = $obj['obj_baseurl']; + unset($obj['obj_id']); + unset($obj['obj_baseurl']); - $baseurl = $obj['obj_baseurl']; - unset($obj['obj_id']); - unset($obj['obj_baseurl']); + $obj['obj_channel'] = $channel['channel_id']; - $obj['obj_channel'] = $channel['channel_id']; + if ($baseurl && (strpos($obj['obj_url'], $baseurl . '/thing/') !== false)) { + $obj['obj_url'] = str_replace($baseurl, z_root(), $obj['obj_url']); + } - if ($baseurl && (strpos($obj['obj_url'], $baseurl . '/thing/') !== false)) { - $obj['obj_url'] = str_replace($baseurl, z_root(), $obj['obj_url']); - } + $exists = false; - $exists = false; + $x = q( + "select * from obj where obj_obj = '%s' and obj_channel = %d limit 1", + dbesc($obj['obj_obj']), + intval($channel['channel_id']) + ); + if ($x) { + if ($x[0]['obj_edited'] >= $obj['obj_edited']) { + continue; + } - $x = q("select * from obj where obj_obj = '%s' and obj_channel = %d limit 1", - dbesc($obj['obj_obj']), - intval($channel['channel_id']) - ); - if ($x) { - if ($x[0]['obj_edited'] >= $obj['obj_edited']) { - continue; - } + $exists = true; + } - $exists = true; - } + if ($obj['obj_imgurl']) { + // import_xchan_photo() has a switch to store thing images + $x = import_remote_xchan_photo($obj['obj_imgurl'], $channel['channel_hash'], true); + if ($x) { + $obj['obj_imgurl'] = $x[0]; + } + } - if ($obj['obj_imgurl']) { - // import_xchan_photo() has a switch to store thing images - $x = import_remote_xchan_photo($obj['obj_imgurl'], $channel['channel_hash'], true); - if ($x) { - $obj['obj_imgurl'] = $x[0]; - } - } + $hash = $obj['obj_obj']; - $hash = $obj['obj_obj']; + if ($exists) { + unset($obj['obj_obj']); - if ($exists) { - unset($obj['obj_obj']); + foreach ($obj as $k => $v) { + if (! in_array($k, $columns)) { + continue; + } - foreach ($obj as $k => $v) { - if (! in_array($k,$columns)) { - continue; - } - - $r = q("UPDATE obj SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE obj_obj = '%s' AND obj_channel = %d", - dbesc($k), - dbesc($v), - dbesc($hash), - intval($channel['channel_id']) - ); - } - } - else { - create_table_from_array('obj', $obj); - } - } - } + $r = q( + "UPDATE obj SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE obj_obj = '%s' AND obj_channel = %d", + dbesc($k), + dbesc($v), + dbesc($hash), + intval($channel['channel_id']) + ); + } + } else { + create_table_from_array('obj', $obj); + } + } + } } /** @@ -550,52 +566,53 @@ function sync_objs($channel, $objs) { * @param array $channel * @param array $apps */ -function import_apps($channel, $apps) { +function import_apps($channel, $apps) +{ - if ($channel && $apps) { - foreach ($apps as $app) { + if ($channel && $apps) { + foreach ($apps as $app) { + if (array_key_exists('app_system', $app) && intval($app['app_system'])) { + continue; + } - if (array_key_exists('app_system',$app) && intval($app['app_system'])) { - continue; - } + $term = ((array_key_exists('term', $app) && is_array($app['term'])) ? $app['term'] : null); - $term = ((array_key_exists('term',$app) && is_array($app['term'])) ? $app['term'] : null); + unset($app['id']); + unset($app['app_channel']); + unset($app['term']); - unset($app['id']); - unset($app['app_channel']); - unset($app['term']); + $app['app_channel'] = $channel['channel_id']; - $app['app_channel'] = $channel['channel_id']; + if ($app['app_photo']) { + // overload import_xchan_photo() + $x = import_remote_xchan_photo($app['app_photo'], $channel['channel_hash'], true); + if ($x) { + $app['app_photo'] = $x[0]; + } + } - if ($app['app_photo']) { - // overload import_xchan_photo() - $x = import_remote_xchan_photo($app['app_photo'], $channel['channel_hash'], true); - if ($x) { - $app['app_photo'] = $x[0]; - } - } + $hash = $app['app_id']; - $hash = $app['app_id']; + create_table_from_array('app', $app); - create_table_from_array('app', $app); + if ($term) { + $x = q( + "select * from app where app_id = '%s' and app_channel = %d limit 1", + dbesc($hash), + intval($channel['channel_id']) + ); + if ($x) { + foreach ($term as $t) { + if (array_key_exists('type', $t)) { + $t['ttype'] = $t['type']; + } - if ($term) { - $x = q("select * from app where app_id = '%s' and app_channel = %d limit 1", - dbesc($hash), - intval($channel['channel_id']) - ); - if ($x) { - foreach ($term as $t) { - if (array_key_exists('type',$t)) { - $t['ttype'] = $t['type']; - } - - store_item_tag($channel['channel_id'],$x[0]['id'],TERM_OBJ_APP,$t['ttype'],escape_tags($t['term']),escape_tags($t['url'])); - } - } - } - } - } + store_item_tag($channel['channel_id'], $x[0]['id'], TERM_OBJ_APP, $t['ttype'], escape_tags($t['term']), escape_tags($t['url'])); + } + } + } + } + } } /** @@ -604,180 +621,183 @@ function import_apps($channel, $apps) { * @param array $channel * @param array $apps */ -function sync_apps($channel, $apps) { +function sync_apps($channel, $apps) +{ - if ($channel && $apps) { + if ($channel && $apps) { + $columns = db_columns('app'); - $columns = db_columns('app'); + foreach ($apps as $app) { + $exists = false; + $term = ((array_key_exists('term', $app)) ? $app['term'] : null); - foreach ($apps as $app) { + if (array_key_exists('app_system', $app) && intval($app['app_system'])) { + continue; + } - $exists = false; - $term = ((array_key_exists('term',$app)) ? $app['term'] : null); + $x = q( + "select * from app where app_id = '%s' and app_channel = %d limit 1", + dbesc($app['app_id']), + intval($channel['channel_id']) + ); + if ($x) { + $exists = $x[0]; + } - if (array_key_exists('app_system',$app) && intval($app['app_system'])) { - continue; - } + if (array_key_exists('app_deleted', $app) && $app['app_deleted'] && $app['app_id']) { + q( + "delete from app where app_id = '%s' and app_channel = %d", + dbesc($app['app_id']), + intval($channel['channel_id']) + ); + if ($exists) { + q( + "delete from term where otype = %d and oid = %d", + intval(TERM_OBJ_APP), + intval($exists['id']) + ); + } + continue; + } - $x = q("select * from app where app_id = '%s' and app_channel = %d limit 1", - dbesc($app['app_id']), - intval($channel['channel_id']) - ); - if ($x) { - $exists = $x[0]; - } + unset($app['id']); + unset($app['app_channel']); + unset($app['term']); - if (array_key_exists('app_deleted',$app) && $app['app_deleted'] && $app['app_id']) { - q("delete from app where app_id = '%s' and app_channel = %d", - dbesc($app['app_id']), - intval($channel['channel_id']) - ); - if ($exists) { - q("delete from term where otype = %d and oid = %d", - intval(TERM_OBJ_APP), - intval($exists['id']) - ); - } - continue; - } + if ($exists) { + q( + "delete from term where otype = %d and oid = %d", + intval(TERM_OBJ_APP), + intval($exists['id']) + ); + } - unset($app['id']); - unset($app['app_channel']); - unset($app['term']); + if ((! $app['app_created']) || ($app['app_created'] <= NULL_DATE)) { + $app['app_created'] = datetime_convert(); + } + if ((! $app['app_edited']) || ($app['app_edited'] <= NULL_DATE)) { + $app['app_edited'] = datetime_convert(); + } - if ($exists) { - q("delete from term where otype = %d and oid = %d", - intval(TERM_OBJ_APP), - intval($exists['id']) - ); - } + $app['app_channel'] = $channel['channel_id']; - if ((! $app['app_created']) || ($app['app_created'] <= NULL_DATE)) { - $app['app_created'] = datetime_convert(); - } - if ((! $app['app_edited']) || ($app['app_edited'] <= NULL_DATE)) { - $app['app_edited'] = datetime_convert(); - } + if ($app['app_photo']) { + // use import_xchan_photo() + $x = import_remote_xchan_photo($app['app_photo'], $channel['channel_hash'], true); + if ($x) { + $app['app_photo'] = $x[0]; + } + } - $app['app_channel'] = $channel['channel_id']; + if ($exists && $term) { + foreach ($term as $t) { + if (array_key_exists('type', $t)) { + $t['ttype'] = $t['type']; + } + store_item_tag($channel['channel_id'], $exists['id'], TERM_OBJ_APP, $t['ttype'], escape_tags($t['term']), escape_tags($t['url'])); + } + } - if ($app['app_photo']) { - // use import_xchan_photo() - $x = import_remote_xchan_photo($app['app_photo'],$channel['channel_hash'],true); - if ($x) { - $app['app_photo'] = $x[0]; - } - } + if ($exists) { + if ($exists['app_edited'] >= $app['app_edited']) { + continue; + } + } + $hash = $app['app_id']; - if ($exists && $term) { - foreach ($term as $t) { - if (array_key_exists('type',$t)) { - $t['ttype'] = $t['type']; - } - store_item_tag($channel['channel_id'],$exists['id'],TERM_OBJ_APP,$t['ttype'],escape_tags($t['term']),escape_tags($t['url'])); - } - } + if ($exists) { + unset($app['app_id']); + foreach ($app as $k => $v) { + if (! in_array($k, $columns)) { + continue; + } - if ($exists) { - if ($exists['app_edited'] >= $app['app_edited']) { - continue; - } - } - $hash = $app['app_id']; + $r = q( + "UPDATE app SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE app_id = '%s' AND app_channel = %d", + dbesc($k), + dbesc($v), + dbesc($hash), + intval($channel['channel_id']) + ); + } + } else { + create_table_from_array('app', $app); - if ($exists) { - unset($app['app_id']); - foreach ($app as $k => $v) { - - if (! in_array($k,$columns)) { - continue; - } - - $r = q("UPDATE app SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE app_id = '%s' AND app_channel = %d", - dbesc($k), - dbesc($v), - dbesc($hash), - intval($channel['channel_id']) - ); - } - } - else { - create_table_from_array('app',$app); - - if ($term) { - $x = q("select * from app where app_id = '%s' and app_channel = %d", - dbesc($hash), - intval($channel['channel_id']) - ); - if ($x) { - foreach ($term as $t) { - if (array_key_exists('type',$t)) { - $t['ttype'] = $t['type']; - } - store_item_tag($channel['channel_id'],$x[0]['id'],TERM_OBJ_APP,$t['ttype'],escape_tags($t['term']),escape_tags($t['url'])); - } - } - } - } - } - } + if ($term) { + $x = q( + "select * from app where app_id = '%s' and app_channel = %d", + dbesc($hash), + intval($channel['channel_id']) + ); + if ($x) { + foreach ($term as $t) { + if (array_key_exists('type', $t)) { + $t['ttype'] = $t['type']; + } + store_item_tag($channel['channel_id'], $x[0]['id'], TERM_OBJ_APP, $t['ttype'], escape_tags($t['term']), escape_tags($t['url'])); + } + } + } + } + } + } } /** * @brief Import system apps. - * System apps from the original server may not exist on this system + * System apps from the original server may not exist on this system * (e.g. apps associated with addons that are not installed here). * Check the system apps that were provided in the import file to see if they * exist here and if so, install them locally. Preserve categories that * might have been added by this channel on the other server. - * Do not use any paths from the original as they will point to a different server. + * Do not use any paths from the original as they will point to a different server. * @param array $channel * @param array $apps */ -function import_sysapps($channel, $apps) { +function import_sysapps($channel, $apps) +{ - if ($channel && $apps) { + if ($channel && $apps) { + $sysapps = Apps::get_system_apps(false); - $sysapps = Apps::get_system_apps(false); + foreach ($apps as $app) { + if (array_key_exists('app_system', $app) && (! intval($app['app_system']))) { + continue; + } - foreach ($apps as $app) { + if (array_key_exists('app_deleted', $app) && (intval($app['app_deleted']))) { + continue; + } - if (array_key_exists('app_system',$app) && (! intval($app['app_system']))) { - continue; - } + $term = ((array_key_exists('term', $app) && is_array($app['term'])) ? $app['term'] : null); - if (array_key_exists('app_deleted',$app) && (intval($app['app_deleted']))) { - continue; - } + foreach ($sysapps as $sysapp) { + if ($app['app_id'] === hash('whirlpool', $sysapp['app_name'])) { + // install this app on this server + $newapp = $sysapp; + $newapp['uid'] = $channel['channel_id']; + $newapp['guid'] = hash('whirlpool', $newapp['name']); - $term = ((array_key_exists('term',$app) && is_array($app['term'])) ? $app['term'] : null); + $installed = q( + "select id from app where app_id = '%s' and app_channel = %d limit 1", + dbesc($newapp['guid']), + intval($channel['channel_id']) + ); + if ($installed) { + break; + } - foreach ($sysapps as $sysapp) { - if ($app['app_id'] === hash('whirlpool',$sysapp['app_name'])) { - // install this app on this server - $newapp = $sysapp; - $newapp['uid'] = $channel['channel_id']; - $newapp['guid'] = hash('whirlpool',$newapp['name']); - - $installed = q("select id from app where app_id = '%s' and app_channel = %d limit 1", - dbesc($newapp['guid']), - intval($channel['channel_id']) - ); - if ($installed) { - break; - } - - $newapp['system'] = 1; - if ($term) { - $newapp['categories'] = array_elm_to_str($term,'term'); - } - Apps::app_install($channel['channel_id'],$newapp); - } - } - } - } + $newapp['system'] = 1; + if ($term) { + $newapp['categories'] = array_elm_to_str($term, 'term'); + } + Apps::app_install($channel['channel_id'], $newapp); + } + } + } + } } /** @@ -786,47 +806,46 @@ function import_sysapps($channel, $apps) { * @param array $channel * @param array $apps */ -function sync_sysapps($channel, $apps) { +function sync_sysapps($channel, $apps) +{ - $sysapps = Apps::get_system_apps(false); + $sysapps = Apps::get_system_apps(false); - if ($channel && $apps) { + if ($channel && $apps) { + $columns = db_columns('app'); - $columns = db_columns('app'); + foreach ($apps as $app) { + $exists = false; + $term = ((array_key_exists('term', $app)) ? $app['term'] : null); - foreach ($apps as $app) { + if (array_key_exists('app_system', $app) && (! intval($app['app_system']))) { + continue; + } - $exists = false; - $term = ((array_key_exists('term',$app)) ? $app['term'] : null); + foreach ($sysapps as $sysapp) { + if ($app['app_id'] === hash('whirlpool', $sysapp['app_name'])) { + if (array_key_exists('app_deleted', $app) && $app['app_deleted'] && $app['app_id']) { + q( + "update app set app_deleted = 1 where app_id = '%s' and app_channel = %d", + dbesc($app['app_id']), + intval($channel['channel_id']) + ); + } else { + // install this app on this server + $newapp = $sysapp; + $newapp['uid'] = $channel['channel_id']; + $newapp['guid'] = hash('whirlpool', $newapp['name']); - if (array_key_exists('app_system',$app) && (! intval($app['app_system']))) { - continue; - } - - foreach ($sysapps as $sysapp) { - if ($app['app_id'] === hash('whirlpool',$sysapp['app_name'])) { - if (array_key_exists('app_deleted',$app) && $app['app_deleted'] && $app['app_id']) { - q("update app set app_deleted = 1 where app_id = '%s' and app_channel = %d", - dbesc($app['app_id']), - intval($channel['channel_id']) - ); - } - else { - // install this app on this server - $newapp = $sysapp; - $newapp['uid'] = $channel['channel_id']; - $newapp['guid'] = hash('whirlpool',$newapp['name']); - - $newapp['system'] = 1; - if ($term) { - $newapp['categories'] = array_elm_to_str($term,'term'); - } - Apps::app_install($channel['channel_id'],$newapp); - } - } - } - } - } + $newapp['system'] = 1; + if ($term) { + $newapp['categories'] = array_elm_to_str($term, 'term'); + } + Apps::app_install($channel['channel_id'], $newapp); + } + } + } + } + } } @@ -839,25 +858,25 @@ function sync_sysapps($channel, $apps) { * @param array $channel * @param array $chatrooms */ -function import_chatrooms($channel, $chatrooms) { +function import_chatrooms($channel, $chatrooms) +{ - if ($channel && $chatrooms) { - foreach ($chatrooms as $chatroom) { + if ($channel && $chatrooms) { + foreach ($chatrooms as $chatroom) { + if (! $chatroom['cr_name']) { + continue; + } - if (! $chatroom['cr_name']) { - continue; - } + unset($chatroom['cr_id']); + unset($chatroom['cr_aid']); + unset($chatroom['cr_uid']); - unset($chatroom['cr_id']); - unset($chatroom['cr_aid']); - unset($chatroom['cr_uid']); + $chatroom['cr_aid'] = $channel['channel_account_id']; + $chatroom['cr_uid'] = $channel['channel_id']; - $chatroom['cr_aid'] = $channel['channel_account_id']; - $chatroom['cr_uid'] = $channel['channel_id']; - - create_table_from_array('chatroom', $chatroom); - } - } + create_table_from_array('chatroom', $chatroom); + } + } } /** @@ -866,74 +885,74 @@ function import_chatrooms($channel, $chatrooms) { * @param array $channel * @param array $chatrooms */ -function sync_chatrooms($channel, $chatrooms) { +function sync_chatrooms($channel, $chatrooms) +{ - if ($channel && $chatrooms) { + if ($channel && $chatrooms) { + $columns = db_columns('chatroom'); - $columns = db_columns('chatroom'); + foreach ($chatrooms as $chatroom) { + if (! $chatroom['cr_name']) { + continue; + } - foreach ($chatrooms as $chatroom) { + if (array_key_exists('cr_deleted', $chatroom) && $chatroom['cr_deleted']) { + q( + "delete from chatroom where cr_name = '%s' and cr_uid = %d", + dbesc($chatroom['cr_name']), + intval($channel['channel_id']) + ); + continue; + } - if (! $chatroom['cr_name']) { - continue; - } + unset($chatroom['cr_id']); + unset($chatroom['cr_aid']); + unset($chatroom['cr_uid']); - if (array_key_exists('cr_deleted',$chatroom) && $chatroom['cr_deleted']) { - q("delete from chatroom where cr_name = '%s' and cr_uid = %d", - dbesc($chatroom['cr_name']), - intval($channel['channel_id']) - ); - continue; - } + if ((! $chatroom['cr_created']) || ($chatroom['cr_created'] <= NULL_DATE)) { + $chatroom['cr_created'] = datetime_convert(); + } + if ((! $chatroom['cr_edited']) || ($chatroom['cr_edited'] <= NULL_DATE)) { + $chatroom['cr_edited'] = datetime_convert(); + } - unset($chatroom['cr_id']); - unset($chatroom['cr_aid']); - unset($chatroom['cr_uid']); + $chatroom['cr_aid'] = $channel['channel_account_id']; + $chatroom['cr_uid'] = $channel['channel_id']; - if ((! $chatroom['cr_created']) || ($chatroom['cr_created'] <= NULL_DATE)) { - $chatroom['cr_created'] = datetime_convert(); - } - if ((! $chatroom['cr_edited']) || ($chatroom['cr_edited'] <= NULL_DATE)) { - $chatroom['cr_edited'] = datetime_convert(); - } + $exists = false; - $chatroom['cr_aid'] = $channel['channel_account_id']; - $chatroom['cr_uid'] = $channel['channel_id']; + $x = q( + "select * from chatroom where cr_name = '%s' and cr_uid = %d limit 1", + dbesc($chatroom['cr_name']), + intval($channel['channel_id']) + ); + if ($x) { + if ($x[0]['cr_edited'] >= $chatroom['cr_edited']) { + continue; + } + $exists = true; + } + $name = $chatroom['cr_name']; - $exists = false; + if ($exists) { + foreach ($chatroom as $k => $v) { + if (! in_array($k, $columns)) { + continue; + } - $x = q("select * from chatroom where cr_name = '%s' and cr_uid = %d limit 1", - dbesc($chatroom['cr_name']), - intval($channel['channel_id']) - ); - if ($x) { - if ($x[0]['cr_edited'] >= $chatroom['cr_edited']) { - continue; - } - $exists = true; - } - $name = $chatroom['cr_name']; - - if ($exists) { - foreach ($chatroom as $k => $v) { - - if (! in_array($k,$columns)) { - continue; - } - - $r = q("UPDATE chatroom SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE cr_name = '%s' AND cr_uid = %d", - dbesc($k), - dbesc($v), - dbesc($name), - intval($channel['channel_id']) - ); - } - } - else { - create_table_from_array('chatroom', $chatroom); - } - } - } + $r = q( + "UPDATE chatroom SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE cr_name = '%s' AND cr_uid = %d", + dbesc($k), + dbesc($v), + dbesc($name), + intval($channel['channel_id']) + ); + } + } else { + create_table_from_array('chatroom', $chatroom); + } + } + } } @@ -942,67 +961,69 @@ function sync_chatrooms($channel, $chatrooms) { * * @param array $channel where to import to * @param array $items - * @param boolean $sync default false + * @param bool $sync default false * @param array $relocate default null */ -function import_items($channel, $items, $sync = false, $relocate = null) { +function import_items($channel, $items, $sync = false, $relocate = null) +{ - if ($channel && $items) { + if ($channel && $items) { + $allow_code = channel_codeallowed($channel['channel_id']); - $allow_code = channel_codeallowed($channel['channel_id']); + $deliver = false; // Don't deliver any messages or notifications when importing - $deliver = false; // Don't deliver any messages or notifications when importing + foreach ($items as $i) { + $item_result = false; + $item = get_item_elements($i, $allow_code); - foreach ($items as $i) { - $item_result = false; - $item = get_item_elements($i,$allow_code); + if (! $item) { + continue; + } - if (! $item) - continue; + if ($relocate && $item['mid'] === $item['parent_mid']) { + item_url_replace($channel, $item, $relocate['url'], z_root(), $relocate['channel_address']); + } - if ($relocate && $item['mid'] === $item['parent_mid']) { - item_url_replace($channel,$item,$relocate['url'],z_root(),$relocate['channel_address']); - } + $r = q( + "select id, edited from item where mid = '%s' and uid = %d limit 1", + dbesc($item['mid']), + intval($channel['channel_id']) + ); + if ($r) { + // flags may have changed and we are probably relocating the post, + // so force an update even if we have the same timestamp - $r = q("select id, edited from item where mid = '%s' and uid = %d limit 1", - dbesc($item['mid']), - intval($channel['channel_id']) - ); - if ($r) { + if ($item['edited'] >= $r[0]['edited']) { + $item['id'] = $r[0]['id']; + $item['uid'] = $channel['channel_id']; + $item_result = item_store_update($item, $allow_code, $deliver, false); + } + } else { + $item['aid'] = $channel['channel_account_id']; + $item['uid'] = $channel['channel_id']; + $item_result = item_store($item, $allow_code, $deliver, false); + } - // flags may have changed and we are probably relocating the post, - // so force an update even if we have the same timestamp + // preserve conversations you've been involved in from being expired - if ($item['edited'] >= $r[0]['edited']) { - $item['id'] = $r[0]['id']; - $item['uid'] = $channel['channel_id']; - $item_result = item_store_update($item,$allow_code,$deliver,false); - } - } - else { - $item['aid'] = $channel['channel_account_id']; - $item['uid'] = $channel['channel_id']; - $item_result = item_store($item,$allow_code,$deliver,false); - } + $stored = $item_result['item']; + if ( + (is_array($stored)) && ($stored['id'] != $stored['parent']) + && ($stored['author_xchan'] === $channel['channel_hash']) + ) { + retain_item($stored['item']['parent']); + } - // preserve conversations you've been involved in from being expired + fix_attached_permissions($channel['channel_id'], $item['body'], $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid']); - $stored = $item_result['item']; - if ((is_array($stored)) && ($stored['id'] != $stored['parent']) - && ($stored['author_xchan'] === $channel['channel_hash'])) { - retain_item($stored['item']['parent']); - } - - fix_attached_permissions($channel['channel_id'],$item['body'],$item['allow_cid'],$item['allow_gid'],$item['deny_cid'],$item['deny_gid']); - - if ($sync && $item['item_wall']) { - // deliver singletons if we have any - if ($item_result && $item_result['success']) { - Run::Summon( [ 'Notifier','single_activity',$item_result['item_id'] ]); - } - } - } - } + if ($sync && $item['item_wall']) { + // deliver singletons if we have any + if ($item_result && $item_result['success']) { + Run::Summon([ 'Notifier','single_activity',$item_result['item_id'] ]); + } + } + } + } } /** @@ -1014,8 +1035,9 @@ function import_items($channel, $items, $sync = false, $relocate = null) { * @param array $items * @param array $relocate default null */ -function sync_items($channel, $items, $relocate = null) { - import_items($channel, $items, true, $relocate); +function sync_items($channel, $items, $relocate = null) +{ + import_items($channel, $items, true, $relocate); } @@ -1025,21 +1047,22 @@ function sync_items($channel, $items, $relocate = null) { * @param array $channel * @param array $events */ -function import_events($channel, $events) { +function import_events($channel, $events) +{ - if ($channel && $events) { - foreach ($events as $event) { - unset($event['id']); - $event['aid'] = $channel['channel_account_id']; - $event['uid'] = $channel['channel_id']; - convert_oldfields($event,'start','dtstart'); - convert_oldfields($event,'finish','dtend'); - convert_oldfields($event,'type','etype'); - convert_oldfields($event,'ignore','dismissed'); + if ($channel && $events) { + foreach ($events as $event) { + unset($event['id']); + $event['aid'] = $channel['channel_account_id']; + $event['uid'] = $channel['channel_id']; + convert_oldfields($event, 'start', 'dtstart'); + convert_oldfields($event, 'finish', 'dtend'); + convert_oldfields($event, 'type', 'etype'); + convert_oldfields($event, 'ignore', 'dismissed'); - create_table_from_array('event', $event); - } - } + create_table_from_array('event', $event); + } + } } /** @@ -1048,75 +1071,76 @@ function import_events($channel, $events) { * @param array $channel * @param array $events */ -function sync_events($channel, $events) { +function sync_events($channel, $events) +{ - if ($channel && $events) { + if ($channel && $events) { + $columns = db_columns('event'); - $columns = db_columns('event'); + foreach ($events as $event) { + if ((! $event['event_hash']) || (! $event['dtstart'])) { + continue; + } - foreach ($events as $event) { + if ($event['event_deleted']) { + $r = q( + "delete from event where event_hash = '%s' and uid = %d", + dbesc($event['event_hash']), + intval($channel['channel_id']) + ); + $r = q( + "select id from item where resource_type = 'event' and resource_id = '%s' and uid = %d", + dbesc($event['event_hash']), + intval($channel['channel_id']) + ); + if ($r) { + drop_item($r[0]['id'], false, (($event['event_xchan'] === $channel['channel_hash']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL)); + } + continue; + } - if ((! $event['event_hash']) || (! $event['dtstart'])) { - continue; - } + unset($event['id']); + $event['aid'] = $channel['channel_account_id']; + $event['uid'] = $channel['channel_id']; - if ($event['event_deleted']) { - $r = q("delete from event where event_hash = '%s' and uid = %d", - dbesc($event['event_hash']), - intval($channel['channel_id']) - ); - $r = q("select id from item where resource_type = 'event' and resource_id = '%s' and uid = %d", - dbesc($event['event_hash']), - intval($channel['channel_id']) - ); - if ($r) { - drop_item($r[0]['id'],false,(($event['event_xchan'] === $channel['channel_hash']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL)); - } - continue; - } + convert_oldfields($event, 'start', 'dtstart'); + convert_oldfields($event, 'finish', 'dtend'); + convert_oldfields($event, 'type', 'etype'); + convert_oldfields($event, 'ignore', 'dismissed'); - unset($event['id']); - $event['aid'] = $channel['channel_account_id']; - $event['uid'] = $channel['channel_id']; + $exists = false; - convert_oldfields($event,'start','dtstart'); - convert_oldfields($event,'finish','dtend'); - convert_oldfields($event,'type','etype'); - convert_oldfields($event,'ignore','dismissed'); + $x = q( + "select * from event where event_hash = '%s' and uid = %d limit 1", + dbesc($event['event_hash']), + intval($channel['channel_id']) + ); + if ($x) { + if ($x[0]['edited'] >= $event['edited']) { + continue; + } + $exists = true; + } - $exists = false; + if ($exists) { + foreach ($event as $k => $v) { + if (! in_array($k, $columns)) { + continue; + } - $x = q("select * from event where event_hash = '%s' and uid = %d limit 1", - dbesc($event['event_hash']), - intval($channel['channel_id']) - ); - if ($x) { - if ($x[0]['edited'] >= $event['edited']) { - continue; - } - $exists = true; - } - - if ($exists) { - foreach ($event as $k => $v) { - - if (! in_array($k,$columns)) { - continue; - } - - $r = q("UPDATE event SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE event_hash = '%s' AND uid = %d", - dbesc($k), - dbesc($v), - dbesc($event['event_hash']), - intval($channel['channel_id']) - ); - } - } - else { - create_table_from_array('event', $event); - } - } - } + $r = q( + "UPDATE event SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE event_hash = '%s' AND uid = %d", + dbesc($k), + dbesc($v), + dbesc($event['event_hash']), + intval($channel['channel_id']) + ); + } + } else { + create_table_from_array('event', $event); + } + } + } } /** @@ -1125,62 +1149,63 @@ function sync_events($channel, $events) { * @param array $channel * @param array $menus */ -function import_menus($channel, $menus) { +function import_menus($channel, $menus) +{ - if ($channel && $menus) { - foreach ($menus as $menu) { - $m = []; - $m['menu_channel_id'] = $channel['channel_id']; - $m['menu_name'] = $menu['pagetitle']; - $m['menu_desc'] = $menu['desc']; - if ($menu['created']) { - $m['menu_created'] = datetime_convert('UTC','UTC',$menu['created']); - } - if ($menu['edited']) { - $m['menu_edited'] = datetime_convert('UTC','UTC', $menu['edited']); - } - $m['menu_flags'] = 0; - if ($menu['flags']) { - if (in_array('bookmark',$menu['flags'])) { - $m['menu_flags'] |= MENU_BOOKMARK; - } - if (in_array('system',$menu['flags'])) { - $m['menu_flags'] |= MENU_SYSTEM; - } - } + if ($channel && $menus) { + foreach ($menus as $menu) { + $m = []; + $m['menu_channel_id'] = $channel['channel_id']; + $m['menu_name'] = $menu['pagetitle']; + $m['menu_desc'] = $menu['desc']; + if ($menu['created']) { + $m['menu_created'] = datetime_convert('UTC', 'UTC', $menu['created']); + } + if ($menu['edited']) { + $m['menu_edited'] = datetime_convert('UTC', 'UTC', $menu['edited']); + } + $m['menu_flags'] = 0; + if ($menu['flags']) { + if (in_array('bookmark', $menu['flags'])) { + $m['menu_flags'] |= MENU_BOOKMARK; + } + if (in_array('system', $menu['flags'])) { + $m['menu_flags'] |= MENU_SYSTEM; + } + } - $menu_id = menu_create($m); + $menu_id = menu_create($m); - if ($menu_id) { - if (is_array($menu['items'])) { - foreach ($menu['items'] as $it) { - $mitem = []; + if ($menu_id) { + if (is_array($menu['items'])) { + foreach ($menu['items'] as $it) { + $mitem = []; - $mitem['mitem_link'] = str_replace('[channelurl]',z_root() . '/channel/' . $channel['channel_address'],$it['link']); - $mitem['mitem_link'] = str_replace('[pageurl]',z_root() . '/page/' . $channel['channel_address'],$it['link']); - $mitem['mitem_link'] = str_replace('[cloudurl]',z_root() . '/cloud/' . $channel['channel_address'],$it['link']); - $mitem['mitem_link'] = str_replace('[baseurl]',z_root(),$it['link']); + $mitem['mitem_link'] = str_replace('[channelurl]', z_root() . '/channel/' . $channel['channel_address'], $it['link']); + $mitem['mitem_link'] = str_replace('[pageurl]', z_root() . '/page/' . $channel['channel_address'], $it['link']); + $mitem['mitem_link'] = str_replace('[cloudurl]', z_root() . '/cloud/' . $channel['channel_address'], $it['link']); + $mitem['mitem_link'] = str_replace('[baseurl]', z_root(), $it['link']); - $mitem['mitem_desc'] = escape_tags($it['desc']); - $mitem['mitem_order'] = intval($it['order']); - if (is_array($it['flags'])) { - $mitem['mitem_flags'] = 0; - if (in_array('zid',$it['flags'])) { - $mitem['mitem_flags'] |= MENU_ITEM_ZID; - } - if (in_array('new-window',$it['flags'])) { - $mitem['mitem_flags'] |= MENU_ITEM_NEWWIN; - } - if (in_array('chatroom',$it['flags'])) { - $mitem['mitem_flags'] |= MENU_ITEM_CHATROOM; - } - } - menu_add_item($menu_id,$channel['channel_id'],$mitem); - } - } - } - } - } + $mitem['mitem_desc'] = escape_tags($it['desc']); + $mitem['mitem_order'] = intval($it['order']); + if (is_array($it['flags'])) { + $mitem['mitem_flags'] = 0; + if (in_array('zid', $it['flags'])) { + $mitem['mitem_flags'] |= MENU_ITEM_ZID; + } + if (in_array('new-window', $it['flags'])) { + $mitem['mitem_flags'] |= MENU_ITEM_NEWWIN; + } + if (in_array('chatroom', $it['flags'])) { + $mitem['mitem_flags'] |= MENU_ITEM_CHATROOM; + } + } + menu_add_item($menu_id, $channel['channel_id'], $mitem); + } + } + } + } + } } /** @@ -1189,94 +1214,95 @@ function import_menus($channel, $menus) { * @param array $channel * @param array $menus */ -function sync_menus($channel, $menus) { +function sync_menus($channel, $menus) +{ - if ($channel && $menus) { + if ($channel && $menus) { + foreach ($menus as $menu) { + $m = []; + $m['menu_channel_id'] = $channel['channel_id']; + $m['menu_name'] = $menu['pagetitle']; + $m['menu_desc'] = $menu['desc']; + if ($menu['created']) { + $m['menu_created'] = datetime_convert('UTC', 'UTC', $menu['created']); + } + if ($menu['edited']) { + $m['menu_edited'] = datetime_convert('UTC', 'UTC', $menu['edited']); + } + $m['menu_flags'] = 0; + if ($menu['flags']) { + if (in_array('bookmark', $menu['flags'])) { + $m['menu_flags'] |= MENU_BOOKMARK; + } + if (in_array('system', $menu['flags'])) { + $m['menu_flags'] |= MENU_SYSTEM; + } + } + $editing = false; - foreach ($menus as $menu) { - $m = []; - $m['menu_channel_id'] = $channel['channel_id']; - $m['menu_name'] = $menu['pagetitle']; - $m['menu_desc'] = $menu['desc']; - if ($menu['created']) { - $m['menu_created'] = datetime_convert('UTC','UTC',$menu['created']); - } - if ($menu['edited']) { - $m['menu_edited'] = datetime_convert('UTC','UTC',$menu['edited']); - } - $m['menu_flags'] = 0; - if ($menu['flags']) { - if (in_array('bookmark',$menu['flags'])) { - $m['menu_flags'] |= MENU_BOOKMARK; - } - if (in_array('system',$menu['flags'])) { - $m['menu_flags'] |= MENU_SYSTEM; - } - } + $r = q( + "select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1", + dbesc($m['menu_name']), + intval($channel['channel_id']) + ); + if ($r) { + if ($r[0]['menu_edited'] >= $m['menu_edited']) { + continue; + } + if ($menu['menu_deleted']) { + menu_delete_id($r[0]['menu_id'], $channel['channel_id']); + continue; + } + $menu_id = $r[0]['menu_id']; + $m['menu_id'] = $r[0]['menu_id']; + $x = menu_edit($m); + if (! $x) { + continue; + } + $editing = true; + } + if (! $editing) { + $menu_id = menu_create($m); + } + if ($menu_id) { + if ($editing) { + // don't try syncing - just delete all the entries and start over + q( + "delete from menu_item where mitem_menu_id = %d", + intval($menu_id) + ); + } - $editing = false; + if (is_array($menu['items'])) { + foreach ($menu['items'] as $it) { + $mitem = []; - $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1", - dbesc($m['menu_name']), - intval($channel['channel_id']) - ); - if ($r) { - if ($r[0]['menu_edited'] >= $m['menu_edited']) { - continue; - } - if ($menu['menu_deleted']) { - menu_delete_id($r[0]['menu_id'],$channel['channel_id']); - continue; - } - $menu_id = $r[0]['menu_id']; - $m['menu_id'] = $r[0]['menu_id']; - $x = menu_edit($m); - if (! $x) { - continue; - } - $editing = true; - } - if (! $editing) { - $menu_id = menu_create($m); - } - if ($menu_id) { - if ($editing) { - // don't try syncing - just delete all the entries and start over - q("delete from menu_item where mitem_menu_id = %d", - intval($menu_id) - ); - } + $mitem['mitem_link'] = str_replace('[channelurl]', z_root() . '/channel/' . $channel['channel_address'], $it['link']); + $mitem['mitem_link'] = str_replace('[pageurl]', z_root() . '/page/' . $channel['channel_address'], $it['link']); + $mitem['mitem_link'] = str_replace('[cloudurl]', z_root() . '/cloud/' . $channel['channel_address'], $it['link']); + $mitem['mitem_link'] = str_replace('[baseurl]', z_root(), $it['link']); - if (is_array($menu['items'])) { - foreach ($menu['items'] as $it) { - $mitem = []; - - $mitem['mitem_link'] = str_replace('[channelurl]',z_root() . '/channel/' . $channel['channel_address'],$it['link']); - $mitem['mitem_link'] = str_replace('[pageurl]',z_root() . '/page/' . $channel['channel_address'],$it['link']); - $mitem['mitem_link'] = str_replace('[cloudurl]',z_root() . '/cloud/' . $channel['channel_address'],$it['link']); - $mitem['mitem_link'] = str_replace('[baseurl]',z_root(),$it['link']); - - $mitem['mitem_desc'] = escape_tags($it['desc']); - $mitem['mitem_order'] = intval($it['order']); - if (is_array($it['flags'])) { - $mitem['mitem_flags'] = 0; - if (in_array('zid',$it['flags'])) { - $mitem['mitem_flags'] |= MENU_ITEM_ZID; - } - if (in_array('new-window',$it['flags'])) { - $mitem['mitem_flags'] |= MENU_ITEM_NEWWIN; - } - if (in_array('chatroom',$it['flags'])) { - $mitem['mitem_flags'] |= MENU_ITEM_CHATROOM; - } - } - menu_add_item($menu_id,$channel['channel_id'],$mitem); - } - } - } - } - } + $mitem['mitem_desc'] = escape_tags($it['desc']); + $mitem['mitem_order'] = intval($it['order']); + if (is_array($it['flags'])) { + $mitem['mitem_flags'] = 0; + if (in_array('zid', $it['flags'])) { + $mitem['mitem_flags'] |= MENU_ITEM_ZID; + } + if (in_array('new-window', $it['flags'])) { + $mitem['mitem_flags'] |= MENU_ITEM_NEWWIN; + } + if (in_array('chatroom', $it['flags'])) { + $mitem['mitem_flags'] |= MENU_ITEM_CHATROOM; + } + } + menu_add_item($menu_id, $channel['channel_id'], $mitem); + } + } + } + } + } } /** @@ -1285,65 +1311,71 @@ function sync_menus($channel, $menus) { * @param array $channel * @param array $likes */ -function import_likes($channel, $likes) { - if ($channel && $likes) { - foreach ($likes as $like) { - if ($like['deleted']) { - q("delete from likes where liker = '%s' and likee = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s'", - dbesc($like['liker']), - dbesc($like['likee']), - dbesc($like['verb']), - dbesc($like['target_type']), - dbesc($like['target_id']) - ); - continue; - } +function import_likes($channel, $likes) +{ + if ($channel && $likes) { + foreach ($likes as $like) { + if ($like['deleted']) { + q( + "delete from likes where liker = '%s' and likee = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s'", + dbesc($like['liker']), + dbesc($like['likee']), + dbesc($like['verb']), + dbesc($like['target_type']), + dbesc($like['target_id']) + ); + continue; + } - unset($like['id']); - unset($like['iid']); - $like['channel_id'] = $channel['channel_id']; - $r = q("select * from likes where liker = '%s' and likee = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' and i_mid = '%s'", - dbesc($like['liker']), - dbesc($like['likee']), - dbesc($like['verb']), - dbesc($like['target_type']), - dbesc($like['target_id']), - dbesc($like['i_mid']) - ); - if ($r) { - continue; - } - create_table_from_array('likes', $like); - } - } + unset($like['id']); + unset($like['iid']); + $like['channel_id'] = $channel['channel_id']; + $r = q( + "select * from likes where liker = '%s' and likee = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' and i_mid = '%s'", + dbesc($like['liker']), + dbesc($like['likee']), + dbesc($like['verb']), + dbesc($like['target_type']), + dbesc($like['target_id']), + dbesc($like['i_mid']) + ); + if ($r) { + continue; + } + create_table_from_array('likes', $like); + } + } } -function import_conv($channel,$convs) { - if ($channel && $convs) { - foreach ($convs as $conv) { - if ($conv['deleted']) { - q("delete from conv where guid = '%s' and uid = %d", - dbesc($conv['guid']), - intval($channel['channel_id']) - ); - continue; - } +function import_conv($channel, $convs) +{ + if ($channel && $convs) { + foreach ($convs as $conv) { + if ($conv['deleted']) { + q( + "delete from conv where guid = '%s' and uid = %d", + dbesc($conv['guid']), + intval($channel['channel_id']) + ); + continue; + } - unset($conv['id']); + unset($conv['id']); - $conv['uid'] = $channel['channel_id']; - $conv['subject'] = str_rot47(base64url_encode($conv['subject'])); + $conv['uid'] = $channel['channel_id']; + $conv['subject'] = str_rot47(base64url_encode($conv['subject'])); - $r = q("select id from conv where guid = '%s' and uid = %d limit 1", - dbesc($conv['guid']), - intval($channel['channel_id']) - ); - if ($r) { - continue; - } - create_table_from_array('conv',$conv); - } - } + $r = q( + "select id from conv where guid = '%s' and uid = %d limit 1", + dbesc($conv['guid']), + intval($channel['channel_id']) + ); + if ($r) { + continue; + } + create_table_from_array('conv', $conv); + } + } } /** @@ -1351,39 +1383,42 @@ function import_conv($channel,$convs) { * * @param array $channel * @param array $mails - * @param boolean $sync (optional) default false + * @param bool $sync (optional) default false */ -function import_mail($channel, $mails, $sync = false) { - if ($channel && $mails) { - foreach ($mails as $mail) { - if (array_key_exists('flags',$mail) && in_array('deleted',$mail['flags'])) { - q("delete from mail where mid = '%s' and uid = %d", - dbesc($mail['message_id']), - intval($channel['channel_id']) - ); - continue; - } - if (array_key_exists('flags',$mail) && in_array('recalled',$mail['flags'])) { - q("update mail set mail_recalled = 1 where mid = '%s' and uid = %d", - dbesc($mail['message_id']), - intval($channel['channel_id']) - ); - continue; - } +function import_mail($channel, $mails, $sync = false) +{ + if ($channel && $mails) { + foreach ($mails as $mail) { + if (array_key_exists('flags', $mail) && in_array('deleted', $mail['flags'])) { + q( + "delete from mail where mid = '%s' and uid = %d", + dbesc($mail['message_id']), + intval($channel['channel_id']) + ); + continue; + } + if (array_key_exists('flags', $mail) && in_array('recalled', $mail['flags'])) { + q( + "update mail set mail_recalled = 1 where mid = '%s' and uid = %d", + dbesc($mail['message_id']), + intval($channel['channel_id']) + ); + continue; + } - $m = get_mail_elements($mail); - if (! $m) { - continue; - } - $m['account_id'] = $channel['channel_account_id']; - $m['channel_id'] = $channel['channel_id']; - $mail_id = mail_store($m); - if ($sync && $mail_id) { - // Not applicable to Zap which does not support mail - // Run::Summon( [ 'Notifier','single_mail',$mail_id ] ); - } - } - } + $m = get_mail_elements($mail); + if (! $m) { + continue; + } + $m['account_id'] = $channel['channel_account_id']; + $m['channel_id'] = $channel['channel_id']; + $mail_id = mail_store($m); + if ($sync && $mail_id) { + // Not applicable to Zap which does not support mail + // Run::Summon( [ 'Notifier','single_mail',$mail_id ] ); + } + } + } } /** @@ -1393,8 +1428,9 @@ function import_mail($channel, $mails, $sync = false) { * @param array $channel * @param array $mails */ -function sync_mail($channel, $mails) { - import_mail($channel, $mails, true); +function sync_mail($channel, $mails) +{ + import_mail($channel, $mails, true); } /** @@ -1403,355 +1439,352 @@ function sync_mail($channel, $mails) { * @param array $channel * @param array $files */ -function sync_files($channel, $files) { +function sync_files($channel, $files) +{ - require_once('include/attach.php'); + require_once('include/attach.php'); - if ($channel && $files) { + if ($channel && $files) { + $limit = engr_units_to_bytes(service_class_fetch($channel['channel_id'], 'attach_upload_limit')); - $limit = engr_units_to_bytes(service_class_fetch($channel['channel_id'], 'attach_upload_limit')); + foreach ($files as $f) { + if (! $f) { + continue; + } + $fetch_url = $f['fetch_url']; + $oldbase = dirname($fetch_url); + $original_channel = $f['original_channel']; - foreach ($files as $f) { - if (! $f) { - continue; - } - $fetch_url = $f['fetch_url']; - $oldbase = dirname($fetch_url); - $original_channel = $f['original_channel']; + if (! ($fetch_url && $original_channel)) { + continue; + } - if (! ($fetch_url && $original_channel)) { - continue; - } + $has_undeleted_attachments = false; - $has_undeleted_attachments = false; - - if ($f['attach']) { - foreach ($f['attach'] as $att) { - $attachment_stored = false; - convert_oldfields($att,'data','content'); + if ($f['attach']) { + foreach ($f['attach'] as $att) { + $attachment_stored = false; + convert_oldfields($att, 'data', 'content'); - if (intval($att['deleted'])) { - logger('deleting attachment'); - attach_delete($channel['channel_id'],$att['hash']); - continue; - } + if (intval($att['deleted'])) { + logger('deleting attachment'); + attach_delete($channel['channel_id'], $att['hash']); + continue; + } - $has_undeleted_attachments = true; - $attach_exists = false; - $x = attach_by_hash($att['hash'],$channel['channel_hash']); - logger('sync_files duplicate check: attach_exists=' . $attach_exists, LOGGER_DEBUG); - logger('sync_files duplicate check: att=' . print_r($att,true), LOGGER_DEBUG); - logger('sync_files duplicate check: attach_by_hash() returned ' . print_r($x,true), LOGGER_DEBUG); + $has_undeleted_attachments = true; + $attach_exists = false; + $x = attach_by_hash($att['hash'], $channel['channel_hash']); + logger('sync_files duplicate check: attach_exists=' . $attach_exists, LOGGER_DEBUG); + logger('sync_files duplicate check: att=' . print_r($att, true), LOGGER_DEBUG); + logger('sync_files duplicate check: attach_by_hash() returned ' . print_r($x, true), LOGGER_DEBUG); - if ($x['success']) { - $orig_attach = $x['data']; - $attach_exists = true; - $attach_id = $orig_attach['id']; - } + if ($x['success']) { + $orig_attach = $x['data']; + $attach_exists = true; + $attach_id = $orig_attach['id']; + } - $newfname = 'store/' . $channel['channel_address'] . '/' . get_attach_binname($att['content']); + $newfname = 'store/' . $channel['channel_address'] . '/' . get_attach_binname($att['content']); - unset($att['id']); - $att['aid'] = $channel['channel_account_id']; - $att['uid'] = $channel['channel_id']; + unset($att['id']); + $att['aid'] = $channel['channel_account_id']; + $att['uid'] = $channel['channel_id']; - // check for duplicate folder names with the same parent. - // If we have a duplicate that doesn't match this hash value - // change the name so that the contents won't be "covered over" - // by the existing directory. Use the same logic we use for - // duplicate files. + // check for duplicate folder names with the same parent. + // If we have a duplicate that doesn't match this hash value + // change the name so that the contents won't be "covered over" + // by the existing directory. Use the same logic we use for + // duplicate files. - if (strpos($att['filename'],'.') !== false) { - $basename = substr($att['filename'],0,strrpos($att['filename'],'.')); - $ext = substr($att['filename'],strrpos($att['filename'],'.')); - } - else { - $basename = $att['filename']; - $ext = ''; - } + if (strpos($att['filename'], '.') !== false) { + $basename = substr($att['filename'], 0, strrpos($att['filename'], '.')); + $ext = substr($att['filename'], strrpos($att['filename'], '.')); + } else { + $basename = $att['filename']; + $ext = ''; + } - $r = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' and hash != '%s' and uid = %d ", - dbesc($basename . $ext), - dbesc($basename . '(%)' . $ext), - dbesc($att['folder']), - dbesc($att['hash']), - intval($channel['channel_id']) - ); + $r = q( + "select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' and hash != '%s' and uid = %d ", + dbesc($basename . $ext), + dbesc($basename . '(%)' . $ext), + dbesc($att['folder']), + dbesc($att['hash']), + intval($channel['channel_id']) + ); - if ($r) { - $x = 1; + if ($r) { + $x = 1; - do { - $found = false; - foreach ($r as $rr) { - if ($rr['filename'] === $basename . '(' . $x . ')' . $ext) { - $found = true; - break; - } - } - if ($found) { - $x++; - } - } - while ($found); - $att['filename'] = $basename . '(' . $x . ')' . $ext; - } - else { - $att['filename'] = $basename . $ext; - } - // end duplicate detection + do { + $found = false; + foreach ($r as $rr) { + if ($rr['filename'] === $basename . '(' . $x . ')' . $ext) { + $found = true; + break; + } + } + if ($found) { + $x++; + } + } while ($found); + $att['filename'] = $basename . '(' . $x . ')' . $ext; + } else { + $att['filename'] = $basename . $ext; + } + // end duplicate detection - /// @FIXME update attachment structures if they are modified rather than created + /// @FIXME update attachment structures if they are modified rather than created - $att['content'] = $newfname; + $att['content'] = $newfname; - // Note: we use $att['hash'] below after it has been escaped to - // fetch the file contents. - // If the hash ever contains any escapable chars this could cause - // problems. Currently it does not. + // Note: we use $att['hash'] below after it has been escaped to + // fetch the file contents. + // If the hash ever contains any escapable chars this could cause + // problems. Currently it does not. - if (!isset($att['os_path'])) { - $att['os_path'] = ''; - } + if (!isset($att['os_path'])) { + $att['os_path'] = ''; + } - if ($attach_exists) { - logger('sync_files attach exists: ' . print_r($att,true), LOGGER_DEBUG); + if ($attach_exists) { + logger('sync_files attach exists: ' . print_r($att, true), LOGGER_DEBUG); - // process/sync a remote rename/move operation + // process/sync a remote rename/move operation - if ($orig_attach && $orig_attach['content'] && $orig_attach['content'] !== $newfname) { - logger('rename: ' . $orig_attach['content'] . ' -> ' . $newfname); - rename($orig_attach['content'],$newfname); - } + if ($orig_attach && $orig_attach['content'] && $orig_attach['content'] !== $newfname) { + logger('rename: ' . $orig_attach['content'] . ' -> ' . $newfname); + rename($orig_attach['content'], $newfname); + } - if (! dbesc_array($att)) { - continue; - } + if (! dbesc_array($att)) { + continue; + } - $columns = db_columns('attach'); + $columns = db_columns('attach'); - $str = ''; - foreach ($att as $k => $v) { - if (! in_array($k,$columns)) { - continue; - } - - if ($str) { - $str .= ","; - } - $str .= " " . TQUOT . $k . TQUOT . " = '" . $v . "' "; - } - $r = dbq("update attach set " . $str . " where id = " . intval($attach_id) ); - } - else { - logger('sync_files attach does not exists: ' . print_r($att,true), LOGGER_DEBUG); + $str = ''; + foreach ($att as $k => $v) { + if (! in_array($k, $columns)) { + continue; + } - if ($limit !== false) { - $r = q("select sum(filesize) as total from attach where aid = %d ", - intval($channel['channel_account_id']) - ); - if (($r) && (($r[0]['total'] + $att['filesize']) > $limit)) { - logger('service class limit exceeded'); - continue; - } - } + if ($str) { + $str .= ","; + } + $str .= " " . TQUOT . $k . TQUOT . " = '" . $v . "' "; + } + $r = dbq("update attach set " . $str . " where id = " . intval($attach_id)); + } else { + logger('sync_files attach does not exists: ' . print_r($att, true), LOGGER_DEBUG); - create_table_from_array('attach',$att); - } + if ($limit !== false) { + $r = q( + "select sum(filesize) as total from attach where aid = %d ", + intval($channel['channel_account_id']) + ); + if (($r) && (($r[0]['total'] + $att['filesize']) > $limit)) { + logger('service class limit exceeded'); + continue; + } + } + + create_table_from_array('attach', $att); + } - // is this a directory? + // is this a directory? - if ($att['filetype'] === 'multipart/mixed' && $att['is_dir']) { - os_mkdir($newfname, STORAGE_DEFAULT_PERMISSIONS,true); - $attachment_stored = true; - continue; - } - else { + if ($att['filetype'] === 'multipart/mixed' && $att['is_dir']) { + os_mkdir($newfname, STORAGE_DEFAULT_PERMISSIONS, true); + $attachment_stored = true; + continue; + } else { + // it's a file + // for the sync version of this algorithm (as opposed to 'offline import') + // we will fetch the actual file from the source server so it can be + // streamed directly to disk and avoid consuming PHP memory if it's a huge + // audio/video file or something. - // it's a file - // for the sync version of this algorithm (as opposed to 'offline import') - // we will fetch the actual file from the source server so it can be - // streamed directly to disk and avoid consuming PHP memory if it's a huge - // audio/video file or something. + $time = datetime_convert(); - $time = datetime_convert(); + $parr = [ + 'hash' => $channel['channel_hash'], + 'time' => $time, + 'resource' => $att['hash'], + 'revision' => 0, + 'signature' => Libzot::sign($channel['channel_hash'] . '.' . $time, $channel['channel_prvkey']) + ]; - $parr = [ - 'hash' => $channel['channel_hash'], - 'time' => $time, - 'resource' => $att['hash'], - 'revision' => 0, - 'signature' => Libzot::sign($channel['channel_hash'] . '.' . $time, $channel['channel_prvkey']) - ]; + $store_path = $newfname; - $store_path = $newfname; + $fp = fopen($newfname, 'w'); - $fp = fopen($newfname,'w'); + if (! $fp) { + logger('failed to open storage file.', LOGGER_NORMAL, LOG_ERR); + continue; + } - if (! $fp) { - logger('failed to open storage file.',LOGGER_NORMAL,LOG_ERR); - continue; - } + $redirects = 0; - $redirects = 0; + $m = parse_url($fetch_url); - $m = parse_url($fetch_url); + $headers = [ + 'Accept' => 'application/x-nomad+json, application/x-zot+json', + 'Sigtoken' => random_string(), + 'Host' => $m['host'], + '(request-target)' => 'post ' . $m['path'] . '/' . $att['hash'] + ]; - $headers = [ - 'Accept' => 'application/x-nomad+json, application/x-zot+json', - 'Sigtoken' => random_string(), - 'Host' => $m['host'], - '(request-target)' => 'post ' . $m['path'] . '/' . $att['hash'] - ]; + $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel), true, 'sha512'); - $headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'], channel_url($channel),true,'sha512'); + $x = z_post_url($fetch_url . '/' . $att['hash'], $parr, $redirects, [ 'filep' => $fp, 'headers' => $headers]); - $x = z_post_url($fetch_url . '/' . $att['hash'],$parr,$redirects,[ 'filep' => $fp, 'headers' => $headers]); + fclose($fp); - fclose($fp); + if ($x['success']) { + $attachment_stored = true; + } + continue; + } + } + } + if (($has_undeleted_attachments) && (! $attachment_stored)) { + /// @TODO should we queue this and retry or delete everything or what? + logger('attachment store failed', LOGGER_NORMAL, LOG_ERR); + } + if ($f['photo']) { + foreach ($f['photo'] as $p) { + unset($p['id']); + $p['aid'] = $channel['channel_account_id']; + $p['uid'] = $channel['channel_id']; - if ($x['success']) { - $attachment_stored = true; - } - continue; - } - } - } - if (($has_undeleted_attachments) && (! $attachment_stored)) { - /// @TODO should we queue this and retry or delete everything or what? - logger('attachment store failed',LOGGER_NORMAL,LOG_ERR); - } - if ($f['photo']) { - foreach ($f['photo'] as $p) { - unset($p['id']); - $p['aid'] = $channel['channel_account_id']; - $p['uid'] = $channel['channel_id']; + convert_oldfields($p, 'data', 'content'); + convert_oldfields($p, 'scale', 'imgscale'); + convert_oldfields($p, 'size', 'filesize'); + convert_oldfields($p, 'type', 'mimetype'); - convert_oldfields($p,'data','content'); - convert_oldfields($p,'scale','imgscale'); - convert_oldfields($p,'size','filesize'); - convert_oldfields($p,'type','mimetype'); + // if this is a profile photo, undo the profile photo bit + // for any other photo which previously held it. - // if this is a profile photo, undo the profile photo bit - // for any other photo which previously held it. - - if ($p['photo_usage'] == PHOTO_PROFILE) { - $e = q("update photo set photo_usage = %d where photo_usage = %d + if ($p['photo_usage'] == PHOTO_PROFILE) { + $e = q( + "update photo set photo_usage = %d where photo_usage = %d and resource_id != '%s' and uid = %d ", - intval(PHOTO_NORMAL), - intval(PHOTO_PROFILE), - dbesc($p['resource_id']), - intval($channel['channel_id']) - ); - } + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE), + dbesc($p['resource_id']), + intval($channel['channel_id']) + ); + } - // same for cover photos + // same for cover photos - if ($p['photo_usage'] == PHOTO_COVER) { - $e = q("update photo set photo_usage = %d where photo_usage = %d + if ($p['photo_usage'] == PHOTO_COVER) { + $e = q( + "update photo set photo_usage = %d where photo_usage = %d and resource_id != '%s' and uid = %d ", - intval(PHOTO_NORMAL), - intval(PHOTO_COVER), - dbesc($p['resource_id']), - intval($channel['channel_id']) - ); - } + intval(PHOTO_NORMAL), + intval(PHOTO_COVER), + dbesc($p['resource_id']), + intval($channel['channel_id']) + ); + } - if (intval($p['os_storage'])) { - $p['content'] = $store_path . ((intval($p['imgscale'])) ? '-' . $p['imgscale'] : EMPTY_STR); - } - else { - $p['content'] = (($p['content']) ? base64_decode($p['content']) : ''); - } + if (intval($p['os_storage'])) { + $p['content'] = $store_path . ((intval($p['imgscale'])) ? '-' . $p['imgscale'] : EMPTY_STR); + } else { + $p['content'] = (($p['content']) ? base64_decode($p['content']) : ''); + } - if (intval($p['imgscale']) && ((intval($p['os_storage'])) || (! $p['content']))) { + if (intval($p['imgscale']) && ((intval($p['os_storage'])) || (! $p['content']))) { + $time = datetime_convert(); - $time = datetime_convert(); - - $parr = [ - 'hash' => $channel['channel_hash'], - 'time' => $time, - 'resource' => $att['hash'], - 'revision' => 0, - 'signature' => Libzot::sign($channel['channel_hash'] . '.' . $time, $channel['channel_prvkey']), - 'resolution' => $p['imgscale'] - ]; + $parr = [ + 'hash' => $channel['channel_hash'], + 'time' => $time, + 'resource' => $att['hash'], + 'revision' => 0, + 'signature' => Libzot::sign($channel['channel_hash'] . '.' . $time, $channel['channel_prvkey']), + 'resolution' => $p['imgscale'] + ]; - $stored_image = $newfname . '-' . intval($p['imgscale']); + $stored_image = $newfname . '-' . intval($p['imgscale']); - logger('fetching_photo: ' . $stored_image); + logger('fetching_photo: ' . $stored_image); - $fp = fopen($stored_image,'w'); - if (! $fp) { - logger('failed to open storage file.',LOGGER_NORMAL,LOG_ERR); - continue; - } - $redirects = 0; + $fp = fopen($stored_image, 'w'); + if (! $fp) { + logger('failed to open storage file.', LOGGER_NORMAL, LOG_ERR); + continue; + } + $redirects = 0; - $m = parse_url($fetch_url); + $m = parse_url($fetch_url); - $headers = [ + $headers = [ 'Accept' => 'application/x-nomad+json, application/x-zot+json', - 'Sigtoken' => random_string(), - 'Host' => $m['host'], - '(request-target)' => 'post ' . $m['path'] . '/' . $att['hash'] - ]; + 'Sigtoken' => random_string(), + 'Host' => $m['host'], + '(request-target)' => 'post ' . $m['path'] . '/' . $att['hash'] + ]; - $headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'], channel_url($channel),true,'sha512'); + $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel), true, 'sha512'); - $x = z_post_url($fetch_url . '/' . $att['hash'],$parr,$redirects,[ 'filep' => $fp, 'headers' => $headers]); + $x = z_post_url($fetch_url . '/' . $att['hash'], $parr, $redirects, [ 'filep' => $fp, 'headers' => $headers]); - fclose($fp); + fclose($fp); - if (! intval($p['os_storage'])) { - $p['content'] = file_get_contents($stored_image); - unlink($stored_image); - } - } + if (! intval($p['os_storage'])) { + $p['content'] = file_get_contents($stored_image); + unlink($stored_image); + } + } - if (!isset($p['display_path'])) { - $p['display_path'] = ''; - } + if (!isset($p['display_path'])) { + $p['display_path'] = ''; + } - $exists = q("select * from photo where resource_id = '%s' and imgscale = %d and uid = %d limit 1", - dbesc($p['resource_id']), - intval($p['imgscale']), - intval($channel['channel_id']) - ); + $exists = q( + "select * from photo where resource_id = '%s' and imgscale = %d and uid = %d limit 1", + dbesc($p['resource_id']), + intval($p['imgscale']), + intval($channel['channel_id']) + ); - if ($exists) { + if ($exists) { + $str = ''; + foreach ($p as $k => $v) { + $matches = false; + if (preg_match('/([^a-zA-Z0-9\-\_\.])/', $k, $matches)) { + continue; + } - $str = ''; - foreach ($p as $k => $v) { - $matches = false; - if (preg_match('/([^a-zA-Z0-9\-\_\.])/',$k,$matches)) { - continue; - } + if ($str) { + $str .= ","; + } + $str .= " " . TQUOT . $k . TQUOT . " = '" . (($k === 'content') ? dbescbin($v) : dbesc($v)) . "' "; + } + $r = dbq("update photo set " . $str . " where id = " . intval($exists[0]['id'])); + } else { + create_table_from_array('photo', $p, [ 'content' ]); + } + } + } - if ($str) { - $str .= ","; - } - $str .= " " . TQUOT . $k . TQUOT . " = '" . (($k === 'content') ? dbescbin($v) : dbesc($v)) . "' "; - } - $r = dbq("update photo set " . $str . " where id = " . intval($exists[0]['id']) ); - } - else { - create_table_from_array('photo',$p, [ 'content' ] ); - } - } - } + Run::Summon([ 'Thumbnail' , $att['hash'] ]); - Run::Summon([ 'Thumbnail' , $att['hash'] ]); - - if ($f['item']) { - sync_items($channel,$f['item'], - ['channel_address' => $original_channel,'url' => $oldbase] - ); - } - } - } + if ($f['item']) { + sync_items( + $channel, + $f['item'], + ['channel_address' => $original_channel,'url' => $oldbase] + ); + } + } + } } /** @@ -1763,365 +1796,370 @@ function sync_files($channel, $files) { * @param string $old The old key in the array * @param string $new The new key in the array */ -function convert_oldfields(&$arr, $old, $new) { - if (array_key_exists($old, $arr)) { - $arr[$new] = $arr[$old]; - unset($arr[$old]); - } +function convert_oldfields(&$arr, $old, $new) +{ + if (array_key_exists($old, $arr)) { + $arr[$new] = $arr[$old]; + unset($arr[$old]); + } } -function scan_webpage_elements($path, $type, $cloud = false) { - $channel = App::get_channel(); - $dirtoscan = $path; - switch ($type) { - case 'page': - $dirtoscan .= '/pages/'; - $json_filename = 'page.json'; - break; - case 'layout': - $dirtoscan .= '/layouts/'; - $json_filename = 'layout.json'; - break; - case 'block': - $dirtoscan .= '/blocks/'; - $json_filename = 'block.json'; - break; - default : - return []; - } - if($cloud) { - $dirtoscan = get_dirpath_by_cloudpath($channel, $dirtoscan); - } - $elements = []; - if (is_dir($dirtoscan)) { - $dirlist = scandir($dirtoscan); - if ($dirlist) { - foreach ($dirlist as $element) { - if ($element === '.' || $element === '..') { - continue; - } - $folder = $dirtoscan . '/' . $element; - if (is_dir($folder)) { - if ($cloud) { - $jsonfilepath = $folder . '/' . get_filename_by_cloudname($json_filename, $channel, $folder); - } - else { - $jsonfilepath = $folder . '/' . $json_filename; - } - if (is_file($jsonfilepath)) { - $metadata = json_decode(file_get_contents($jsonfilepath), true); - if ($cloud) { - $contentfilename = get_filename_by_cloudname($metadata['contentfile'], $channel, $folder); - $metadata['path'] = $folder . '/' . $contentfilename; - } - else { - $contentfilename = $metadata['contentfile']; - $metadata['path'] = $folder . '/' . $contentfilename; - } - if ($metadata['contentfile'] === '') { - logger('Invalid ' . $type . ' content file'); - return false; - } - $content = file_get_contents($folder . '/' . $contentfilename); - if (!$content) { - if (is_readable($folder . '/' . $contentfilename)) { - $content = ''; - } - else { - logger('Failed to get file content for ' . $metadata['contentfile']); - return false; - } - } - $elements[] = $metadata; - } - } - } - } - } +function scan_webpage_elements($path, $type, $cloud = false) +{ + $channel = App::get_channel(); + $dirtoscan = $path; + switch ($type) { + case 'page': + $dirtoscan .= '/pages/'; + $json_filename = 'page.json'; + break; + case 'layout': + $dirtoscan .= '/layouts/'; + $json_filename = 'layout.json'; + break; + case 'block': + $dirtoscan .= '/blocks/'; + $json_filename = 'block.json'; + break; + default: + return []; + } + if ($cloud) { + $dirtoscan = get_dirpath_by_cloudpath($channel, $dirtoscan); + } + $elements = []; + if (is_dir($dirtoscan)) { + $dirlist = scandir($dirtoscan); + if ($dirlist) { + foreach ($dirlist as $element) { + if ($element === '.' || $element === '..') { + continue; + } + $folder = $dirtoscan . '/' . $element; + if (is_dir($folder)) { + if ($cloud) { + $jsonfilepath = $folder . '/' . get_filename_by_cloudname($json_filename, $channel, $folder); + } else { + $jsonfilepath = $folder . '/' . $json_filename; + } + if (is_file($jsonfilepath)) { + $metadata = json_decode(file_get_contents($jsonfilepath), true); + if ($cloud) { + $contentfilename = get_filename_by_cloudname($metadata['contentfile'], $channel, $folder); + $metadata['path'] = $folder . '/' . $contentfilename; + } else { + $contentfilename = $metadata['contentfile']; + $metadata['path'] = $folder . '/' . $contentfilename; + } + if ($metadata['contentfile'] === '') { + logger('Invalid ' . $type . ' content file'); + return false; + } + $content = file_get_contents($folder . '/' . $contentfilename); + if (!$content) { + if (is_readable($folder . '/' . $contentfilename)) { + $content = ''; + } else { + logger('Failed to get file content for ' . $metadata['contentfile']); + return false; + } + } + $elements[] = $metadata; + } + } + } + } + } - return $elements; + return $elements; } -function import_webpage_element($element, $channel, $type) { +function import_webpage_element($element, $channel, $type) +{ - $arr = []; // construct information for the webpage element item table record + $arr = []; // construct information for the webpage element item table record - switch ($type) { - // - // PAGES - // - case 'page': - $arr['item_type'] = ITEM_TYPE_WEBPAGE; - $namespace = 'WEBPAGE'; - $name = $element['pagelink']; - if ($name) { - require_once('library/urlify/URLify.php'); - $name = strtolower(\URLify::transliterate($name)); - } - $arr['title'] = $element['title']; - $arr['term'] = $element['term']; - $arr['layout_mid'] = ''; // by default there is no layout associated with the page - // If a layout was specified, find it in the database and get its info. If - // it does not exist, leave layout_mid empty - if ($element['layout'] !== '') { - $liid = q("select iid from iconfig where k = 'PDL' and v = '%s' and cat = 'system'", - dbesc($element['layout']) - ); - if ($liid) { - $linfo = q("select mid from item where id = %d", - intval($liid[0]['iid']) - ); - $arr['layout_mid'] = $linfo[0]['mid']; - } - } - break; - // - // LAYOUTS - // - case 'layout': - $arr['item_type'] = ITEM_TYPE_PDL; - $namespace = 'PDL'; - $name = $element['name']; - $arr['title'] = $element['description']; - $arr['term'] = $element['term']; - break; - // - // BLOCKS - // - case 'block': - $arr['item_type'] = ITEM_TYPE_BLOCK; - $namespace = 'BUILDBLOCK'; - $name = $element['name']; - $arr['title'] = $element['title']; + switch ($type) { + // + // PAGES + // + case 'page': + $arr['item_type'] = ITEM_TYPE_WEBPAGE; + $namespace = 'WEBPAGE'; + $name = $element['pagelink']; + if ($name) { + require_once('library/urlify/URLify.php'); + $name = strtolower(URLify::transliterate($name)); + } + $arr['title'] = $element['title']; + $arr['term'] = $element['term']; + $arr['layout_mid'] = ''; // by default there is no layout associated with the page + // If a layout was specified, find it in the database and get its info. If + // it does not exist, leave layout_mid empty + if ($element['layout'] !== '') { + $liid = q( + "select iid from iconfig where k = 'PDL' and v = '%s' and cat = 'system'", + dbesc($element['layout']) + ); + if ($liid) { + $linfo = q( + "select mid from item where id = %d", + intval($liid[0]['iid']) + ); + $arr['layout_mid'] = $linfo[0]['mid']; + } + } + break; + // + // LAYOUTS + // + case 'layout': + $arr['item_type'] = ITEM_TYPE_PDL; + $namespace = 'PDL'; + $name = $element['name']; + $arr['title'] = $element['description']; + $arr['term'] = $element['term']; + break; + // + // BLOCKS + // + case 'block': + $arr['item_type'] = ITEM_TYPE_BLOCK; + $namespace = 'BUILDBLOCK'; + $name = $element['name']; + $arr['title'] = $element['title']; - break; - default : - return null; // return null if invalid element type - } + break; + default: + return null; // return null if invalid element type + } - $arr['uid'] = local_channel(); - $arr['aid'] = $channel['channel_account_id']; + $arr['uid'] = local_channel(); + $arr['aid'] = $channel['channel_account_id']; - // Check if an item already exists based on the name - $iid = q("select iid from iconfig where k = '" . $namespace . "' and v = '%s' and cat = 'system'", - dbesc($name) - ); - if ($iid) { // If the item does exist, get the item metadata - $iteminfo = q("select mid,created,edited from item where id = %d", - intval($iid[0]['iid']) - ); - $arr['mid'] = $arr['parent_mid'] = $iteminfo[0]['mid']; - $arr['created'] = $iteminfo[0]['created']; - } - else { // otherwise, generate the creation times and unique id - $arr['created'] = datetime_convert('UTC', 'UTC'); - $arr['uuid'] = new_uuid(); - $arr['mid'] = $arr['parent_mid'] = z_root() . '/item/' . $arr['uuid']; - } - // Update the edited time whether or not the element already exists - $arr['edited'] = datetime_convert('UTC', 'UTC'); - // Import the actual element content - $arr['body'] = file_get_contents($element['path']); - // The element owner is the channel importing the elements - $arr['owner_xchan'] = get_observer_hash(); - // The author is either the owner or whomever was specified - $arr['author_xchan'] = (($element['author_xchan']) ? $element['author_xchan'] : get_observer_hash()); - // Import mimetype if it is a valid mimetype for the element - $mimetypes = [ - 'text/bbcode', + // Check if an item already exists based on the name + $iid = q( + "select iid from iconfig where k = '" . $namespace . "' and v = '%s' and cat = 'system'", + dbesc($name) + ); + if ($iid) { // If the item does exist, get the item metadata + $iteminfo = q( + "select mid,created,edited from item where id = %d", + intval($iid[0]['iid']) + ); + $arr['mid'] = $arr['parent_mid'] = $iteminfo[0]['mid']; + $arr['created'] = $iteminfo[0]['created']; + } else { // otherwise, generate the creation times and unique id + $arr['created'] = datetime_convert('UTC', 'UTC'); + $arr['uuid'] = new_uuid(); + $arr['mid'] = $arr['parent_mid'] = z_root() . '/item/' . $arr['uuid']; + } + // Update the edited time whether or not the element already exists + $arr['edited'] = datetime_convert('UTC', 'UTC'); + // Import the actual element content + $arr['body'] = file_get_contents($element['path']); + // The element owner is the channel importing the elements + $arr['owner_xchan'] = get_observer_hash(); + // The author is either the owner or whomever was specified + $arr['author_xchan'] = (($element['author_xchan']) ? $element['author_xchan'] : get_observer_hash()); + // Import mimetype if it is a valid mimetype for the element + $mimetypes = [ + 'text/bbcode', 'text/x-multicode', - 'text/html', - 'text/markdown', - 'text/plain', - 'application/x-pdl', - 'application/x-php' - ]; - // Blocks and pages can have any of the valid mimetypes, but layouts must be text/bbcode - if ((in_array($element['mimetype'], $mimetypes)) && in_array($type, [ 'page', 'block' ]) ) { - $arr['mimetype'] = $element['mimetype']; - } - else { - $arr['mimetype'] = 'text/x-multicode'; - } + 'text/html', + 'text/markdown', + 'text/plain', + 'application/x-pdl', + 'application/x-php' + ]; + // Blocks and pages can have any of the valid mimetypes, but layouts must be text/bbcode + if ((in_array($element['mimetype'], $mimetypes)) && in_array($type, [ 'page', 'block' ])) { + $arr['mimetype'] = $element['mimetype']; + } else { + $arr['mimetype'] = 'text/x-multicode'; + } - // Verify ability to use html or php!!! + // Verify ability to use html or php!!! - $execflag = channel_codeallowed(local_channel()); + $execflag = channel_codeallowed(local_channel()); - $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", - dbesc($arr['mid']), - intval(local_channel()) - ); + $i = q( + "select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", + dbesc($arr['mid']), + intval(local_channel()) + ); - IConfig::Set($arr,'system',$namespace,(($name) ? $name : substr($arr['mid'],0,16)),true); + IConfig::Set($arr, 'system', $namespace, (($name) ? $name : substr($arr['mid'], 0, 16)), true); - if ($i) { - $arr['id'] = $i[0]['id']; - // don't update if it has the same timestamp as the original - if ($arr['edited'] > $i[0]['edited']) { - $x = item_store_update($arr,$execflag); - } - } - else { - if (($i) && (intval($i[0]['item_deleted']))) { - // was partially deleted already, finish it off - q("delete from item where mid = '%s' and uid = %d", - dbesc($arr['mid']), - intval(local_channel()) - ); - } - else { - $x = item_store($arr,$execflag); - } - } + if ($i) { + $arr['id'] = $i[0]['id']; + // don't update if it has the same timestamp as the original + if ($arr['edited'] > $i[0]['edited']) { + $x = item_store_update($arr, $execflag); + } + } else { + if (($i) && (intval($i[0]['item_deleted']))) { + // was partially deleted already, finish it off + q( + "delete from item where mid = '%s' and uid = %d", + dbesc($arr['mid']), + intval(local_channel()) + ); + } else { + $x = item_store($arr, $execflag); + } + } - if ($x && $x['success']) { - $element['import_success'] = 1; - } - else { - $element['import_success'] = 0; - } + if ($x && $x['success']) { + $element['import_success'] = 1; + } else { + $element['import_success'] = 0; + } - return $element; + return $element; } -function get_webpage_elements($channel, $type = 'all') { - $elements = []; - if (!$channel['channel_id']) { - return null; - } - switch ($type) { - case 'all': - // If all, execute all the pages, layouts, blocks case statements - case 'pages': - $elements['pages'] = null; - $owner = $channel['channel_id']; +function get_webpage_elements($channel, $type = 'all') +{ + $elements = []; + if (!$channel['channel_id']) { + return null; + } + switch ($type) { + case 'all': + // If all, execute all the pages, layouts, blocks case statements + case 'pages': + $elements['pages'] = null; + $owner = $channel['channel_id']; - $sql_extra = item_permissions_sql($owner); + $sql_extra = item_permissions_sql($owner); - $r = q("select * from iconfig left join item on iconfig.iid = item.id + $r = q( + "select * from iconfig left join item on iconfig.iid = item.id where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d $sql_extra order by item.created desc", - intval($owner), - intval(ITEM_TYPE_WEBPAGE) - ); + intval($owner), + intval(ITEM_TYPE_WEBPAGE) + ); - $pages = null; + $pages = null; - if ($r) { - $elements['pages'] = []; - $pages = []; - foreach ($r as $rr) { - unobscure($rr); + if ($r) { + $elements['pages'] = []; + $pages = []; + foreach ($r as $rr) { + unobscure($rr); - //$lockstate = (($rr['allow_cid'] || $rr['allow_gid'] || $rr['deny_cid'] || $rr['deny_gid']) ? 'lock' : 'unlock'); + //$lockstate = (($rr['allow_cid'] || $rr['allow_gid'] || $rr['deny_cid'] || $rr['deny_gid']) ? 'lock' : 'unlock'); - $element_arr = [ - 'type' => 'webpage', - 'title' => $rr['title'], - 'body' => $rr['body'], - 'created' => $rr['created'], - 'edited' => $rr['edited'], - 'mimetype' => $rr['mimetype'], - 'pagetitle' => $rr['v'], - 'mid' => $rr['mid'], - 'layout_mid' => $rr['layout_mid'] - ]; - $pages[$rr['iid']][] = [ - 'url' => $rr['iid'], - 'pagetitle' => $rr['v'], - 'title' => $rr['title'], - 'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']), - 'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']), - 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]', - //'lockstate' => $lockstate - ]; - $elements['pages'][] = $element_arr; - } - } - if ($type !== 'all') { - break; - } + $element_arr = [ + 'type' => 'webpage', + 'title' => $rr['title'], + 'body' => $rr['body'], + 'created' => $rr['created'], + 'edited' => $rr['edited'], + 'mimetype' => $rr['mimetype'], + 'pagetitle' => $rr['v'], + 'mid' => $rr['mid'], + 'layout_mid' => $rr['layout_mid'] + ]; + $pages[$rr['iid']][] = [ + 'url' => $rr['iid'], + 'pagetitle' => $rr['v'], + 'title' => $rr['title'], + 'created' => datetime_convert('UTC', date_default_timezone_get(), $rr['created']), + 'edited' => datetime_convert('UTC', date_default_timezone_get(), $rr['edited']), + 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]', + //'lockstate' => $lockstate + ]; + $elements['pages'][] = $element_arr; + } + } + if ($type !== 'all') { + break; + } - case 'layouts': - $elements['layouts'] = null; - $owner = $channel['channel_id']; + case 'layouts': + $elements['layouts'] = null; + $owner = $channel['channel_id']; - $sql_extra = item_permissions_sql($owner); + $sql_extra = item_permissions_sql($owner); - $r = q("select * from iconfig left join item on iconfig.iid = item.id + $r = q( + "select * from iconfig left join item on iconfig.iid = item.id where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' and item_type = %d $sql_extra order by item.created desc", - intval($owner), - intval(ITEM_TYPE_PDL) - ); + intval($owner), + intval(ITEM_TYPE_PDL) + ); - if ($r) { - $elements['layouts'] = []; + if ($r) { + $elements['layouts'] = []; - foreach ($r as $rr) { - unobscure($rr); + foreach ($r as $rr) { + unobscure($rr); - $elements['layouts'][] = array( - 'type' => 'layout', - 'description' => $rr['title'], // description of the layout - 'body' => $rr['body'], - 'created' => $rr['created'], - 'edited' => $rr['edited'], - 'mimetype' => $rr['mimetype'], - 'name' => $rr['v'], // name of reference for the layout - 'mid' => $rr['mid'], - ); - } - } + $elements['layouts'][] = array( + 'type' => 'layout', + 'description' => $rr['title'], // description of the layout + 'body' => $rr['body'], + 'created' => $rr['created'], + 'edited' => $rr['edited'], + 'mimetype' => $rr['mimetype'], + 'name' => $rr['v'], // name of reference for the layout + 'mid' => $rr['mid'], + ); + } + } - if ($type !== 'all') { - break; - } + if ($type !== 'all') { + break; + } - case 'blocks': - $elements['blocks'] = null; - $owner = $channel['channel_id']; + case 'blocks': + $elements['blocks'] = null; + $owner = $channel['channel_id']; - $sql_extra = item_permissions_sql($owner); + $sql_extra = item_permissions_sql($owner); - $r = q("select iconfig.iid, iconfig.k, iconfig.v, mid, title, body, mimetype, created, edited from iconfig + $r = q( + "select iconfig.iid, iconfig.k, iconfig.v, mid, title, body, mimetype, created, edited from iconfig left join item on iconfig.iid = item.id where uid = %d and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' and item_type = %d order by item.created desc", - intval($owner), - intval(ITEM_TYPE_BLOCK) - ); + intval($owner), + intval(ITEM_TYPE_BLOCK) + ); - if ($r) { - $elements['blocks'] = []; + if ($r) { + $elements['blocks'] = []; - foreach ($r as $rr) { - unobscure($rr); + foreach ($r as $rr) { + unobscure($rr); - $elements['blocks'][] = [ - 'type' => 'block', - 'title' => $rr['title'], - 'body' => $rr['body'], - 'created' => $rr['created'], - 'edited' => $rr['edited'], - 'mimetype' => $rr['mimetype'], - 'name' => $rr['v'], - 'mid' => $rr['mid'] - ]; - } - } + $elements['blocks'][] = [ + 'type' => 'block', + 'title' => $rr['title'], + 'body' => $rr['body'], + 'created' => $rr['created'], + 'edited' => $rr['edited'], + 'mimetype' => $rr['mimetype'], + 'name' => $rr['v'], + 'mid' => $rr['mid'] + ]; + } + } - if ($type !== 'all') { - break; - } + if ($type !== 'all') { + break; + } - default: - break; - } + default: + break; + } - return $elements; + return $elements; } /** @@ -2129,47 +2167,47 @@ function get_webpage_elements($channel, $type = 'all') { * * @param array $files List of files to put in zip file * @param string $destination - * @param boolean $overwrite - * @return boolean Success status + * @param bool $overwrite + * @return bool Success status */ -function create_zip_file($files = [], $destination = '', $overwrite = false) { - // if the zip file already exists and overwrite is false, return false - if (file_exists($destination) && ! $overwrite) { - return false; - } - //vars - $valid_files = []; - // if files were passed in... - if (is_array($files)) { - // cycle through each file - foreach ($files as $file) { - // make sure the file exists - if (file_exists($file)) { - $valid_files[] = $file; - } - } - } +function create_zip_file($files = [], $destination = '', $overwrite = false) +{ + // if the zip file already exists and overwrite is false, return false + if (file_exists($destination) && ! $overwrite) { + return false; + } + //vars + $valid_files = []; + // if files were passed in... + if (is_array($files)) { + // cycle through each file + foreach ($files as $file) { + // make sure the file exists + if (file_exists($file)) { + $valid_files[] = $file; + } + } + } - // if we have good files... - if (count($valid_files)) { - //create the archive - $zip = new ZipArchive(); - if($zip->open($destination, $overwrite ? ZipArchive::OVERWRITE : ZipArchive::CREATE) !== true) { - return false; - } - // add the files - foreach ($valid_files as $file) { - $zip->addFile($file, $file); - } - //debug - //echo 'The zip archive contains ',$zip->numFiles,' files with a status of ',$zip->status; - //close the zip -- done! - $zip->close(); + // if we have good files... + if (count($valid_files)) { + //create the archive + $zip = new ZipArchive(); + if ($zip->open($destination, $overwrite ? ZipArchive::OVERWRITE : ZipArchive::CREATE) !== true) { + return false; + } + // add the files + foreach ($valid_files as $file) { + $zip->addFile($file, $file); + } + //debug + //echo 'The zip archive contains ',$zip->numFiles,' files with a status of ',$zip->status; + //close the zip -- done! + $zip->close(); - // check to make sure the file exists - return file_exists($destination); - } - else { - return false; - } + // check to make sure the file exists + return file_exists($destination); + } else { + return false; + } } diff --git a/include/items.php b/include/items.php index c221b957e..0f9dd7ab0 100644 --- a/include/items.php +++ b/include/items.php @@ -291,93 +291,92 @@ function is_item_normal($item) { * @param array $item * @return boolean */ -function can_comment_on_post($observer_xchan, $item) { +function can_comment_on_post($observer_xchan, $item) +{ -// logger('Comment_policy: ' . $item['comment_policy'], LOGGER_DEBUG); +// logger('Comment_policy: ' . $item['comment_policy'], LOGGER_DEBUG); - $x = [ - 'observer_hash' => $observer_xchan, - 'item' => $item, - 'allowed' => 'unset' - ]; + $x = [ + 'observer_hash' => $observer_xchan, + 'item' => $item, + 'allowed' => 'unset' + ]; - /** - * @hooks can_comment_on_post - * Called when deciding whether or not to present a comment box for a post. - * * \e string \b observer_hash - * * \e array \b item - * * \e boolean \b allowed - return value - */ + /** + * @hooks can_comment_on_post + * Called when deciding whether or not to present a comment box for a post. + * * \e string \b observer_hash + * * \e array \b item + * * \e boolean \b allowed - return value + */ - call_hooks('can_comment_on_post', $x); + call_hooks('can_comment_on_post', $x); - if ($x['allowed'] !== 'unset') { - return $x['allowed']; - } + if ($x['allowed'] !== 'unset') { + return $x['allowed']; + } - if (! $observer_xchan) { - return false; - } + if (! $observer_xchan) { + return false; + } - if ($item['comment_policy'] === 'none') { - return false; - } + if ($item['comment_policy'] === 'none') { + return false; + } - if (intval($item['item_nocomment'])) { - return false; - } + if (intval($item['item_nocomment'])) { + return false; + } - if (comments_are_now_closed($item)) { - return false; - } + if (comments_are_now_closed($item)) { + return false; + } - if ($observer_xchan === $item['author_xchan'] || $observer_xchan === $item['owner_xchan']) { - return true; - } + if ($observer_xchan === $item['author_xchan'] || $observer_xchan === $item['owner_xchan']) { + return true; + } - switch ($item['comment_policy']) { - case 'self': - if ($observer_xchan === $item['author_xchan'] || $observer_xchan === $item['owner_xchan']) { - return true; - } - break; - case 'public': - case 'authenticated': - // Anonymous folks won't ever reach this point (as $observer_xchan will be empty). - // This means the viewer has an xchan and we can identify them. - return true; - break; - case 'any connections': - case 'specific': - case 'contacts': - case '': + switch ($item['comment_policy']) { + case 'self': + if ($observer_xchan === $item['author_xchan'] || $observer_xchan === $item['owner_xchan']) { + return true; + } + break; + case 'public': + case 'authenticated': + // Anonymous folks won't ever reach this point (as $observer_xchan will be empty). + // This means the viewer has an xchan and we can identify them. + return true; + break; + case 'any connections': + case 'specific': + case 'contacts': + case '': + // local posts only - check if the post owner granted me comment permission + if (local_channel() && array_key_exists('owner', $item) && their_perms_contains(local_channel(), $item['owner']['abook_xchan'], 'post_comments')) { + return true; + } - // local posts only - check if the post owner granted me - // comment permission - if (local_channel() && array_key_exists('owner',$item) && their_perms_contains(local_channel(),$item['owner']['abook_xchan'],'post_comments')) { - return true; - } + if (intval($item['item_wall']) && perm_is_allowed($item['uid'], $observer_xchan, 'post_comments')) { + return true; + } + break; + default: + break; + } + if (strstr($item['comment_policy'], 'network:') && strstr($item['comment_policy'], 'red')) { + return true; + } - if (intval($item['item_wall']) && perm_is_allowed($item['uid'],$observer_xchan,'post_comments')) { - return true; - } - break; - default: - break; - } - if (strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'red')) { - return true; - } - - if (strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'activitypub')) { - return true; - } + if (strstr($item['comment_policy'], 'network:') && strstr($item['comment_policy'], 'activitypub')) { + return true; + } - if (strstr($item['comment_policy'],'site:') && strstr($item['comment_policy'],App::get_hostname())) { - return true; - } + if (strstr($item['comment_policy'], 'site:') && strstr($item['comment_policy'], App::get_hostname())) { + return true; + } - return false; + return false; } diff --git a/include/js_strings.php b/include/js_strings.php index 4b9485a89..b59832dde 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -1,117 +1,120 @@ - '/images/' . PLATFORM_NAME . '-64.png', - '$delitem' => t('Delete this item?'), - '$comment' => t('Comment'), - '$showmore' => sprintf( t('%s show all'), ''), - '$showfewer' => sprintf( t('%s show less'), ''), - '$divgrowmore' => sprintf( t('%s expand'), ''), - '$divgrowless' => sprintf( t('%s collapse'),''), - '$pwshort' => t("Password too short"), - '$pwnomatch' => t("Passwords do not match"), - '$everybody' => t('everybody'), - '$passphrase' => t('Secret Passphrase'), - '$passhint' => t('Passphrase hint'), - '$permschange' => t('Notice: Permissions have changed but have not yet been submitted.'), - '$closeAll' => t('close all'), - '$nothingnew' => t('Nothing new here'), - '$rating_desc' => t('Rate This Channel (this is public)'), - '$rating_val' => t('Rating'), - '$rating_text' => t('Describe (optional)'), - '$submit' => t('Submit'), - '$linkurl' => t('Please enter a link URL'), - '$leavethispage' => t('Unsaved changes. Are you sure you wish to leave this page?'), - '$location' => t('Location'), - '$lovely' => t('lovely'), - '$wonderful' => t('wonderful'), - '$fantastic' => t('fantastic'), - '$great' => t('great'), - '$nick_invld1' => t('Your chosen nickname was either already taken or not valid. Please use our suggestion ('), - '$nick_invld2' => t(') or enter a new one.'), - '$nick_valid' => t('Thank you, this nickname is valid.'), - '$name_empty' => t('A channel name is required.'), - '$name_ok1' => t('This is a '), - '$name_ok2' => t(' channel name'), - '$pinned' => t('Pinned'), - '$pin_item' => t('Pin this post'), - '$unpin_item' => t('Unpin this post'), - '$tos' => t('Please accept terms to continue'), - - // translatable prefix and suffix strings for jquery.timeago - - // using the defaults set below if left untranslated, empty strings if - // translated to "NONE" and the corresponding language strings - // if translated to anything else - '$t01' => ((t('timeago.prefixAgo') == 'timeago.prefixAgo') ? '' : ((t('timeago.prefixAgo') == 'NONE') ? '' : t('timeago.prefixAgo'))), - '$t02' => ((t('timeago.prefixFromNow') == 'timeago.prefixFromNow') ? '' : ((t('timeago.prefixFromNow') == 'NONE') ? '' : t('timeago.prefixFromNow'))), - '$t03' => ((t('timeago.suffixAgo') == 'timeago.suffixAgo') ? 'ago' : ((t('timeago.suffixAgo') == 'NONE') ? '' : t('timeago.suffixAgo'))), - '$t04' => ((t('timeago.suffixFromNow') == 'timeago.suffixFromNow') ? 'from now' : ((t('timeago.suffixFromNow') == 'NONE') ? '' : t('timeago.suffixFromNow'))), +/** @file */ - // translatable main strings for jquery.timeago - '$t05' => t('less than a minute'), - '$t06' => t('about a minute'), - '$t07' => t('%d minutes'), - '$t08' => t('about an hour'), - '$t09' => t('about %d hours'), - '$t10' => t('a day'), - '$t11' => t('%d days'), - '$t12' => t('about a month'), - '$t13' => t('%d months'), - '$t14' => t('about a year'), - '$t15' => t('%d years'), - '$t16' => t(' '), // wordSeparator - '$t17' => ((t('timeago.numbers') != 'timeago.numbers') ? t('timeago.numbers') : '[]'), +function js_strings() +{ + return replace_macros(get_markup_template('js_strings.tpl'), array( + '$icon' => '/images/' . PLATFORM_NAME . '-64.png', + '$delitem' => t('Delete this item?'), + '$comment' => t('Comment'), + '$showmore' => sprintf(t('%s show all'), ''), + '$showfewer' => sprintf(t('%s show less'), ''), + '$divgrowmore' => sprintf(t('%s expand'), ''), + '$divgrowless' => sprintf(t('%s collapse'), ''), + '$pwshort' => t("Password too short"), + '$pwnomatch' => t("Passwords do not match"), + '$everybody' => t('everybody'), + '$passphrase' => t('Secret Passphrase'), + '$passhint' => t('Passphrase hint'), + '$permschange' => t('Notice: Permissions have changed but have not yet been submitted.'), + '$closeAll' => t('close all'), + '$nothingnew' => t('Nothing new here'), + '$rating_desc' => t('Rate This Channel (this is public)'), + '$rating_val' => t('Rating'), + '$rating_text' => t('Describe (optional)'), + '$submit' => t('Submit'), + '$linkurl' => t('Please enter a link URL'), + '$leavethispage' => t('Unsaved changes. Are you sure you wish to leave this page?'), + '$location' => t('Location'), + '$lovely' => t('lovely'), + '$wonderful' => t('wonderful'), + '$fantastic' => t('fantastic'), + '$great' => t('great'), + '$nick_invld1' => t('Your chosen nickname was either already taken or not valid. Please use our suggestion ('), + '$nick_invld2' => t(') or enter a new one.'), + '$nick_valid' => t('Thank you, this nickname is valid.'), + '$name_empty' => t('A channel name is required.'), + '$name_ok1' => t('This is a '), + '$name_ok2' => t(' channel name'), + '$pinned' => t('Pinned'), + '$pin_item' => t('Pin this post'), + '$unpin_item' => t('Unpin this post'), + '$tos' => t('Please accept terms to continue'), - '$January' => t('January'), - '$February' => t('February'), - '$March' => t('March'), - '$April' => t('April'), - '$May' => t('May','long'), - '$June' => t('June'), - '$July' => t('July'), - '$August' => t('August'), - '$September' => t('September'), - '$October' => t('October'), - '$November' => t('November'), - '$December' => t('December'), - '$Jan' => t('Jan'), - '$Feb' => t('Feb'), - '$Mar' => t('Mar'), - '$Apr' => t('Apr'), - '$MayShort' => t('May','short'), - '$Jun' => t('Jun'), - '$Jul' => t('Jul'), - '$Aug' => t('Aug'), - '$Sep' => t('Sep'), - '$Oct' => t('Oct'), - '$Nov' => t('Nov'), - '$Dec' => t('Dec'), - '$Sunday' => t('Sunday'), - '$Monday' => t('Monday'), - '$Tuesday' => t('Tuesday'), - '$Wednesday' => t('Wednesday'), - '$Thursday' => t('Thursday'), - '$Friday' => t('Friday'), - '$Saturday' => t('Saturday'), - '$Sun' => t('Sun'), - '$Mon' => t('Mon'), - '$Tue' => t('Tue'), - '$Wed' => t('Wed'), - '$Thu' => t('Thu'), - '$Fri' => t('Fri'), - '$Sat' => t('Sat'), - '$today' => t('today','calendar'), - '$month' => t('month','calendar'), - '$week' => t('week','calendar'), - '$day' => t('day','calendar'), - '$allday' => t('All day','calendar'), - '$channel_social' => t('A social networking profile that is public by default and private if desired'), - '$channel_social_restricted' => t('A social networking profile where content is private to your [Friends] Access List by default but can be made public if desired'), - '$channel_forum' => t('A public group where members are allowed to upload media by default'), - '$channel_forum_restricted' => t('A private group with no upload permission'), - '$channel_forum_moderated' => t('A public group where posts are moderated by the owner. The [moderated] permission may be removed from any group member once trust is established'), - '$channel_collection' =>t('A sub-channel of your main channel - often devoted to a specific language or topic. Replies are sent back to your main channel'), - '$channel_collection_restricted' =>t('A private sub-channel of your main channel - often devoted to a specific language or topic. Replies are sent back to your main channel'), - )); + // translatable prefix and suffix strings for jquery.timeago - + // using the defaults set below if left untranslated, empty strings if + // translated to "NONE" and the corresponding language strings + // if translated to anything else + '$t01' => ((t('timeago.prefixAgo') == 'timeago.prefixAgo') ? '' : ((t('timeago.prefixAgo') == 'NONE') ? '' : t('timeago.prefixAgo'))), + '$t02' => ((t('timeago.prefixFromNow') == 'timeago.prefixFromNow') ? '' : ((t('timeago.prefixFromNow') == 'NONE') ? '' : t('timeago.prefixFromNow'))), + '$t03' => ((t('timeago.suffixAgo') == 'timeago.suffixAgo') ? 'ago' : ((t('timeago.suffixAgo') == 'NONE') ? '' : t('timeago.suffixAgo'))), + '$t04' => ((t('timeago.suffixFromNow') == 'timeago.suffixFromNow') ? 'from now' : ((t('timeago.suffixFromNow') == 'NONE') ? '' : t('timeago.suffixFromNow'))), + + // translatable main strings for jquery.timeago + '$t05' => t('less than a minute'), + '$t06' => t('about a minute'), + '$t07' => t('%d minutes'), + '$t08' => t('about an hour'), + '$t09' => t('about %d hours'), + '$t10' => t('a day'), + '$t11' => t('%d days'), + '$t12' => t('about a month'), + '$t13' => t('%d months'), + '$t14' => t('about a year'), + '$t15' => t('%d years'), + '$t16' => t(' '), // wordSeparator + '$t17' => ((t('timeago.numbers') != 'timeago.numbers') ? t('timeago.numbers') : '[]'), + + '$January' => t('January'), + '$February' => t('February'), + '$March' => t('March'), + '$April' => t('April'), + '$May' => t('May', 'long'), + '$June' => t('June'), + '$July' => t('July'), + '$August' => t('August'), + '$September' => t('September'), + '$October' => t('October'), + '$November' => t('November'), + '$December' => t('December'), + '$Jan' => t('Jan'), + '$Feb' => t('Feb'), + '$Mar' => t('Mar'), + '$Apr' => t('Apr'), + '$MayShort' => t('May', 'short'), + '$Jun' => t('Jun'), + '$Jul' => t('Jul'), + '$Aug' => t('Aug'), + '$Sep' => t('Sep'), + '$Oct' => t('Oct'), + '$Nov' => t('Nov'), + '$Dec' => t('Dec'), + '$Sunday' => t('Sunday'), + '$Monday' => t('Monday'), + '$Tuesday' => t('Tuesday'), + '$Wednesday' => t('Wednesday'), + '$Thursday' => t('Thursday'), + '$Friday' => t('Friday'), + '$Saturday' => t('Saturday'), + '$Sun' => t('Sun'), + '$Mon' => t('Mon'), + '$Tue' => t('Tue'), + '$Wed' => t('Wed'), + '$Thu' => t('Thu'), + '$Fri' => t('Fri'), + '$Sat' => t('Sat'), + '$today' => t('today', 'calendar'), + '$month' => t('month', 'calendar'), + '$week' => t('week', 'calendar'), + '$day' => t('day', 'calendar'), + '$allday' => t('All day', 'calendar'), + '$channel_social' => t('A social networking profile that is public by default and private if desired'), + '$channel_social_restricted' => t('A social networking profile where content is private to your [Friends] Access List by default but can be made public if desired'), + '$channel_forum' => t('A public group where members are allowed to upload media by default'), + '$channel_forum_restricted' => t('A private group with no upload permission'), + '$channel_forum_moderated' => t('A public group where posts are moderated by the owner. The [moderated] permission may be removed from any group member once trust is established'), + '$channel_collection' => t('A sub-channel of your main channel - often devoted to a specific language or topic. Replies are sent back to your main channel'), + '$channel_collection_restricted' => t('A private sub-channel of your main channel - often devoted to a specific language or topic. Replies are sent back to your main channel'), + )); } diff --git a/include/language.php b/include/language.php index 35cfdd1af..7e6cf90b3 100644 --- a/include/language.php +++ b/include/language.php @@ -1,4 +1,5 @@ 0.8 - $langs = array_combine($lang_parse[1], $lang_parse[4]); + if (count($lang_parse[1])) { + // create a list like "en" => 0.8 + $langs = array_combine($lang_parse[1], $lang_parse[4]); - // set default to 1 for any without q factor - foreach ($langs as $lang => $val) { - if ($val === '') $langs[$lang] = 1; - } + // set default to 1 for any without q factor + foreach ($langs as $lang => $val) { + if ($val === '') { + $langs[$lang] = 1; + } + } - // sort list based on value - arsort($langs, SORT_NUMERIC); - } - } + // sort list based on value + arsort($langs, SORT_NUMERIC); + } + } - return $langs; + return $langs; } /** @@ -61,57 +68,58 @@ function get_browser_language() { * * @return Language code in 2-letter ISO 639-1 (en). */ -function get_best_language() { - $langs = get_browser_language(); +function get_best_language() +{ + $langs = get_browser_language(); - if(isset($langs) && count($langs)) { - foreach ($langs as $lang => $v) { - $lang = strtolower($lang); - if(is_dir("view/$lang")) { - $preferred = $lang; - break; - } - } - } + if (isset($langs) && count($langs)) { + foreach ($langs as $lang => $v) { + $lang = strtolower($lang); + if (is_dir("view/$lang")) { + $preferred = $lang; + break; + } + } + } - if(! isset($preferred)) { + if (! isset($preferred)) { + /* + * We could find no perfect match for any of the preferred languages. + * For cases where the preference is fr-fr and we have fr but *not* fr-fr + * run the test again and only look for the language base + * which should provide an interface they can sort of understand + */ - /* - * We could find no perfect match for any of the preferred languages. - * For cases where the preference is fr-fr and we have fr but *not* fr-fr - * run the test again and only look for the language base - * which should provide an interface they can sort of understand - */ + if (isset($langs) && count($langs)) { + foreach ($langs as $lang => $v) { + if (strlen($lang) === 2) { + /* we have already checked this language */ + continue; + } + /* Check the base */ + $lang = strtolower(substr($lang, 0, 2)); + if (is_dir("view/$lang")) { + $preferred = $lang; + break; + } + } + } + } - if(isset($langs) && count($langs)) { - foreach ($langs as $lang => $v) { - if(strlen($lang) === 2) { - /* we have already checked this language */ - continue; - } - /* Check the base */ - $lang = strtolower(substr($lang,0,2)); - if(is_dir("view/$lang")) { - $preferred = $lang; - break; - } - } - } - } + if (! isset($preferred)) { + $preferred = 'unset'; + } - if(! isset($preferred)) { - $preferred = 'unset'; - } + $arr = array('langs' => $langs, 'preferred' => $preferred); - $arr = array('langs' => $langs, 'preferred' => $preferred); + call_hooks('get_best_language', $arr); - call_hooks('get_best_language',$arr); + if ($arr['preferred'] !== 'unset') { + return $arr['preferred']; + } - if($arr['preferred'] !== 'unset') - return $arr['preferred']; - - return ((isset(App::$config['system']['language'])) ? App::$config['system']['language'] : 'en'); + return ((isset(App::$config['system']['language'])) ? App::$config['system']['language'] : 'en'); } /* @@ -121,66 +129,72 @@ function get_best_language() { */ -function push_lang($language) { +function push_lang($language) +{ - App::$langsave = App::$language; + App::$langsave = App::$language; - if($language === App::$language) - return; + if ($language === App::$language) { + return; + } - if(isset(App::$strings) && count(App::$strings)) { - App::$stringsave = App::$strings; - } - App::$strings = []; - load_translation_table($language); - App::$language = $language; + if (isset(App::$strings) && count(App::$strings)) { + App::$stringsave = App::$strings; + } + App::$strings = []; + load_translation_table($language); + App::$language = $language; } -function pop_lang() { +function pop_lang() +{ - if(App::$language === App::$langsave) - return; + if (App::$language === App::$langsave) { + return; + } - if(isset(App::$stringsave) && is_array(App::$stringsave)) - App::$strings = App::$stringsave; - else - App::$strings = []; + if (isset(App::$stringsave) && is_array(App::$stringsave)) { + App::$strings = App::$stringsave; + } else { + App::$strings = []; + } - App::$language = App::$langsave; + App::$language = App::$langsave; } /** * @brief Load string translation table for alternate language. * * @param string $lang language code in 2-letter ISO 639-1 (en, de, fr) format - * @param boolean $install (optional) default false + * @param bool $install (optional) default false */ -function load_translation_table($lang, $install = false) { +function load_translation_table($lang, $install = false) +{ - App::$strings = []; + App::$strings = []; - if(file_exists("view/$lang/strings.php")) { - include("view/$lang/strings.php"); - } + if (file_exists("view/$lang/strings.php")) { + include("view/$lang/strings.php"); + } - if(! $install) { - $plugins = q("SELECT aname FROM addon WHERE installed=1;"); - if ($plugins !== false) { - foreach($plugins as $p) { - $name = $p['aname']; - if(file_exists("addon/$name/lang/$lang/strings.php")) { - include("addon/$name/lang/$lang/strings.php"); - } - } - } - } + if (! $install) { + $plugins = q("SELECT aname FROM addon WHERE installed=1;"); + if ($plugins !== false) { + foreach ($plugins as $p) { + $name = $p['aname']; + if (file_exists("addon/$name/lang/$lang/strings.php")) { + include("addon/$name/lang/$lang/strings.php"); + } + } + } + } - // Allow individual strings to be over-ridden on this site - // Either for the default language or for all languages + // Allow individual strings to be over-ridden on this site + // Either for the default language or for all languages - if(file_exists("view/local-$lang/strings.php")) { - include("view/local-$lang/strings.php"); - } + if (file_exists("view/local-$lang/strings.php")) { + include("view/local-$lang/strings.php"); + } } /** @@ -191,16 +205,17 @@ function load_translation_table($lang, $install = false) { * @return translated string if exists, otherwise return $s * */ -function t($s, $ctx = '') { +function t($s, $ctx = '') +{ - $cs = $ctx ? '__ctx:' . $ctx . '__ ' . $s : $s; - if (x(App::$strings, $cs)) { - $t = App::$strings[$cs]; + $cs = $ctx ? '__ctx:' . $ctx . '__ ' . $s : $s; + if (x(App::$strings, $cs)) { + $t = App::$strings[$cs]; - return ((is_array($t)) ? translate_projectname($t[0]) : translate_projectname($t)); - } + return ((is_array($t)) ? translate_projectname($t[0]) : translate_projectname($t)); + } - return translate_projectname($s); + return translate_projectname($s); } /** @@ -208,11 +223,12 @@ function t($s, $ctx = '') { * Merging strings from different project names is problematic so we'll do that with a string replacement */ -function translate_projectname($s) { - if (strpos($s,'rojectname') !== false) { - return str_replace( [ '$projectname','$Projectname' ], [ System::get_platform_name(), ucfirst(System::get_platform_name()) ],$s); - } - return $s; +function translate_projectname($s) +{ + if (strpos($s, 'rojectname') !== false) { + return str_replace([ '$projectname','$Projectname' ], [ System::get_platform_name(), ucfirst(System::get_platform_name()) ], $s); + } + return $s; } @@ -225,25 +241,27 @@ function translate_projectname($s) { * @param string $ctx * @return string */ -function tt($singular, $plural, $count, $ctx = ''){ +function tt($singular, $plural, $count, $ctx = '') +{ - $cs = $ctx ? "__ctx:" . $ctx . "__ " . $singular : $singular; - if (x(App::$strings,$cs)) { - $t = App::$strings[$cs]; - $f = 'string_plural_select_' . str_replace('-', '_', App::$language); - if (! function_exists($f)) - $f = 'string_plural_select_default'; + $cs = $ctx ? "__ctx:" . $ctx . "__ " . $singular : $singular; + if (x(App::$strings, $cs)) { + $t = App::$strings[$cs]; + $f = 'string_plural_select_' . str_replace('-', '_', App::$language); + if (! function_exists($f)) { + $f = 'string_plural_select_default'; + } - $k = $f(intval($count)); + $k = $f(intval($count)); - return is_array($t) ? $t[$k] : $t; - } + return is_array($t) ? $t[$k] : $t; + } - if ($count != 1) { - return $plural; - } else { - return $singular; - } + if ($count != 1) { + return $plural; + } else { + return $singular; + } } /** @@ -251,10 +269,11 @@ function tt($singular, $plural, $count, $ctx = ''){ * any language file. * * @param int $n - * @return boolean + * @return bool */ -function string_plural_select_default($n) { - return ($n != 1); +function string_plural_select_default($n) +{ + return ($n != 1); } /** @@ -275,47 +294,50 @@ function string_plural_select_default($n) { * This project: https://github.com/patrickschur/language-detection *may* be useful as a replacement. * */ -function detect_language($s) { +function detect_language($s) +{ - require_once('library/text_languagedetect/Text/LanguageDetect.php'); + require_once('library/text_languagedetect/Text/LanguageDetect.php'); - $min_length = get_config('system', 'language_detect_min_length'); - if ($min_length === false) - $min_length = LANGUAGE_DETECT_MIN_LENGTH; + $min_length = get_config('system', 'language_detect_min_length'); + if ($min_length === false) { + $min_length = LANGUAGE_DETECT_MIN_LENGTH; + } - $min_confidence = get_config('system', 'language_detect_min_confidence'); - if ($min_confidence === false) - $min_confidence = LANGUAGE_DETECT_MIN_CONFIDENCE; + $min_confidence = get_config('system', 'language_detect_min_confidence'); + if ($min_confidence === false) { + $min_confidence = LANGUAGE_DETECT_MIN_CONFIDENCE; + } - // embedded apps have long base64 strings which will trip up the detector. - $naked_body = preg_replace('/\[app\](.*?)\[\/app\]/', '', $s); - // strip off bbcode - $naked_body = preg_replace('/\[(.+?)\]/', '', $naked_body); - if (mb_strlen($naked_body) < intval($min_length)) { - logger('string length less than ' . intval($min_length), LOGGER_DATA); - return ''; - } + // embedded apps have long base64 strings which will trip up the detector. + $naked_body = preg_replace('/\[app\](.*?)\[\/app\]/', '', $s); + // strip off bbcode + $naked_body = preg_replace('/\[(.+?)\]/', '', $naked_body); + if (mb_strlen($naked_body) < intval($min_length)) { + logger('string length less than ' . intval($min_length), LOGGER_DATA); + return ''; + } - $l = new Text_LanguageDetect; - try { - // return 2-letter ISO 639-1 (en) language code - $l->setNameMode(2); - $lng = $l->detectConfidence($naked_body); - logger('detect language: ' . print_r($lng, true) . $naked_body, LOGGER_DATA); - } catch (Text_LanguageDetect_Exception $e) { - logger('detect language exception: ' . $e->getMessage(), LOGGER_DATA); - } + $l = new Text_LanguageDetect(); + try { + // return 2-letter ISO 639-1 (en) language code + $l->setNameMode(2); + $lng = $l->detectConfidence($naked_body); + logger('detect language: ' . print_r($lng, true) . $naked_body, LOGGER_DATA); + } catch (Text_LanguageDetect_Exception $e) { + logger('detect language exception: ' . $e->getMessage(), LOGGER_DATA); + } - if ((! $lng) || (! (x($lng,'language')))) { - return ''; - } + if ((! $lng) || (! (x($lng, 'language')))) { + return ''; + } - if ($lng['confidence'] < (float) $min_confidence) { - logger('detect language: confidence less than ' . (float) $min_confidence, LOGGER_DATA); - return ''; - } + if ($lng['confidence'] < (float) $min_confidence) { + logger('detect language: confidence less than ' . (float) $min_confidence, LOGGER_DATA); + return ''; + } - return($lng['language']); + return($lng['language']); } /** @@ -332,85 +354,95 @@ function detect_language($s) { * @param string $l (optional) In which language to return the name * @return string with the language name, or $s if unrecognized */ -function get_language_name($s, $l = null) { - // get() expects the second part to be in upper case - if (strpos($s, '-') !== false) $s = substr($s, 0, 2) . strtoupper(substr($s, 2)); - if ($l !== null && strpos($l, '-') !== false) $l = substr($l, 0, 2) . strtoupper(substr($l, 2)); +function get_language_name($s, $l = null) +{ + // get() expects the second part to be in upper case + if (strpos($s, '-') !== false) { + $s = substr($s, 0, 2) . strtoupper(substr($s, 2)); + } + if ($l !== null && strpos($l, '-') !== false) { + $l = substr($l, 0, 2) . strtoupper(substr($l, 2)); + } - $languageRepository = new LanguageRepository; + $languageRepository = new LanguageRepository(); - // Sometimes intl doesn't like the second part at all ... - try { - $language = $languageRepository->get($s, $l); - } catch(CommerceGuys\Intl\Exception\UnknownLanguageException $e) { - $s = substr($s, 0, 2); - if($l !== null) $l = substr($s, 0, 2); - try { - $language = $languageRepository->get($s, $l); - } catch (CommerceGuys\Intl\Exception\UnknownLanguageException $e) { - return $s; // Give up - } catch (CommerceGuys\Intl\Exception\UnknownLocaleException $e) { - return $s; // Give up - } - } + // Sometimes intl doesn't like the second part at all ... + try { + $language = $languageRepository->get($s, $l); + } catch (CommerceGuys\Intl\Exception\UnknownLanguageException $e) { + $s = substr($s, 0, 2); + if ($l !== null) { + $l = substr($s, 0, 2); + } + try { + $language = $languageRepository->get($s, $l); + } catch (CommerceGuys\Intl\Exception\UnknownLanguageException $e) { + return $s; // Give up + } catch (CommerceGuys\Intl\Exception\UnknownLocaleException $e) { + return $s; // Give up + } + } - return $language->getName(); + return $language->getName(); } -function language_list() { +function language_list() +{ - $langs = glob('view/*/strings.php'); + $langs = glob('view/*/strings.php'); - $lang_options = []; - $selected = ""; + $lang_options = []; + $selected = ""; - if(is_array($langs) && count($langs)) { - if(! in_array('view/en/strings.php',$langs)) - $langs[] = 'view/en/'; - asort($langs); - foreach($langs as $l) { - $ll = substr($l,5); - $ll = substr($ll,0,strrpos($ll,'/')); - $lang_options[$ll] = get_language_name($ll, $ll) . " ($ll)"; - } - } - return $lang_options; + if (is_array($langs) && count($langs)) { + if (! in_array('view/en/strings.php', $langs)) { + $langs[] = 'view/en/'; + } + asort($langs); + foreach ($langs as $l) { + $ll = substr($l, 5); + $ll = substr($ll, 0, strrpos($ll, '/')); + $lang_options[$ll] = get_language_name($ll, $ll) . " ($ll)"; + } + } + return $lang_options; } -function lang_selector() { +function lang_selector() +{ - $langs = glob('view/*/strings.php'); + $langs = glob('view/*/strings.php'); - $lang_options = []; - $selected = ""; + $lang_options = []; + $selected = ""; - if(is_array($langs) && count($langs)) { - $langs[] = ''; - if(! in_array('view/en/strings.php',$langs)) - $langs[] = 'view/en/'; - asort($langs); - foreach($langs as $l) { - if($l == '') { - $lang_options[""] = t('default'); - continue; - } - $ll = substr($l,5); - $ll = substr($ll,0,strrpos($ll,'/')); - $selected = (($ll === App::$language && (x($_SESSION, 'language'))) ? $ll : $selected); - $lang_options[$ll] = get_language_name($ll, $ll) . " ($ll)"; - } - } + if (is_array($langs) && count($langs)) { + $langs[] = ''; + if (! in_array('view/en/strings.php', $langs)) { + $langs[] = 'view/en/'; + } + asort($langs); + foreach ($langs as $l) { + if ($l == '') { + $lang_options[""] = t('default'); + continue; + } + $ll = substr($l, 5); + $ll = substr($ll, 0, strrpos($ll, '/')); + $selected = (($ll === App::$language && (x($_SESSION, 'language'))) ? $ll : $selected); + $lang_options[$ll] = get_language_name($ll, $ll) . " ($ll)"; + } + } - $tpl = get_markup_template('lang_selector.tpl'); + $tpl = get_markup_template('lang_selector.tpl'); - $o = replace_macros($tpl, array( - '$title' => t('Select an alternate language'), - '$langs' => array($lang_options, $selected), + $o = replace_macros($tpl, array( + '$title' => t('Select an alternate language'), + '$langs' => array($lang_options, $selected), - )); + )); - return $o; + return $o; } - diff --git a/include/menu.php b/include/menu.php index ac9674446..0ac4f9a78 100644 --- a/include/menu.php +++ b/include/menu.php @@ -1,5 +1,6 @@ - $r[0], 'items' => $x ); - } + intval($r[0]['menu_id']), + intval($uid) + ); + return array('menu' => $r[0], 'items' => $x ); + } - return null; + return null; } - -function menu_element($channel,$menu) { - $arr = []; - $arr['type'] = 'menu'; - $arr['pagetitle'] = $menu['menu']['menu_name']; - $arr['desc'] = $menu['menu']['menu_desc']; - $arr['created'] = $menu['menu']['menu_created']; - $arr['edited'] = $menu['menu']['menu_edited']; +function menu_element($channel, $menu) +{ - $arr['baseurl'] = z_root(); - if($menu['menu']['menu_flags']) { - $arr['flags'] = []; - if($menu['menu']['menu_flags'] & MENU_BOOKMARK) - $arr['flags'][] = 'bookmark'; - if($menu['menu']['menu_flags'] & MENU_SYSTEM) - $arr['flags'][] = 'system'; - } - if($menu['items']) { - $arr['items'] = []; - foreach($menu['items'] as $it) { - $entry = []; + $arr = []; + $arr['type'] = 'menu'; + $arr['pagetitle'] = $menu['menu']['menu_name']; + $arr['desc'] = $menu['menu']['menu_desc']; + $arr['created'] = $menu['menu']['menu_created']; + $arr['edited'] = $menu['menu']['menu_edited']; - $entry['link'] = str_replace(z_root() . '/channel/' . $channel['channel_address'],'[channelurl]',$it['mitem_link']); - $entry['link'] = str_replace(z_root() . '/page/' . $channel['channel_address'],'[pageurl]',$it['mitem_link']); - $entry['link'] = str_replace(z_root() . '/cloud/' . $channel['channel_address'],'[cloudurl]',$it['mitem_link']); - $entry['link'] = str_replace(z_root(),'[baseurl]',$it['mitem_link']); + $arr['baseurl'] = z_root(); + if ($menu['menu']['menu_flags']) { + $arr['flags'] = []; + if ($menu['menu']['menu_flags'] & MENU_BOOKMARK) { + $arr['flags'][] = 'bookmark'; + } + if ($menu['menu']['menu_flags'] & MENU_SYSTEM) { + $arr['flags'][] = 'system'; + } + } + if ($menu['items']) { + $arr['items'] = []; + foreach ($menu['items'] as $it) { + $entry = []; - $entry['desc'] = $it['mitem_desc']; - $entry['order'] = $it['mitem_order']; - if($it['mitem_flags']) { - $entry['flags'] = []; - if($it['mitem_flags'] & MENU_ITEM_ZID) - $entry['flags'][] = 'zid'; - if($it['mitem_flags'] & MENU_ITEM_NEWWIN) - $entry['flags'][] = 'new-window'; - if($it['mitem_flags'] & MENU_ITEM_CHATROOM) - $entry['flags'][] = 'chatroom'; - } - $arr['items'][] = $entry; - } - } + $entry['link'] = str_replace(z_root() . '/channel/' . $channel['channel_address'], '[channelurl]', $it['mitem_link']); + $entry['link'] = str_replace(z_root() . '/page/' . $channel['channel_address'], '[pageurl]', $it['mitem_link']); + $entry['link'] = str_replace(z_root() . '/cloud/' . $channel['channel_address'], '[cloudurl]', $it['mitem_link']); + $entry['link'] = str_replace(z_root(), '[baseurl]', $it['mitem_link']); - return $arr; + $entry['desc'] = $it['mitem_desc']; + $entry['order'] = $it['mitem_order']; + if ($it['mitem_flags']) { + $entry['flags'] = []; + if ($it['mitem_flags'] & MENU_ITEM_ZID) { + $entry['flags'][] = 'zid'; + } + if ($it['mitem_flags'] & MENU_ITEM_NEWWIN) { + $entry['flags'][] = 'new-window'; + } + if ($it['mitem_flags'] & MENU_ITEM_CHATROOM) { + $entry['flags'][] = 'chatroom'; + } + } + $arr['items'][] = $entry; + } + } + + return $arr; } -function menu_render($menu, $class='', $edit = false, $var = []) { +function menu_render($menu, $class = '', $edit = false, $var = []) +{ - if(! $menu) - return ''; + if (! $menu) { + return ''; + } - $channel_id = ((is_array(App::$profile)) ? App::$profile['profile_uid'] : 0); - if ((! $channel_id) && (local_channel())) - $channel_id = local_channel(); + $channel_id = ((is_array(App::$profile)) ? App::$profile['profile_uid'] : 0); + if ((! $channel_id) && (local_channel())) { + $channel_id = local_channel(); + } - $chan = channelx_by_n($channel_id); - if(! $chan) - return ''; + $chan = channelx_by_n($channel_id); + if (! $chan) { + return ''; + } - $menu_list = menu_list($channel_id); - $menu_names = []; + $menu_list = menu_list($channel_id); + $menu_names = []; - foreach($menu_list as $menus) { - if($menus['menu_name'] != $menu['menu']['menu_name']) - $menu_names[] = $menus['menu_name']; - } + foreach ($menu_list as $menus) { + if ($menus['menu_name'] != $menu['menu']['menu_name']) { + $menu_names[] = $menus['menu_name']; + } + } - for($x = 0; $x < count($menu['items']); $x ++) { - if(in_array($menu['items'][$x]['mitem_link'], $menu_names)) { - $m = menu_fetch($menu['items'][$x]['mitem_link'], $channel_id, get_observer_hash()); - $submenu = menu_render($m, 'dropdown-menu', $edit = false, array('wrap' => 'none')); - $menu['items'][$x]['submenu'] = $submenu; - } + for ($x = 0; $x < count($menu['items']); $x++) { + if (in_array($menu['items'][$x]['mitem_link'], $menu_names)) { + $m = menu_fetch($menu['items'][$x]['mitem_link'], $channel_id, get_observer_hash()); + $submenu = menu_render($m, 'dropdown-menu', $edit = false, array('wrap' => 'none')); + $menu['items'][$x]['submenu'] = $submenu; + } - if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_ZID) - $menu['items'][$x]['mitem_link'] = zid($menu['items'][$x]['mitem_link']); + if ($menu['items'][$x]['mitem_flags'] & MENU_ITEM_ZID) { + $menu['items'][$x]['mitem_link'] = zid($menu['items'][$x]['mitem_link']); + } - if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_NEWWIN) - $menu['items'][$x]['newwin'] = '1'; + if ($menu['items'][$x]['mitem_flags'] & MENU_ITEM_NEWWIN) { + $menu['items'][$x]['newwin'] = '1'; + } - $menu['items'][$x]['mitem_desc'] = zidify_links(smilies(bbcode($menu['items'][$x]['mitem_desc']))); - } + $menu['items'][$x]['mitem_desc'] = zidify_links(smilies(bbcode($menu['items'][$x]['mitem_desc']))); + } - $wrap = (($var['wrap'] === 'none') ? false : true); + $wrap = (($var['wrap'] === 'none') ? false : true); - $ret = replace_macros(get_markup_template('usermenu.tpl'),array( - '$menu' => $menu['menu'], - '$class' => $class, - '$nick' => $chan['channel_address'], - '$edit' => (($edit) ? t("Edit") : ''), - '$id' => $menu['menu']['menu_id'], - '$items' => $menu['items'], - '$wrap' => $wrap - )); + $ret = replace_macros(get_markup_template('usermenu.tpl'), array( + '$menu' => $menu['menu'], + '$class' => $class, + '$nick' => $chan['channel_address'], + '$edit' => (($edit) ? t("Edit") : ''), + '$id' => $menu['menu']['menu_id'], + '$items' => $menu['items'], + '$wrap' => $wrap + )); - return $ret; + return $ret; } -function menu_fetch_id($menu_id,$channel_id) { +function menu_fetch_id($menu_id, $channel_id) +{ - $r = q("select * from menu where menu_id = %d and menu_channel_id = %d limit 1", - intval($menu_id), - intval($channel_id) - ); + $r = q( + "select * from menu where menu_id = %d and menu_channel_id = %d limit 1", + intval($menu_id), + intval($channel_id) + ); - return (($r) ? $r[0] : false); + return (($r) ? $r[0] : false); } -function menu_create($arr) { - $menu_name = trim(escape_tags($arr['menu_name'])); - $menu_desc = trim(escape_tags($arr['menu_desc'])); - $menu_flags = intval($arr['menu_flags']); +function menu_create($arr) +{ + $menu_name = trim(escape_tags($arr['menu_name'])); + $menu_desc = trim(escape_tags($arr['menu_desc'])); + $menu_flags = intval($arr['menu_flags']); - //allow menu_desc (title) to be empty - //if(! $menu_desc) - // $menu_desc = $menu_name; + //allow menu_desc (title) to be empty + //if(! $menu_desc) + // $menu_desc = $menu_name; - if(! $menu_name) - return false; + if (! $menu_name) { + return false; + } - if(! $menu_flags) - $menu_flags = 0; + if (! $menu_flags) { + $menu_flags = 0; + } - $menu_channel_id = intval($arr['menu_channel_id']); + $menu_channel_id = intval($arr['menu_channel_id']); - $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1", - dbesc($menu_name), - intval($menu_channel_id) - ); + $r = q( + "select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1", + dbesc($menu_name), + intval($menu_channel_id) + ); - if($r) - return false; + if ($r) { + return false; + } - $t = datetime_convert(); + $t = datetime_convert(); - $r = q("insert into menu ( menu_name, menu_desc, menu_flags, menu_channel_id, menu_created, menu_edited ) + $r = q( + "insert into menu ( menu_name, menu_desc, menu_flags, menu_channel_id, menu_created, menu_edited ) values( '%s', '%s', %d, %d, '%s', '%s' )", - dbesc($menu_name), - dbesc($menu_desc), - intval($menu_flags), - intval($menu_channel_id), - dbesc(datetime_convert('UTC','UTC',(($arr['menu_created']) ? $arr['menu_created'] : $t))), - dbesc(datetime_convert('UTC','UTC',(($arr['menu_edited']) ? $arr['menu_edited'] : $t))) - ); - if(! $r) - return false; - - $r = q("select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", - dbesc($menu_name), - intval($menu_channel_id) - ); - if($r) - return $r[0]['menu_id']; - return false; + dbesc($menu_name), + dbesc($menu_desc), + intval($menu_flags), + intval($menu_channel_id), + dbesc(datetime_convert('UTC', 'UTC', (($arr['menu_created']) ? $arr['menu_created'] : $t))), + dbesc(datetime_convert('UTC', 'UTC', (($arr['menu_edited']) ? $arr['menu_edited'] : $t))) + ); + if (! $r) { + return false; + } + $r = q( + "select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", + dbesc($menu_name), + intval($menu_channel_id) + ); + if ($r) { + return $r[0]['menu_id']; + } + return false; } /** @@ -197,218 +224,245 @@ function menu_create($arr) { * bits set. We will use this to find system generated bookmarks. */ -function menu_list($channel_id, $name = '', $flags = 0) { +function menu_list($channel_id, $name = '', $flags = 0) +{ - $sel_options = ''; - $sel_options .= (($name) ? " and menu_name = '" . protect_sprintf(dbesc($name)) . "' " : ''); - $sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : ''); + $sel_options = ''; + $sel_options .= (($name) ? " and menu_name = '" . protect_sprintf(dbesc($name)) . "' " : ''); + $sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : ''); - $r = q("select * from menu where menu_channel_id = %d $sel_options order by menu_desc", - intval($channel_id) - ); - return $r; + $r = q( + "select * from menu where menu_channel_id = %d $sel_options order by menu_desc", + intval($channel_id) + ); + return $r; } -function menu_list_count($channel_id, $name = '', $flags = 0) { +function menu_list_count($channel_id, $name = '', $flags = 0) +{ - $sel_options = ''; - $sel_options .= (($name) ? " and menu_name = '" . protect_sprintf(dbesc($name)) . "' " : ''); - $sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : ''); + $sel_options = ''; + $sel_options .= (($name) ? " and menu_name = '" . protect_sprintf(dbesc($name)) . "' " : ''); + $sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : ''); - $r = q("select count(*) as total from menu where menu_channel_id = %d $sel_options", - intval($channel_id) - ); - return $r[0]['total']; + $r = q( + "select count(*) as total from menu where menu_channel_id = %d $sel_options", + intval($channel_id) + ); + return $r[0]['total']; } -function menu_edit($arr) { +function menu_edit($arr) +{ - $menu_id = intval($arr['menu_id']); + $menu_id = intval($arr['menu_id']); - $menu_name = trim(escape_tags($arr['menu_name'])); - $menu_desc = trim(escape_tags($arr['menu_desc'])); - $menu_flags = intval($arr['menu_flags']); + $menu_name = trim(escape_tags($arr['menu_name'])); + $menu_desc = trim(escape_tags($arr['menu_desc'])); + $menu_flags = intval($arr['menu_flags']); - //allow menu_desc (title) to be empty - //if(! $menu_desc) - // $menu_desc = $menu_name; + //allow menu_desc (title) to be empty + //if(! $menu_desc) + // $menu_desc = $menu_name; - if(! $menu_name) - return false; + if (! $menu_name) { + return false; + } - if(! $menu_flags) - $menu_flags = 0; + if (! $menu_flags) { + $menu_flags = 0; + } - $menu_channel_id = intval($arr['menu_channel_id']); + $menu_channel_id = intval($arr['menu_channel_id']); - $r = q("select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", - dbesc($menu_name), - intval($menu_channel_id) - ); - if(($r) && ($r[0]['menu_id'] != $menu_id)) { - logger('menu_edit: duplicate menu name for channel ' . $menu_channel_id); - return false; - } + $r = q( + "select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", + dbesc($menu_name), + intval($menu_channel_id) + ); + if (($r) && ($r[0]['menu_id'] != $menu_id)) { + logger('menu_edit: duplicate menu name for channel ' . $menu_channel_id); + return false; + } - $r = q("select * from menu where menu_id = %d and menu_channel_id = %d limit 1", - intval($menu_id), - intval($menu_channel_id) - ); - if(! $r) { - logger('menu_edit: not found: ' . print_r($arr,true)); - return false; - } + $r = q( + "select * from menu where menu_id = %d and menu_channel_id = %d limit 1", + intval($menu_id), + intval($menu_channel_id) + ); + if (! $r) { + logger('menu_edit: not found: ' . print_r($arr, true)); + return false; + } - return q("update menu set menu_name = '%s', menu_desc = '%s', menu_flags = %d, menu_edited = '%s' - where menu_id = %d and menu_channel_id = %d", - dbesc($menu_name), - dbesc($menu_desc), - intval($menu_flags), - dbesc(datetime_convert()), - intval($menu_id), - intval($menu_channel_id) - ); + return q( + "update menu set menu_name = '%s', menu_desc = '%s', menu_flags = %d, menu_edited = '%s' + where menu_id = %d and menu_channel_id = %d", + dbesc($menu_name), + dbesc($menu_desc), + intval($menu_flags), + dbesc(datetime_convert()), + intval($menu_id), + intval($menu_channel_id) + ); } -function menu_delete($menu_name, $uid) { - $r = q("select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", - dbesc($menu_name), - intval($uid) - ); +function menu_delete($menu_name, $uid) +{ + $r = q( + "select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", + dbesc($menu_name), + intval($uid) + ); - if($r) - return menu_delete_id($r[0]['menu_id'],$uid); - return false; + if ($r) { + return menu_delete_id($r[0]['menu_id'], $uid); + } + return false; } -function menu_delete_id($menu_id, $uid) { - $r = q("select menu_id from menu where menu_id = %d and menu_channel_id = %d limit 1", - intval($menu_id), - intval($uid) - ); - if($r) { - $x = q("delete from menu_item where mitem_menu_id = %d and mitem_channel_id = %d", - intval($menu_id), - intval($uid) - ); - return q("delete from menu where menu_id = %d and menu_channel_id = %d", - intval($menu_id), - intval($uid) - ); - } - return false; +function menu_delete_id($menu_id, $uid) +{ + $r = q( + "select menu_id from menu where menu_id = %d and menu_channel_id = %d limit 1", + intval($menu_id), + intval($uid) + ); + if ($r) { + $x = q( + "delete from menu_item where mitem_menu_id = %d and mitem_channel_id = %d", + intval($menu_id), + intval($uid) + ); + return q( + "delete from menu where menu_id = %d and menu_channel_id = %d", + intval($menu_id), + intval($uid) + ); + } + return false; } -function menu_add_item($menu_id, $uid, $arr) { +function menu_add_item($menu_id, $uid, $arr) +{ - $mitem_link = escape_tags($arr['mitem_link']); - $mitem_desc = escape_tags($arr['mitem_desc']); - $mitem_order = intval($arr['mitem_order']); - $mitem_flags = intval($arr['mitem_flags']); + $mitem_link = escape_tags($arr['mitem_link']); + $mitem_desc = escape_tags($arr['mitem_desc']); + $mitem_order = intval($arr['mitem_order']); + $mitem_flags = intval($arr['mitem_flags']); - if(local_channel() == $uid) { - $channel = App::get_channel(); - } + if (local_channel() == $uid) { + $channel = App::get_channel(); + } - $acl = new Zotlabs\Access\AccessControl($channel); - $acl->set_from_array($arr); - $p = $acl->get(); + $acl = new Zotlabs\Access\AccessControl($channel); + $acl->set_from_array($arr); + $p = $acl->get(); - $r = q("insert into menu_item ( mitem_link, mitem_desc, mitem_flags, allow_cid, allow_gid, deny_cid, deny_gid, mitem_channel_id, mitem_menu_id, mitem_order ) values ( '%s', '%s', %d, '%s', '%s', '%s', '%s', %d, %d, %d ) ", - dbesc($mitem_link), - dbesc($mitem_desc), - intval($mitem_flags), - dbesc($p['allow_cid']), - dbesc($p['allow_gid']), - dbesc($p['deny_cid']), - dbesc($p['deny_gid']), - intval($uid), - intval($menu_id), - intval($mitem_order) - ); + $r = q( + "insert into menu_item ( mitem_link, mitem_desc, mitem_flags, allow_cid, allow_gid, deny_cid, deny_gid, mitem_channel_id, mitem_menu_id, mitem_order ) values ( '%s', '%s', %d, '%s', '%s', '%s', '%s', %d, %d, %d ) ", + dbesc($mitem_link), + dbesc($mitem_desc), + intval($mitem_flags), + dbesc($p['allow_cid']), + dbesc($p['allow_gid']), + dbesc($p['deny_cid']), + dbesc($p['deny_gid']), + intval($uid), + intval($menu_id), + intval($mitem_order) + ); - $x = q("update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", - dbesc(datetime_convert()), - intval($menu_id), - intval($uid) - ); - - return $r; + $x = q( + "update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", + dbesc(datetime_convert()), + intval($menu_id), + intval($uid) + ); + return $r; } -function menu_edit_item($menu_id, $uid, $arr) { +function menu_edit_item($menu_id, $uid, $arr) +{ - $mitem_id = intval($arr['mitem_id']); - $mitem_link = escape_tags($arr['mitem_link']); - $mitem_desc = escape_tags($arr['mitem_desc']); - $mitem_order = intval($arr['mitem_order']); - $mitem_flags = intval($arr['mitem_flags']); + $mitem_id = intval($arr['mitem_id']); + $mitem_link = escape_tags($arr['mitem_link']); + $mitem_desc = escape_tags($arr['mitem_desc']); + $mitem_order = intval($arr['mitem_order']); + $mitem_flags = intval($arr['mitem_flags']); - if(local_channel() == $uid) { - $channel = App::get_channel(); - } + if (local_channel() == $uid) { + $channel = App::get_channel(); + } - $acl = new Zotlabs\Access\AccessControl($channel); - $acl->set_from_array($arr); - $p = $acl->get(); + $acl = new Zotlabs\Access\AccessControl($channel); + $acl->set_from_array($arr); + $p = $acl->get(); - $r = q("update menu_item set mitem_link = '%s', mitem_desc = '%s', mitem_flags = %d, allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', mitem_order = %d where mitem_channel_id = %d and mitem_menu_id = %d and mitem_id = %d", - dbesc($mitem_link), - dbesc($mitem_desc), - intval($mitem_flags), - dbesc($p['allow_cid']), - dbesc($p['allow_gid']), - dbesc($p['deny_cid']), - dbesc($p['deny_gid']), - intval($mitem_order), - intval($uid), - intval($menu_id), - intval($mitem_id) - ); + $r = q( + "update menu_item set mitem_link = '%s', mitem_desc = '%s', mitem_flags = %d, allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', mitem_order = %d where mitem_channel_id = %d and mitem_menu_id = %d and mitem_id = %d", + dbesc($mitem_link), + dbesc($mitem_desc), + intval($mitem_flags), + dbesc($p['allow_cid']), + dbesc($p['allow_gid']), + dbesc($p['deny_cid']), + dbesc($p['deny_gid']), + intval($mitem_order), + intval($uid), + intval($menu_id), + intval($mitem_id) + ); - $x = q("update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", - dbesc(datetime_convert()), - intval($menu_id), - intval($uid) - ); + $x = q( + "update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", + dbesc(datetime_convert()), + intval($menu_id), + intval($uid) + ); - return $r; + return $r; } -function menu_del_item($menu_id,$uid,$item_id) { - $r = q("delete from menu_item where mitem_menu_id = %d and mitem_channel_id = %d and mitem_id = %d", - intval($menu_id), - intval($uid), - intval($item_id) - ); +function menu_del_item($menu_id, $uid, $item_id) +{ + $r = q( + "delete from menu_item where mitem_menu_id = %d and mitem_channel_id = %d and mitem_id = %d", + intval($menu_id), + intval($uid), + intval($item_id) + ); - $x = q("update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", - dbesc(datetime_convert()), - intval($menu_id), - intval($uid) - ); + $x = q( + "update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", + dbesc(datetime_convert()), + intval($menu_id), + intval($uid) + ); - return $r; + return $r; } -function menu_sync_packet($uid,$observer_hash,$menu_id,$delete = false) { - $r = menu_fetch_id($menu_id,$uid); - $c = channelx_by_n($uid); - if($r) { - $m = menu_fetch($r['menu_name'],$uid,$observer_hash); - if($m) { - if($delete) - $m['menu_delete'] = 1; - Libsync::build_sync_packet($uid,array('menu' => array(menu_element($c,$m)))); - } - } +function menu_sync_packet($uid, $observer_hash, $menu_id, $delete = false) +{ + $r = menu_fetch_id($menu_id, $uid); + $c = channelx_by_n($uid); + if ($r) { + $m = menu_fetch($r['menu_name'], $uid, $observer_hash); + if ($m) { + if ($delete) { + $m['menu_delete'] = 1; + } + Libsync::build_sync_packet($uid, array('menu' => array(menu_element($c, $m)))); + } + } } diff --git a/include/nav.php b/include/nav.php index ca3e08adc..d3cc8e381 100644 --- a/include/nav.php +++ b/include/nav.php @@ -1,534 +1,536 @@ -$(document).ready(function() { $("#nav-search-text").search_autocomplete(\'' . z_root() . '/acl' . '\');});'; - - $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false); - - if(local_channel()) { - $channel = App::get_channel(); - $observer = App::get_observer(); - $prof = q("select id from profile where uid = %d and is_default = 1", - intval($channel['channel_id']) - ); - - if(! (isset($_SESSION['delegate']) && $_SESSION['delegate'])) { - $chans = q("select channel_name, channel_id from channel left join pconfig on channel_id = pconfig.uid where channel_account_id = %d and channel_removed = 0 and pconfig.cat = 'system' and pconfig.k = 'include_in_menu' and pconfig.v = '1' order by channel_name ", - intval(get_account_id()) - ); - $q = get_sys_channel(); - if (is_site_admin() && intval(get_pconfig($q['channel_id'],'system','include_in_menu'))) { - $chans = array_merge([$q],$chans); - } - } - - $sitelocation = (($is_owner) ? '' : App::$profile['reddress']); - } - elseif(remote_channel()) { - $observer = App::get_observer(); - $sitelocation = ((App::$profile['reddress']) ? App::$profile['reddress'] : '@' . App::get_hostname()); - } - - require_once('include/conversation.php'); - - - $channel_apps[] = ((isset(App::$profile)) ? channel_apps($is_owner, App::$profile['channel_address']) : []); - - $site_icon = System::get_site_icon(); - - $banner = System::get_site_name(); - if (! isset(App::$page['header'])) { - App::$page['header'] = EMPTY_STR; - } - App::$page['header'] .= replace_macros(get_markup_template('hdr.tpl'), array( - //we could additionally use this to display important system notifications e.g. for updates - )); - - - // nav links: array of array('href', 'text', 'extra css classes', 'title') - $nav = []; - - if(can_view_public_stream()) - $nav['pubs'] = true; - - /** - * Display login or logout - */ - - $nav['usermenu'] = []; - $userinfo = null; - $nav['loginmenu'] = []; - - if($observer) { - $userinfo = [ - 'icon' => $observer['xchan_photo_m'].'?rev='.strtotime($observer['xchan_photo_date']), - 'name' => $observer['xchan_addr'], - ]; - } - - elseif(! $_SESSION['authenticated']) { - $nav['remote_login'] = remote_login(); - $nav['loginmenu'][] = Array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub'),'rmagic_nav_btn'); - } - - if(local_channel()) { - - if(! (isset($_SESSION['delegate']) && $_SESSION['delegate'])) { - $nav['manage'] = array('manage', t('Channels'), "", t('Manage your channels'),'manage_nav_btn'); - } - - $nav['group'] = array('lists', t('Lists'),"", t('Manage your access lists'),'group_nav_btn'); - - $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); - - $nav['safe'] = array('safe', t('Safe Mode'), ((get_safemode()) ? t('(is on)') : t('(is off)')) , t('Content filtering'),'safe_nav_btn'); - - - if ($chans && count($chans) > 0) { - $nav['channels'] = $chans; - } - - $nav['logout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn']; - - // user menu - $nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), ((App::$nav_sel['raw_name'] == 'Profile') ? 'active' : ''), t('Your profile page'),'profile_nav_btn']; - - if(feature_enabled(local_channel(),'multi_profiles')) - $nav['usermenu'][] = ['profiles', t('Edit Profiles'), ((App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : '') , t('Manage/Edit profiles'),'profiles_nav_btn']; - else - $nav['usermenu'][] = ['profiles/' . $prof[0]['id'], t('Edit Profile'), ((App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : ''), t('Edit your profile'),'profiles_nav_btn']; - - } - else { - if(! get_account_id()) { - if(App::$module === 'channel') { - $nav['login'] = login(true,'navbar-login',false,false); - $nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),'']; - } - else { - $nav['login'] = login(true,'navbar-login',false,false); - $nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),'login_nav_btn']; - App::$page['content'] .= replace_macros(get_markup_template('nav_login.tpl'), - [ - '$nav' => $nav, - 'userinfo' => $userinfo - ] - ); - } - } - else - $nav['alogout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn']; - - - } - - $my_url = get_my_url(); - if(! $my_url) { - $observer = App::get_observer(); - $my_url = (($observer) ? $observer['xchan_url'] : ''); - } - - $homelink_arr = parse_url($my_url); - $homelink = $homelink_arr['scheme'] . '://' . $homelink_arr['host']; - - if(! $is_owner) { - $nav['rusermenu'] = array( - $homelink, - t('Take me home'), - 'logout', - ((local_channel()) ? t('Logout') : t('Log me out of this site')) - ); - } - - if(((get_config('system','register_policy') == REGISTER_OPEN) || (get_config('system','register_policy') == REGISTER_APPROVE)) && (! $_SESSION['authenticated'])) - $nav['register'] = ['register',t('Register'), "", t('Create an account'),'register_nav_btn']; - - if(! get_config('system','hide_help',true)) { - $help_url = z_root() . '/help?f=&cmd=' . App::$cmd; - $context_help = ''; - $enable_context_help = ((intval(get_config('system','enable_context_help')) === 1 || get_config('system','enable_context_help') === false) ? true : false); - if($enable_context_help === true) { - require_once('include/help.php'); - $context_help = load_context_help(); - //point directly to /help if $context_help is empty - this can be removed once we have context help for all modules - $enable_context_help = (($context_help) ? true : false); - } - $nav['help'] = [$help_url, t('Help'), "", t('Help and documentation'), 'help_nav_btn', $context_help, $enable_context_help]; - } - - - $search_form_action = 'search'; - - - $nav['search'] = ['search', t('Search'), "", t('Search site @name, #tag, ?doc, content'), $search_form_action]; - - /** - * Admin page - */ - if (is_site_admin()) { - $nav['admin'] = array('admin/', t('Admin'), "", t('Site Setup and Configuration'),'admin_nav_btn'); - } - - $x = array('nav' => $nav, 'usermenu' => $userinfo ); - - call_hooks('nav', $x); - - // Not sure the best place to put this on the page. So I'm implementing it but leaving it - // turned off until somebody discovers this and figures out a good location for it. - $powered_by = ''; - - if(App::$profile_uid && App::$nav_sel['raw_name']) { - $active_app = q("SELECT app_url FROM app WHERE app_channel = %d AND app_name = '%s' LIMIT 1", - intval(App::$profile_uid), - dbesc(App::$nav_sel['raw_name']) - ); - - if($active_app) { - $url = $active_app[0]['app_url']; - } - } - - $pinned_list = []; - $syslist = []; - - //app bin - if($is_owner) { - if(get_pconfig(local_channel(), 'system','import_system_apps') !== datetime_convert('UTC','UTC','now','Y-m-d')) { - Apps::import_system_apps(); - set_pconfig(local_channel(), 'system','import_system_apps', datetime_convert('UTC','UTC','now','Y-m-d')); - } - - $list = Apps::app_list(local_channel(), false, [ 'nav_pinned_app' ]); - if($list) { - foreach($list as $li) { - $pinned_list[] = Apps::app_encode($li); - } - } - Apps::translate_system_apps($pinned_list); - - usort($pinned_list,'Zotlabs\\Lib\\Apps::app_name_compare'); - - $pinned_list = Apps::app_order(local_channel(),$pinned_list, 'nav_pinned_app'); - - - $syslist = []; - $list = Apps::app_list(local_channel(), false, [ 'nav_featured_app' ]); - - if($list) { - foreach($list as $li) { - $syslist[] = Apps::app_encode($li); - } - } - Apps::translate_system_apps($syslist); - - - } - else { - $syslist = Apps::get_system_apps(true); - } - - usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare'); - - $syslist = Apps::app_order(local_channel(),$syslist, 'nav_featured_app'); - - - if($pinned_list) { - foreach($pinned_list as $app) { - if(App::$nav_sel['name'] == $app['name']) - $app['active'] = true; - - if($is_owner) { - $navbar_apps[] = Apps::app_render($app,'navbar'); - } - elseif(! $is_owner && strpos($app['requires'], 'local_channel') === false) { - $navbar_apps[] = Apps::app_render($app,'navbar'); - } - } - } - - if($syslist) { - foreach($syslist as $app) { - if(App::$nav_sel['name'] == $app['name']) - $app['active'] = true; - - if($is_owner) { - $nav_apps[] = Apps::app_render($app,'nav'); - } - elseif(! $is_owner && strpos($app['requires'], 'local_channel') === false) { - $nav_apps[] = Apps::app_render($app,'nav'); - } - } - } - - $c = theme_include('navbar_' . purify_filename($template) . '.css'); - $tpl = get_markup_template('navbar_' . purify_filename($template) . '.tpl'); - - if($c && $tpl) { - head_add_css('navbar_' . $template . '.css'); - } - - if(! $tpl) { - $tpl = get_markup_template('navbar_default.tpl'); - } - - App::$page['nav'] .= replace_macros($tpl, array( - '$baseurl' => z_root(), - '$project_icon' => $site_icon, - '$project_title' => t('Powered by $Projectname'), - '$fulldocs' => t('Help'), - '$sitelocation' => $sitelocation, - '$nav' => $x['nav'], - '$banner' => $banner, - '$emptynotifications' => t('Loading'), - '$userinfo' => $x['usermenu'], - '$localuser' => local_channel(), - '$is_owner' => $is_owner, - '$sel' => App::$nav_sel, - '$powered_by' => $powered_by, - '$help' => t('@name, #tag, ?doc, content'), - '$pleasewait' => t('Please wait...'), - '$nav_apps' => ((isset($nav_apps)) ? $nav_apps : []), - '$navbar_apps' => ((isset($navbar_apps)) ? $navbar_apps : []), - '$channel_menu' => get_pconfig(App::$profile_uid,'system','channel_menu',get_config('system','channel_menu')), - '$channel_thumb' => ((App::$profile) ? App::$profile['thumb'] : ''), - '$channel_apps' => ((isset($channel_apps)) ? $channel_apps : []), - '$manageapps' => t('Installed Apps'), - '$addapps' => t('Available Apps'), - '$orderapps' => t('Arrange Apps'), - '$sysapps_toggle' => t('Toggle System Apps'), - '$url' => ((isset($url) && $url) ? $url : App::$cmd) - )); - - if(x($_SESSION, 'reload_avatar') && $observer) { - // The avatar has been changed on the server but the browser doesn't know that, - // force the browser to reload the image from the server instead of its cache. - $tpl = get_markup_template('force_image_reload.tpl'); - - App::$page['nav'] .= replace_macros($tpl, array( - '$imgUrl' => $observer['xchan_photo_m'] - )); - unset($_SESSION['reload_avatar']); - } - - call_hooks('page_header', App::$page['nav']); + if (! isset(App::$page['nav'])) { + App::$page['nav'] = EMPTY_STR; + } + if (! isset(App::$page['htmlhead'])) { + App::$page['htmlhead'] = EMPTY_STR; + } + + App::$page['htmlhead'] .= ''; + + $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false); + + if (local_channel()) { + $channel = App::get_channel(); + $observer = App::get_observer(); + $prof = q( + "select id from profile where uid = %d and is_default = 1", + intval($channel['channel_id']) + ); + + if (! (isset($_SESSION['delegate']) && $_SESSION['delegate'])) { + $chans = q( + "select channel_name, channel_id from channel left join pconfig on channel_id = pconfig.uid where channel_account_id = %d and channel_removed = 0 and pconfig.cat = 'system' and pconfig.k = 'include_in_menu' and pconfig.v = '1' order by channel_name ", + intval(get_account_id()) + ); + $q = get_sys_channel(); + if (is_site_admin() && intval(get_pconfig($q['channel_id'], 'system', 'include_in_menu'))) { + $chans = array_merge([$q], $chans); + } + } + + $sitelocation = (($is_owner) ? '' : App::$profile['reddress']); + } elseif (remote_channel()) { + $observer = App::get_observer(); + $sitelocation = ((App::$profile['reddress']) ? App::$profile['reddress'] : '@' . App::get_hostname()); + } + + require_once('include/conversation.php'); + + + $channel_apps[] = ((isset(App::$profile)) ? channel_apps($is_owner, App::$profile['channel_address']) : []); + + $site_icon = System::get_site_icon(); + + $banner = System::get_site_name(); + if (! isset(App::$page['header'])) { + App::$page['header'] = EMPTY_STR; + } + App::$page['header'] .= replace_macros(get_markup_template('hdr.tpl'), array( + //we could additionally use this to display important system notifications e.g. for updates + )); + + + // nav links: array of array('href', 'text', 'extra css classes', 'title') + $nav = []; + + if (can_view_public_stream()) { + $nav['pubs'] = true; + } + + /** + * Display login or logout + */ + + $nav['usermenu'] = []; + $userinfo = null; + $nav['loginmenu'] = []; + + if ($observer) { + $userinfo = [ + 'icon' => $observer['xchan_photo_m'] . '?rev=' . strtotime($observer['xchan_photo_date']), + 'name' => $observer['xchan_addr'], + ]; + } elseif (! $_SESSION['authenticated']) { + $nav['remote_login'] = remote_login(); + $nav['loginmenu'][] = array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub'),'rmagic_nav_btn'); + } + + if (local_channel()) { + if (! (isset($_SESSION['delegate']) && $_SESSION['delegate'])) { + $nav['manage'] = array('manage', t('Channels'), "", t('Manage your channels'),'manage_nav_btn'); + } + + $nav['group'] = array('lists', t('Lists'),"", t('Manage your access lists'),'group_nav_btn'); + + $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); + + $nav['safe'] = array('safe', t('Safe Mode'), ((get_safemode()) ? t('(is on)') : t('(is off)')) , t('Content filtering'),'safe_nav_btn'); + + + if ($chans && count($chans) > 0) { + $nav['channels'] = $chans; + } + + $nav['logout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn']; + + // user menu + $nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), ((App::$nav_sel['raw_name'] == 'Profile') ? 'active' : ''), t('Your profile page'),'profile_nav_btn']; + + if (feature_enabled(local_channel(), 'multi_profiles')) { + $nav['usermenu'][] = ['profiles', t('Edit Profiles'), ((App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : '') , t('Manage/Edit profiles'),'profiles_nav_btn']; + } else { + $nav['usermenu'][] = ['profiles/' . $prof[0]['id'], t('Edit Profile'), ((App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : ''), t('Edit your profile'),'profiles_nav_btn']; + } + } else { + if (! get_account_id()) { + if (App::$module === 'channel') { + $nav['login'] = login(true, 'navbar-login', false, false); + $nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),'']; + } else { + $nav['login'] = login(true, 'navbar-login', false, false); + $nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),'login_nav_btn']; + App::$page['content'] .= replace_macros( + get_markup_template('nav_login.tpl'), + [ + '$nav' => $nav, + 'userinfo' => $userinfo + ] + ); + } + } else { + $nav['alogout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn']; + } + } + + $my_url = get_my_url(); + if (! $my_url) { + $observer = App::get_observer(); + $my_url = (($observer) ? $observer['xchan_url'] : ''); + } + + $homelink_arr = parse_url($my_url); + $homelink = $homelink_arr['scheme'] . '://' . $homelink_arr['host']; + + if (! $is_owner) { + $nav['rusermenu'] = array( + $homelink, + t('Take me home'), + 'logout', + ((local_channel()) ? t('Logout') : t('Log me out of this site')) + ); + } + + if (((get_config('system', 'register_policy') == REGISTER_OPEN) || (get_config('system', 'register_policy') == REGISTER_APPROVE)) && (! $_SESSION['authenticated'])) { + $nav['register'] = ['register',t('Register'), "", t('Create an account'),'register_nav_btn']; + } + + if (! get_config('system', 'hide_help', true)) { + $help_url = z_root() . '/help?f=&cmd=' . App::$cmd; + $context_help = ''; + $enable_context_help = ((intval(get_config('system', 'enable_context_help')) === 1 || get_config('system', 'enable_context_help') === false) ? true : false); + if ($enable_context_help === true) { + require_once('include/help.php'); + $context_help = load_context_help(); + //point directly to /help if $context_help is empty - this can be removed once we have context help for all modules + $enable_context_help = (($context_help) ? true : false); + } + $nav['help'] = [$help_url, t('Help'), "", t('Help and documentation'), 'help_nav_btn', $context_help, $enable_context_help]; + } + + + $search_form_action = 'search'; + + + $nav['search'] = ['search', t('Search'), "", t('Search site @name, #tag, ?doc, content'), $search_form_action]; + + /** + * Admin page + */ + if (is_site_admin()) { + $nav['admin'] = array('admin/', t('Admin'), "", t('Site Setup and Configuration'),'admin_nav_btn'); + } + + $x = array('nav' => $nav, 'usermenu' => $userinfo ); + + call_hooks('nav', $x); + + // Not sure the best place to put this on the page. So I'm implementing it but leaving it + // turned off until somebody discovers this and figures out a good location for it. + $powered_by = ''; + + if (App::$profile_uid && App::$nav_sel['raw_name']) { + $active_app = q( + "SELECT app_url FROM app WHERE app_channel = %d AND app_name = '%s' LIMIT 1", + intval(App::$profile_uid), + dbesc(App::$nav_sel['raw_name']) + ); + + if ($active_app) { + $url = $active_app[0]['app_url']; + } + } + + $pinned_list = []; + $syslist = []; + + //app bin + if ($is_owner) { + if (get_pconfig(local_channel(), 'system', 'import_system_apps') !== datetime_convert('UTC', 'UTC', 'now', 'Y-m-d')) { + Apps::import_system_apps(); + set_pconfig(local_channel(), 'system', 'import_system_apps', datetime_convert('UTC', 'UTC', 'now', 'Y-m-d')); + } + + $list = Apps::app_list(local_channel(), false, [ 'nav_pinned_app' ]); + if ($list) { + foreach ($list as $li) { + $pinned_list[] = Apps::app_encode($li); + } + } + Apps::translate_system_apps($pinned_list); + + usort($pinned_list, 'Zotlabs\\Lib\\Apps::app_name_compare'); + + $pinned_list = Apps::app_order(local_channel(), $pinned_list, 'nav_pinned_app'); + + + $syslist = []; + $list = Apps::app_list(local_channel(), false, [ 'nav_featured_app' ]); + + if ($list) { + foreach ($list as $li) { + $syslist[] = Apps::app_encode($li); + } + } + Apps::translate_system_apps($syslist); + } else { + $syslist = Apps::get_system_apps(true); + } + + usort($syslist, 'Zotlabs\\Lib\\Apps::app_name_compare'); + + $syslist = Apps::app_order(local_channel(), $syslist, 'nav_featured_app'); + + + if ($pinned_list) { + foreach ($pinned_list as $app) { + if (App::$nav_sel['name'] == $app['name']) { + $app['active'] = true; + } + + if ($is_owner) { + $navbar_apps[] = Apps::app_render($app, 'navbar'); + } elseif (! $is_owner && strpos($app['requires'], 'local_channel') === false) { + $navbar_apps[] = Apps::app_render($app, 'navbar'); + } + } + } + + if ($syslist) { + foreach ($syslist as $app) { + if (App::$nav_sel['name'] == $app['name']) { + $app['active'] = true; + } + + if ($is_owner) { + $nav_apps[] = Apps::app_render($app, 'nav'); + } elseif (! $is_owner && strpos($app['requires'], 'local_channel') === false) { + $nav_apps[] = Apps::app_render($app, 'nav'); + } + } + } + + $c = theme_include('navbar_' . purify_filename($template) . '.css'); + $tpl = get_markup_template('navbar_' . purify_filename($template) . '.tpl'); + + if ($c && $tpl) { + head_add_css('navbar_' . $template . '.css'); + } + + if (! $tpl) { + $tpl = get_markup_template('navbar_default.tpl'); + } + + App::$page['nav'] .= replace_macros($tpl, array( + '$baseurl' => z_root(), + '$project_icon' => $site_icon, + '$project_title' => t('Powered by $Projectname'), + '$fulldocs' => t('Help'), + '$sitelocation' => $sitelocation, + '$nav' => $x['nav'], + '$banner' => $banner, + '$emptynotifications' => t('Loading'), + '$userinfo' => $x['usermenu'], + '$localuser' => local_channel(), + '$is_owner' => $is_owner, + '$sel' => App::$nav_sel, + '$powered_by' => $powered_by, + '$help' => t('@name, #tag, ?doc, content'), + '$pleasewait' => t('Please wait...'), + '$nav_apps' => ((isset($nav_apps)) ? $nav_apps : []), + '$navbar_apps' => ((isset($navbar_apps)) ? $navbar_apps : []), + '$channel_menu' => get_pconfig(App::$profile_uid, 'system', 'channel_menu', get_config('system', 'channel_menu')), + '$channel_thumb' => ((App::$profile) ? App::$profile['thumb'] : ''), + '$channel_apps' => ((isset($channel_apps)) ? $channel_apps : []), + '$manageapps' => t('Installed Apps'), + '$addapps' => t('Available Apps'), + '$orderapps' => t('Arrange Apps'), + '$sysapps_toggle' => t('Toggle System Apps'), + '$url' => ((isset($url) && $url) ? $url : App::$cmd) + )); + + if (x($_SESSION, 'reload_avatar') && $observer) { + // The avatar has been changed on the server but the browser doesn't know that, + // force the browser to reload the image from the server instead of its cache. + $tpl = get_markup_template('force_image_reload.tpl'); + + App::$page['nav'] .= replace_macros($tpl, array( + '$imgUrl' => $observer['xchan_photo_m'] + )); + unset($_SESSION['reload_avatar']); + } + + call_hooks('page_header', App::$page['nav']); } /* * Set a menu item in navbar as selected - * + * */ -function nav_set_selected($item){ - App::$nav_sel['raw_name'] = $item; - $item = ['name' => $item]; - Apps::translate_system_apps($item); - App::$nav_sel['name'] = $item['name']; +function nav_set_selected($item) +{ + App::$nav_sel['raw_name'] = $item; + $item = ['name' => $item]; + Apps::translate_system_apps($item); + App::$nav_sel['name'] = $item['name']; } -function channel_apps($is_owner = false, $nickname = null) { +function channel_apps($is_owner = false, $nickname = null) +{ - // Don't provide any channel apps if we're running as the sys channel + // Don't provide any channel apps if we're running as the sys channel - if(App::$is_sys) - return ''; + if (App::$is_sys) { + return ''; + } - $channel = App::get_channel(); + $channel = App::get_channel(); - if($channel && is_null($nickname)) - $nickname = $channel['channel_address']; + if ($channel && is_null($nickname)) { + $nickname = $channel['channel_address']; + } - $uid = ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : local_channel()); - $account_id = ((App::$profile['profile_uid']) ? App::$profile['channel_account_id'] : App::$channel['channel_account_id']); + $uid = ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : local_channel()); + $account_id = ((App::$profile['profile_uid']) ? App::$profile['channel_account_id'] : App::$channel['channel_account_id']); - if (! get_pconfig($uid, 'system', 'channelapps','1')) { - return ''; - } + if (! get_pconfig($uid, 'system', 'channelapps', '1')) { + return ''; + } - if($uid == local_channel()) { - return; - } - else { - $cal_link = '/cal/' . $nickname; - } + if ($uid == local_channel()) { + return; + } else { + $cal_link = '/cal/' . $nickname; + } - $sql_options = item_permissions_sql($uid); + $sql_options = item_permissions_sql($uid); - $r = q("select item.* from item left join iconfig on item.id = iconfig.iid + $r = q( + "select item.* from item left join iconfig on item.id = iconfig.iid where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 and item.item_deleted = 0 and ( iconfig.k = 'WEBPAGE' and item_type = %d ) $sql_options limit 1", - intval($uid), - dbesc('home'), - intval(ITEM_TYPE_WEBPAGE) - ); + intval($uid), + dbesc('home'), + intval(ITEM_TYPE_WEBPAGE) + ); - $has_webpages = (($r) ? true : false); + $has_webpages = (($r) ? true : false); - if(x($_GET, 'tab')) - $tab = notags(trim($_GET['tab'])); + if (x($_GET, 'tab')) { + $tab = notags(trim($_GET['tab'])); + } - $url = z_root() . '/channel/' . $nickname; - $pr = z_root() . '/profile/' . $nickname; + $url = z_root() . '/channel/' . $nickname; + $pr = z_root() . '/profile/' . $nickname; - $tabs = [ - [ - 'label' => t('Channel'), - 'url' => $url, - 'sel' => ((argv(0) == 'channel') ? 'active' : ''), - 'title' => t('Status Messages and Posts'), - 'id' => 'status-tab', - 'icon' => 'home' - ], - ]; + $tabs = [ + [ + 'label' => t('Channel'), + 'url' => $url, + 'sel' => ((argv(0) == 'channel') ? 'active' : ''), + 'title' => t('Status Messages and Posts'), + 'id' => 'status-tab', + 'icon' => 'home' + ], + ]; - $p = get_all_perms($uid,get_observer_hash()); + $p = get_all_perms($uid, get_observer_hash()); - if ($p['view_profile']) { - $tabs[] = [ - 'label' => t('About'), - 'url' => $pr, - 'sel' => ((argv(0) == 'profile') ? 'active' : ''), - 'title' => t('Profile Details'), - 'id' => 'profile-tab', - 'icon' => 'user' - ]; - } - if ($p['view_storage']) { - $tabs[] = [ - 'label' => t('Photos'), - 'url' => z_root() . '/photos/' . $nickname, - 'sel' => ((argv(0) == 'photos') ? 'active' : ''), - 'title' => t('Photo Albums'), - 'id' => 'photo-tab', - 'icon' => 'photo' - ]; - $tabs[] = [ - 'label' => t('Files'), - 'url' => z_root() . '/cloud/' . $nickname, - 'sel' => ((argv(0) == 'cloud' || argv(0) == 'sharedwithme') ? 'active' : ''), - 'title' => t('Files and Storage'), - 'id' => 'files-tab', - 'icon' => 'folder-open' - ]; - } + if ($p['view_profile']) { + $tabs[] = [ + 'label' => t('About'), + 'url' => $pr, + 'sel' => ((argv(0) == 'profile') ? 'active' : ''), + 'title' => t('Profile Details'), + 'id' => 'profile-tab', + 'icon' => 'user' + ]; + } + if ($p['view_storage']) { + $tabs[] = [ + 'label' => t('Photos'), + 'url' => z_root() . '/photos/' . $nickname, + 'sel' => ((argv(0) == 'photos') ? 'active' : ''), + 'title' => t('Photo Albums'), + 'id' => 'photo-tab', + 'icon' => 'photo' + ]; + $tabs[] = [ + 'label' => t('Files'), + 'url' => z_root() . '/cloud/' . $nickname, + 'sel' => ((argv(0) == 'cloud' || argv(0) == 'sharedwithme') ? 'active' : ''), + 'title' => t('Files and Storage'), + 'id' => 'files-tab', + 'icon' => 'folder-open' + ]; + } - if($p['view_stream'] && $cal_link) { - $tabs[] = [ - 'label' => t('Calendar'), - 'url' => z_root() . $cal_link, - 'sel' => ((argv(0) == 'cal') ? 'active' : ''), - 'title' => t('Calendar'), - 'id' => 'event-tab', - 'icon' => 'calendar' - ]; - } + if ($p['view_stream'] && $cal_link) { + $tabs[] = [ + 'label' => t('Calendar'), + 'url' => z_root() . $cal_link, + 'sel' => ((argv(0) == 'cal') ? 'active' : ''), + 'title' => t('Calendar'), + 'id' => 'event-tab', + 'icon' => 'calendar' + ]; + } - if ($p['chat'] && Apps::system_app_installed($uid,'Chatrooms')) { - $has_chats = Chatroom::list_count($uid); - if ($has_chats) { - $tabs[] = [ - 'label' => t('Chatrooms'), - 'url' => z_root() . '/chat/' . $nickname, - 'sel' => ((argv(0) == 'chat') ? 'active' : '' ), - 'title' => t('Chatrooms'), - 'id' => 'chat-tab', - 'icon' => 'comments-o' - ]; - } - } + if ($p['chat'] && Apps::system_app_installed($uid, 'Chatrooms')) { + $has_chats = Chatroom::list_count($uid); + if ($has_chats) { + $tabs[] = [ + 'label' => t('Chatrooms'), + 'url' => z_root() . '/chat/' . $nickname, + 'sel' => ((argv(0) == 'chat') ? 'active' : '' ), + 'title' => t('Chatrooms'), + 'id' => 'chat-tab', + 'icon' => 'comments-o' + ]; + } + } - $has_bookmarks = menu_list_count(local_channel(),'',MENU_BOOKMARK) + menu_list_count(local_channel(),'',MENU_SYSTEM|MENU_BOOKMARK); - if ($is_owner && $has_bookmarks) { - $tabs[] = [ - 'label' => t('Bookmarks'), - 'url' => z_root() . '/bookmarks', - 'sel' => ((argv(0) == 'bookmarks') ? 'active' : ''), - 'title' => t('Saved Bookmarks'), - 'id' => 'bookmarks-tab', - 'icon' => 'bookmark' - ]; - } + $has_bookmarks = menu_list_count(local_channel(), '', MENU_BOOKMARK) + menu_list_count(local_channel(), '', MENU_SYSTEM | MENU_BOOKMARK); + if ($is_owner && $has_bookmarks) { + $tabs[] = [ + 'label' => t('Bookmarks'), + 'url' => z_root() . '/bookmarks', + 'sel' => ((argv(0) == 'bookmarks') ? 'active' : ''), + 'title' => t('Saved Bookmarks'), + 'id' => 'bookmarks-tab', + 'icon' => 'bookmark' + ]; + } - if($p['view_pages'] && Apps::system_app_installed($uid, 'Cards')) { - $tabs[] = [ - 'label' => t('Cards'), - 'url' => z_root() . '/cards/' . $nickname , - 'sel' => ((argv(0) == 'cards') ? 'active' : ''), - 'title' => t('View Cards'), - 'id' => 'cards-tab', - 'icon' => 'list' - ]; - } + if ($p['view_pages'] && Apps::system_app_installed($uid, 'Cards')) { + $tabs[] = [ + 'label' => t('Cards'), + 'url' => z_root() . '/cards/' . $nickname , + 'sel' => ((argv(0) == 'cards') ? 'active' : ''), + 'title' => t('View Cards'), + 'id' => 'cards-tab', + 'icon' => 'list' + ]; + } - if($p['view_pages'] && Apps::system_app_installed($uid, 'Articles')) { - $tabs[] = [ - 'label' => t('Articles'), - 'url' => z_root() . '/articles/' . $nickname , - 'sel' => ((argv(0) == 'articles') ? 'active' : ''), - 'title' => t('View Articles'), - 'id' => 'articles-tab', - 'icon' => 'file-text-o' - ]; - } + if ($p['view_pages'] && Apps::system_app_installed($uid, 'Articles')) { + $tabs[] = [ + 'label' => t('Articles'), + 'url' => z_root() . '/articles/' . $nickname , + 'sel' => ((argv(0) == 'articles') ? 'active' : ''), + 'title' => t('View Articles'), + 'id' => 'articles-tab', + 'icon' => 'file-text-o' + ]; + } - if($has_webpages && Apps::system_app_installed($uid, 'Webpages')) { - $tabs[] = [ - 'label' => t('Webpages'), - 'url' => z_root() . '/page/' . $nickname . '/home', - 'sel' => ((argv(0) == 'webpages') ? 'active' : ''), - 'title' => t('View Webpages'), - 'id' => 'webpages-tab', - 'icon' => 'newspaper-o' - ]; - } - + if ($has_webpages && Apps::system_app_installed($uid, 'Webpages')) { + $tabs[] = [ + 'label' => t('Webpages'), + 'url' => z_root() . '/page/' . $nickname . '/home', + 'sel' => ((argv(0) == 'webpages') ? 'active' : ''), + 'title' => t('View Webpages'), + 'id' => 'webpages-tab', + 'icon' => 'newspaper-o' + ]; + } - if ($p['view_wiki'] && Apps::system_app_installed($uid, 'Wiki')) { - $tabs[] = [ - 'label' => t('Wikis'), - 'url' => z_root() . '/wiki/' . $nickname, - 'sel' => ((argv(0) == 'wiki') ? 'active' : ''), - 'title' => t('Wiki'), - 'id' => 'wiki-tab', - 'icon' => 'pencil-square-o' - ]; - } + if ($p['view_wiki'] && Apps::system_app_installed($uid, 'Wiki')) { + $tabs[] = [ + 'label' => t('Wikis'), + 'url' => z_root() . '/wiki/' . $nickname, + 'sel' => ((argv(0) == 'wiki') ? 'active' : ''), + 'title' => t('Wiki'), + 'id' => 'wiki-tab', + 'icon' => 'pencil-square-o' + ]; + } - $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs); + $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs); - call_hooks('channel_apps', $arr); + call_hooks('channel_apps', $arr); - return replace_macros(get_markup_template('profile_tabs.tpl'), - [ - '$tabs' => $arr['tabs'], - '$name' => App::$profile['channel_name'], - '$thumb' => App::$profile['thumb'], - ] - ); + return replace_macros( + get_markup_template('profile_tabs.tpl'), + [ + '$tabs' => $arr['tabs'], + '$name' => App::$profile['channel_name'], + '$thumb' => App::$profile['thumb'], + ] + ); } diff --git a/include/network.php b/include/network.php index 46c6b9d4b..d864cf419 100644 --- a/include/network.php +++ b/include/network.php @@ -13,7 +13,6 @@ use Zotlabs\Lib\LDSignatures; use Zotlabs\Web\HTTPSig; use Zotlabs\Daemon\Run; - /** * @file include/network.php * @brief Network related functions. @@ -24,8 +23,9 @@ use Zotlabs\Daemon\Run; * * @return string */ -function get_capath() { - return appdirpath() . '/library/cacert.pem'; +function get_capath() +{ + return appdirpath() . '/library/cacert.pem'; } /** @@ -33,7 +33,7 @@ function get_capath() { * * @param string $url * URL to fetch - * @param boolean $binary default false + * @param bool $binary default false * TRUE if asked to return binary results (file download) * @param int $redirects default 0 * internal use, recursion counter @@ -55,201 +55,218 @@ function get_capath() { * * \e string \b header => HTTP headers * * \e string \b body => fetched content */ -function z_fetch_url($url, $binary = false, $redirects = 0, $opts = []) { +function z_fetch_url($url, $binary = false, $redirects = 0, $opts = []) +{ - $ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => ""); - $passthru = false; + $ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => ""); + $passthru = false; - $ch = @curl_init($url); - if(($redirects > 8) || (! $ch)) - return $ret; + $ch = @curl_init($url); + if (($redirects > 8) || (! $ch)) { + return $ret; + } - if(! array_key_exists('request_target',$opts)) { - $opts['request_target'] = 'get ' . get_request_string($url); - } + if (! array_key_exists('request_target', $opts)) { + $opts['request_target'] = 'get ' . get_request_string($url); + } - @curl_setopt($ch, CURLOPT_HEADER, true); - @curl_setopt($ch, CURLINFO_HEADER_OUT, true); - @curl_setopt($ch, CURLOPT_CAINFO, get_capath()); - @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); - @curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); - @curl_setopt($ch, CURLOPT_ENCODING, ''); - - $ciphers = @get_config('system','curl_ssl_ciphers'); - if($ciphers) - @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); + @curl_setopt($ch, CURLOPT_HEADER, true); + @curl_setopt($ch, CURLINFO_HEADER_OUT, true); + @curl_setopt($ch, CURLOPT_CAINFO, get_capath()); + @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); + @curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + @curl_setopt($ch, CURLOPT_ENCODING, ''); - if(x($opts,'filep')) { - @curl_setopt($ch, CURLOPT_FILE, $opts['filep']); - @curl_setopt($ch, CURLOPT_HEADER, false); - @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - $passthru = true; - } + $ciphers = @get_config('system', 'curl_ssl_ciphers'); + if ($ciphers) { + @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); + } - if (x($opts,'useragent')) { - @curl_setopt($ch, CURLOPT_USERAGENT, $opts['useragent']); - } - else { - @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; zot)"); - } + if (x($opts, 'filep')) { + @curl_setopt($ch, CURLOPT_FILE, $opts['filep']); + @curl_setopt($ch, CURLOPT_HEADER, false); + @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); + $passthru = true; + } - if(x($opts,'upload')) - @curl_setopt($ch, CURLOPT_UPLOAD, $opts['upload']); + if (x($opts, 'useragent')) { + @curl_setopt($ch, CURLOPT_USERAGENT, $opts['useragent']); + } else { + @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; zot)"); + } - if(x($opts,'infile')) - @curl_setopt($ch, CURLOPT_INFILE, $opts['infile']); + if (x($opts, 'upload')) { + @curl_setopt($ch, CURLOPT_UPLOAD, $opts['upload']); + } - if(x($opts,'infilesize')) - @curl_setopt($ch, CURLOPT_INFILESIZE, $opts['infilesize']); + if (x($opts, 'infile')) { + @curl_setopt($ch, CURLOPT_INFILE, $opts['infile']); + } - if(x($opts,'readfunc')) - @curl_setopt($ch, CURLOPT_READFUNCTION, $opts['readfunc']); + if (x($opts, 'infilesize')) { + @curl_setopt($ch, CURLOPT_INFILESIZE, $opts['infilesize']); + } - // When using the session option and fetching from our own site, - // append the PHPSESSID cookie to any existing headers. - // Don't add to $opts['headers'] so that the cookie does not get - // sent to other sites via redirects + if (x($opts, 'readfunc')) { + @curl_setopt($ch, CURLOPT_READFUNCTION, $opts['readfunc']); + } - $instance_headers = ((array_key_exists('headers',$opts) && is_array($opts['headers'])) ? $opts['headers'] : []); + // When using the session option and fetching from our own site, + // append the PHPSESSID cookie to any existing headers. + // Don't add to $opts['headers'] so that the cookie does not get + // sent to other sites via redirects - if(x($opts,'session')) { - if(strpos($url,z_root()) === 0) { - $instance_headers[] = 'Cookie: PHPSESSID=' . session_id(); - } - } - if($instance_headers) - @curl_setopt($ch, CURLOPT_HTTPHEADER, $instance_headers); + $instance_headers = ((array_key_exists('headers', $opts) && is_array($opts['headers'])) ? $opts['headers'] : []); + + if (x($opts, 'session')) { + if (strpos($url, z_root()) === 0) { + $instance_headers[] = 'Cookie: PHPSESSID=' . session_id(); + } + } + if ($instance_headers) { + @curl_setopt($ch, CURLOPT_HTTPHEADER, $instance_headers); + } - if(x($opts,'nobody')) - @curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']); + if (x($opts, 'nobody')) { + @curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']); + } - if(x($opts,'custom')) - @curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $opts['custom']); + if (x($opts, 'custom')) { + @curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $opts['custom']); + } - if(x($opts,'timeout') && intval($opts['timeout'])) { - @curl_setopt($ch, CURLOPT_TIMEOUT, intval($opts['timeout'])); - } - else { - $curl_time = intval(get_config('system','curl_timeout',60)); - @curl_setopt($ch, CURLOPT_TIMEOUT, $curl_time); - } + if (x($opts, 'timeout') && intval($opts['timeout'])) { + @curl_setopt($ch, CURLOPT_TIMEOUT, intval($opts['timeout'])); + } else { + $curl_time = intval(get_config('system', 'curl_timeout', 60)); + @curl_setopt($ch, CURLOPT_TIMEOUT, $curl_time); + } - if(x($opts,'connecttimeout') && intval($opts['connecttimeout'])) { - @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, intval($opts['connecttimeout'])); - } - else { - $curl_contime = intval(@get_config('system','curl_connecttimeout',60)); - @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $curl_contime); - } + if (x($opts, 'connecttimeout') && intval($opts['connecttimeout'])) { + @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, intval($opts['connecttimeout'])); + } else { + $curl_contime = intval(@get_config('system', 'curl_connecttimeout', 60)); + @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $curl_contime); + } - if(x($opts,'http_auth')) { - // "username" . ':' . "password" - @curl_setopt($ch, CURLOPT_USERPWD, $opts['http_auth']); - } + if (x($opts, 'http_auth')) { + // "username" . ':' . "password" + @curl_setopt($ch, CURLOPT_USERPWD, $opts['http_auth']); + } - if(x($opts,'cookiejar')) - @curl_setopt($ch, CURLOPT_COOKIEJAR, $opts['cookiejar']); - if(x($opts,'cookiefile')) - @curl_setopt($ch, CURLOPT_COOKIEFILE, $opts['cookiefile']); + if (x($opts, 'cookiejar')) { + @curl_setopt($ch, CURLOPT_COOKIEJAR, $opts['cookiejar']); + } + if (x($opts, 'cookiefile')) { + @curl_setopt($ch, CURLOPT_COOKIEFILE, $opts['cookiefile']); + } - if(x($opts,'cookie')) - @curl_setopt($ch, CURLOPT_COOKIE, $opts['cookie']); + if (x($opts, 'cookie')) { + @curl_setopt($ch, CURLOPT_COOKIE, $opts['cookie']); + } - @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, - ((x($opts,'novalidate') && intval($opts['novalidate'])) ? false : true)); + @curl_setopt( + $ch, + CURLOPT_SSL_VERIFYPEER, + ((x($opts, 'novalidate') && intval($opts['novalidate'])) ? false : true) + ); - $prx = @get_config('system','proxy'); - if(strlen($prx)) { - @curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1); - @curl_setopt($ch, CURLOPT_PROXY, $prx); - $prxusr = @get_config('system','proxyuser'); - if(strlen($prxusr)) - @curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr); - } - if($binary) - @curl_setopt($ch, CURLOPT_BINARYTRANSFER,1); + $prx = @get_config('system', 'proxy'); + if (strlen($prx)) { + @curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1); + @curl_setopt($ch, CURLOPT_PROXY, $prx); + $prxusr = @get_config('system', 'proxyuser'); + if (strlen($prxusr)) { + @curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr); + } + } + if ($binary) { + @curl_setopt($ch, CURLOPT_BINARYTRANSFER, 1); + } - // don't let curl abort the entire application' - // if it throws any errors. + // don't let curl abort the entire application' + // if it throws any errors. - $s = @curl_exec($ch); + $s = @curl_exec($ch); - $base = $s; - $curl_info = @curl_getinfo($ch); - $http_code = $curl_info['http_code']; - //logger('fetch_url:' . $http_code . ' data: ' . $s); - $header = ''; + $base = $s; + $curl_info = @curl_getinfo($ch); + $http_code = $curl_info['http_code']; + //logger('fetch_url:' . $http_code . ' data: ' . $s); + $header = ''; - // For file redirects, set curl to follow location (indicated by $passthru). - // Then just return success or failure. - - if ($passthru) { - if ($http_code >= 200 && $http_code < 300) { - $ret['success'] = true; - } - $ret['return_code'] = $http_code; - @curl_close($ch); - return $ret; - } - + // For file redirects, set curl to follow location (indicated by $passthru). + // Then just return success or failure. - // Pull out multiple headers, e.g. proxy and continuation headers - // allow for HTTP/2.x without fixing code + if ($passthru) { + if ($http_code >= 200 && $http_code < 300) { + $ret['success'] = true; + } + $ret['return_code'] = $http_code; + @curl_close($ch); + return $ret; + } - while(preg_match('/^HTTP\/[1-3][\.0-9]* [1-5][0-9][0-9]/',$base)) { - $chunk = substr($base,0,strpos($base,"\r\n\r\n")+4); - $header .= $chunk; - $base = substr($base,strlen($chunk)); - } - if($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307 || $http_code == 308) { - $matches = []; - preg_match('/(Location:|URI:)(.*?)\n/i', $header, $matches); - $newurl = trim(array_pop($matches)); - if(strpos($newurl,'/') === 0) { - // We received a redirect to a relative path. - // Find the base component of the original url and re-assemble it with the new location - $base = @parse_url($url); - if ($base) { - unset($base['path']); unset($base['query']); unset($base['fragment']); - $newurl = unparse_url($base) . $newurl; - } - } - if ($newurl) { - @curl_close($ch); - return z_fetch_url($newurl,$binary,++$redirects,$opts); - } - } + // Pull out multiple headers, e.g. proxy and continuation headers + // allow for HTTP/2.x without fixing code - $rc = intval($http_code); - $ret['return_code'] = $rc; - $ret['success'] = (($rc >= 200 && $rc <= 299) ? true : false); - if(! $ret['success']) { - $ret['error'] = curl_error($ch); - $ret['debug'] = $curl_info; - $dbg = [ - 'url' => $ret['debug']['url'], - 'content_type' => $ret['debug']['content_type'], - 'error_code' => ((isset($ret['debug']['error_code'])) ? $ret['debug']['error_code'] : 0), - 'request_header' => $ret['debug']['request_header'] - ]; - logger('z_fetch_url: error: ' . $url . ': ' . $ret['error'], LOGGER_DEBUG); - logger('z_fetch_url: debug: ' . print_r($dbg,true), LOGGER_DATA); - } - $ret['body'] = substr($s,strlen($header)); - $ret['header'] = $header; - $ret['request_target'] = $opts['request_target']; + while (preg_match('/^HTTP\/[1-3][\.0-9]* [1-5][0-9][0-9]/', $base)) { + $chunk = substr($base, 0, strpos($base, "\r\n\r\n") + 4); + $header .= $chunk; + $base = substr($base, strlen($chunk)); + } - if(x($opts,'debug')) { - $ret['debug'] = $curl_info; - } + if ($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307 || $http_code == 308) { + $matches = []; + preg_match('/(Location:|URI:)(.*?)\n/i', $header, $matches); + $newurl = trim(array_pop($matches)); + if (strpos($newurl, '/') === 0) { + // We received a redirect to a relative path. + // Find the base component of the original url and re-assemble it with the new location + $base = @parse_url($url); + if ($base) { + unset($base['path']); + unset($base['query']); + unset($base['fragment']); + $newurl = unparse_url($base) . $newurl; + } + } + if ($newurl) { + @curl_close($ch); + return z_fetch_url($newurl, $binary, ++$redirects, $opts); + } + } - @curl_close($ch); - return($ret); + $rc = intval($http_code); + $ret['return_code'] = $rc; + $ret['success'] = (($rc >= 200 && $rc <= 299) ? true : false); + if (! $ret['success']) { + $ret['error'] = curl_error($ch); + $ret['debug'] = $curl_info; + $dbg = [ + 'url' => $ret['debug']['url'], + 'content_type' => $ret['debug']['content_type'], + 'error_code' => ((isset($ret['debug']['error_code'])) ? $ret['debug']['error_code'] : 0), + 'request_header' => $ret['debug']['request_header'] + ]; + logger('z_fetch_url: error: ' . $url . ': ' . $ret['error'], LOGGER_DEBUG); + logger('z_fetch_url: debug: ' . print_r($dbg, true), LOGGER_DATA); + } + $ret['body'] = substr($s, strlen($header)); + $ret['header'] = $header; + $ret['request_target'] = $opts['request_target']; + + if (x($opts, 'debug')) { + $ret['debug'] = $curl_info; + } + + @curl_close($ch); + return($ret); } @@ -279,237 +296,250 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = []) { * * \e string \b body => content * * \e string \b debug => from curl_info() */ -function z_post_url($url, $params, $redirects = 0, $opts = []) { +function z_post_url($url, $params, $redirects = 0, $opts = []) +{ -// logger('url: ' . $url); -// logger('params: ' . print_r($params,true)); -// logger('opts: ' . print_r($opts,true)); +// logger('url: ' . $url); +// logger('params: ' . print_r($params,true)); +// logger('opts: ' . print_r($opts,true)); - $ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => ""); + $ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => ""); - $ch = curl_init($url); - if(($redirects > 8) || (! $ch)) - return $ret; + $ch = curl_init($url); + if (($redirects > 8) || (! $ch)) { + return $ret; + } - if(! array_key_exists('request_target',$opts)) { - $opts['request_target'] = 'post ' . get_request_string($url); - } + if (! array_key_exists('request_target', $opts)) { + $opts['request_target'] = 'post ' . get_request_string($url); + } - @curl_setopt($ch, CURLOPT_HEADER, true); - @curl_setopt($ch, CURLINFO_HEADER_OUT, true); - @curl_setopt($ch, CURLOPT_CAINFO, get_capath()); - @curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); - @curl_setopt($ch, CURLOPT_POST,1); - @curl_setopt($ch, CURLOPT_POSTFIELDS,$params); - @curl_setopt($ch, CURLOPT_ENCODING, ''); - - $ciphers = @get_config('system','curl_ssl_ciphers'); - if($ciphers) - @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); + @curl_setopt($ch, CURLOPT_HEADER, true); + @curl_setopt($ch, CURLINFO_HEADER_OUT, true); + @curl_setopt($ch, CURLOPT_CAINFO, get_capath()); + @curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + @curl_setopt($ch, CURLOPT_POST, 1); + @curl_setopt($ch, CURLOPT_POSTFIELDS, $params); + @curl_setopt($ch, CURLOPT_ENCODING, ''); - if(x($opts,'filep')) { - @curl_setopt($ch, CURLOPT_FILE, $opts['filep']); - @curl_setopt($ch, CURLOPT_HEADER, false); - } + $ciphers = @get_config('system', 'curl_ssl_ciphers'); + if ($ciphers) { + @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); + } - if (x($opts,'useragent')) { - @curl_setopt($ch, CURLOPT_USERAGENT, $opts['useragent']); - } - else { - @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; zot)"); - } + if (x($opts, 'filep')) { + @curl_setopt($ch, CURLOPT_FILE, $opts['filep']); + @curl_setopt($ch, CURLOPT_HEADER, false); + } + + if (x($opts, 'useragent')) { + @curl_setopt($ch, CURLOPT_USERAGENT, $opts['useragent']); + } else { + @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; zot)"); + } - $instance_headers = ((array_key_exists('headers',$opts) && is_array($opts['headers'])) ? $opts['headers'] : []); + $instance_headers = ((array_key_exists('headers', $opts) && is_array($opts['headers'])) ? $opts['headers'] : []); - if(x($opts,'session')) { - if(strpos($url,z_root()) === 0) { - $instance_headers[] = 'Cookie: PHPSESSID=' . session_id(); - } - } - if($instance_headers) - @curl_setopt($ch, CURLOPT_HTTPHEADER, $instance_headers); + if (x($opts, 'session')) { + if (strpos($url, z_root()) === 0) { + $instance_headers[] = 'Cookie: PHPSESSID=' . session_id(); + } + } + if ($instance_headers) { + @curl_setopt($ch, CURLOPT_HTTPHEADER, $instance_headers); + } - if(x($opts,'nobody')) - @curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']); + if (x($opts, 'nobody')) { + @curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']); + } - if(x($opts,'custom')) { - @curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $opts['custom']); - @curl_setopt($ch, CURLOPT_POST,0); - } + if (x($opts, 'custom')) { + @curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $opts['custom']); + @curl_setopt($ch, CURLOPT_POST, 0); + } - if(x($opts,'timeout') && intval($opts['timeout'])) { - @curl_setopt($ch, CURLOPT_TIMEOUT, intval($opts['timeout'])); - } - else { - $curl_time = intval(@get_config('system','curl_post_timeout',90)); - @curl_setopt($ch, CURLOPT_TIMEOUT, $curl_time); - } + if (x($opts, 'timeout') && intval($opts['timeout'])) { + @curl_setopt($ch, CURLOPT_TIMEOUT, intval($opts['timeout'])); + } else { + $curl_time = intval(@get_config('system', 'curl_post_timeout', 90)); + @curl_setopt($ch, CURLOPT_TIMEOUT, $curl_time); + } - if(x($opts,'connecttimeout') && intval($opts['connecttimeout'])) { - @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, intval($opts['connecttimeout'])); - } - else { - $curl_contime = intval(@get_config('system','curl_post_connecttimeout',90)); - @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $curl_contime); - } + if (x($opts, 'connecttimeout') && intval($opts['connecttimeout'])) { + @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, intval($opts['connecttimeout'])); + } else { + $curl_contime = intval(@get_config('system', 'curl_post_connecttimeout', 90)); + @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $curl_contime); + } - if(x($opts,'http_auth')) { - // "username" . ':' . "password" - @curl_setopt($ch, CURLOPT_USERPWD, $opts['http_auth']); - } + if (x($opts, 'http_auth')) { + // "username" . ':' . "password" + @curl_setopt($ch, CURLOPT_USERPWD, $opts['http_auth']); + } - if(x($opts,'cookiejar')) - @curl_setopt($ch, CURLOPT_COOKIEJAR, $opts['cookiejar']); - if(x($opts,'cookiefile')) - @curl_setopt($ch, CURLOPT_COOKIEFILE, $opts['cookiefile']); - if(x($opts,'cookie')) - @curl_setopt($ch, CURLOPT_COOKIE, $opts['cookie']); + if (x($opts, 'cookiejar')) { + @curl_setopt($ch, CURLOPT_COOKIEJAR, $opts['cookiejar']); + } + if (x($opts, 'cookiefile')) { + @curl_setopt($ch, CURLOPT_COOKIEFILE, $opts['cookiefile']); + } + if (x($opts, 'cookie')) { + @curl_setopt($ch, CURLOPT_COOKIE, $opts['cookie']); + } - @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, - ((x($opts,'novalidate') && intval($opts['novalidate'])) ? false : true)); + @curl_setopt( + $ch, + CURLOPT_SSL_VERIFYPEER, + ((x($opts, 'novalidate') && intval($opts['novalidate'])) ? false : true) + ); - $prx = get_config('system','proxy'); - if(strlen($prx)) { - @curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1); - @curl_setopt($ch, CURLOPT_PROXY, $prx); - $prxusr = get_config('system','proxyuser'); - if(strlen($prxusr)) - @curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr); - } + $prx = get_config('system', 'proxy'); + if (strlen($prx)) { + @curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1); + @curl_setopt($ch, CURLOPT_PROXY, $prx); + $prxusr = get_config('system', 'proxyuser'); + if (strlen($prxusr)) { + @curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr); + } + } - // don't let curl abort the entire application - // if it throws any errors. + // don't let curl abort the entire application + // if it throws any errors. - $s = @curl_exec($ch); + $s = @curl_exec($ch); - $base = $s; - $curl_info = @curl_getinfo($ch); - $http_code = $curl_info['http_code']; + $base = $s; + $curl_info = @curl_getinfo($ch); + $http_code = $curl_info['http_code']; - $header = ''; + $header = ''; - // Pull out multiple headers, e.g. proxy and continuation headers - // allow for HTTP/2.x without fixing code + // Pull out multiple headers, e.g. proxy and continuation headers + // allow for HTTP/2.x without fixing code - while(preg_match('/^HTTP\/[1-3][\.0-9]* [1-5][0-9][0-9]/',$base)) { - $chunk = substr($base,0,strpos($base,"\r\n\r\n")+4); - $header .= $chunk; - $base = substr($base,strlen($chunk)); - } + while (preg_match('/^HTTP\/[1-3][\.0-9]* [1-5][0-9][0-9]/', $base)) { + $chunk = substr($base, 0, strpos($base, "\r\n\r\n") + 4); + $header .= $chunk; + $base = substr($base, strlen($chunk)); + } - // would somebody take lighttpd and just shoot it? + // would somebody take lighttpd and just shoot it? - if($http_code == 417) { - curl_close($ch); - if($opts) { - if($opts['headers']) - $opts['headers'][] = 'Expect:'; - else - $opts['headers'] = array('Expect:'); - } - else - $opts = array('headers' => array('Expect:')); - return z_post_url($url,$params,++$redirects,$opts); - } + if ($http_code == 417) { + curl_close($ch); + if ($opts) { + if ($opts['headers']) { + $opts['headers'][] = 'Expect:'; + } else { + $opts['headers'] = array('Expect:'); + } + } else { + $opts = array('headers' => array('Expect:')); + } + return z_post_url($url, $params, ++$redirects, $opts); + } - if($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307 || $http_code == 308) { - $matches = []; - preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches); - $newurl = trim(array_pop($matches)); - if(strpos($newurl,'/') === 0) { - // We received a redirect to a relative path. - // Find the base component of the original url and re-assemble it with the new location - $base = @parse_url($url); - if ($base) { - unset($base['path']); unset($base['query']); unset($base['fragment']); - $newurl = unparse_url($base) . $newurl; - } - } - if ($newurl) { - curl_close($ch); - if($http_code == 303) { - return z_fetch_url($newurl,false,++$redirects,$opts); - } - else { - return z_post_url($newurl,$params,++$redirects,$opts); - } - } - } - $rc = intval($http_code); - $ret['return_code'] = $rc; - $ret['success'] = (($rc >= 200 && $rc <= 299) ? true : false); - if(! $ret['success']) { - $ret['error'] = curl_error($ch); - $ret['debug'] = $curl_info; - $dbg = [ - 'url' => $ret['debug']['url'], - 'content_type' => $ret['debug']['content_type'], - 'error_code' => $ret['debug']['error_code'], - 'request_header' => $ret['debug']['request_header'] - ]; - logger('z_post_url: error: ' . $url . ': ' . $ret['error'], LOGGER_DEBUG); - logger('z_post_url: debug: ' . print_r($dbg,true), LOGGER_DATA); - } + if ($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307 || $http_code == 308) { + $matches = []; + preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches); + $newurl = trim(array_pop($matches)); + if (strpos($newurl, '/') === 0) { + // We received a redirect to a relative path. + // Find the base component of the original url and re-assemble it with the new location + $base = @parse_url($url); + if ($base) { + unset($base['path']); + unset($base['query']); + unset($base['fragment']); + $newurl = unparse_url($base) . $newurl; + } + } + if ($newurl) { + curl_close($ch); + if ($http_code == 303) { + return z_fetch_url($newurl, false, ++$redirects, $opts); + } else { + return z_post_url($newurl, $params, ++$redirects, $opts); + } + } + } + $rc = intval($http_code); + $ret['return_code'] = $rc; + $ret['success'] = (($rc >= 200 && $rc <= 299) ? true : false); + if (! $ret['success']) { + $ret['error'] = curl_error($ch); + $ret['debug'] = $curl_info; + $dbg = [ + 'url' => $ret['debug']['url'], + 'content_type' => $ret['debug']['content_type'], + 'error_code' => $ret['debug']['error_code'], + 'request_header' => $ret['debug']['request_header'] + ]; + logger('z_post_url: error: ' . $url . ': ' . $ret['error'], LOGGER_DEBUG); + logger('z_post_url: debug: ' . print_r($dbg, true), LOGGER_DATA); + } - $ret['body'] = substr($s, strlen($header)); - $ret['header'] = $header; - $ret['request_target'] = $opts['request_target']; + $ret['body'] = substr($s, strlen($header)); + $ret['header'] = $header; + $ret['request_target'] = $opts['request_target']; - if(x($opts,'debug')) { - $ret['debug'] = $curl_info; - } + if (x($opts, 'debug')) { + $ret['debug'] = $curl_info; + } - curl_close($ch); - return($ret); + curl_close($ch); + return($ret); } -function z_curl_error($ret) { - $output = EMPTY_STR; - if (isset($ret['debug'])) { - $output .= datetime_convert() . EOL; - $output .= t('url: ') . $ret['debug']['url'] . EOL; - $output .= t('error_code: ') . $ret['debug']['error_code'] . EOL; - $output .= t('error_string: ') . $ret['error'] . EOL; - $output .= t('content-type: ') . $ret['debug']['content_type'] . EOL; - } - return $output; +function z_curl_error($ret) +{ + $output = EMPTY_STR; + if (isset($ret['debug'])) { + $output .= datetime_convert() . EOL; + $output .= t('url: ') . $ret['debug']['url'] . EOL; + $output .= t('error_code: ') . $ret['debug']['error_code'] . EOL; + $output .= t('error_string: ') . $ret['error'] . EOL; + $output .= t('content-type: ') . $ret['debug']['content_type'] . EOL; + } + return $output; } -function json_return_and_die($x, $content_type = 'application/json', $debug = false) { - header("Content-type: $content_type"); - if ($debug) { - logger('returned_json: ' . json_encode($x,JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES), LOGGER_DATA); - } - echo json_encode($x); - killme(); +function json_return_and_die($x, $content_type = 'application/json', $debug = false) +{ + header("Content-type: $content_type"); + if ($debug) { + logger('returned_json: ' . json_encode($x, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES), LOGGER_DATA); + } + echo json_encode($x); + killme(); } -function as_return_and_die($obj,$channel) { +function as_return_and_die($obj, $channel) +{ - $x = array_merge(['@context' => [ - ACTIVITYSTREAMS_JSONLD_REV, - 'https://w3id.org/security/v1', - Activity::ap_schema() - ]], $obj ); + $x = array_merge(['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + Activity::ap_schema() + ]], $obj); - $headers = []; - $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' ; - $x['signature'] = LDSignatures::sign($x,$channel); - $ret = json_encode($x, JSON_UNESCAPED_SLASHES); - logger('data: ' . jindent($ret), LOGGER_DATA); - $headers['Date'] = datetime_convert('UTC','UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T'); - $headers['Digest'] = HTTPSig::generate_digest_header($ret); - $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; + $headers = []; + $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' ; + $x['signature'] = LDSignatures::sign($x, $channel); + $ret = json_encode($x, JSON_UNESCAPED_SLASHES); + logger('data: ' . jindent($ret), LOGGER_DATA); + $headers['Date'] = datetime_convert('UTC', 'UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T'); + $headers['Digest'] = HTTPSig::generate_digest_header($ret); + $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; - $h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel)); - HTTPSig::set_headers($h); - - echo $ret; - killme(); + $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel)); + HTTPSig::set_headers($h); + echo $ret; + killme(); } @@ -521,14 +551,17 @@ function as_return_and_die($obj,$channel) { * @param string $msg * optional message */ -function http_status($val, $msg = '') { - if ($val >= 400) - $msg = (($msg) ? $msg : 'Error'); - if ($val >= 200 && $val < 300) - $msg = (($msg) ? $msg : 'OK'); +function http_status($val, $msg = '') +{ + if ($val >= 400) { + $msg = (($msg) ? $msg : 'Error'); + } + if ($val >= 200 && $val < 300) { + $msg = (($msg) ? $msg : 'OK'); + } - logger(\App::$query_string . ':' . $val . ' ' . $msg); - header($_SERVER['SERVER_PROTOCOL'] . ' ' . $val . ' ' . $msg); + logger(App::$query_string . ':' . $val . ' ' . $msg); + header($_SERVER['SERVER_PROTOCOL'] . ' ' . $val . ' ' . $msg); } @@ -541,9 +574,10 @@ function http_status($val, $msg = '') { * optional message * @return void does not return, process is terminated */ -function http_status_exit($val, $msg = '') { - http_status($val, $msg); - killme(); +function http_status_exit($val, $msg = '') +{ + http_status($val, $msg); + killme(); } /* @@ -551,19 +585,20 @@ function http_status_exit($val, $msg = '') { * Takes the output of parse_url and builds a URL from it * */ - -function unparse_url($parsed_url) { - $scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : ''; - $host = isset($parsed_url['host']) ? $parsed_url['host'] : ''; - $port = ((isset($parsed_url['port']) && intval($parsed_url['port'])) ? ':' . intval($parsed_url['port']) : ''); - $user = isset($parsed_url['user']) ? $parsed_url['user'] : ''; - $pass = isset($parsed_url['pass']) ? ':' . $parsed_url['pass'] : ''; - $pass = ($user || $pass) ? "$pass@" : ''; - $path = isset($parsed_url['path']) ? $parsed_url['path'] : ''; - $query = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : ''; - $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : ''; - return "$scheme$user$pass$host$port$path$query$fragment"; -} + +function unparse_url($parsed_url) +{ + $scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : ''; + $host = isset($parsed_url['host']) ? $parsed_url['host'] : ''; + $port = ((isset($parsed_url['port']) && intval($parsed_url['port'])) ? ':' . intval($parsed_url['port']) : ''); + $user = isset($parsed_url['user']) ? $parsed_url['user'] : ''; + $pass = isset($parsed_url['pass']) ? ':' . $parsed_url['pass'] : ''; + $pass = ($user || $pass) ? "$pass@" : ''; + $path = isset($parsed_url['path']) ? $parsed_url['path'] : ''; + $query = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : ''; + $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : ''; + return "$scheme$user$pass$host$port$path$query$fragment"; +} @@ -576,72 +611,80 @@ function unparse_url($parsed_url) { * @param[in,out] int $recursion_depth * @return NULL|string|array */ -function convert_xml_element_to_array($xml_element, &$recursion_depth=0) { +function convert_xml_element_to_array($xml_element, &$recursion_depth = 0) +{ - // If we're getting too deep, bail out - if ($recursion_depth > 512) { - return(null); - } + // If we're getting too deep, bail out + if ($recursion_depth > 512) { + return(null); + } - if (!is_string($xml_element) && - !is_array($xml_element) && - (get_class($xml_element) == 'SimpleXMLElement')) { - $xml_element_copy = $xml_element; - $xml_element = get_object_vars($xml_element); - } + if ( + !is_string($xml_element) && + !is_array($xml_element) && + (get_class($xml_element) == 'SimpleXMLElement') + ) { + $xml_element_copy = $xml_element; + $xml_element = get_object_vars($xml_element); + } - if (is_array($xml_element)) { - $result_array = []; - if (count($xml_element) <= 0) { - return (trim(strval($xml_element_copy))); - } + if (is_array($xml_element)) { + $result_array = []; + if (count($xml_element) <= 0) { + return (trim(strval($xml_element_copy))); + } - foreach($xml_element as $key=>$value) { - $recursion_depth++; - $result_array[strtolower($key)] = - convert_xml_element_to_array($value, $recursion_depth); - $recursion_depth--; - } - if ($recursion_depth == 0) { - $temp_array = $result_array; - $result_array = array( - strtolower($xml_element_copy->getName()) => $temp_array, - ); - } + foreach ($xml_element as $key => $value) { + $recursion_depth++; + $result_array[strtolower($key)] = + convert_xml_element_to_array($value, $recursion_depth); + $recursion_depth--; + } + if ($recursion_depth == 0) { + $temp_array = $result_array; + $result_array = array( + strtolower($xml_element_copy->getName()) => $temp_array, + ); + } - return ($result_array); - } else { - return (trim(strval($xml_element))); - } + return ($result_array); + } else { + return (trim(strval($xml_element))); + } } -function z_dns_check($h,$check_mx = 0) { +function z_dns_check($h, $check_mx = 0) +{ - // dns_get_record() has issues on some platforms - // so allow somebody to ignore it completely - // Use config values from memory as this can be called during setup - // before a database or even any config structure exists. + // dns_get_record() has issues on some platforms + // so allow somebody to ignore it completely + // Use config values from memory as this can be called during setup + // before a database or even any config structure exists. - if(is_array(App::$config) && array_path_exists('system/do_not_check_dns', App::$config) && App::$config['system']['do_not_check_dns']) - return true; + if (is_array(App::$config) && array_path_exists('system/do_not_check_dns', App::$config) && App::$config['system']['do_not_check_dns']) { + return true; + } - // This will match either Windows or Mac ('Darwin') - if(stripos(PHP_OS,'win') !== false) - return true; + // This will match either Windows or Mac ('Darwin') + if (stripos(PHP_OS, 'win') !== false) { + return true; + } - // BSD variants have dns_get_record() but it only works reliably without any options - if(stripos(PHP_OS,'bsd') !== false) - return((@dns_get_record($h) || filter_var($h, FILTER_VALIDATE_IP)) ? true : false); + // BSD variants have dns_get_record() but it only works reliably without any options + if (stripos(PHP_OS, 'bsd') !== false) { + return((@dns_get_record($h) || filter_var($h, FILTER_VALIDATE_IP)) ? true : false); + } - // Otherwise we will assume dns_get_record() works as documented + // Otherwise we will assume dns_get_record() works as documented - $opts = DNS_A + DNS_CNAME + DNS_AAAA; - if($check_mx) - $opts += DNS_MX; + $opts = DNS_A + DNS_CNAME + DNS_AAAA; + if ($check_mx) { + $opts += DNS_MX; + } - return((@dns_get_record($h,$opts) || filter_var($h, FILTER_VALIDATE_IP)) ? true : false); + return((@dns_get_record($h, $opts) || filter_var($h, FILTER_VALIDATE_IP)) ? true : false); } /** @@ -653,47 +696,53 @@ function z_dns_check($h,$check_mx = 0) { * @see z_dns_check() * * @param[in,out] string $url URL to check - * @return boolean Return true if it's OK, false if something is wrong with it + * @return bool Return true if it's OK, false if something is wrong with it */ -function validate_url(&$url) { +function validate_url(&$url) +{ - // no naked subdomains (allow localhost for tests) - if(strpos($url, '.') === false && strpos($url, '/localhost/') === false) - return false; + // no naked subdomains (allow localhost for tests) + if (strpos($url, '.') === false && strpos($url, '/localhost/') === false) { + return false; + } - if(substr($url, 0, 4) != 'http') - $url = 'http://' . $url; + if (substr($url, 0, 4) != 'http') { + $url = 'http://' . $url; + } - $h = @parse_url($url); + $h = @parse_url($url); - if(($h) && z_dns_check($h['host'])) { - return true; - } + if (($h) && z_dns_check($h['host'])) { + return true; + } - return false; + return false; } /** * @brief Checks that email is an actual resolvable internet address. * * @param string $addr - * @return boolean + * @return bool */ -function validate_email($addr) { +function validate_email($addr) +{ - if(get_config('system', 'disable_email_validation')) - return true; + if (get_config('system', 'disable_email_validation')) { + return true; + } - if(! strpos($addr, '@')) - return false; + if (! strpos($addr, '@')) { + return false; + } - $h = substr($addr, strpos($addr, '@') + 1); + $h = substr($addr, strpos($addr, '@') + 1); - if(($h) && z_dns_check($h, true)) { - return true; - } + if (($h) && z_dns_check($h, true)) { + return true; + } - return false; + return false; } /** @@ -702,93 +751,99 @@ function validate_email($addr) { * Compare against our list (wildcards allowed). * * @param string $email - * @return boolean Returns false if not allowed, true if allowed or if allowed list is + * @return bool Returns false if not allowed, true if allowed or if allowed list is * not configured. */ -function allowed_email($email) { - - $domain = strtolower(substr($email, strpos($email, '@') + 1)); - if(! $domain) - return false; - - $str_allowed = get_config('system', 'allowed_email'); - $str_not_allowed = get_config('system', 'not_allowed_email'); - - if(! $str_allowed && ! $str_not_allowed) - return true; - - $return = false; - $found_allowed = false; - $found_not_allowed = false; - - $fnmatch = function_exists('fnmatch'); - - $allowed = explode(',', $str_allowed); - - if(count($allowed)) { - foreach($allowed as $a) { - $pat = strtolower(trim($a)); - if(($fnmatch && fnmatch($pat,$email)) || ($pat == $domain)) { - $found_allowed = true; - break; - } - } - } - - $not_allowed = explode(',', $str_not_allowed); - - if(count($not_allowed)) { - foreach($not_allowed as $na) { - $pat = strtolower(trim($na)); - if(($fnmatch && fnmatch($pat,$email)) || ($pat == $domain)) { - $found_not_allowed = true; - break; - } - } - } - - if ($found_allowed) { - $return = true; - } elseif (!$str_allowed && !$found_not_allowed) { - $return = true; - } - - return $return; -} - - - -function parse_xml_string($s, $strict = true) { - if($strict) { - if(! strstr($s,'code . ' at ' . $err->line - . ':' . $err->column . ' : ' . $err->message, LOGGER_DATA); - } - libxml_clear_errors(); - } - - return $x; -} - - -function sxml2array ( $xmlObject, $out = array () ) +function allowed_email($email) { - foreach ( (array) $xmlObject as $index => $node ) - $out[$index] = ( is_object ( $node ) ) ? sxml2array ( $node ) : $node; + + $domain = strtolower(substr($email, strpos($email, '@') + 1)); + if (! $domain) { + return false; + } + + $str_allowed = get_config('system', 'allowed_email'); + $str_not_allowed = get_config('system', 'not_allowed_email'); + + if (! $str_allowed && ! $str_not_allowed) { + return true; + } + + $return = false; + $found_allowed = false; + $found_not_allowed = false; + + $fnmatch = function_exists('fnmatch'); + + $allowed = explode(',', $str_allowed); + + if (count($allowed)) { + foreach ($allowed as $a) { + $pat = strtolower(trim($a)); + if (($fnmatch && fnmatch($pat, $email)) || ($pat == $domain)) { + $found_allowed = true; + break; + } + } + } + + $not_allowed = explode(',', $str_not_allowed); + + if (count($not_allowed)) { + foreach ($not_allowed as $na) { + $pat = strtolower(trim($na)); + if (($fnmatch && fnmatch($pat, $email)) || ($pat == $domain)) { + $found_not_allowed = true; + break; + } + } + } + + if ($found_allowed) { + $return = true; + } elseif (!$str_allowed && !$found_not_allowed) { + $return = true; + } + + return $return; +} + + + +function parse_xml_string($s, $strict = true) +{ + if ($strict) { + if (! strstr($s, 'code . ' at ' . $err->line + . ':' . $err->column . ' : ' . $err->message, LOGGER_DATA); + } + libxml_clear_errors(); + } + + return $x; +} + + +function sxml2array($xmlObject, $out = array ()) +{ + foreach ((array) $xmlObject as $index => $node) { + $out[$index] = ( is_object($node) ) ? sxml2array($node) : $node; + } return $out; } @@ -797,219 +852,227 @@ function sxml2array ( $xmlObject, $out = array () ) * @brief xml2[] will convert the given XML text to an array in the XML structure. * * Link: http://www.bin-co.com/php/scripts/xml2array/ - * Portions significantly re-written by mike@macgirvin.com + * Portions significantly re-written by mike@macgirvin.com * (namespaces, lowercase tags, get_attribute default changed, more...) * * Examples: $array = xml2array(file_get_contents('feed.xml')); * $array = xml2array(file_get_contents('feed.xml', true, 1, 'attribute')); * * @param string $contents The XML text - * @param boolean $namespaces true or false include namespace information in the returned array as array elements + * @param bool $namespaces true or false include namespace information in the returned array as array elements * @param int $get_attributes 1 or 0. If this is 1 the function will get the attributes as well as the tag values - this results in a different array structure in the return value. * @param string $priority Can be 'tag' or 'attribute'. This will change the way the resulting array sturcture. For 'tag', the tags are given more importance. * * @return array The parsed XML in an array form. Use print_r() to see the resulting array structure. */ -function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = 'attribute') { - if(!$contents) - return []; +function xml2array($contents, $namespaces = true, $get_attributes = 1, $priority = 'attribute') +{ + if (!$contents) { + return []; + } - if(!function_exists('xml_parser_create')) { - logger('xml2array: parser function missing'); - return []; - } + if (!function_exists('xml_parser_create')) { + logger('xml2array: parser function missing'); + return []; + } - libxml_use_internal_errors(true); - libxml_clear_errors(); + libxml_use_internal_errors(true); + libxml_clear_errors(); - if($namespaces) - $parser = @xml_parser_create_ns("UTF-8",':'); - else - $parser = @xml_parser_create(); + if ($namespaces) { + $parser = @xml_parser_create_ns("UTF-8", ':'); + } else { + $parser = @xml_parser_create(); + } - if(! $parser) { - logger('xml2array: xml_parser_create: no resource'); - return []; - } + if (! $parser) { + logger('xml2array: xml_parser_create: no resource'); + return []; + } - xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8"); - // http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss - xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); - xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1); - @xml_parse_into_struct($parser, trim($contents), $xml_values); - @xml_parser_free($parser); + xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8"); + // http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss + xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); + xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1); + @xml_parse_into_struct($parser, trim($contents), $xml_values); + @xml_parser_free($parser); - if(! $xml_values) { - logger('xml2array: libxml: parse error: ' . $contents, LOGGER_DATA); - foreach(libxml_get_errors() as $err) - logger('libxml: parse: ' . $err->code . " at " . $err->line . ":" . $err->column . " : " . $err->message, LOGGER_DATA); - libxml_clear_errors(); + if (! $xml_values) { + logger('xml2array: libxml: parse error: ' . $contents, LOGGER_DATA); + foreach (libxml_get_errors() as $err) { + logger('libxml: parse: ' . $err->code . " at " . $err->line . ":" . $err->column . " : " . $err->message, LOGGER_DATA); + } + libxml_clear_errors(); - return; - } + return; + } - //Initializations - $xml_array = []; - $parents = []; - $opened_tags = []; - $arr = []; + //Initializations + $xml_array = []; + $parents = []; + $opened_tags = []; + $arr = []; - $current = &$xml_array; // Reference + $current = &$xml_array; // Reference - // Go through the tags. - $repeated_tag_index = []; // Multiple tags with same name will be turned into an array - foreach($xml_values as $data) { - unset($attributes,$value); // Remove existing values, or there will be trouble + // Go through the tags. + $repeated_tag_index = []; // Multiple tags with same name will be turned into an array + foreach ($xml_values as $data) { + unset($attributes, $value); // Remove existing values, or there will be trouble - // This command will extract these variables into the foreach scope - // tag(string), type(string), level(int), attributes(array). - extract($data); // We could use the array by itself, but this cooler. + // This command will extract these variables into the foreach scope + // tag(string), type(string), level(int), attributes(array). + extract($data); // We could use the array by itself, but this cooler. - $result = []; - $attributes_data = []; + $result = []; + $attributes_data = []; - if(isset($value)) { - if($priority == 'tag') $result = $value; - else $result['value'] = $value; // Put the value in a assoc array if we are in the 'Attribute' mode - } + if (isset($value)) { + if ($priority == 'tag') { + $result = $value; + } else { + $result['value'] = $value; // Put the value in a assoc array if we are in the 'Attribute' mode + } + } - //Set the attributes too. - if(isset($attributes) and $get_attributes) { - foreach($attributes as $attr => $val) { - if($priority == 'tag') $attributes_data[$attr] = $val; - else $result['@attributes'][$attr] = $val; // Set all the attributes in a array called 'attr' - } - } + //Set the attributes too. + if (isset($attributes) and $get_attributes) { + foreach ($attributes as $attr => $val) { + if ($priority == 'tag') { + $attributes_data[$attr] = $val; + } else { + $result['@attributes'][$attr] = $val; // Set all the attributes in a array called 'attr' + } + } + } - // See tag status and do the needed. - if($namespaces && strpos($tag,':')) { - $namespc = substr($tag,0,strrpos($tag,':')); - $tag = strtolower(substr($tag,strlen($namespc)+1)); - $result['@namespace'] = $namespc; - } - $tag = strtolower($tag); + // See tag status and do the needed. + if ($namespaces && strpos($tag, ':')) { + $namespc = substr($tag, 0, strrpos($tag, ':')); + $tag = strtolower(substr($tag, strlen($namespc) + 1)); + $result['@namespace'] = $namespc; + } + $tag = strtolower($tag); - if($type == "open") { // The starting of the tag '' - $parent[$level-1] = &$current; - if(!is_array($current) or (!in_array($tag, array_keys($current)))) { // Insert New tag - $current[$tag] = $result; - if($attributes_data) $current[$tag. '_attr'] = $attributes_data; - $repeated_tag_index[$tag.'_'.$level] = 1; + if ($type == "open") { // The starting of the tag ' ' - $current = &$parent[$level-1]; - } - } - - return($xml_array); + return($xml_array); } -function email_header_encode($in_str, $charset = 'UTF-8', $header = 'Subject') { - $out_str = $in_str; - $need_to_convert = false; +function email_header_encode($in_str, $charset = 'UTF-8', $header = 'Subject') +{ + $out_str = $in_str; + $need_to_convert = false; - for($x = 0; $x < strlen($in_str); $x ++) { - if((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { - $need_to_convert = true; - break; - } - } + for ($x = 0; $x < strlen($in_str); $x++) { + if ((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { + $need_to_convert = true; + break; + } + } - if(! $need_to_convert) - return $in_str; + if (! $need_to_convert) { + return $in_str; + } - if ($out_str && $charset) { + if ($out_str && $charset) { + // define start delimimter, end delimiter and spacer + $end = "?="; + $start = "=?" . $charset . "?B?"; + $spacer = $end . PHP_EOL . " " . $start; - // define start delimimter, end delimiter and spacer - $end = "?="; - $start = "=?" . $charset . "?B?"; - $spacer = $end . PHP_EOL . " " . $start; + // determine length of encoded text within chunks + // and ensure length is even + $length = 75 - strlen($start) - strlen($end) - (strlen($header) + 2); - // determine length of encoded text within chunks - // and ensure length is even - $length = 75 - strlen($start) - strlen($end) - (strlen($header) + 2); + /* + [EDIT BY danbrown AT php DOT net: The following + is a bugfix provided by (gardan AT gmx DOT de) + on 31-MAR-2005 with the following note: + "This means: $length should not be even, + but divisible by 4. The reason is that in + base64-encoding 3 8-bit-chars are represented + by 4 6-bit-chars. These 4 chars must not be + split between two encoded words, according + to RFC-2047. + */ + $length = $length - ($length % 4); - /* - [EDIT BY danbrown AT php DOT net: The following - is a bugfix provided by (gardan AT gmx DOT de) - on 31-MAR-2005 with the following note: - "This means: $length should not be even, - but divisible by 4. The reason is that in - base64-encoding 3 8-bit-chars are represented - by 4 6-bit-chars. These 4 chars must not be - split between two encoded words, according - to RFC-2047. - */ - $length = $length - ($length % 4); + // encode the string and split it into chunks + // with spacers after each chunk + $out_str = base64_encode($out_str); + $out_str = chunk_split($out_str, $length, $spacer); - // encode the string and split it into chunks - // with spacers after each chunk - $out_str = base64_encode($out_str); - $out_str = chunk_split($out_str, $length, $spacer); - - // remove trailing spacer and - // add start and end delimiters - $spacer = preg_quote($spacer,'/'); - $out_str = preg_replace("/" . $spacer . "$/", "", $out_str); - $out_str = $start . $out_str . $end; - } - return $out_str; + // remove trailing spacer and + // add start and end delimiters + $spacer = preg_quote($spacer, '/'); + $out_str = preg_replace("/" . $spacer . "$/", "", $out_str); + $out_str = $start . $out_str . $end; + } + return $out_str; } /** @@ -1017,42 +1080,44 @@ function email_header_encode($in_str, $charset = 'UTF-8', $header = 'Subject') { * * @param string $webbie * @param string $protocol (optional) default empty - * @param boolean $verify (optional) default true, verify HTTP signatures on Zot discovery packets. - * @return boolean + * @param bool $verify (optional) default true, verify HTTP signatures on Zot discovery packets. + * @return bool */ -function discover_by_webbie($webbie, $protocol = '', $verify = true) { +function discover_by_webbie($webbie, $protocol = '', $verify = true) +{ - $result = []; + $result = []; - $network = null; + $network = null; - $x = Webfinger::exec($webbie); + $x = Webfinger::exec($webbie); - $address = EMPTY_STR; + $address = EMPTY_STR; - if($x && array_key_exists('subject',$x) && strpos($x['subject'],'acct:') === 0) - $address = str_replace('acct:','',$x['subject']); - if($x && array_key_exists('aliases',$x) && count($x['aliases'])) { - foreach($x['aliases'] as $a) { - if(strpos($a,'acct:') === 0) { - $address = str_replace('acct:','',$a); + if ($x && array_key_exists('subject', $x) && strpos($x['subject'], 'acct:') === 0) { + $address = str_replace('acct:', '', $x['subject']); + } + if ($x && array_key_exists('aliases', $x) && count($x['aliases'])) { + foreach ($x['aliases'] as $a) { + if (strpos($a, 'acct:') === 0) { + $address = str_replace('acct:', '', $a); break; } } } - if($x && array_key_exists('links',$x) && is_array($x['links'])) { + if ($x && array_key_exists('links', $x) && is_array($x['links'])) { // look for Nomad first - foreach($x['links'] as $link) { - if(array_key_exists('rel',$link)) { + foreach ($x['links'] as $link) { + if (array_key_exists('rel',$link)) { $apurl = null; // If we discover zot - don't search further; grab the info and get out of // here. - if(in_array($link['rel'], [ PROTOCOL_NOMAD ]) && ((! $protocol) || (in_array(strtolower($protocol), [ 'nomad' ])))) { + if (in_array($link['rel'], [ PROTOCOL_NOMAD ]) && ((! $protocol) || (in_array(strtolower($protocol), [ 'nomad' ])))) { logger('nomad found for ' . $webbie, LOGGER_DEBUG); $record = Zotfinger::exec($link['href'], null, $verify); @@ -1081,77 +1146,76 @@ function discover_by_webbie($webbie, $protocol = '', $verify = true) { // if we reached this point, nomad wasn't found. - foreach($x['links'] as $link) { - if(array_key_exists('rel',$link)) { + foreach ($x['links'] as $link) { + if (array_key_exists('rel', $link)) { + $apurl = null; - $apurl = null; + // If we discover zot - don't search further; grab the info and get out of + // here. - // If we discover zot - don't search further; grab the info and get out of - // here. + if ($link['rel'] === PROTOCOL_ZOT6 && ((! $protocol) || (strtolower($protocol) === 'zot6'))) { + logger('zot6 found for ' . $webbie, LOGGER_DEBUG); + $record = Zotfinger::exec($link['href'], null, $verify); - if(in_array($link['rel'], [ PROTOCOL_ZOT6 ]) && ((! $protocol) || (in_array(strtolower($protocol), [ 'zot6' ])))) { - logger('zot6 found for ' . $webbie, LOGGER_DEBUG); - $record = Zotfinger::exec($link['href'], null, $verify); + // Check the HTTP signature - // Check the HTTP signature + if ($verify) { + $hsig = $record['signature']; + if ($hsig && ($hsig['signer'] === $url || $hsig['signer'] === $link['href']) && $hsig['header_valid'] === true && $hsig['content_valid'] === true) { + $hsig_valid = true; + } - if ($verify) { + if (! $hsig_valid) { + logger('http signature not valid: ' . print_r($hsig, true)); + continue; + } + } - $hsig = $record['signature']; - if($hsig && ($hsig['signer'] === $url || $hsig['signer'] === $link['href']) && $hsig['header_valid'] === true && $hsig['content_valid'] === true) { - $hsig_valid = true; - } + $x = Libzot::import_xchan($record['data']); + if ($x['success']) { + return $x['hash']; + } + } + if ($link['rel'] === 'self' && ($link['type'] === 'application/activity+json' || strpos($link['type'], 'ld+json') !== false) && ((! $protocol) || (strtolower($protocol) === 'activitypub'))) { + $ap = ActivityPub::discover($link['href']); + if ($ap) { + return $ap; + } + } + } + } + } - if(! $hsig_valid) { - logger('http signature not valid: ' . print_r($hsig,true)); - continue; - } - } + if (strpos($webbie, 'http') === 0) { + $ap = ActivityPub::discover($webbie); + if ($ap) { + return $ap; + } + } - $x = Libzot::import_xchan($record['data']); - if($x['success']) { - return $x['hash']; - } - } - if($link['rel'] === 'self' && ($link['type'] === 'application/activity+json' || strpos($link['type'],'ld+json') !== false) && ((! $protocol) || (strtolower($protocol) === 'activitypub'))) { - $ap = ActivityPub::discover($link['href']); - if($ap) { - return $ap; - } - } - } - } - } + logger('webfinger: ' . print_r($x, true), LOGGER_DATA, LOG_INFO); - if(strpos($webbie,'http') === 0) { - $ap = ActivityPub::discover($webbie); - if($ap) { - return $ap; - } - } + $arr = [ + 'address' => $webbie, + 'protocol' => $protocol, + 'success' => false, + 'xchan' => '', + 'webfinger' => $x + ]; + /** + * @hooks discover_channel_webfinger + * Called when performing a webfinger lookup. + * * \e string \b address - The webbie + * * \e string \b protocol + * * \e array \b webfinger - The result from webfinger_rfc7033() + * * \e boolean \b success - The return value, default false + */ + call_hooks('discover_channel_webfinger', $arr); + if ($arr['success']) { + return $arr['xchan']; + } - logger('webfinger: ' . print_r($x,true), LOGGER_DATA, LOG_INFO); - - $arr = [ - 'address' => $webbie, - 'protocol' => $protocol, - 'success' => false, - 'xchan' => '', - 'webfinger' => $x - ]; - /** - * @hooks discover_channel_webfinger - * Called when performing a webfinger lookup. - * * \e string \b address - The webbie - * * \e string \b protocol - * * \e array \b webfinger - The result from webfinger_rfc7033() - * * \e boolean \b success - The return value, default false - */ - call_hooks('discover_channel_webfinger', $arr); - if($arr['success']) - return $arr['xchan']; - - return false; + return false; } /** @@ -1159,319 +1223,335 @@ function discover_by_webbie($webbie, $protocol = '', $verify = true) { * No longer used - see Zotlabs/Lib/Webfinger.php * * @param string $webbie - The resource - * @return boolean|string false or associative array from result JSON + * @return bool|string false or associative array from result JSON */ -function webfinger_rfc7033($webbie) { +function webfinger_rfc7033($webbie) +{ - if(strpos($webbie,'@')) { - $lhs = substr($webbie,0,strpos($webbie,'@')); - $rhs = substr($webbie,strpos($webbie,'@')+1); - $resource = urlencode('acct:' . $webbie); - } - else { - $m = parse_url($webbie); - if($m) { - if($m['scheme'] !== 'https') - return false; + if (strpos($webbie, '@')) { + $lhs = substr($webbie, 0, strpos($webbie, '@')); + $rhs = substr($webbie, strpos($webbie, '@') + 1); + $resource = urlencode('acct:' . $webbie); + } else { + $m = parse_url($webbie); + if ($m) { + if ($m['scheme'] !== 'https') { + return false; + } - $rhs = $m['host'] . ((isset($m['port']) && intval($m['port'])) ? ':' . intval($m['port']) : ''); - $resource = urlencode($webbie); - } - else - return false; - } - logger('fetching url from resource: ' . $rhs . ':' . $webbie); + $rhs = $m['host'] . ((isset($m['port']) && intval($m['port'])) ? ':' . intval($m['port']) : ''); + $resource = urlencode($webbie); + } else { + return false; + } + } + logger('fetching url from resource: ' . $rhs . ':' . $webbie); - $counter = 0; - $s = z_fetch_url('https://' . $rhs . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=1' : ''), - false, $counter, [ 'headers' => [ 'Accept: application/jrd+json, application/json, */*' ] ]); + $counter = 0; + $s = z_fetch_url( + 'https://' . $rhs . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=1' : ''), + false, + $counter, + [ 'headers' => [ 'Accept: application/jrd+json, application/json, */*' ] ] + ); - if($s['success']) { - $j = json_decode($s['body'], true); - return($j); - } + if ($s['success']) { + $j = json_decode($s['body'], true); + return($j); + } - return false; + return false; } -function do_delivery($deliveries, $force = false) { +function do_delivery($deliveries, $force = false) +{ - // $force is set if a site that wasn't responding suddenly returns to life. - // Try and shove through everything going to that site while it's responding. + // $force is set if a site that wasn't responding suddenly returns to life. + // Try and shove through everything going to that site while it's responding. - if(! (is_array($deliveries) && count($deliveries))) - return; + if (! (is_array($deliveries) && count($deliveries))) { + return; + } - $x = q("select count(outq_hash) as total from outq where outq_delivered = 0"); - if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',3000)) && (! $force)) { - logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO); - foreach($deliveries as $d) { - Queue::update($d); - } - return; - } + $x = q("select count(outq_hash) as total from outq where outq_delivered = 0"); + if (intval($x[0]['total']) > intval(get_config('system', 'force_queue_threshold', 3000)) && (! $force)) { + logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO); + foreach ($deliveries as $d) { + Queue::update($d); + } + return; + } - $interval = ((get_config('system','delivery_interval') !== false) - ? intval(get_config('system','delivery_interval')) : 2 ); + $interval = ((get_config('system', 'delivery_interval') !== false) + ? intval(get_config('system', 'delivery_interval')) : 2 ); - $deliveries_per_process = intval(get_config('system','delivery_batch_count')); + $deliveries_per_process = intval(get_config('system', 'delivery_batch_count')); - if($deliveries_per_process <= 0) - $deliveries_per_process = 1; + if ($deliveries_per_process <= 0) { + $deliveries_per_process = 1; + } - $deliver = []; - foreach($deliveries as $d) { + $deliver = []; + foreach ($deliveries as $d) { + if (! $d) { + continue; + } - if(! $d) - continue; + $deliver[] = $d; - $deliver[] = $d; + if (count($deliver) >= $deliveries_per_process) { + Run::Summon([ 'Deliver',$deliver ]); + $deliver = []; + if ($interval) { + @time_sleep_until(microtime(true) + (float) $interval); + } + } + } - if(count($deliver) >= $deliveries_per_process) { - Run::Summon( [ 'Deliver',$deliver ] ); - $deliver = []; - if($interval) - @time_sleep_until(microtime(true) + (float) $interval); - } - } + // catch any stragglers - // catch any stragglers - - if($deliver) { - Run::Summon( [ 'Deliver',$deliver ] ); - } + if ($deliver) { + Run::Summon([ 'Deliver',$deliver ]); + } } -function get_site_info() { +function get_site_info() +{ - $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'); - $directory_mode = Array('DIRECTORY_MODE_NORMAL', 'DIRECTORY_MODE_PRIMARY', 'DIRECTORY_MODE_SECONDARY', 256 => 'DIRECTORY_MODE_STANDALONE'); + $register_policy = array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'); + $directory_mode = array('DIRECTORY_MODE_NORMAL', 'DIRECTORY_MODE_PRIMARY', 'DIRECTORY_MODE_SECONDARY', 256 => 'DIRECTORY_MODE_STANDALONE'); - $sql_extra = ''; + $sql_extra = ''; - $r = q("select * from channel left join account on account_id = channel_account_id where ( account_roles & 4096 ) > 0 and account_default_channel = channel_id"); + $r = q("select * from channel left join account on account_id = channel_account_id where ( account_roles & 4096 ) > 0 and account_default_channel = channel_id"); - if($r) { - $admin = []; - foreach($r as $rr) { - if($rr['channel_pageflags'] & PAGE_HUBADMIN) - $admin[] = array( 'name' => $rr['channel_name'], 'address' => channel_reddress($rr), 'channel' => z_root() . '/channel/' . $rr['channel_address']); - } - if(! $admin) { - foreach($r as $rr) { - $admin[] = array( 'name' => $rr['channel_name'], 'address' => channel_reddress($rr), 'channel' => z_root() . '/channel/' . $rr['channel_address']); - } - } - } - else { - $admin = false; - } + if ($r) { + $admin = []; + foreach ($r as $rr) { + if ($rr['channel_pageflags'] & PAGE_HUBADMIN) { + $admin[] = array( 'name' => $rr['channel_name'], 'address' => channel_reddress($rr), 'channel' => z_root() . '/channel/' . $rr['channel_address']); + } + } + if (! $admin) { + foreach ($r as $rr) { + $admin[] = array( 'name' => $rr['channel_name'], 'address' => channel_reddress($rr), 'channel' => z_root() . '/channel/' . $rr['channel_address']); + } + } + } else { + $admin = false; + } - $def_service_class = get_config('system','default_service_class'); - if($def_service_class) - $service_class = get_config('service_class',$def_service_class); - else - $service_class = false; + $def_service_class = get_config('system', 'default_service_class'); + if ($def_service_class) { + $service_class = get_config('service_class', $def_service_class); + } else { + $service_class = false; + } - $visible_plugins = visible_plugin_list(); + $visible_plugins = visible_plugin_list(); - if(@is_dir('.git') && function_exists('shell_exec')) - $commit = trim(@shell_exec('git log -1 --format="%h"')); - if(! isset($commit) || strlen($commit) > 16) - $commit = ''; + if (@is_dir('.git') && function_exists('shell_exec')) { + $commit = trim(@shell_exec('git log -1 --format="%h"')); + } + if (! isset($commit) || strlen($commit) > 16) { + $commit = ''; + } - $site_info = get_config('system','info'); - $site_name = get_config('system','sitename'); - if(! get_config('system','hidden_version_siteinfo')) { - $version = System::get_project_version(); + $site_info = get_config('system', 'info'); + $site_name = get_config('system', 'sitename'); + if (! get_config('system', 'hidden_version_siteinfo')) { + $version = System::get_project_version(); - if(@is_dir('.git') && function_exists('shell_exec')) { - $commit = trim( @shell_exec('git log -1 --format="%h"')); - } + if (@is_dir('.git') && function_exists('shell_exec')) { + $commit = trim(@shell_exec('git log -1 --format="%h"')); + } - if(! isset($commit) || strlen($commit) > 16) - $commit = ''; - } - else { - $version = $commit = ''; - } + if (! isset($commit) || strlen($commit) > 16) { + $commit = ''; + } + } else { + $version = $commit = ''; + } - //Statistics -// $channels_total_stat = intval(get_config('system','channels_total_stat')); -// $channels_active_halfyear_stat = intval(get_config('system','channels_active_halfyear_stat')); -// $channels_active_monthly_stat = intval(get_config('system','channels_active_monthly_stat')); -// $local_posts_stat = intval(get_config('system','local_posts_stat')); -// $local_comments_stat = intval(get_config('system','local_comments_stat')); -// $hide_in_statistics = intval(get_config('system','hide_in_statistics')); + //Statistics +// $channels_total_stat = intval(get_config('system','channels_total_stat')); +// $channels_active_halfyear_stat = intval(get_config('system','channels_active_halfyear_stat')); +// $channels_active_monthly_stat = intval(get_config('system','channels_active_monthly_stat')); +// $local_posts_stat = intval(get_config('system','local_posts_stat')); +// $local_comments_stat = intval(get_config('system','local_comments_stat')); +// $hide_in_statistics = intval(get_config('system','hide_in_statistics')); - $site_expire = intval(get_config('system', 'default_expire_days')); + $site_expire = intval(get_config('system', 'default_expire_days')); - load_config('feature_lock'); - $locked_features = []; - if(is_array(App::$config['feature_lock']) && count(App::$config['feature_lock'])) { - foreach(App::$config['feature_lock'] as $k => $v) { - if($k === 'config_loaded') - continue; + load_config('feature_lock'); + $locked_features = []; + if (is_array(App::$config['feature_lock']) && count(App::$config['feature_lock'])) { + foreach (App::$config['feature_lock'] as $k => $v) { + if ($k === 'config_loaded') { + continue; + } - $locked_features[$k] = intval($v); - } - } + $locked_features[$k] = intval($v); + } + } - $protocols = [ 'nomad' ]; - if (get_config('system','activitypub', ACTIVITYPUB_ENABLED)) { - $protocols[] = 'activitypub'; - } + $protocols = [ 'nomad' ]; + if (get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) { + $protocols[] = 'activitypub'; + } - $data = [ - 'url' => z_root(), - 'platform' => System::get_platform_name(), - 'site_name' => (($site_name) ? $site_name : ''), - 'version' => $version, -// 'version_tag' => $tag, - 'addon_version' => defined('ADDON_VERSION') ? ADDON_VERSION : 'unknown', - 'commit' => $commit, - 'protocols' => $protocols, - 'plugins' => $visible_plugins, - 'register_policy' => $register_policy[get_config('system','register_policy')], - 'invitation_only' => (bool) (defined('INVITE_WORKING') && intval(get_config('system','invitation_only'))), - 'directory_mode' => $directory_mode[get_config('system','directory_mode')], -// 'directory_server' => get_config('system','directory_server'), - 'language' => get_config('system','language'), -// 'rss_connections' => (bool) intval(get_config('system','feed_contacts')), - 'expiration' => $site_expire, - 'default_service_restrictions' => $service_class, - 'locked_features' => $locked_features, - 'admin' => $admin, - 'dbdriver' => DBA::$dba->getdriver() . ' ' . ((ACTIVE_DBTYPE == DBTYPE_POSTGRES) ? 'postgres' : 'mysql'), - 'lastpoll' => get_config('system','lastpoll'), - 'ebs' => System::ebs(), // bit.ly/3DGCmki - 'info' => (($site_info) ? $site_info : '') + $data = [ + 'url' => z_root(), + 'platform' => System::get_platform_name(), + 'site_name' => (($site_name) ? $site_name : ''), + 'version' => $version, +// 'version_tag' => $tag, + 'addon_version' => defined('ADDON_VERSION') ? ADDON_VERSION : 'unknown', + 'commit' => $commit, + 'protocols' => $protocols, + 'plugins' => $visible_plugins, + 'register_policy' => $register_policy[get_config('system', 'register_policy')], + 'invitation_only' => (bool) (defined('INVITE_WORKING') && intval(get_config('system', 'invitation_only'))), + 'directory_mode' => $directory_mode[get_config('system', 'directory_mode')], +// 'directory_server' => get_config('system','directory_server'), + 'language' => get_config('system', 'language'), +// 'rss_connections' => (bool) intval(get_config('system','feed_contacts')), + 'expiration' => $site_expire, + 'default_service_restrictions' => $service_class, + 'locked_features' => $locked_features, + 'admin' => $admin, + 'dbdriver' => DBA::$dba->getdriver() . ' ' . ((ACTIVE_DBTYPE == DBTYPE_POSTGRES) ? 'postgres' : 'mysql'), + 'lastpoll' => get_config('system', 'lastpoll'), + 'ebs' => System::ebs(), // bit.ly/3DGCmki + 'info' => (($site_info) ? $site_info : '') - ]; + ]; - return $data; + return $data; } /** * @brief * * @param string $url - * @return boolean + * @return bool */ -function check_siteallowed($url) { +function check_siteallowed($url) +{ - $retvalue = true; + $retvalue = true; - $arr = [ 'url' => $url ]; - /** - * @hooks check_siteallowed - * Used to over-ride or bypass the site black/white block lists. - * * \e string \b url - * * \e boolean \b allowed - optional return value set in hook - */ - call_hooks('check_siteallowed', $arr); + $arr = [ 'url' => $url ]; + /** + * @hooks check_siteallowed + * Used to over-ride or bypass the site black/white block lists. + * * \e string \b url + * * \e boolean \b allowed - optional return value set in hook + */ + call_hooks('check_siteallowed', $arr); - if (array_key_exists('allowed',$arr)) { - return $arr['allowed']; - } + if (array_key_exists('allowed', $arr)) { + return $arr['allowed']; + } - // your own site is always allowed - if (strpos($url, z_root()) !== false) { - return $retvalue; - } + // your own site is always allowed + if (strpos($url, z_root()) !== false) { + return $retvalue; + } - $bl1 = get_config('system','allowed_sites'); - $bl2 = get_config('system','denied_sites'); + $bl1 = get_config('system', 'allowed_sites'); + $bl2 = get_config('system', 'denied_sites'); - if (is_array($bl1) && $bl1) { - if (! (is_array($bl2) && $bl2)) { - $retvalue = false; - } - foreach ($bl1 as $bl) { - if ($bl === '*') { - $retvalue = true; - } - if ($bl && (strpos($url,$bl) !== false || wildmat($bl,$url))) { - return true; - } - } - } - if (is_array($bl2) && $bl2) { - foreach ($bl2 as $bl) { - if ($bl === '*') { - $retvalue = false; - } - if ($bl && (strpos($url,$bl) !== false || wildmat($bl,$url))) { - return false; - } - } - } + if (is_array($bl1) && $bl1) { + if (! (is_array($bl2) && $bl2)) { + $retvalue = false; + } + foreach ($bl1 as $bl) { + if ($bl === '*') { + $retvalue = true; + } + if ($bl && (strpos($url, $bl) !== false || wildmat($bl, $url))) { + return true; + } + } + } + if (is_array($bl2) && $bl2) { + foreach ($bl2 as $bl) { + if ($bl === '*') { + $retvalue = false; + } + if ($bl && (strpos($url, $bl) !== false || wildmat($bl, $url))) { + return false; + } + } + } - return $retvalue; + return $retvalue; } /** * @brief * * @param string $url - * @return boolean + * @return bool */ -function check_pubstream_siteallowed($url) { +function check_pubstream_siteallowed($url) +{ - $retvalue = true; + $retvalue = true; - $arr = array('url' => $url); - /** - * @hooks check_siteallowed - * Used to over-ride or bypass the site black/white block lists. - * * \e string \b url - * * \e boolean \b allowed - optional return value set in hook - */ - call_hooks('pubstream_check_siteallowed', $arr); + $arr = array('url' => $url); + /** + * @hooks check_siteallowed + * Used to over-ride or bypass the site black/white block lists. + * * \e string \b url + * * \e boolean \b allowed - optional return value set in hook + */ + call_hooks('pubstream_check_siteallowed', $arr); - if (array_key_exists('allowed',$arr)) { - return $arr['allowed']; - } + if (array_key_exists('allowed', $arr)) { + return $arr['allowed']; + } - // your own site is always allowed - if (strpos($url, z_root()) !== false) { - return $retvalue; - } + // your own site is always allowed + if (strpos($url, z_root()) !== false) { + return $retvalue; + } - $bl1 = get_config('system','pubstream_allowed_sites'); - $bl2 = get_config('system','pubstream_denied_sites'); + $bl1 = get_config('system', 'pubstream_allowed_sites'); + $bl2 = get_config('system', 'pubstream_denied_sites'); - if (is_array($bl1) && $bl1) { - if (! (is_array($bl2) && $bl2)) { - $retvalue = false; - } - foreach ($bl1 as $bl) { - if ($bl === '*') { - $retvalue = true; - } - if ($bl && (strpos($url,$bl) !== false || wildmat($bl,$url))) { - return true; - } - } - } - if (is_array($bl2) && $bl2) { - foreach ($bl2 as $bl) { - if ($bl === '*') { - $retvalue = false; - } - if ($bl && (strpos($url,$bl) !== false || wildmat($bl,$url))) { - return false; - } - } - } + if (is_array($bl1) && $bl1) { + if (! (is_array($bl2) && $bl2)) { + $retvalue = false; + } + foreach ($bl1 as $bl) { + if ($bl === '*') { + $retvalue = true; + } + if ($bl && (strpos($url, $bl) !== false || wildmat($bl, $url))) { + return true; + } + } + } + if (is_array($bl2) && $bl2) { + foreach ($bl2 as $bl) { + if ($bl === '*') { + $retvalue = false; + } + if ($bl && (strpos($url, $bl) !== false || wildmat($bl, $url))) { + return false; + } + } + } - return $retvalue; + return $retvalue; } @@ -1480,53 +1560,54 @@ function check_pubstream_siteallowed($url) { * @brief * * @param string $hash - * @return boolean + * @return bool */ -function check_channelallowed($hash) { +function check_channelallowed($hash) +{ - $retvalue = true; + $retvalue = true; - $arr = [ 'hash' => $hash ]; - /** - * @hooks check_channelallowed - * Used to over-ride or bypass the channel black/white block lists. - * * \e string \b hash - * * \e boolean \b allowed - optional return value set in hook - */ - call_hooks('check_channelallowed', $arr); + $arr = [ 'hash' => $hash ]; + /** + * @hooks check_channelallowed + * Used to over-ride or bypass the channel black/white block lists. + * * \e string \b hash + * * \e boolean \b allowed - optional return value set in hook + */ + call_hooks('check_channelallowed', $arr); - if (array_key_exists('allowed',$arr)) { - return $arr['allowed']; - } + if (array_key_exists('allowed', $arr)) { + return $arr['allowed']; + } - $bl1 = get_config('system','allowed_channels'); - $bl2 = get_config('system','denied_channels'); + $bl1 = get_config('system', 'allowed_channels'); + $bl2 = get_config('system', 'denied_channels'); - if (is_array($bl1) && $bl1) { - if (! (is_array($bl2) && $bl2)) { - $retvalue = false; - } - foreach ($bl1 as $bl) { - if ($bl === '*') { - $retvalue = true; - } - if ($bl && (strpos($url,$bl) !== false || wildmat($bl,$url))) { - return true; - } - } - } - if (is_array($bl2) && $bl2) { - foreach ($bl2 as $bl) { - if ($bl === '*') { - $retvalue = false; - } - if ($bl && (strpos($url,$bl) !== false || wildmat($bl,$url))) { - return false; - } - } - } + if (is_array($bl1) && $bl1) { + if (! (is_array($bl2) && $bl2)) { + $retvalue = false; + } + foreach ($bl1 as $bl) { + if ($bl === '*') { + $retvalue = true; + } + if ($bl && (strpos($url, $bl) !== false || wildmat($bl, $url))) { + return true; + } + } + } + if (is_array($bl2) && $bl2) { + foreach ($bl2 as $bl) { + if ($bl === '*') { + $retvalue = false; + } + if ($bl && (strpos($url, $bl) !== false || wildmat($bl, $url))) { + return false; + } + } + } - return $retvalue; + return $retvalue; } @@ -1534,82 +1615,88 @@ function check_channelallowed($hash) { * @brief * * @param string $hash - * @return boolean + * @return bool */ -function check_pubstream_channelallowed($hash) { +function check_pubstream_channelallowed($hash) +{ - $retvalue = true; + $retvalue = true; - $arr = array('hash' => $hash); - /** - * @hooks check_channelallowed - * Used to over-ride or bypass the channel black/white block lists. - * * \e string \b hash - * * \e boolean \b allowed - optional return value set in hook - */ - call_hooks('check_pubstream_channelallowed', $arr); + $arr = array('hash' => $hash); + /** + * @hooks check_channelallowed + * Used to over-ride or bypass the channel black/white block lists. + * * \e string \b hash + * * \e boolean \b allowed - optional return value set in hook + */ + call_hooks('check_pubstream_channelallowed', $arr); - if (array_key_exists('allowed',$arr)) { - return $arr['allowed']; - } + if (array_key_exists('allowed', $arr)) { + return $arr['allowed']; + } - $bl1 = get_config('system','pubstream_allowed_channels'); - $bl2 = get_config('system','pubstream_denied_channels'); + $bl1 = get_config('system', 'pubstream_allowed_channels'); + $bl2 = get_config('system', 'pubstream_denied_channels'); - if (is_array($bl1) && $bl1) { - if (! (is_array($bl2) && $bl2)) { - $retvalue = false; - } - foreach ($bl1 as $bl) { - if ($bl === '*') { - $retvalue = true; - } - if ($bl && (strpos($url,$bl) !== false || wildmat($bl,$url))) { - return true; - } - } - } - if (is_array($bl2) && $bl2) { - foreach ($bl2 as $bl) { - if ($bl === '*') { - $retvalue = false; - } - if ($bl && (strpos($url,$bl) !== false || wildmat($bl,$url))) { - return false; - } - } - } + if (is_array($bl1) && $bl1) { + if (! (is_array($bl2) && $bl2)) { + $retvalue = false; + } + foreach ($bl1 as $bl) { + if ($bl === '*') { + $retvalue = true; + } + if ($bl && (strpos($url, $bl) !== false || wildmat($bl, $url))) { + return true; + } + } + } + if (is_array($bl2) && $bl2) { + foreach ($bl2 as $bl) { + if ($bl === '*') { + $retvalue = false; + } + if ($bl && (strpos($url, $bl) !== false || wildmat($bl, $url))) { + return false; + } + } + } - return $retvalue; + return $retvalue; } -function deliverable_singleton($channel_id,$xchan) { +function deliverable_singleton($channel_id, $xchan) +{ - if(array_key_exists('xchan_hash',$xchan)) - $xchan_hash = $xchan['xchan_hash']; - elseif(array_key_exists('hubloc_hash',$xchan)) - $xchan_hash = $xchan['hubloc_hash']; - else - return true; + if (array_key_exists('xchan_hash', $xchan)) { + $xchan_hash = $xchan['xchan_hash']; + } elseif (array_key_exists('hubloc_hash', $xchan)) { + $xchan_hash = $xchan['hubloc_hash']; + } else { + return true; + } - $r = q("select abook_instance from abook where abook_channel = %d and abook_xchan = '%s' limit 1", - intval($channel_id), - dbesc($xchan_hash) - ); - if($r) { - if(! $r[0]['abook_instance']) - return true; - if(strpos($r[0]['abook_instance'],z_root()) !== false) - return true; - } - return false; + $r = q( + "select abook_instance from abook where abook_channel = %d and abook_xchan = '%s' limit 1", + intval($channel_id), + dbesc($xchan_hash) + ); + if ($r) { + if (! $r[0]['abook_instance']) { + return true; + } + if (strpos($r[0]['abook_instance'], z_root()) !== false) { + return true; + } + } + return false; } -function get_repository_version($branch = 'release') { - +function get_repository_version($branch = 'release') +{ if (PLATFORM_NAME === 'streams') { $path = "https://codeberg.org/streams/" . PLATFORM_NAME . "/raw/$branch/boot.php"; @@ -1618,13 +1705,14 @@ function get_repository_version($branch = 'release') { $path = "https://codeberg.org/zot/" . ((PLATFORM_NAME === 'mistpark') ? 'misty' : PLATFORM_NAME) . "/raw/$branch/boot.php"; } - $x = z_fetch_url($path); - if($x['success']) { - $y = preg_match('/define(.*?)STD_VERSION(.*?)([0-9.].*)\'/',$x['body'],$matches); - if($y) - return $matches[3]; - } - return '?.?'; + $x = z_fetch_url($path); + if ($x['success']) { + $y = preg_match('/define(.*?)STD_VERSION(.*?)([0-9.].*)\'/', $x['body'], $matches); + if ($y) { + return $matches[3]; + } + } + return '?.?'; } /** @@ -1633,36 +1721,37 @@ function get_repository_version($branch = 'release') { * @param string $s Network string, see boot.php * @return string Translated name of the network */ -function network_to_name($s) { +function network_to_name($s) +{ - $nets = array( - NETWORK_DFRN => t('Friendica'), - NETWORK_FRND => t('Friendica'), - NETWORK_OSTATUS => t('OStatus'), - NETWORK_GNUSOCIAL => t('GNU-Social'), - NETWORK_FEED => t('RSS/Atom'), - NETWORK_ACTIVITYPUB => t('ActivityPub'), - NETWORK_MAIL => t('Email'), - NETWORK_DIASPORA => t('Diaspora'), - NETWORK_FACEBOOK => t('Facebook'), + $nets = array( + NETWORK_DFRN => t('Friendica'), + NETWORK_FRND => t('Friendica'), + NETWORK_OSTATUS => t('OStatus'), + NETWORK_GNUSOCIAL => t('GNU-Social'), + NETWORK_FEED => t('RSS/Atom'), + NETWORK_ACTIVITYPUB => t('ActivityPub'), + NETWORK_MAIL => t('Email'), + NETWORK_DIASPORA => t('Diaspora'), + NETWORK_FACEBOOK => t('Facebook'), NETWORK_NOMAD => t('Nomad'), - NETWORK_ZOT6 => t('Nomad'), - NETWORK_ZOT => t('Zot'), - NETWORK_LINKEDIN => t('LinkedIn'), - NETWORK_XMPP => t('XMPP/IM'), - NETWORK_MYSPACE => t('MySpace'), - ); + NETWORK_ZOT6 => t('Nomad'), + NETWORK_ZOT => t('Zot'), + NETWORK_LINKEDIN => t('LinkedIn'), + NETWORK_XMPP => t('XMPP/IM'), + NETWORK_MYSPACE => t('MySpace'), + ); - /** - * @hooks network_to_name - * @deprecated - */ - call_hooks('network_to_name', $nets); + /** + * @hooks network_to_name + * @deprecated + */ + call_hooks('network_to_name', $nets); - $search = array_keys($nets); - $replace = array_values($nets); + $search = array_keys($nets); + $replace = array_values($nets); - return str_replace($search, $replace, $s); + return str_replace($search, $replace, $s); } /** @@ -1678,57 +1767,61 @@ function network_to_name($s) { * * \e string \b textVersion text only version of the message * * \e string \b additionalMailHeader additions to the smtp mail header */ -function z_mail($params) { +function z_mail($params) +{ - if(! $params['fromEmail']) { - $params['fromEmail'] = get_config('system','from_email'); - if(! $params['fromEmail']) - $params['fromEmail'] = 'Administrator' . '@' . App::get_hostname(); - } - if(! $params['fromName']) { - $params['fromName'] = get_config('system','from_email_name'); - if(! $params['fromName']) - $params['fromName'] = System::get_site_name(); - } - if(! $params['replyTo']) { - $params['replyTo'] = get_config('system','reply_address'); - if(! $params['replyTo']) - $params['replyTo'] = 'noreply' . '@' . App::get_hostname(); - } + if (! $params['fromEmail']) { + $params['fromEmail'] = get_config('system', 'from_email'); + if (! $params['fromEmail']) { + $params['fromEmail'] = 'Administrator' . '@' . App::get_hostname(); + } + } + if (! $params['fromName']) { + $params['fromName'] = get_config('system', 'from_email_name'); + if (! $params['fromName']) { + $params['fromName'] = System::get_site_name(); + } + } + if (! $params['replyTo']) { + $params['replyTo'] = get_config('system', 'reply_address'); + if (! $params['replyTo']) { + $params['replyTo'] = 'noreply' . '@' . App::get_hostname(); + } + } - $params['sent'] = false; - $params['result'] = false; + $params['sent'] = false; + $params['result'] = false; - /** - * @hooks email_send - * * \e params @see z_mail() - */ - call_hooks('email_send', $params); + /** + * @hooks email_send + * * \e params @see z_mail() + */ + call_hooks('email_send', $params); - if($params['sent']) { - logger('notification: z_mail returns ' . (($params['result']) ? 'success' : 'failure'), LOGGER_DEBUG); - return $params['result']; - } + if ($params['sent']) { + logger('notification: z_mail returns ' . (($params['result']) ? 'success' : 'failure'), LOGGER_DEBUG); + return $params['result']; + } - $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8'); - $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8'); + $fromName = email_header_encode(html_entity_decode($params['fromName'], ENT_QUOTES, 'UTF-8'), 'UTF-8'); + $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'], ENT_QUOTES, 'UTF-8'), 'UTF-8'); - $messageHeader = - $params['additionalMailHeader'] . + $messageHeader = + $params['additionalMailHeader'] . - "From: $fromName <{$params['fromEmail']}>" .PHP_EOL . - "Reply-To: $fromName <{$params['replyTo']}>" . PHP_EOL . - "Content-Type: text/plain; charset=UTF-8"; + "From: $fromName <{$params['fromEmail']}>" . PHP_EOL . + "Reply-To: $fromName <{$params['replyTo']}>" . PHP_EOL . + "Content-Type: text/plain; charset=UTF-8"; - // send the message - $res = mail( - $params['toEmail'], // send to address - $messageSubject, // subject - $params['textVersion'], - $messageHeader // message headers - ); - logger('notification: z_mail returns ' . (($res) ? 'success' : 'failure'), LOGGER_DEBUG); - return $res; + // send the message + $res = mail( + $params['toEmail'], // send to address + $messageSubject, // subject + $params['textVersion'], + $messageHeader // message headers + ); + logger('notification: z_mail returns ' . (($res) ? 'success' : 'failure'), LOGGER_DEBUG); + return $res; } @@ -1738,50 +1831,52 @@ function z_mail($params) { * @param string $host * @return string */ -function probe_api_path($host) { +function probe_api_path($host) +{ - $schemes = ['https', 'http' ]; - $paths = ['/api/z/1.0/version', '/api/red/version' ]; + $schemes = ['https', 'http' ]; + $paths = ['/api/z/1.0/version', '/api/red/version' ]; - foreach($schemes as $scheme) { - foreach($paths as $path) { - $curpath = $scheme . '://' . $host . $path; - $x = z_fetch_url($curpath); - if($x['success'] && ! strpos($x['body'], 'not implemented')) - return str_replace('version', '', $curpath); - } - } + foreach ($schemes as $scheme) { + foreach ($paths as $path) { + $curpath = $scheme . '://' . $host . $path; + $x = z_fetch_url($curpath); + if ($x['success'] && ! strpos($x['body'], 'not implemented')) { + return str_replace('version', '', $curpath); + } + } + } - return ''; + return ''; } -function service_plink($contact, $guid) { +function service_plink($contact, $guid) +{ - $plink = ''; + $plink = ''; - $m = parse_url($contact['xchan_url']); - if($m) { - $url = $m['scheme'] . '://' . $m['host'] . ((isset($m['port']) && intval($m['port'])) ? ':' . intval($m['port']) : ''); - } - else { - $url = 'https://' . substr($contact['xchan_addr'],strpos($contact['xchan_addr'],'@')+1); - } + $m = parse_url($contact['xchan_url']); + if ($m) { + $url = $m['scheme'] . '://' . $m['host'] . ((isset($m['port']) && intval($m['port'])) ? ':' . intval($m['port']) : ''); + } else { + $url = 'https://' . substr($contact['xchan_addr'], strpos($contact['xchan_addr'], '@') + 1); + } - $handle = substr($contact['xchan_addr'], 0, strpos($contact['xchan_addr'],'@')); + $handle = substr($contact['xchan_addr'], 0, strpos($contact['xchan_addr'], '@')); - $plink = $url . '/channel/' . $handle . '?f=&mid=' . $guid; + $plink = $url . '/channel/' . $handle . '?f=&mid=' . $guid; - $x = [ 'xchan' => $contact, 'guid' => $guid, 'url' => $url, 'plink' => $plink ]; - /** - * @hooks service_plink - * * \e array \b xchan - * * \e string \b guid - * * \e string \b url - * * \e string \b plink will get returned - */ - call_hooks('service_plink', $x); + $x = [ 'xchan' => $contact, 'guid' => $guid, 'url' => $url, 'plink' => $plink ]; + /** + * @hooks service_plink + * * \e array \b xchan + * * \e string \b guid + * * \e string \b url + * * \e string \b plink will get returned + */ + call_hooks('service_plink', $x); - return $x['plink']; + return $x['plink']; } @@ -1792,111 +1887,117 @@ function service_plink($contact, $guid) { * @param string $acceptedTypes by default false will use $_SERVER['HTTP_ACCEPT'] * @return array|NULL */ -function getBestSupportedMimeType($mimeTypes = null, $acceptedTypes = false) { - // Values will be stored in this array - $AcceptTypes = []; +function getBestSupportedMimeType($mimeTypes = null, $acceptedTypes = false) +{ + // Values will be stored in this array + $AcceptTypes = []; - if($acceptedTypes === false) { - $acceptedTypes = ((isset($_SERVER['HTTP_ACCEPT']) && $_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : EMPTY_STR); - } + if ($acceptedTypes === false) { + $acceptedTypes = ((isset($_SERVER['HTTP_ACCEPT']) && $_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : EMPTY_STR); + } - // Accept header is case insensitive, and whitespace isn’t important - $accept = strtolower(str_replace(' ', '', $acceptedTypes)); - // divide it into parts in the place of a "," - $accept = explode(',', $accept); - foreach ($accept as $a) { - // the default quality is 1. - $q = 1; - // check if there is a different quality - if (strpos($a, ';q=')) { - // divide "mime/type;q=X" into two parts: "mime/type" i "X" - list($a, $q) = explode(';q=', $a); - } - // mime-type $a is accepted with the quality $q - // WARNING: $q == 0 means, that mime-type isn’t supported! - $AcceptTypes[$a] = $q; - } - arsort($AcceptTypes); + // Accept header is case insensitive, and whitespace isn’t important + $accept = strtolower(str_replace(' ', '', $acceptedTypes)); + // divide it into parts in the place of a "," + $accept = explode(',', $accept); + foreach ($accept as $a) { + // the default quality is 1. + $q = 1; + // check if there is a different quality + if (strpos($a, ';q=')) { + // divide "mime/type;q=X" into two parts: "mime/type" i "X" + list($a, $q) = explode(';q=', $a); + } + // mime-type $a is accepted with the quality $q + // WARNING: $q == 0 means, that mime-type isn’t supported! + $AcceptTypes[$a] = $q; + } + arsort($AcceptTypes); - // if no parameter was passed, just return parsed data - if (!$mimeTypes) return $AcceptTypes; + // if no parameter was passed, just return parsed data + if (!$mimeTypes) { + return $AcceptTypes; + } - $mimeTypes = array_map('strtolower', (array)$mimeTypes); + $mimeTypes = array_map('strtolower', (array)$mimeTypes); - // let’s check our supported types: - foreach ($AcceptTypes as $mime => $q) { - if ($q && in_array($mime, $mimeTypes)) return $mime; - } + // let’s check our supported types: + foreach ($AcceptTypes as $mime => $q) { + if ($q && in_array($mime, $mimeTypes)) { + return $mime; + } + } - // no mime-type found - return null; + // no mime-type found + return null; } /** * @brief Perform caching for jsonld normaliser. * * @param string $url - * @return mixed|boolean|array + * @return mixed|bool|array */ -function jsonld_document_loader($url) { +function jsonld_document_loader($url) +{ - require_once('library/jsonld/jsonld.php'); + require_once('library/jsonld/jsonld.php'); - $recursion = 0; + $recursion = 0; - $x = debug_backtrace(); - if($x) { - foreach($x as $n) { - if($n['function'] === __FUNCTION__) { - $recursion ++; - } - } - } - if($recursion > 5) { - logger('jsonld bomb detected at: ' . $url); - killme(); - } + $x = debug_backtrace(); + if ($x) { + foreach ($x as $n) { + if ($n['function'] === __FUNCTION__) { + $recursion++; + } + } + } + if ($recursion > 5) { + logger('jsonld bomb detected at: ' . $url); + killme(); + } - $cachepath = 'cache/ldcache'; - if(! is_dir($cachepath)) - os_mkdir($cachepath, STORAGE_DEFAULT_PERMISSIONS, true); + $cachepath = 'cache/ldcache'; + if (! is_dir($cachepath)) { + os_mkdir($cachepath, STORAGE_DEFAULT_PERMISSIONS, true); + } - $filename = $cachepath . '/' . urlencode($url); - if(file_exists($filename) && filemtime($filename) > time() - (12 * 60 * 60)) { - return json_decode(file_get_contents($filename)); - } + $filename = $cachepath . '/' . urlencode($url); + if (file_exists($filename) && filemtime($filename) > time() - (12 * 60 * 60)) { + return json_decode(file_get_contents($filename)); + } - $r = jsonld_default_document_loader($url); - if($r) { - file_put_contents($filename, json_encode($r)); - return $r; - } + $r = jsonld_default_document_loader($url); + if ($r) { + file_put_contents($filename, json_encode($r)); + return $r; + } - logger('not found'); - if(file_exists($filename)) { - return json_decode(file_get_contents($filename)); - } + logger('not found'); + if (file_exists($filename)) { + return json_decode(file_get_contents($filename)); + } - return []; + return []; } -function is_https_request() { +function is_https_request() +{ - $https = false; + $https = false; - if (array_key_exists('HTTPS',$_SERVER) && $_SERVER['HTTPS']) { - $https = true; - } - elseif (array_key_exists('SERVER_PORT',$_SERVER) && intval($_SERVER['SERVER_PORT']) === 443) { - $https = true; - } - elseif (array_key_exists('HTTP_X_FORWARDED_PROTO',$_SERVER) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') { - $https = true; // technically this is not true, but pretending it is will allow reverse proxies to work - } + if (array_key_exists('HTTPS', $_SERVER) && $_SERVER['HTTPS']) { + $https = true; + } elseif (array_key_exists('SERVER_PORT', $_SERVER) && intval($_SERVER['SERVER_PORT']) === 443) { + $https = true; + } elseif (array_key_exists('HTTP_X_FORWARDED_PROTO', $_SERVER) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') { + $https = true; // technically this is not true, but pretending it is will allow reverse proxies to work + } - return $https; + return $https; } /** @@ -1908,15 +2009,13 @@ function is_https_request() { * result always returns the leading slash */ -function get_request_string($url) { +function get_request_string($url) +{ - $m = parse_url($url); - if ($m) { - return ( (isset($m['path']) ? $m['path'] : '/' ) . (isset($m['query']) ? '?' . $m['query'] : EMPTY_STR) ); - } - - return EMPTY_STR; + $m = parse_url($url); + if ($m) { + return ( (isset($m['path']) ? $m['path'] : '/' ) . (isset($m['query']) ? '?' . $m['query'] : EMPTY_STR) ); + } + return EMPTY_STR; } - - diff --git a/include/oauth.php b/include/oauth.php index e27e770b5..2d71cac1f 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -1,8 +1,10 @@ -key), - dbesc($token_type), - dbesc($token) - ); + logger(__function__ . ':' . $consumer . ', ' . $token_type . ', ' . $token, LOGGER_DEBUG); - if ($r) { - $ot = new OAuth1Token($r[0]['id'],$r[0]['secret']); - $ot->scope = $r[0]['auth_scope']; - $ot->expires = $r[0]['expires']; - $ot->uid = $r[0]['uid']; - return $ot; - } - return null; - } + $r = q( + "SELECT id, secret, auth_scope, expires, uid FROM tokens WHERE client_id = '%s' AND auth_scope = '%s' AND id = '%s'", + dbesc($consumer->key), + dbesc($token_type), + dbesc($token) + ); - function lookup_nonce($consumer, $token, $nonce, $timestamp) { + if ($r) { + $ot = new OAuth1Token($r[0]['id'], $r[0]['secret']); + $ot->scope = $r[0]['auth_scope']; + $ot->expires = $r[0]['expires']; + $ot->uid = $r[0]['uid']; + return $ot; + } + return null; + } - $r = q("SELECT id, secret FROM tokens WHERE client_id = '%s' AND id = '%s' AND expires = %d", - dbesc($consumer->key), - dbesc($nonce), - intval($timestamp) - ); + public function lookup_nonce($consumer, $token, $nonce, $timestamp) + { - if ($r) { - return new OAuth1Token($r[0]['id'],$r[0]['secret']); - } - return null; - } + $r = q( + "SELECT id, secret FROM tokens WHERE client_id = '%s' AND id = '%s' AND expires = %d", + dbesc($consumer->key), + dbesc($nonce), + intval($timestamp) + ); - function new_request_token($consumer, $callback = null) { + if ($r) { + return new OAuth1Token($r[0]['id'], $r[0]['secret']); + } + return null; + } - logger(__function__ . ':' . $consumer . ', ' . $callback, LOGGER_DEBUG); + public function new_request_token($consumer, $callback = null) + { - $key = $this->gen_token(); - $sec = $this->gen_token(); - - if ($consumer->key){ - $k = $consumer->key; - } - else { - $k = $consumer; - } + logger(__function__ . ':' . $consumer . ', ' . $callback, LOGGER_DEBUG); - $r = q("INSERT INTO tokens (id, secret, client_id, auth_scope, expires, uid) VALUES ('%s','%s','%s','%s', %d, 0)", - dbesc($key), - dbesc($sec), - dbesc($k), - 'request', - time()+intval(REQUEST_TOKEN_DURATION)); + $key = $this->gen_token(); + $sec = $this->gen_token(); - if (! $r) { - return null; - } - return new OAuth1Token($key,$sec); - } + if ($consumer->key) { + $k = $consumer->key; + } else { + $k = $consumer; + } - function new_access_token($token, $consumer, $verifier = null) { + $r = q( + "INSERT INTO tokens (id, secret, client_id, auth_scope, expires, uid) VALUES ('%s','%s','%s','%s', %d, 0)", + dbesc($key), + dbesc($sec), + dbesc($k), + 'request', + time() + intval(REQUEST_TOKEN_DURATION) + ); - logger(__function__ . ':' . $token . ', ' . $consumer .', ' . $verifier, LOGGER_DEBUG); - - // return a new access token attached to this consumer - // for the user associated with this token if the request token - // is authorized - // should also invalidate the request token - - $ret = null; - - // get user for this verifier - $uverifier = get_config("oauth", $verifier); - logger(__function__ . ':' . $verifier . ', ' . $uverifier, LOGGER_DEBUG); - if (is_null($verifier) || ($uverifier !== false)) { - - $key = $this->gen_token(); - $sec = $this->gen_token(); + if (!$r) { + return null; + } + return new OAuth1Token($key, $sec); + } - $r = q("INSERT INTO tokens (id, secret, client_id, auth_scope, expires, uid) VALUES ('%s','%s','%s','%s', %d, %d)", - dbesc($key), - dbesc($sec), - dbesc($consumer->key), - 'access', - time()+intval(ACCESS_TOKEN_DURATION), - intval($uverifier)); + public function new_access_token($token, $consumer, $verifier = null) + { - if ($r) { - $ret = new OAuth1Token($key,$sec); - } - } - - - q("DELETE FROM tokens WHERE id='%s'", $token->key); - - - if (! is_null($ret) && $uverifier !== false) { - del_config('oauth', $verifier); - } - return $ret; - } + logger(__function__ . ':' . $token . ', ' . $consumer . ', ' . $verifier, LOGGER_DEBUG); + + // return a new access token attached to this consumer + // for the user associated with this token if the request token + // is authorized + // should also invalidate the request token + + $ret = null; + + // get user for this verifier + $uverifier = get_config("oauth", $verifier); + logger(__function__ . ':' . $verifier . ', ' . $uverifier, LOGGER_DEBUG); + if (is_null($verifier) || ($uverifier !== false)) { + $key = $this->gen_token(); + $sec = $this->gen_token(); + + $r = q( + "INSERT INTO tokens (id, secret, client_id, auth_scope, expires, uid) VALUES ('%s','%s','%s','%s', %d, %d)", + dbesc($key), + dbesc($sec), + dbesc($consumer->key), + 'access', + time() + intval(ACCESS_TOKEN_DURATION), + intval($uverifier) + ); + + if ($r) { + $ret = new OAuth1Token($key, $sec); + } + } + + + q("DELETE FROM tokens WHERE id='%s'", $token->key); + + + if (!is_null($ret) && $uverifier !== false) { + del_config('oauth', $verifier); + } + return $ret; + } } -class ZotOAuth1 extends OAuth1Server { +class ZotOAuth1 extends OAuth1Server +{ - function __construct() { - parent::__construct(new ZotOAuth1DataStore()); - $this->add_signature_method(new OAuth1SignatureMethod_PLAINTEXT()); - $this->add_signature_method(new OAuth1SignatureMethod_HMAC_SHA1()); - } - - function loginUser($uid) { + public function __construct() + { + parent::__construct(new ZotOAuth1DataStore()); + $this->add_signature_method(new OAuth1SignatureMethod_PLAINTEXT()); + $this->add_signature_method(new OAuth1SignatureMethod_HMAC_SHA1()); + } - logger("ZotOAuth1::loginUser $uid"); + public function loginUser($uid) + { - $r = q("SELECT * FROM channel WHERE channel_id = %d LIMIT 1", - intval($uid) - ); - if ($r) { - $record = $r[0]; - } - else { - logger('ZotOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG); - header('HTTP/1.0 401 Unauthorized'); - echo('This api requires login'); - killme(); - } + logger("ZotOAuth1::loginUser $uid"); - $_SESSION['uid'] = $record['channel_id']; - $_SESSION['addr'] = $_SERVER['REMOTE_ADDR']; + $r = q( + "SELECT * FROM channel WHERE channel_id = %d LIMIT 1", + intval($uid) + ); + if ($r) { + $record = $r[0]; + } else { + logger('ZotOAuth1::loginUser failure: ' . print_r($_SERVER, true), LOGGER_DEBUG); + header('HTTP/1.0 401 Unauthorized'); + echo('This api requires login'); + killme(); + } - $x = q("select * from account where account_id = %d limit 1", - intval($record['channel_account_id']) - ); - if ($x) { - require_once('include/security.php'); - authenticate_success($x[0],null,true,false,true,true); - $_SESSION['allow_api'] = true; - } - } - + $_SESSION['uid'] = $record['channel_id']; + $_SESSION['addr'] = $_SERVER['REMOTE_ADDR']; + + $x = q( + "select * from account where account_id = %d limit 1", + intval($record['channel_account_id']) + ); + if ($x) { + require_once('include/security.php'); + authenticate_success($x[0], null, true, false, true, true); + $_SESSION['allow_api'] = true; + } + } } - diff --git a/include/oembed.php b/include/oembed.php index e3053f164..50f68b581 100644 --- a/include/oembed.php +++ b/include/oembed.php @@ -1,450 +1,472 @@ -' . $result['url'] . ''; + } - $result = oembed_action($embedurl); - if($result['action'] === 'block') { - return '' . $result['url'] . ''; - } - - $j = oembed_fetch_url($result['url']); - $s = oembed_format_object($j); - return $s; + $j = oembed_fetch_url($result['url']); + $s = oembed_format_object($j); + return $s; } -function oembed_action($embedurl) { +function oembed_action($embedurl) +{ - $host = ''; - $action = 'filter'; + $host = ''; + $action = 'filter'; - $embedurl = trim(str_replace('&','&', $embedurl)); + $embedurl = trim(str_replace('&', '&', $embedurl)); - //logger('oembed_action: ' . $embedurl, LOGGER_DEBUG, LOG_INFO); + //logger('oembed_action: ' . $embedurl, LOGGER_DEBUG, LOG_INFO); - if(strpos($embedurl,'http://') === 0) { - if(intval(get_config('system','embed_sslonly'))) { - $action = 'block'; - } - } + if (strpos($embedurl, 'http://') === 0) { + if (intval(get_config('system', 'embed_sslonly'))) { + $action = 'block'; + } + } - if(strpos($embedurl,'.well-known') !== false) - $action = 'block'; + if (strpos($embedurl, '.well-known') !== false) { + $action = 'block'; + } - // site allow/deny list + // site allow/deny list - if(($x = get_config('system','embed_deny'))) { - if(($x) && (! is_array($x))) - $x = explode("\n",$x); - if($x) { - foreach($x as $ll) { - $t = trim($ll); - if(($t) && (strpos($embedurl,$t) !== false)) { - $action = 'block'; - break; - } - } - } - } - - $found = false; + if (($x = get_config('system', 'embed_deny'))) { + if (($x) && (! is_array($x))) { + $x = explode("\n", $x); + } + if ($x) { + foreach ($x as $ll) { + $t = trim($ll); + if (($t) && (strpos($embedurl, $t) !== false)) { + $action = 'block'; + break; + } + } + } + } - if(($x = get_config('system','embed_allow'))) { - if(($x) && (! is_array($x))) - $x = explode("\n",$x); - if($x) { - foreach($x as $ll) { - $t = trim($ll); - if(($t) && (strpos($embedurl,$t) !== false) && ($action !== 'block')) { - $found = true; - $action = 'allow'; - break; - } - } - } - if((! $found) && ($action !== 'block')) { - $action = 'filter'; - } - } + $found = false; - // allow individual members to block something that wasn't blocked already. - // They cannot over-ride the site to allow or change the filtering on an - // embed that is not allowed by the site admin. + if (($x = get_config('system', 'embed_allow'))) { + if (($x) && (! is_array($x))) { + $x = explode("\n", $x); + } + if ($x) { + foreach ($x as $ll) { + $t = trim($ll); + if (($t) && (strpos($embedurl, $t) !== false) && ($action !== 'block')) { + $found = true; + $action = 'allow'; + break; + } + } + } + if ((! $found) && ($action !== 'block')) { + $action = 'filter'; + } + } - if(local_channel()) { - if(($x = get_pconfig(local_channel(),'system','embed_deny'))) { - if(($x) && (! is_array($x))) - $x = explode("\n",$x); - if($x) { - foreach($x as $ll) { - $t = trim($ll); - if(($t) && (strpos($embedurl,$t) !== false)) { - $action = 'block'; - break; - } - } - } - } - } + // allow individual members to block something that wasn't blocked already. + // They cannot over-ride the site to allow or change the filtering on an + // embed that is not allowed by the site admin. - $arr = array('url' => $embedurl, 'action' => $action); - call_hooks('oembed_action',$arr); + if (local_channel()) { + if (($x = get_pconfig(local_channel(), 'system', 'embed_deny'))) { + if (($x) && (! is_array($x))) { + $x = explode("\n", $x); + } + if ($x) { + foreach ($x as $ll) { + $t = trim($ll); + if (($t) && (strpos($embedurl, $t) !== false)) { + $action = 'block'; + break; + } + } + } + } + } - //logger('action: ' . $arr['action'] . ' url: ' . $arr['url'], LOGGER_DEBUG,LOG_DEBUG); + $arr = array('url' => $embedurl, 'action' => $action); + call_hooks('oembed_action', $arr); - return $arr; + //logger('action: ' . $arr['action'] . ' url: ' . $arr['url'], LOGGER_DEBUG,LOG_DEBUG); + return $arr; } // if the url is embeddable with oembed, return the bbcode link. -function oembed_process($url) { +function oembed_process($url) +{ - $j = oembed_fetch_url($url); - logger('oembed_process: ' . print_r($j,true), LOGGER_DATA, LOG_DEBUG); - if($j && $j['type'] !== 'error') - return '[embed]' . $url . '[/embed]'; - return false; + $j = oembed_fetch_url($url); + logger('oembed_process: ' . print_r($j, true), LOGGER_DATA, LOG_DEBUG); + if ($j && $j['type'] !== 'error') { + return '[embed]' . $url . '[/embed]'; + } + return false; } -function oembed_fetch_url($embedurl){ +function oembed_fetch_url($embedurl) +{ - $noexts = [ '.mp3', '.mp4', '.ogg', '.ogv', '.oga', '.ogm', '.webm', '.opus', '.m4a', '.mov' ]; + $noexts = [ '.mp3', '.mp4', '.ogg', '.ogv', '.oga', '.ogm', '.webm', '.opus', '.m4a', '.mov' ]; - $result = oembed_action($embedurl); + $result = oembed_action($embedurl); - $embedurl = $result['url']; - $action = $result['action']; + $embedurl = $result['url']; + $action = $result['action']; - foreach($noexts as $ext) { - if(strpos(strtolower($embedurl),$ext) !== false) { - $action = 'block'; - } - } + foreach ($noexts as $ext) { + if (strpos(strtolower($embedurl), $ext) !== false) { + $action = 'block'; + } + } - $txt = null; + $txt = null; - // we should try to cache this and avoid a lookup on each render - $is_matrix = is_matrix_url($embedurl); + // we should try to cache this and avoid a lookup on each render + $is_matrix = is_matrix_url($embedurl); - $zrl = ((get_config('system','oembed_zrl')) ? $is_matrix : false); + $zrl = ((get_config('system', 'oembed_zrl')) ? $is_matrix : false); - $furl = ((local_channel() && $zrl) ? zid($embedurl) : $embedurl); + $furl = ((local_channel() && $zrl) ? zid($embedurl) : $embedurl); - if($action !== 'block' && (! get_config('system','oembed_cache_disable'))) { - $txt = Cache::get('[' . App::$videowidth . '] ' . $furl); - } + if ($action !== 'block' && (! get_config('system', 'oembed_cache_disable'))) { + $txt = Cache::get('[' . App::$videowidth . '] ' . $furl); + } - if(strpos(strtolower($embedurl),'.pdf') !== false && get_config('system','inline_pdf')) { - $action = 'allow'; - $j = [ - 'html' => '', - 'title' => t('View PDF'), - 'type' => 'pdf' - ]; - - // set $txt to something so that we don't attempt to fetch what could be a lengthy pdf. - $txt = EMPTY_STR; - } + if (strpos(strtolower($embedurl), '.pdf') !== false && get_config('system', 'inline_pdf')) { + $action = 'allow'; + $j = [ + 'html' => '', + 'title' => t('View PDF'), + 'type' => 'pdf' + ]; - if(is_null($txt)) { + // set $txt to something so that we don't attempt to fetch what could be a lengthy pdf. + $txt = EMPTY_STR; + } - $txt = ""; + if (is_null($txt)) { + $txt = ""; - if ($action !== 'block') { - // try oembed autodiscovery - $redirects = 0; - $result = z_fetch_url($furl, false, $redirects, - [ - 'timeout' => 30, - 'accept_content' => "text/*", - 'novalidate' => true, - 'session' => ((local_channel() && $zrl) ? true : false) - ] - ); + if ($action !== 'block') { + // try oembed autodiscovery + $redirects = 0; + $result = z_fetch_url( + $furl, + false, + $redirects, + [ + 'timeout' => 30, + 'accept_content' => "text/*", + 'novalidate' => true, + 'session' => ((local_channel() && $zrl) ? true : false) + ] + ); - if($result['success']) - $html_text = $result['body']; - else - logger('fetch failure: ' . $furl); + if ($result['success']) { + $html_text = $result['body']; + } else { + logger('fetch failure: ' . $furl); + } - if($html_text) { - $dom = new DOMDocument(); - @$dom->loadHTML($html_text); - if ($dom) { - $xpath = new DOMXPath($dom); - $attr = "oembed"; - $xattr = oe_build_xpath("class","oembed"); + if ($html_text) { + $dom = new DOMDocument(); + @$dom->loadHTML($html_text); + if ($dom) { + $xpath = new DOMXPath($dom); + $attr = "oembed"; + $xattr = oe_build_xpath("class", "oembed"); - $entries = $xpath->query("//link[@type='application/json+oembed']"); - foreach($entries as $e){ - $href = $e->getAttributeNode("href")->nodeValue; - - $x = z_fetch_url($href . '&maxwidth=' . App::$videowidth); - if($x['success']) - $txt = $x['body']; - else - logger('fetch failed: ' . $href); - break; - } - // soundcloud is now using text/json+oembed instead of application/json+oembed, - // others may be also - $entries = $xpath->query("//link[@type='text/json+oembed']"); - foreach($entries as $e){ - $href = $e->getAttributeNode("href")->nodeValue; - $x = z_fetch_url($href . '&maxwidth=' . App::$videowidth); - if($x['success']) - $txt = $x['body']; - else - logger('json fetch failed: ' . $href); - break; - } - } - } - } - - if ($txt==false || $txt=="") { - $x = array('url' => $embedurl,'videowidth' => App::$videowidth); - call_hooks('oembed_probe',$x); - if(array_key_exists('embed',$x)) - $txt = $x['embed']; - } - - $txt=trim($txt); + $entries = $xpath->query("//link[@type='application/json+oembed']"); + foreach ($entries as $e) { + $href = $e->getAttributeNode("href")->nodeValue; - if ($txt[0]!="{") $txt='{"type":"error"}'; - - // save in cache + $x = z_fetch_url($href . '&maxwidth=' . App::$videowidth); + if ($x['success']) { + $txt = $x['body']; + } else { + logger('fetch failed: ' . $href); + } + break; + } + // soundcloud is now using text/json+oembed instead of application/json+oembed, + // others may be also + $entries = $xpath->query("//link[@type='text/json+oembed']"); + foreach ($entries as $e) { + $href = $e->getAttributeNode("href")->nodeValue; + $x = z_fetch_url($href . '&maxwidth=' . App::$videowidth); + if ($x['success']) { + $txt = $x['body']; + } else { + logger('json fetch failed: ' . $href); + } + break; + } + } + } + } - if(! get_config('system','oembed_cache_disable')) - Cache::set('[' . App::$videowidth . '] ' . $furl, $txt); + if ($txt == false || $txt == "") { + $x = array('url' => $embedurl,'videowidth' => App::$videowidth); + call_hooks('oembed_probe', $x); + if (array_key_exists('embed', $x)) { + $txt = $x['embed']; + } + } - } + $txt = trim($txt); + + if ($txt[0] != "{") { + $txt = '{"type":"error"}'; + } + + // save in cache + + if (! get_config('system', 'oembed_cache_disable')) { + Cache::set('[' . App::$videowidth . '] ' . $furl, $txt); + } + } - if(! $j) { - $j = json_decode($txt,true); - } + if (! $j) { + $j = json_decode($txt, true); + } - if(! $j) { - $j = []; - } + if (! $j) { + $j = []; + } - if($action === 'filter') { - if($j['html']) { - $orig = $j['html']; - $allow_position = (($is_matrix) ? true : false); + if ($action === 'filter') { + if ($j['html']) { + $orig = $j['html']; + $allow_position = (($is_matrix) ? true : false); - // some sites (e.g. Mastodon) wrap their entire embed in an iframe - // which we will purify away and which we provide anyway. - // So if we see this, grab the frame src url and use that - // as the embed content - which will still need to be purified. + // some sites (e.g. Mastodon) wrap their entire embed in an iframe + // which we will purify away and which we provide anyway. + // So if we see this, grab the frame src url and use that + // as the embed content - which will still need to be purified. - if(preg_match('#\' + $parent[$level - 1] = &$current; + if (!is_array($current) or (!in_array($tag, array_keys($current)))) { // Insert New tag + $current[$tag] = $result; + if ($attributes_data) { + $current[$tag . '_attr'] = $attributes_data; + } + $repeated_tag_index[$tag . '_' . $level] = 1; - $current = &$current[$tag]; + $current = &$current[$tag]; + } else { // There was another element with the same tag name + if (isset($current[$tag][0])) { // If there is a 0th element it is already an array + $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result; + $repeated_tag_index[$tag . '_' . $level]++; + } else { // This section will make the value an array if multiple tags with the same name appear together + $current[$tag] = array($current[$tag],$result); // This will combine the existing item and the new item together to make an array + $repeated_tag_index[$tag . '_' . $level] = 2; - } else { // There was another element with the same tag name + if (isset($current[$tag . '_attr'])) { // The attribute of the last(0th) tag must be moved as well + $current[$tag]['0_attr'] = $current[$tag . '_attr']; + unset($current[$tag . '_attr']); + } + } + $last_item_index = $repeated_tag_index[$tag . '_' . $level] - 1; + $current = &$current[$tag][$last_item_index]; + } + } elseif ($type == "complete") { // Tags that ends in 1 line ' ' + $current = &$parent[$level - 1]; + } + } - } elseif($type == "complete") { // Tags that ends in 1 line '' + //See if the key is already taken. + if (!isset($current[$tag])) { //New Key + $current[$tag] = $result; + $repeated_tag_index[$tag . '_' . $level] = 1; + if ($priority == 'tag' and $attributes_data) { + $current[$tag . '_attr'] = $attributes_data; + } + } else { // If taken, put all things inside a list(array) + if (isset($current[$tag][0]) and is_array($current[$tag])) { // If it is already an array... + // ...push the new element into that array. + $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result; - if(isset($current[$tag][0])) { // If there is a 0th element it is already an array - $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result; - $repeated_tag_index[$tag.'_'.$level]++; - } else { // This section will make the value an array if multiple tags with the same name appear together - $current[$tag] = array($current[$tag],$result); // This will combine the existing item and the new item together to make an array - $repeated_tag_index[$tag.'_'.$level] = 2; + if ($priority == 'tag' and $get_attributes and $attributes_data) { + $current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data; + } + $repeated_tag_index[$tag . '_' . $level]++; + } else { // If it is not an array... + $current[$tag] = array($current[$tag],$result); //...Make it an array using using the existing value and the new value + $repeated_tag_index[$tag . '_' . $level] = 1; + if ($priority == 'tag' and $get_attributes) { + if (isset($current[$tag . '_attr'])) { // The attribute of the last(0th) tag must be moved as well + $current[$tag]['0_attr'] = $current[$tag . '_attr']; + unset($current[$tag . '_attr']); + } - if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well - $current[$tag]['0_attr'] = $current[$tag.'_attr']; - unset($current[$tag.'_attr']); - } - } - $last_item_index = $repeated_tag_index[$tag.'_'.$level]-1; - $current = &$current[$tag][$last_item_index]; - } + if ($attributes_data) { + $current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data; + } + } + $repeated_tag_index[$tag . '_' . $level]++; // 0 and 1 indexes are already taken + } + } + } elseif ($type == 'close') { // End of tag ' ' - //See if the key is already taken. - if(!isset($current[$tag])) { //New Key - $current[$tag] = $result; - $repeated_tag_index[$tag.'_'.$level] = 1; - if($priority == 'tag' and $attributes_data) - $current[$tag. '_attr'] = $attributes_data; - - } else { // If taken, put all things inside a list(array) - if(isset($current[$tag][0]) and is_array($current[$tag])) { // If it is already an array... - - // ...push the new element into that array. - $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result; - - if($priority == 'tag' and $get_attributes and $attributes_data) { - $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data; - } - $repeated_tag_index[$tag.'_'.$level]++; - } else { // If it is not an array... - $current[$tag] = array($current[$tag],$result); //...Make it an array using using the existing value and the new value - $repeated_tag_index[$tag.'_'.$level] = 1; - if($priority == 'tag' and $get_attributes) { - if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well - $current[$tag]['0_attr'] = $current[$tag.'_attr']; - unset($current[$tag.'_attr']); - } - - if($attributes_data) { - $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data; - } - } - $repeated_tag_index[$tag.'_'.$level]++; // 0 and 1 indexes are already taken - } - } - - } elseif($type == 'close') { // End of tag '
"; - }; break; - case "photo": { - $ret.= ""; - $ret.="
"; - }; break; - case "link": { - if($j['thumbnail_url']) { - if(is_matrix_url($embedurl)) { - $embedurl = zid($embedurl); - $j['thumbnail_url'] = zid($j['thumbnail_url']); - } - $ret = '
'; - } + '$embedurl' => $embedurl, + '$escapedhtml' => base64_encode($jhtml), + '$tw' => $tw, + '$th' => $th, + '$turl' => $j['thumbnail_url'], + )); + } else { + $ret = $jhtml; + } + $ret .= "
"; + } + break; + case "photo": { + $ret .= ""; + $ret .= "
"; + } + break; + case "link": { + if ($j['thumbnail_url']) { + if (is_matrix_url($embedurl)) { + $embedurl = zid($embedurl); + $j['thumbnail_url'] = zid($j['thumbnail_url']); + } + $ret = '
'; + } - //$ret = "".$j['title'].""; - }; break; - case 'pdf': { - $ret = $j['html']; - break; - } + //$ret = "".$j['title'].""; + } + break; + case 'pdf': { + $ret = $j['html']; + break; + } - case "rich": - if($j['zrl']) { - $ret = ((preg_match('/^
' . "$embedlink"; - $ret .= "
"; - if (isset($j['author_name'])) $ret .= t(' by ') . $j['author_name']; - if (isset($j['provider_name'])) $ret .= t(' on ') . $j['provider_name']; - } else { - // add for html2bbcode conversion - $ret .= "
$embedurl"; - } - $ret.="
' . "$embedlink"; + $ret .= "
"; + if (isset($j['author_name'])) { + $ret .= t(' by ') . $j['author_name']; + } + if (isset($j['provider_name'])) { + $ret .= t(' on ') . $j['provider_name']; + } + } else { + // add for html2bbcode conversion + $ret .= "
$embedurl"; + } + $ret .= "
"; + return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret)); } -function oembed_iframe($src,$width,$height) { - $scroll = ' scrolling="no" '; - if(! $width || strstr($width,'%')) { - $width = '640'; - $scroll = ' scrolling="auto" '; - } - if(! $height || strstr($height,'%')) { - $height = '300'; - $scroll = ' scrolling="auto" '; - } +function oembed_iframe($src, $width, $height) +{ + $scroll = ' scrolling="no" '; + if (! $width || strstr($width, '%')) { + $width = '640'; + $scroll = ' scrolling="auto" '; + } + if (! $height || strstr($height, '%')) { + $height = '300'; + $scroll = ' scrolling="auto" '; + } - // try and leave some room for the description line. - $height = intval($height) + 80; - $width = intval($width) + 40; + // try and leave some room for the description line. + $height = intval($height) + 80; + $width = intval($width) + 40; - $s = z_root() . '/oembed/' . base64url_encode($src); + $s = z_root() . '/oembed/' . base64url_encode($src); - // Make sure any children are sandboxed within their own iframe. - - return ''; + // Make sure any children are sandboxed within their own iframe. + return ''; } -function oembed_bbcode2html($text){ - $stopoembed = get_config("system","no_oembed"); - if ($stopoembed == true){ - return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "". t('Embedding disabled') ." : $1" ,$text); - } - return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", 'oembed_replacecb' ,$text); +function oembed_bbcode2html($text) +{ + $stopoembed = get_config("system", "no_oembed"); + if ($stopoembed == true) { + return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "" . t('Embedding disabled') . " : $1", $text); + } + return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", 'oembed_replacecb', $text); } -function oe_build_xpath($attr, $value){ - // http://westhoffswelt.de/blog/0036_xpath_to_select_html_by_class.html - return "contains( normalize-space( @$attr ), ' $value ' ) or substring( normalize-space( @$attr ), 1, string-length( '$value' ) + 1 ) = '$value ' or substring( normalize-space( @$attr ), string-length( @$attr ) - string-length( '$value' ) ) = ' $value' or @$attr = '$value'"; +function oe_build_xpath($attr, $value) +{ + // http://westhoffswelt.de/blog/0036_xpath_to_select_html_by_class.html + return "contains( normalize-space( @$attr ), ' $value ' ) or substring( normalize-space( @$attr ), 1, string-length( '$value' ) + 1 ) = '$value ' or substring( normalize-space( @$attr ), string-length( @$attr ) - string-length( '$value' ) ) = ' $value' or @$attr = '$value'"; } -function oe_get_inner_html( $node ) { - $innerHTML= ''; +function oe_get_inner_html($node) +{ + $innerHTML = ''; $children = $node->childNodes; foreach ($children as $child) { - $innerHTML .= $child->ownerDocument->saveXML( $child ); + $innerHTML .= $child->ownerDocument->saveXML($child); } return $innerHTML; -} +} /** * Find * and replace it with [embed]url[/embed] */ -function oembed_html2bbcode($text) { - // start parser only if 'oembed' is in text - if (strpos($text, "oembed")) { - - // convert non ascii chars to html entities - $html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text)); - - // If it doesn't parse at all, just return the text. - $dom = new DOMDocument(); - @$dom->loadHTML($html_text); - if ($dom) { - $xpath = new DOMXPath($dom); - $attr = "oembed"; - - $xattr = oe_build_xpath("class","oembed"); - $entries = $xpath->query("//span[$xattr]"); +function oembed_html2bbcode($text) +{ + // start parser only if 'oembed' is in text + if (strpos($text, "oembed")) { + // convert non ascii chars to html entities + $html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text)); - $xattr = "@rel='oembed'";//oe_build_xpath("rel","oembed"); - foreach($entries as $e) { - $href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue; - if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e); - } - return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) ); - } - } - return $text; + // If it doesn't parse at all, just return the text. + $dom = new DOMDocument(); + @$dom->loadHTML($html_text); + if ($dom) { + $xpath = new DOMXPath($dom); + $attr = "oembed"; + $xattr = oe_build_xpath("class", "oembed"); + $entries = $xpath->query("//span[$xattr]"); + + $xattr = "@rel='oembed'";//oe_build_xpath("rel","oembed"); + foreach ($entries as $e) { + $href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue; + if (!is_null($href)) { + $e->parentNode->replaceChild(new DOMText("[embed]" . $href . "[/embed]"), $e); + } + } + return oe_get_inner_html($dom->getElementsByTagName("body")->item(0)); + } + } + return $text; } - - - diff --git a/include/perm_upgrade.php b/include/perm_upgrade.php index 9eb1efba2..e09be409d 100644 --- a/include/perm_upgrade.php +++ b/include/perm_upgrade.php @@ -1,239 +1,290 @@ $v) { - set_pconfig($channel['channel_id'],'autoperms',$k,$v); - } - } - } +function autoperms_upgrade($channel) +{ + $x = get_pconfig($channel['channel_id'], 'system', 'autoperms'); + if (intval($x)) { + $y = perms_int_to_array($x); + if ($y) { + foreach ($y as $k => $v) { + set_pconfig($channel['channel_id'], 'autoperms', $k, $v); + } + } + } } -function perm_abook_upgrade($abook) { +function perm_abook_upgrade($abook) +{ - $x = perms_int_to_array($abook['abook_their_perms']); - if($x) { - foreach($x as $k => $v) { - set_abconfig($abook['abook_channel'],$abook['abook_xchan'],'their_perms',$k, $v); - } - } + $x = perms_int_to_array($abook['abook_their_perms']); + if ($x) { + foreach ($x as $k => $v) { + set_abconfig($abook['abook_channel'], $abook['abook_xchan'], 'their_perms', $k, $v); + } + } - $x = perms_int_to_array($abook['abook_my_perms']); - if($x) { - foreach($x as $k => $v) { - set_abconfig($abook['abook_channel'],$abook['abook_xchan'],'my_perms',$k, $v); - } - } + $x = perms_int_to_array($abook['abook_my_perms']); + if ($x) { + foreach ($x as $k => $v) { + set_abconfig($abook['abook_channel'], $abook['abook_xchan'], 'my_perms', $k, $v); + } + } } -function translate_channel_perms_outbound(&$channel) { - $r = q("select * from pconfig where uid = %d and cat = 'perm_limits' ", - intval($channel['channel_id']) - ); +function translate_channel_perms_outbound(&$channel) +{ + $r = q( + "select * from pconfig where uid = %d and cat = 'perm_limits' ", + intval($channel['channel_id']) + ); - if($r) { - foreach($r as $rr) { - if($rr['k'] === 'view_stream') - $channel['channel_r_stream'] = $rr['v']; - if($rr['k'] === 'view_profile') - $channel['channel_r_profile'] = $rr['v']; - if($rr['k'] === 'view_contacts') - $channel['channel_r_abook'] = $rr['v']; - if($rr['k'] === 'view_storage') - $channel['channel_r_storage'] = $rr['v']; - if($rr['k'] === 'view_pages') - $channel['channel_r_pages'] = $rr['v']; - if($rr['k'] === 'send_stream') - $channel['channel_w_stream'] = $rr['v']; - if($rr['k'] === 'post_wall') - $channel['channel_w_wall'] = $rr['v']; - if($rr['k'] === 'post_comments') - $channel['channel_w_comment'] = $rr['v']; - if($rr['k'] === 'post_mail') - $channel['channel_w_mail'] = $rr['v']; - if($rr['k'] === 'post_like') - $channel['channel_w_like'] = $rr['v']; - if($rr['k'] === 'tag_deliver') - $channel['channel_w_tagwall'] = $rr['v']; - if($rr['k'] === 'chat') - $channel['channel_w_chat'] = $rr['v']; - if($rr['k'] === 'write_storage') - $channel['channel_w_storage'] = $rr['v']; - if($rr['k'] === 'write_pages') - $channel['channel_w_pages'] = $rr['v']; - if($rr['k'] === 'republish') - $channel['channel_a_republish'] = $rr['v']; - if($rr['k'] === 'delegate') - $channel['channel_a_delegate'] = $rr['v']; - - } - $channel['perm_limits'] = $r; - } + if ($r) { + foreach ($r as $rr) { + if ($rr['k'] === 'view_stream') { + $channel['channel_r_stream'] = $rr['v']; + } + if ($rr['k'] === 'view_profile') { + $channel['channel_r_profile'] = $rr['v']; + } + if ($rr['k'] === 'view_contacts') { + $channel['channel_r_abook'] = $rr['v']; + } + if ($rr['k'] === 'view_storage') { + $channel['channel_r_storage'] = $rr['v']; + } + if ($rr['k'] === 'view_pages') { + $channel['channel_r_pages'] = $rr['v']; + } + if ($rr['k'] === 'send_stream') { + $channel['channel_w_stream'] = $rr['v']; + } + if ($rr['k'] === 'post_wall') { + $channel['channel_w_wall'] = $rr['v']; + } + if ($rr['k'] === 'post_comments') { + $channel['channel_w_comment'] = $rr['v']; + } + if ($rr['k'] === 'post_mail') { + $channel['channel_w_mail'] = $rr['v']; + } + if ($rr['k'] === 'post_like') { + $channel['channel_w_like'] = $rr['v']; + } + if ($rr['k'] === 'tag_deliver') { + $channel['channel_w_tagwall'] = $rr['v']; + } + if ($rr['k'] === 'chat') { + $channel['channel_w_chat'] = $rr['v']; + } + if ($rr['k'] === 'write_storage') { + $channel['channel_w_storage'] = $rr['v']; + } + if ($rr['k'] === 'write_pages') { + $channel['channel_w_pages'] = $rr['v']; + } + if ($rr['k'] === 'republish') { + $channel['channel_a_republish'] = $rr['v']; + } + if ($rr['k'] === 'delegate') { + $channel['channel_a_delegate'] = $rr['v']; + } + } + $channel['perm_limits'] = $r; + } } -function translate_channel_perms_inbound($channel) { - - if($channel['perm_limits']) { - foreach($channel['perm_limits'] as $p) { - set_pconfig($channel['channel_id'],'perm_limits',$p['k'],$p['v']); - } - } - else { - perm_limits_upgrade($channel); - } +function translate_channel_perms_inbound($channel) +{ + if ($channel['perm_limits']) { + foreach ($channel['perm_limits'] as $p) { + set_pconfig($channel['channel_id'], 'perm_limits', $p['k'], $p['v']); + } + } else { + perm_limits_upgrade($channel); + } } -function translate_abook_perms_outbound(&$abook) { - $my_perms = 0; - $their_perms = 0; +function translate_abook_perms_outbound(&$abook) +{ + $my_perms = 0; + $their_perms = 0; - if(! $abook) - return; + if (! $abook) { + return; + } - if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && $abook['abconfig']) { - foreach($abook['abconfig'] as $p) { - if($p['cat'] === 'their_perms') { - if($p['k'] === 'view_stream' && intval($p['v'])) - $their_perms += PERMS_R_STREAM; - if($p['k'] === 'view_profile' && intval($p['v'])) - $their_perms += PERMS_R_PROFILE; - if($p['k'] === 'view_contacts' && intval($p['v'])) - $their_perms += PERMS_R_ABOOK; - if($p['k'] === 'view_storage' && intval($p['v'])) - $their_perms += PERMS_R_STORAGE; - if($p['k'] === 'view_pages' && intval($p['v'])) - $their_perms += PERMS_R_PAGES; - if($p['k'] === 'send_stream' && intval($p['v'])) - $their_perms += PERMS_W_STREAM; - if($p['k'] === 'post_wall' && intval($p['v'])) - $their_perms += PERMS_W_WALL; - if($p['k'] === 'post_comments' && intval($p['v'])) - $their_perms += PERMS_W_COMMENT; - if($p['k'] === 'post_mail' && intval($p['v'])) - $their_perms += PERMS_W_MAIL; - if($p['k'] === 'post_like' && intval($p['v'])) - $their_perms += PERMS_W_LIKE; - if($p['k'] === 'tag_deliver' && intval($p['v'])) - $their_perms += PERMS_W_TAGWALL; - if($p['k'] === 'chat' && intval($p['v'])) - $their_perms += PERMS_W_CHAT; - if($p['k'] === 'write_storage' && intval($p['v'])) - $their_perms += PERMS_W_STORAGE; - if($p['k'] === 'write_pages' && intval($p['v'])) - $their_perms += PERMS_W_PAGES; - if($p['k'] === 'republish' && intval($p['v'])) - $their_perms += PERMS_A_REPUBLISH; - if($p['k'] === 'delegate' && intval($p['v'])) - $their_perms += PERMS_A_DELEGATE; - } - if($p['cat'] === 'my_perms') { - if($p['k'] === 'view_stream' && intval($p['v'])) - $my_perms += PERMS_R_STREAM; - if($p['k'] === 'view_profile' && intval($p['v'])) - $my_perms += PERMS_R_PROFILE; - if($p['k'] === 'view_contacts' && intval($p['v'])) - $my_perms += PERMS_R_ABOOK; - if($p['k'] === 'view_storage' && intval($p['v'])) - $my_perms += PERMS_R_STORAGE; - if($p['k'] === 'view_pages' && intval($p['v'])) - $my_perms += PERMS_R_PAGES; - if($p['k'] === 'send_stream' && intval($p['v'])) - $my_perms += PERMS_W_STREAM; - if($p['k'] === 'post_wall' && intval($p['v'])) - $my_perms += PERMS_W_WALL; - if($p['k'] === 'post_comments' && intval($p['v'])) - $my_perms += PERMS_W_COMMENT; - if($p['k'] === 'post_mail' && intval($p['v'])) - $my_perms += PERMS_W_MAIL; - if($p['k'] === 'post_like' && intval($p['v'])) - $my_perms += PERMS_W_LIKE; - if($p['k'] === 'tag_deliver' && intval($p['v'])) - $my_perms += PERMS_W_TAGWALL; - if($p['k'] === 'chat' && intval($p['v'])) - $my_perms += PERMS_W_CHAT; - if($p['k'] === 'write_storage' && intval($p['v'])) - $my_perms += PERMS_W_STORAGE; - if($p['k'] === 'write_pages' && intval($p['v'])) - $my_perms += PERMS_W_PAGES; - if($p['k'] === 'republish' && intval($p['v'])) - $my_perms += PERMS_A_REPUBLISH; - if($p['k'] === 'delegate' && intval($p['v'])) - $my_perms += PERMS_A_DELEGATE; - } - } + if (array_key_exists('abconfig', $abook) && is_array($abook['abconfig']) && $abook['abconfig']) { + foreach ($abook['abconfig'] as $p) { + if ($p['cat'] === 'their_perms') { + if ($p['k'] === 'view_stream' && intval($p['v'])) { + $their_perms += PERMS_R_STREAM; + } + if ($p['k'] === 'view_profile' && intval($p['v'])) { + $their_perms += PERMS_R_PROFILE; + } + if ($p['k'] === 'view_contacts' && intval($p['v'])) { + $their_perms += PERMS_R_ABOOK; + } + if ($p['k'] === 'view_storage' && intval($p['v'])) { + $their_perms += PERMS_R_STORAGE; + } + if ($p['k'] === 'view_pages' && intval($p['v'])) { + $their_perms += PERMS_R_PAGES; + } + if ($p['k'] === 'send_stream' && intval($p['v'])) { + $their_perms += PERMS_W_STREAM; + } + if ($p['k'] === 'post_wall' && intval($p['v'])) { + $their_perms += PERMS_W_WALL; + } + if ($p['k'] === 'post_comments' && intval($p['v'])) { + $their_perms += PERMS_W_COMMENT; + } + if ($p['k'] === 'post_mail' && intval($p['v'])) { + $their_perms += PERMS_W_MAIL; + } + if ($p['k'] === 'post_like' && intval($p['v'])) { + $their_perms += PERMS_W_LIKE; + } + if ($p['k'] === 'tag_deliver' && intval($p['v'])) { + $their_perms += PERMS_W_TAGWALL; + } + if ($p['k'] === 'chat' && intval($p['v'])) { + $their_perms += PERMS_W_CHAT; + } + if ($p['k'] === 'write_storage' && intval($p['v'])) { + $their_perms += PERMS_W_STORAGE; + } + if ($p['k'] === 'write_pages' && intval($p['v'])) { + $their_perms += PERMS_W_PAGES; + } + if ($p['k'] === 'republish' && intval($p['v'])) { + $their_perms += PERMS_A_REPUBLISH; + } + if ($p['k'] === 'delegate' && intval($p['v'])) { + $their_perms += PERMS_A_DELEGATE; + } + } + if ($p['cat'] === 'my_perms') { + if ($p['k'] === 'view_stream' && intval($p['v'])) { + $my_perms += PERMS_R_STREAM; + } + if ($p['k'] === 'view_profile' && intval($p['v'])) { + $my_perms += PERMS_R_PROFILE; + } + if ($p['k'] === 'view_contacts' && intval($p['v'])) { + $my_perms += PERMS_R_ABOOK; + } + if ($p['k'] === 'view_storage' && intval($p['v'])) { + $my_perms += PERMS_R_STORAGE; + } + if ($p['k'] === 'view_pages' && intval($p['v'])) { + $my_perms += PERMS_R_PAGES; + } + if ($p['k'] === 'send_stream' && intval($p['v'])) { + $my_perms += PERMS_W_STREAM; + } + if ($p['k'] === 'post_wall' && intval($p['v'])) { + $my_perms += PERMS_W_WALL; + } + if ($p['k'] === 'post_comments' && intval($p['v'])) { + $my_perms += PERMS_W_COMMENT; + } + if ($p['k'] === 'post_mail' && intval($p['v'])) { + $my_perms += PERMS_W_MAIL; + } + if ($p['k'] === 'post_like' && intval($p['v'])) { + $my_perms += PERMS_W_LIKE; + } + if ($p['k'] === 'tag_deliver' && intval($p['v'])) { + $my_perms += PERMS_W_TAGWALL; + } + if ($p['k'] === 'chat' && intval($p['v'])) { + $my_perms += PERMS_W_CHAT; + } + if ($p['k'] === 'write_storage' && intval($p['v'])) { + $my_perms += PERMS_W_STORAGE; + } + if ($p['k'] === 'write_pages' && intval($p['v'])) { + $my_perms += PERMS_W_PAGES; + } + if ($p['k'] === 'republish' && intval($p['v'])) { + $my_perms += PERMS_A_REPUBLISH; + } + if ($p['k'] === 'delegate' && intval($p['v'])) { + $my_perms += PERMS_A_DELEGATE; + } + } + } - $abook['abook_their_perms'] = $their_perms; - $abook['abook_my_perms'] = $my_perms; - } + $abook['abook_their_perms'] = $their_perms; + $abook['abook_my_perms'] = $my_perms; + } } -function translate_abook_perms_inbound($channel,$abook) { +function translate_abook_perms_inbound($channel, $abook) +{ - $new_perms = false; - $abook['abook_channel'] = $channel['channel_id']; + $new_perms = false; + $abook['abook_channel'] = $channel['channel_id']; - if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && $abook['abconfig']) { - foreach($abook['abconfig'] as $p) { - if($p['cat'] == 'their_perms' || $p['cat'] == 'my_perms') { - $new_perms = true; - break; - } - } - } - - if($new_perms == false) { - perm_abook_upgrade($abook); - } + if (array_key_exists('abconfig', $abook) && is_array($abook['abconfig']) && $abook['abconfig']) { + foreach ($abook['abconfig'] as $p) { + if ($p['cat'] == 'their_perms' || $p['cat'] == 'my_perms') { + $new_perms = true; + break; + } + } + } + if ($new_perms == false) { + perm_abook_upgrade($abook); + } } - - - diff --git a/include/permissions.php b/include/permissions.php index 63e2c284b..22069bdcc 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -9,7 +9,7 @@ require_once('include/security.php'); * @file include/permissions.php * * This file conntains functions to check and work with permissions. - * + * */ @@ -26,213 +26,224 @@ require_once('include/security.php'); * * @returns array of all permissions, key is permission name, value is true or false */ -function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_ignored = true) { +function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_ignored = true) +{ - $api = App::get_oauth_key(); - if ($api) { - return get_all_api_perms($uid,$api); - } - - $global_perms = Permissions::Perms(); + $api = App::get_oauth_key(); + if ($api) { + return get_all_api_perms($uid, $api); + } - // Save lots of individual lookups + $global_perms = Permissions::Perms(); - $r = null; - $c = null; - $x = null; + // Save lots of individual lookups - $channel_checked = false; - $onsite_checked = false; - $abook_checked = false; + $r = null; + $c = null; + $x = null; - $ret = []; + $channel_checked = false; + $onsite_checked = false; + $abook_checked = false; - $abperms = (($uid && $observer_xchan) ? get_abconfig($uid,$observer_xchan,'system','my_perms','') : ''); + $ret = []; - foreach ($global_perms as $perm_name => $permission) { + $abperms = (($uid && $observer_xchan) ? get_abconfig($uid, $observer_xchan, 'system', 'my_perms', '') : ''); - // First find out what the channel owner declared permissions to be. + foreach ($global_perms as $perm_name => $permission) { + // First find out what the channel owner declared permissions to be. - $channel_perm = intval(PermissionLimits::Get($uid,$perm_name)); + $channel_perm = intval(PermissionLimits::Get($uid, $perm_name)); - if (! $channel_checked) { - $r = q("select * from channel where channel_id = %d limit 1", - intval($uid) - ); - $channel_checked = true; - } + if (! $channel_checked) { + $r = q( + "select * from channel where channel_id = %d limit 1", + intval($uid) + ); + $channel_checked = true; + } - // The uid provided doesn't exist. This would be a big fail. + // The uid provided doesn't exist. This would be a big fail. - if(! $r) { - $ret[$perm_name] = false; - continue; - } + if (! $r) { + $ret[$perm_name] = false; + continue; + } - // Next we're going to check for blocked or ignored contacts. - // These take priority over all other settings. + // Next we're going to check for blocked or ignored contacts. + // These take priority over all other settings. - if($observer_xchan) { - if($channel_perm & PERMS_AUTHED) { - $ret[$perm_name] = true; - continue; - } + if ($observer_xchan) { + if ($channel_perm & PERMS_AUTHED) { + $ret[$perm_name] = true; + continue; + } - if(! $abook_checked) { - $x = q("select abook_blocked, abook_ignored, abook_pending, xchan_network from abook + if (! $abook_checked) { + $x = q( + "select abook_blocked, abook_ignored, abook_pending, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_xchan = '%s' and abook_self = 0 limit 1", - intval($uid), - dbesc($observer_xchan) - ); + intval($uid), + dbesc($observer_xchan) + ); - $abook_checked = true; - } + $abook_checked = true; + } - // If they're blocked - they can't read or write - - if(($x) && intval($x[0]['abook_blocked'])) { - $ret[$perm_name] = false; - continue; - } - - // Check if this is a write permission and they are being ignored - // This flag is only visible internally. - - $blocked_anon_perms = Permissions::BlockedAnonPerms(); - - - if(($x) && ($default_ignored) && in_array($perm_name,$blocked_anon_perms) && intval($x[0]['abook_ignored'])) { - $ret[$perm_name] = false; - continue; - } - } - - // system is blocked to anybody who is not authenticated - - if(($check_siteblock) && (! $observer_xchan) && intval(get_config('system', 'block_public'))) { - $ret[$perm_name] = false; - continue; - } - - // Check if this $uid is actually the $observer_xchan - if it's your content - // you always have permission to do anything - // if you've moved elsewhere, you will only have read only access - - if(($observer_xchan) && ($r[0]['channel_hash'] === $observer_xchan)) { - - if($r[0]['channel_moved'] && (in_array($perm_name,$blocked_anon_perms))) - $ret[$perm_name] = false; - else - $ret[$perm_name] = true; - // moderated is a negative permission, don't moderate your own posts - if($perm_name === 'moderated') - $ret[$perm_name] = false; - - continue; - } - - // Anybody at all (that wasn't blocked or ignored). They have permission. - - if($channel_perm & PERMS_PUBLIC) { - $ret[$perm_name] = true; - continue; - } - - // From here on out, we need to know who they are. If we can't figure it - // out, permission is denied. - - if(! $observer_xchan) { - $ret[$perm_name] = false; - continue; - } - - // If we're still here, we have an observer, check the network. - - if($channel_perm & PERMS_NETWORK) { - if($x && in_array($x[0]['xchan_network'],['nomad','zot6'])) { - $ret[$perm_name] = true; - continue; - } - } - - // If PERMS_SITE is specified, find out if they've got an account on this hub - - if($channel_perm & PERMS_SITE) { - if(! $onsite_checked) { - $c = q("select channel_hash from channel where channel_hash = '%s' limit 1", - dbesc($observer_xchan) - ); - - $onsite_checked = true; - } - - if($c) - $ret[$perm_name] = true; - else - $ret[$perm_name] = false; - - continue; - } - - // From here on we require that the observer be a connection and - // handle whether we're allowing any, approved or specific ones - - if(! $x) { - $ret[$perm_name] = false; - continue; - } - - // They are in your address book, but haven't been approved - - if($channel_perm & PERMS_PENDING) { - $ret[$perm_name] = true; - continue; - } - - if(intval($x[0]['abook_pending'])) { - $ret[$perm_name] = false; - continue; - } - - // They're a contact, so they have permission - - if($channel_perm & PERMS_CONTACTS) { - $ret[$perm_name] = true; - continue; - } - - // Permission granted to certain channels. Let's see if the observer is one of them - - if($channel_perm & PERMS_SPECIFIC) { - if($abperms) { - $arr = explode(',',$abperms); - if($arr) { - if (in_array($perm_name,$arr)) { - $ret[$perm_name] = true; - } - else { - $ret[$perm_name] = false; - } + if($channel_perm & PERMS_NETWORK) { + if($x && in_array($x[0]['xchan_network'],['nomad','zot6'])) { + $ret[$perm_name] = true; + continue; } - continue; } - } - // No permissions allowed. + // If they're blocked - they can't read or write - $ret[$perm_name] = false; - continue; - } + if (($x) && intval($x[0]['abook_blocked'])) { + $ret[$perm_name] = false; + continue; + } - $arr = array( - 'channel_id' => $uid, - 'observer_hash' => $observer_xchan, - 'permissions' => $ret); + // Check if this is a write permission and they are being ignored + // This flag is only visible internally. - call_hooks('get_all_perms',$arr); + $blocked_anon_perms = Permissions::BlockedAnonPerms(); - return $arr['permissions']; + + if (($x) && ($default_ignored) && in_array($perm_name, $blocked_anon_perms) && intval($x[0]['abook_ignored'])) { + $ret[$perm_name] = false; + continue; + } + } + + // system is blocked to anybody who is not authenticated + + if (($check_siteblock) && (! $observer_xchan) && intval(get_config('system', 'block_public'))) { + $ret[$perm_name] = false; + continue; + } + + // Check if this $uid is actually the $observer_xchan - if it's your content + // you always have permission to do anything + // if you've moved elsewhere, you will only have read only access + + if (($observer_xchan) && ($r[0]['channel_hash'] === $observer_xchan)) { + if ($r[0]['channel_moved'] && (in_array($perm_name, $blocked_anon_perms))) { + $ret[$perm_name] = false; + } else { + $ret[$perm_name] = true; + } + // moderated is a negative permission, don't moderate your own posts + if ($perm_name === 'moderated') { + $ret[$perm_name] = false; + } + + continue; + } + + // Anybody at all (that wasn't blocked or ignored). They have permission. + + if ($channel_perm & PERMS_PUBLIC) { + $ret[$perm_name] = true; + continue; + } + + // From here on out, we need to know who they are. If we can't figure it + // out, permission is denied. + + if (! $observer_xchan) { + $ret[$perm_name] = false; + continue; + } + + // If we're still here, we have an observer, check the network. + + if ($channel_perm & PERMS_NETWORK) { + if ($x && $x[0]['xchan_network'] === 'zot6') { + $ret[$perm_name] = true; + continue; + } + } + + // If PERMS_SITE is specified, find out if they've got an account on this hub + + if ($channel_perm & PERMS_SITE) { + if (! $onsite_checked) { + $c = q( + "select channel_hash from channel where channel_hash = '%s' limit 1", + dbesc($observer_xchan) + ); + + $onsite_checked = true; + } + + if ($c) { + $ret[$perm_name] = true; + } else { + $ret[$perm_name] = false; + } + + continue; + } + + // From here on we require that the observer be a connection and + // handle whether we're allowing any, approved or specific ones + + if (! $x) { + $ret[$perm_name] = false; + continue; + } + + // They are in your address book, but haven't been approved + + if ($channel_perm & PERMS_PENDING) { + $ret[$perm_name] = true; + continue; + } + + if (intval($x[0]['abook_pending'])) { + $ret[$perm_name] = false; + continue; + } + + // They're a contact, so they have permission + + if ($channel_perm & PERMS_CONTACTS) { + $ret[$perm_name] = true; + continue; + } + + // Permission granted to certain channels. Let's see if the observer is one of them + + if ($channel_perm & PERMS_SPECIFIC) { + if ($abperms) { + $arr = explode(',', $abperms); + if ($arr) { + if (in_array($perm_name, $arr)) { + $ret[$perm_name] = true; + } else { + $ret[$perm_name] = false; + } + } + continue; + } + } + + // No permissions allowed. + + $ret[$perm_name] = false; + continue; + } + + $arr = array( + 'channel_id' => $uid, + 'observer_hash' => $observer_xchan, + 'permissions' => $ret); + + call_hooks('get_all_perms', $arr); + + return $arr['permissions']; } /** @@ -244,106 +255,108 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_ * @param int $uid The channel_id associated with the resource owner * @param string $observer_xchan The xchan_hash representing the observer * @param string $permission - * @param boolean $check_siteblock (default true) + * @param bool $check_siteblock (default true) * if false bypass check for "Block Public" at the site level * @return bool true if permission is allowed for observer on channel */ -function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock = true) { +function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock = true) +{ - $api = App::get_oauth_key(); - if ($api) { - return api_perm_is_allowed($uid,$api,$permission); - } + $api = App::get_oauth_key(); + if ($api) { + return api_perm_is_allowed($uid, $api, $permission); + } - $arr = [ - 'channel_id' => $uid, - 'observer_hash' => $observer_xchan, - 'permission' => $permission, - 'result' => 'unset' - ]; + $arr = [ + 'channel_id' => $uid, + 'observer_hash' => $observer_xchan, + 'permission' => $permission, + 'result' => 'unset' + ]; - call_hooks('perm_is_allowed', $arr); - if ($arr['result'] !== 'unset') { - return $arr['result']; - } + call_hooks('perm_is_allowed', $arr); + if ($arr['result'] !== 'unset') { + return $arr['result']; + } - $global_perms = Permissions::Perms(); + $global_perms = Permissions::Perms(); - // First find out what the channel owner declared permissions to be. + // First find out what the channel owner declared permissions to be. - $channel_perm = PermissionLimits::Get($uid,$permission); - if ($channel_perm === false) { - return false; - } + $channel_perm = PermissionLimits::Get($uid, $permission); + if ($channel_perm === false) { + return false; + } - $r = q("select channel_pageflags, channel_moved, channel_hash from channel where channel_id = %d limit 1", - intval($uid) - ); - if (! $r) { - return false; - } + $r = q( + "select channel_pageflags, channel_moved, channel_hash from channel where channel_id = %d limit 1", + intval($uid) + ); + if (! $r) { + return false; + } - $blocked_anon_perms = Permissions::BlockedAnonPerms(); + $blocked_anon_perms = Permissions::BlockedAnonPerms(); - if ($observer_xchan) { - if ($channel_perm & PERMS_AUTHED) { - return true; - } + if ($observer_xchan) { + if ($channel_perm & PERMS_AUTHED) { + return true; + } - $x = q("select abook_blocked, abook_ignored, abook_pending, xchan_network from abook left join xchan on abook_xchan = xchan_hash + $x = q( + "select abook_blocked, abook_ignored, abook_pending, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_xchan = '%s' and abook_self = 0 limit 1", - intval($uid), - dbesc($observer_xchan) - ); + intval($uid), + dbesc($observer_xchan) + ); - // If they're blocked - they can't read or write - - if (($x) && intval($x[0]['abook_blocked'])) { - return false; - } + // If they're blocked - they can't read or write - if (($x) && in_array($permission,$blocked_anon_perms) && intval($x[0]['abook_ignored'])) { - return false; - } + if (($x) && intval($x[0]['abook_blocked'])) { + return false; + } - $abperms = get_abconfig($uid,$observer_xchan,'system','my_perms',''); - } - + if (($x) && in_array($permission, $blocked_anon_perms) && intval($x[0]['abook_ignored'])) { + return false; + } - // system is blocked to anybody who is not authenticated + $abperms = get_abconfig($uid, $observer_xchan, 'system', 'my_perms', ''); + } - if (($check_siteblock) && (! $observer_xchan) && intval(get_config('system', 'block_public'))) { - return false; - } - // Check if this $uid is actually the $observer_xchan - // you will have full access unless the channel was moved - - // in which case you will have read_only access + // system is blocked to anybody who is not authenticated - if ($r[0]['channel_hash'] === $observer_xchan) { - // moderated is a negative permission - if ($permission === 'moderated') { - return false; - } - if ($r[0]['channel_moved'] && (in_array($permission,$blocked_anon_perms))) { - return false; - } - else { - return true; - } - } + if (($check_siteblock) && (! $observer_xchan) && intval(get_config('system', 'block_public'))) { + return false; + } - if ($channel_perm & PERMS_PUBLIC) { - return true; - } + // Check if this $uid is actually the $observer_xchan + // you will have full access unless the channel was moved - + // in which case you will have read_only access - // If it's an unauthenticated observer, we only need to see if PERMS_PUBLIC is set + if ($r[0]['channel_hash'] === $observer_xchan) { + // moderated is a negative permission + if ($permission === 'moderated') { + return false; + } + if ($r[0]['channel_moved'] && (in_array($permission, $blocked_anon_perms))) { + return false; + } else { + return true; + } + } - if (! $observer_xchan) { - return false; - } + if ($channel_perm & PERMS_PUBLIC) { + return true; + } - // If we're still here, we have an observer, check the network. + // If it's an unauthenticated observer, we only need to see if PERMS_PUBLIC is set + + if (! $observer_xchan) { + return false; + } + + // If we're still here, we have an observer, check the network. if ($channel_perm & PERMS_NETWORK) { if ($x && in_array($x[0]['xchan_network'],['nomad','zot6'])) { @@ -351,133 +364,141 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock = } } - // If PERMS_SITE is specified, find out if they've got an account on this hub + // If PERMS_SITE is specified, find out if they've got an account on this hub - if ($channel_perm & PERMS_SITE) { - $c = q("select channel_hash from channel where channel_hash = '%s' limit 1", - dbesc($observer_xchan) - ); - if ($c) { - return true; - } - return false; - } + if ($channel_perm & PERMS_SITE) { + $c = q( + "select channel_hash from channel where channel_hash = '%s' limit 1", + dbesc($observer_xchan) + ); + if ($c) { + return true; + } + return false; + } - // From here on we require that the observer be a connection and - // handle whether we're allowing any, approved or specific ones + // From here on we require that the observer be a connection and + // handle whether we're allowing any, approved or specific ones - if (! $x) { - return false; - } + if (! $x) { + return false; + } - // They are in your address book, but haven't been approved + // They are in your address book, but haven't been approved - if ($channel_perm & PERMS_PENDING) { - return true; - } + if ($channel_perm & PERMS_PENDING) { + return true; + } - if (intval($x[0]['abook_pending'])) { - return false; - } + if (intval($x[0]['abook_pending'])) { + return false; + } - // They're a contact, so they have permission + // They're a contact, so they have permission - if ($channel_perm & PERMS_CONTACTS) { - return true; - } + if ($channel_perm & PERMS_CONTACTS) { + return true; + } - // Permission granted to certain channels. Let's see if the observer is one of them + // Permission granted to certain channels. Let's see if the observer is one of them - if (($r) && ($channel_perm & PERMS_SPECIFIC)) { - if ($abperms) { - $arr = explode(',',$abperms); - if ($arr) { - if (in_array($permission,$arr)) { - return true; - } - } - } - return false; - } + if (($r) && ($channel_perm & PERMS_SPECIFIC)) { + if ($abperms) { + $arr = explode(',', $abperms); + if ($arr) { + if (in_array($permission, $arr)) { + return true; + } + } + } + return false; + } - // No permissions allowed. + // No permissions allowed. - return false; + return false; } -function get_all_api_perms($uid,$api) { +function get_all_api_perms($uid, $api) +{ - $global_perms = Permissions::Perms(); + $global_perms = Permissions::Perms(); - $ret = []; + $ret = []; - $r = q("select * from xperm where xp_client = '%s' and xp_channel = %d", - dbesc($api), - intval($uid) - ); + $r = q( + "select * from xperm where xp_client = '%s' and xp_channel = %d", + dbesc($api), + intval($uid) + ); - if(! $r) - return false; + if (! $r) { + return false; + } - $allow_all = false; - $allowed = []; - foreach($r as $rr) { - if($rr['xp_perm'] === 'all') - $allow_all = true; - if(! in_array($rr['xp_perm'],$allowed)) - $allowed[] = $rr['xp_perm']; - } + $allow_all = false; + $allowed = []; + foreach ($r as $rr) { + if ($rr['xp_perm'] === 'all') { + $allow_all = true; + } + if (! in_array($rr['xp_perm'], $allowed)) { + $allowed[] = $rr['xp_perm']; + } + } - foreach($global_perms as $perm_name => $permission) { - if($allow_all || in_array($perm_name,$allowed)) - $ret[$perm_name] = true; - else - $ret[$perm_name] = false; + foreach ($global_perms as $perm_name => $permission) { + if ($allow_all || in_array($perm_name, $allowed)) { + $ret[$perm_name] = true; + } else { + $ret[$perm_name] = false; + } + } - } + $arr = array( + 'channel_id' => $uid, + 'observer_hash' => $observer_xchan, + 'permissions' => $ret); - $arr = array( - 'channel_id' => $uid, - 'observer_hash' => $observer_xchan, - 'permissions' => $ret); - - call_hooks('get_all_api_perms',$arr); - - return $arr['permissions']; + call_hooks('get_all_api_perms', $arr); + return $arr['permissions']; } -function api_perm_is_allowed($uid,$api,$permission) { +function api_perm_is_allowed($uid, $api, $permission) +{ - $arr = array( - 'channel_id' => $uid, - 'observer_hash' => $observer_xchan, - 'permission' => $permission, - 'result' => false - ); + $arr = array( + 'channel_id' => $uid, + 'observer_hash' => $observer_xchan, + 'permission' => $permission, + 'result' => false + ); - call_hooks('api_perm_is_allowed', $arr); - if($arr['result']) - return true; + call_hooks('api_perm_is_allowed', $arr); + if ($arr['result']) { + return true; + } - $r = q("select * from xperm where xp_client = '%s' and xp_channel = %d and ( xp_perm = 'all' OR xp_perm = '%s' )", - dbesc($api), - intval($uid), - dbesc($permission) - ); + $r = q( + "select * from xperm where xp_client = '%s' and xp_channel = %d and ( xp_perm = 'all' OR xp_perm = '%s' )", + dbesc($api), + intval($uid), + dbesc($permission) + ); - if(! $r) - return false; + if (! $r) { + return false; + } - foreach($r as $rr) { - if($rr['xp_perm'] === 'all' || $rr['xp_perm'] === $permission) - return true; - - } - - return false; + foreach ($r as $rr) { + if ($rr['xp_perm'] === 'all' || $rr['xp_perm'] === $permission) { + return true; + } + } + return false; } @@ -485,14 +506,18 @@ function api_perm_is_allowed($uid,$api,$permission) { // Check a simple array of observers against a permissions // return a simple array of those with permission -function check_list_permissions($uid, $arr, $perm) { - $result = []; - if($arr) - foreach($arr as $x) - if(perm_is_allowed($uid, $x, $perm)) - $result[] = $x; +function check_list_permissions($uid, $arr, $perm) +{ + $result = []; + if ($arr) { + foreach ($arr as $x) { + if (perm_is_allowed($uid, $x, $perm)) { + $result[] = $x; + } + } + } - return($result); + return($result); } /** @@ -500,59 +525,62 @@ function check_list_permissions($uid, $arr, $perm) { * * @return array */ -function site_default_perms() { +function site_default_perms() +{ - $ret = []; + $ret = []; - $typical = array( - 'view_stream' => PERMS_PUBLIC, - 'view_profile' => PERMS_PUBLIC, - 'view_contacts' => PERMS_PUBLIC, - 'view_storage' => PERMS_PUBLIC, - 'view_pages' => PERMS_PUBLIC, - 'view_wiki' => PERMS_PUBLIC, - 'send_stream' => PERMS_SPECIFIC, - 'post_wall' => PERMS_SPECIFIC, - 'post_comments' => PERMS_SPECIFIC, - 'post_mail' => PERMS_SPECIFIC, - 'tag_deliver' => PERMS_SPECIFIC, - 'chat' => PERMS_SPECIFIC, - 'write_storage' => PERMS_SPECIFIC, - 'write_pages' => PERMS_SPECIFIC, - 'write_wiki' => PERMS_SPECIFIC, - 'delegate' => PERMS_SPECIFIC, - 'post_like' => PERMS_NETWORK - ); + $typical = array( + 'view_stream' => PERMS_PUBLIC, + 'view_profile' => PERMS_PUBLIC, + 'view_contacts' => PERMS_PUBLIC, + 'view_storage' => PERMS_PUBLIC, + 'view_pages' => PERMS_PUBLIC, + 'view_wiki' => PERMS_PUBLIC, + 'send_stream' => PERMS_SPECIFIC, + 'post_wall' => PERMS_SPECIFIC, + 'post_comments' => PERMS_SPECIFIC, + 'post_mail' => PERMS_SPECIFIC, + 'tag_deliver' => PERMS_SPECIFIC, + 'chat' => PERMS_SPECIFIC, + 'write_storage' => PERMS_SPECIFIC, + 'write_pages' => PERMS_SPECIFIC, + 'write_wiki' => PERMS_SPECIFIC, + 'delegate' => PERMS_SPECIFIC, + 'post_like' => PERMS_NETWORK + ); - $global_perms = Permissions::Perms(); + $global_perms = Permissions::Perms(); - foreach($global_perms as $perm => $v) { - $x = get_config('default_perms', $perm, $typical[$perm]); - $ret[$perm] = $x; - } + foreach ($global_perms as $perm => $v) { + $x = get_config('default_perms', $perm, $typical[$perm]); + $ret[$perm] = $x; + } - return $ret; + return $ret; } -function their_perms_contains($channel_id,$xchan_hash,$perm) { - $x = get_abconfig($channel_id,$xchan_hash,'system','their_perms'); - if($x) { - $y = explode(',',$x); - if(in_array($perm,$y)) { - return true; - } - } - return false; +function their_perms_contains($channel_id, $xchan_hash, $perm) +{ + $x = get_abconfig($channel_id, $xchan_hash, 'system', 'their_perms'); + if ($x) { + $y = explode(',', $x); + if (in_array($perm, $y)) { + return true; + } + } + return false; } -function my_perms_contains($channel_id,$xchan_hash,$perm) { - $x = get_abconfig($channel_id,$xchan_hash,'system','my_perms'); - if($x) { - $y = explode(',',$x); - if(in_array($perm,$y)) { - return true; - } - } - return false; -} \ No newline at end of file +function my_perms_contains($channel_id, $xchan_hash, $perm) +{ + $x = get_abconfig($channel_id, $xchan_hash, 'system', 'my_perms'); + if ($x) { + $y = explode(',', $x); + if (in_array($perm, $y)) { + return true; + } + } + return false; +} diff --git a/include/photo_factory.php b/include/photo_factory.php index f27d64998..48509b4f6 100644 --- a/include/photo_factory.php +++ b/include/photo_factory.php @@ -18,43 +18,44 @@ use Zotlabs\Lib\Hashpath; * @return null|PhotoDriver * NULL if unsupported image type or failure, otherwise photo driver object */ -function photo_factory($data, $type = null) { - $ph = null; - $m = null; +function photo_factory($data, $type = null) +{ + $ph = null; + $m = null; - $unsupported_types = [ - 'image/bmp', - 'image/vnd.microsoft.icon', - 'image/tiff', - 'image/svg+xml', - ]; + $unsupported_types = [ + 'image/bmp', + 'image/vnd.microsoft.icon', + 'image/tiff', + 'image/svg+xml', + ]; - if ($type && in_array(strtolower($type), $unsupported_types)) { - logger('Unsupported image type ' . $type); - return null; - } + if ($type && in_array(strtolower($type), $unsupported_types)) { + logger('Unsupported image type ' . $type); + return null; + } - $ignore_imagick = get_config('system','ignore_imagick'); + $ignore_imagick = get_config('system', 'ignore_imagick'); - if (class_exists('Imagick') && !$ignore_imagick) { - $ph = new PhotoImagick($data, $type); + if (class_exists('Imagick') && !$ignore_imagick) { + $ph = new PhotoImagick($data, $type); - // As of August 2020, webp support is still poor in both imagick and gd. Both claim to support it, - // but both may require additional configuration. If it's a webp and the imagick driver failed, - // we'll try again with GD just in case that one handles it. If not, you may need to install libwebp - // which should make imagick work and/or re-compile php-gd with the option to include that library. + // As of August 2020, webp support is still poor in both imagick and gd. Both claim to support it, + // but both may require additional configuration. If it's a webp and the imagick driver failed, + // we'll try again with GD just in case that one handles it. If not, you may need to install libwebp + // which should make imagick work and/or re-compile php-gd with the option to include that library. - if (! $ph->is_valid() && $type === 'image/webp') { - $ph = null; - } - } + if (! $ph->is_valid() && $type === 'image/webp') { + $ph = null; + } + } - if (! $ph) { - $ph = new PhotoGd($data, $type); - } + if (! $ph) { + $ph = new PhotoGd($data, $type); + } - return $ph; + return $ph; } @@ -67,81 +68,79 @@ function photo_factory($data, $type = null) { * Headers to check for Content-Type (from curl request) * @return null|string Guessed mimetype */ - -function guess_image_type($filename, $headers = '') { - // logger('Photo: guess_image_type: '.$filename . ($headers?' from curl headers':''), LOGGER_DEBUG); - $type = null; - $m = null; - if($headers) { - $hdrs = []; - $h = explode("\n", $headers); - foreach ($h as $l) { - if (strpos($l,':') !== false) { - list($k, $v) = array_map('trim', explode(':', trim($l), 2)); - $hdrs[strtolower($k)] = $v; - } - } - logger('Curl headers: ' . print_r($hdrs, true), LOGGER_DEBUG); - if (array_key_exists('content-type', $hdrs)) { - $ph = photo_factory(''); - $types = $ph->supportedTypes(); +function guess_image_type($filename, $headers = '') +{ + // logger('Photo: guess_image_type: '.$filename . ($headers?' from curl headers':''), LOGGER_DEBUG); + $type = null; + $m = null; - if (array_key_exists($hdrs['content-type'], $types)) - $type = $hdrs['content-type']; - } - } + if ($headers) { + $hdrs = []; + $h = explode("\n", $headers); + foreach ($h as $l) { + if (strpos($l, ':') !== false) { + list($k, $v) = array_map('trim', explode(':', trim($l), 2)); + $hdrs[strtolower($k)] = $v; + } + } + logger('Curl headers: ' . print_r($hdrs, true), LOGGER_DEBUG); + if (array_key_exists('content-type', $hdrs)) { + $ph = photo_factory(''); + $types = $ph->supportedTypes(); - if (is_null($type)) { - $ignore_imagick = get_config('system', 'ignore_imagick'); - // Guessing from extension? Isn't that... dangerous? - if(class_exists('Imagick') && file_exists($filename) && is_readable($filename) && !$ignore_imagick) { - /** - * Well, this not much better, - * but at least it comes from the data inside the image, - * we won't be tricked by a manipulated extension - */ - $image = new Imagick($filename); - $type = $image->getImageMimeType(); - } + if (array_key_exists($hdrs['content-type'], $types)) { + $type = $hdrs['content-type']; + } + } + } - if (is_null($type)) { - $ext = pathinfo($filename, PATHINFO_EXTENSION); - $ph = photo_factory(''); - $types = $ph->supportedTypes(); - foreach ($types as $m => $e) { - if ($ext === $e) { - $type = $m; - } - } - } + if (is_null($type)) { + $ignore_imagick = get_config('system', 'ignore_imagick'); + // Guessing from extension? Isn't that... dangerous? + if (class_exists('Imagick') && file_exists($filename) && is_readable($filename) && !$ignore_imagick) { + /** + * Well, this not much better, + * but at least it comes from the data inside the image, + * we won't be tricked by a manipulated extension + */ + $image = new Imagick($filename); + $type = $image->getImageMimeType(); + } - if (is_null($type) && (strpos($filename, 'http') === false)) { - $size = getimagesize($filename); - $ph = photo_factory(''); - $types = $ph->supportedTypes(); - $type = ((array_key_exists($size['mime'], $types)) ? $size['mime'] : 'image/jpeg'); - } - if (is_null($type)) { - if (strpos(strtolower($filename),'jpg') !== false) { - $type = 'image/jpeg'; - } - elseif (strpos(strtolower($filename),'jpeg') !== false) { - $type = 'image/jpeg'; - } - elseif (strpos(strtolower($filename),'gif') !== false) { - $type = 'image/gif'; - } - elseif (strpos(strtolower($filename),'png') !== false) { - $type = 'image/png'; - } - } + if (is_null($type)) { + $ext = pathinfo($filename, PATHINFO_EXTENSION); + $ph = photo_factory(''); + $types = $ph->supportedTypes(); + foreach ($types as $m => $e) { + if ($ext === $e) { + $type = $m; + } + } + } - } - - logger('Photo: guess_image_type: filename = ' . $filename . ' type = ' . $type, LOGGER_DEBUG); + if (is_null($type) && (strpos($filename, 'http') === false)) { + $size = getimagesize($filename); + $ph = photo_factory(''); + $types = $ph->supportedTypes(); + $type = ((array_key_exists($size['mime'], $types)) ? $size['mime'] : 'image/jpeg'); + } + if (is_null($type)) { + if (strpos(strtolower($filename), 'jpg') !== false) { + $type = 'image/jpeg'; + } elseif (strpos(strtolower($filename), 'jpeg') !== false) { + $type = 'image/jpeg'; + } elseif (strpos(strtolower($filename), 'gif') !== false) { + $type = 'image/gif'; + } elseif (strpos(strtolower($filename), 'png') !== false) { + $type = 'image/png'; + } + } + } - return $type; + logger('Photo: guess_image_type: filename = ' . $filename . ' type = ' . $type, LOGGER_DEBUG); + + return $type; } /** @@ -151,38 +150,39 @@ function guess_image_type($filename, $headers = '') { * @param string $ob_hash * @return void */ -function delete_thing_photo($url, $ob_hash) { +function delete_thing_photo($url, $ob_hash) +{ - $hash = basename($url); - $dbhash = substr($hash, 0, strpos($hash, '-')); + $hash = basename($url); + $dbhash = substr($hash, 0, strpos($hash, '-')); - // hashes should be 32 bytes. + // hashes should be 32 bytes. - if ((! $ob_hash) || (strlen($dbhash) < 16)) { - return; - } + if ((! $ob_hash) || (strlen($dbhash) < 16)) { + return; + } - if (strpos($url,'/xp/') !== false && strpos($url,'.obj') !== false) { - $xppath = 'cache/xp/' . substr($hash,0,2) . '/' . substr($hash,2,2) . '/' . $hash; - if (file_exists($xppath)) { - unlink($xppath); - } - $xppath = str_replace('-4','-5',$xppath); - if (file_exists($xppath)) { - unlink($xppath); - } - $xppath = str_replace('-5','-6',$xppath); - if (file_exists($xppath)) { - unlink($xppath); - } - } - else { - q("delete from photo where xchan = '%s' and photo_usage = %d and resource_id = '%s'", - dbesc($ob_hash), - intval(PHOTO_THING), - dbesc($dbhash) - ); - } + if (strpos($url, '/xp/') !== false && strpos($url, '.obj') !== false) { + $xppath = 'cache/xp/' . substr($hash, 0, 2) . '/' . substr($hash, 2, 2) . '/' . $hash; + if (file_exists($xppath)) { + unlink($xppath); + } + $xppath = str_replace('-4', '-5', $xppath); + if (file_exists($xppath)) { + unlink($xppath); + } + $xppath = str_replace('-5', '-6', $xppath); + if (file_exists($xppath)) { + unlink($xppath); + } + } else { + q( + "delete from photo where xchan = '%s' and photo_usage = %d and resource_id = '%s'", + dbesc($ob_hash), + intval(PHOTO_THING), + dbesc($dbhash) + ); + } } /** @@ -192,9 +192,9 @@ function delete_thing_photo($url, $ob_hash) { * external URL to fetch base image * @param string $xchan * channel unique hash - * @param boolean $thing + * @param bool $thing * TRUE if this is a thing URL - * @param boolean $force + * @param bool $force * TRUE if ignore image modification date check (force fetch) * * @return array of results @@ -205,281 +205,269 @@ function delete_thing_photo($url, $ob_hash) { * * \e boolean \b 4 => TRUE if fetch failure * * \e string \b 5 => modification date */ -function import_xchan_photo($photo, $xchan, $thing = false, $force = false) { +function import_xchan_photo($photo, $xchan, $thing = false, $force = false) +{ - logger('Updating channel photo from ' . $photo . ' for ' . $xchan, LOGGER_DEBUG); + logger('Updating channel photo from ' . $photo . ' for ' . $xchan, LOGGER_DEBUG); - $flags = (($thing) ? PHOTO_THING : PHOTO_XCHAN); - $album = (($thing) ? 'Things' : 'Contact Photos'); - $modified = EMPTY_STR; - $matches = null; - $failed = true; - $img_str = EMPTY_STR; - $hash = photo_new_resource(); - $os_storage = false; + $flags = (($thing) ? PHOTO_THING : PHOTO_XCHAN); + $album = (($thing) ? 'Things' : 'Contact Photos'); + $modified = EMPTY_STR; + $matches = null; + $failed = true; + $img_str = EMPTY_STR; + $hash = photo_new_resource(); + $os_storage = false; - if (! $thing) { - $r = q("select resource_id, edited, mimetype from photo where xchan = '%s' and photo_usage = %d and imgscale = 4 limit 1", - dbesc($xchan), - intval(PHOTO_XCHAN) - ); - if ($r) { - $r = array_shift($r); - $hash = $r['resource_id']; - $modified = $r['edited']; - $type = $r['mimetype']; - } - else { - $os_storage = true; - } - } + if (! $thing) { + $r = q( + "select resource_id, edited, mimetype from photo where xchan = '%s' and photo_usage = %d and imgscale = 4 limit 1", + dbesc($xchan), + intval(PHOTO_XCHAN) + ); + if ($r) { + $r = array_shift($r); + $hash = $r['resource_id']; + $modified = $r['edited']; + $type = $r['mimetype']; + } else { + $os_storage = true; + } + } - if ($photo) { + if ($photo) { + if ($modified === EMPTY_STR || $force) { + $result = z_fetch_url($photo, true); + } else { + $h = [ 'headers' => [ 'If-Modified-Since: ' . gmdate('D, d M Y H:i:s', strtotime($modified . 'Z')) . ' GMT' ] ]; + $result = z_fetch_url($photo, true, 0, $h); + } - if ($modified === EMPTY_STR || $force) { - $result = z_fetch_url($photo, true); - } - else { - $h = [ 'headers' => [ 'If-Modified-Since: ' . gmdate('D, d M Y H:i:s', strtotime($modified . 'Z')) . ' GMT' ] ]; - $result = z_fetch_url($photo, true, 0, $h); - } + if ($result['success']) { + $img_str = $result['body']; + $type = guess_image_type($photo, $result['header']); + $modified = gmdate('Y-m-d H:i:s', (preg_match('/last-modified: (.+) \S+/i', $result['header'], $matches) ? strtotime($matches[1] . 'Z') : time())); + if (! is_null($type)) { + $failed = false; + } + } elseif ($result['return_code'] == 304) { + $photo = z_root() . '/photo/' . $hash . '-4'; + $thumb = z_root() . '/photo/' . $hash . '-5'; + $micro = z_root() . '/photo/' . $hash . '-6'; + $failed = false; + } + } - if ($result['success']) { - $img_str = $result['body']; - $type = guess_image_type($photo, $result['header']); - $modified = gmdate('Y-m-d H:i:s', (preg_match('/last-modified: (.+) \S+/i', $result['header'], $matches) ? strtotime($matches[1] . 'Z') : time())); - if (! is_null($type)) { - $failed = false; - } - } - elseif ($result['return_code'] == 304) { - $photo = z_root() . '/photo/' . $hash . '-4'; - $thumb = z_root() . '/photo/' . $hash . '-5'; - $micro = z_root() . '/photo/' . $hash . '-6'; - $failed = false; - } - } + if (! $failed && $result['return_code'] != 304) { + $img = photo_factory($img_str, $type); + if ($img && $img->is_valid()) { + $width = $img->getWidth(); + $height = $img->getHeight(); - if (! $failed && $result['return_code'] != 304) { - $img = photo_factory($img_str, $type); - if ($img && $img->is_valid()) { - $width = $img->getWidth(); - $height = $img->getHeight(); + if ($width && $height) { + if (($width / $height) > 1.2) { + // crop out the sides + $margin = $width - $height; + $img->cropImage(300, ($margin / 2), 0, $height, $height); + } elseif (($height / $width) > 1.2) { + // crop out the bottom + $margin = $height - $width; + $img->cropImage(300, 0, 0, $width, $width); + } else { + $img->scaleImageSquare(300); + } + } else { + $failed = true; + } - if ($width && $height) { - if (($width / $height) > 1.2) { - // crop out the sides - $margin = $width - $height; - $img->cropImage(300, ($margin / 2), 0, $height, $height); - } - elseif (($height / $width) > 1.2) { - // crop out the bottom - $margin = $height - $width; - $img->cropImage(300, 0, 0, $width, $width); - } - else { - $img->scaleImageSquare(300); - } - } - else { - $failed = true; - } + $p = [ + 'xchan' => $xchan, + 'resource_id' => $hash, + 'filename' => basename($photo), + 'album' => $album, + 'photo_usage' => $flags, + 'imgscale' => 4, + 'edited' => $modified, + ]; - $p = [ - 'xchan' => $xchan, - 'resource_id' => $hash, - 'filename' => basename($photo), - 'album' => $album, - 'photo_usage' => $flags, - 'imgscale' => 4, - 'edited' => $modified, - ]; + $r = $img->save($p); + if ($r === false) { + $failed = true; + } + $img->scaleImage(80); + $p['imgscale'] = 5; + $r = $img->save($p); + if ($r === false) { + $failed = true; + } + $img->scaleImage(48); + $p['imgscale'] = 6; + $r = $img->save($p); + if ($r === false) { + $failed = true; + } + $photo = z_root() . '/photo/' . $hash . '-4'; + $thumb = z_root() . '/photo/' . $hash . '-5'; + $micro = z_root() . '/photo/' . $hash . '-6'; + } else { + logger('Invalid image from ' . $photo); + $failed = true; + } + } - $r = $img->save($p); - if ($r === false) { - $failed = true; - } - $img->scaleImage(80); - $p['imgscale'] = 5; - $r = $img->save($p); - if ($r === false) { - $failed = true; - } - $img->scaleImage(48); - $p['imgscale'] = 6; - $r = $img->save($p); - if ($r === false) { - $failed = true; - } - $photo = z_root() . '/photo/' . $hash . '-4'; - $thumb = z_root() . '/photo/' . $hash . '-5'; - $micro = z_root() . '/photo/' . $hash . '-6'; - } - else { - logger('Invalid image from ' . $photo); - $failed = true; - } - } - - if ($failed) { - $default = get_default_profile_photo(); - $photo = z_root() . '/' . $default; - $thumb = z_root() . '/' . get_default_profile_photo(80); - $micro = z_root() . '/' . get_default_profile_photo(48); - $type = 'image/png'; - $modified = gmdate('Y-m-d H:i:s', filemtime($default)); - } + if ($failed) { + $default = get_default_profile_photo(); + $photo = z_root() . '/' . $default; + $thumb = z_root() . '/' . get_default_profile_photo(80); + $micro = z_root() . '/' . get_default_profile_photo(48); + $type = 'image/png'; + $modified = gmdate('Y-m-d H:i:s', filemtime($default)); + } - logger('HTTP code: ' . $result['return_code'] . '; modified: ' . $modified - . '; failure: ' . ($failed ? 'yes' : 'no') . '; URL: ' . $photo, LOGGER_DEBUG); + logger('HTTP code: ' . $result['return_code'] . '; modified: ' . $modified + . '; failure: ' . ($failed ? 'yes' : 'no') . '; URL: ' . $photo, LOGGER_DEBUG); - return([$photo, $thumb, $micro, $type, $failed, $modified]); + return([$photo, $thumb, $micro, $type, $failed, $modified]); } -function import_remote_xchan_photo($photo, $xchan, $thing = false) { +function import_remote_xchan_photo($photo, $xchan, $thing = false) +{ -// logger('Updating channel photo from ' . $photo . ' for ' . $xchan, LOGGER_DEBUG); +// logger('Updating channel photo from ' . $photo . ' for ' . $xchan, LOGGER_DEBUG); - // Assume the worst. - $failed = true; - $type = EMPTY_STR; - - $path = Hashpath::path((($thing) ? $photo . $xchan : $xchan),'cache/xp',2); - $hash = basename($path); + // Assume the worst. + $failed = true; + $type = EMPTY_STR; - $cached_file = $path . '-4' . (($thing) ? '.obj' : EMPTY_STR); + $path = Hashpath::path((($thing) ? $photo . $xchan : $xchan), 'cache/xp', 2); + $hash = basename($path); - $animated = get_config('system','animated_avatars',true); + $cached_file = $path . '-4' . (($thing) ? '.obj' : EMPTY_STR); - $modified = ((file_exists($cached_file)) ? @filemtime($cached_file) : 0); + $animated = get_config('system', 'animated_avatars', true); - // Maybe it's already a cached xchan photo - - if (strpos($photo, z_root() . '/xp/') === 0) { - return false; - } - - if ($modified) { - $h = [ 'headers' => [ 'If-Modified-Since: ' . gmdate('D, d M Y H:i:s', $modified) . ' GMT' ] ]; - $recurse = 0; - $result = z_fetch_url($photo, true, $recurse, $h); - } - else { - $result = z_fetch_url($photo, true); - } + $modified = ((file_exists($cached_file)) ? @filemtime($cached_file) : 0); - if ($result['success']) { - $type = guess_image_type($photo, $result['header']); - if ((! $type) || strpos($type,'image') === false) { - @file_put_contents('cache/' . $hash, $result['body']); - $info = getimagesize('cache/' . $hash); - @unlink('cache/' . $hash); - if (isset($info) && is_array($info) && array_key_exists('mime',$info)) { - $type = $info['mime']; - } - } - if ($type) { - $failed = false; - } - } - elseif (intval($result['return_code']) === 304) { - - // continue using our cached copy, although we still need to figure out the type - // for the benefit of upstream callers that may require it + // Maybe it's already a cached xchan photo - if (file_exists($cached_file)) { - $info = getimagesize($cached_file); - if (isset($info) && is_array($info) && array_key_exists('mime',$info)) { - $type = $info['mime']; - } - } - - $photo = z_root() . '/xp/' . $hash . '-4' . (($thing) ? '.obj' : EMPTY_STR); - $thumb = z_root() . '/xp/' . $hash . '-5' . (($thing) ? '.obj' : EMPTY_STR); - $micro = z_root() . '/xp/' . $hash . '-6' . (($thing) ? '.obj' : EMPTY_STR); - $failed = false; - } + if (strpos($photo, z_root() . '/xp/') === 0) { + return false; + } + + if ($modified) { + $h = [ 'headers' => [ 'If-Modified-Since: ' . gmdate('D, d M Y H:i:s', $modified) . ' GMT' ] ]; + $recurse = 0; + $result = z_fetch_url($photo, true, $recurse, $h); + } else { + $result = z_fetch_url($photo, true); + } + + if ($result['success']) { + $type = guess_image_type($photo, $result['header']); + if ((! $type) || strpos($type, 'image') === false) { + @file_put_contents('cache/' . $hash, $result['body']); + $info = getimagesize('cache/' . $hash); + @unlink('cache/' . $hash); + if (isset($info) && is_array($info) && array_key_exists('mime', $info)) { + $type = $info['mime']; + } + } + if ($type) { + $failed = false; + } + } elseif (intval($result['return_code']) === 304) { + // continue using our cached copy, although we still need to figure out the type + // for the benefit of upstream callers that may require it + + if (file_exists($cached_file)) { + $info = getimagesize($cached_file); + if (isset($info) && is_array($info) && array_key_exists('mime', $info)) { + $type = $info['mime']; + } + } + + $photo = z_root() . '/xp/' . $hash . '-4' . (($thing) ? '.obj' : EMPTY_STR); + $thumb = z_root() . '/xp/' . $hash . '-5' . (($thing) ? '.obj' : EMPTY_STR); + $micro = z_root() . '/xp/' . $hash . '-6' . (($thing) ? '.obj' : EMPTY_STR); + $failed = false; + } - if (! $failed && intval($result['return_code']) !== 304) { - $img = photo_factory($result['body'], $type); - if ($img && $img->is_valid()) { - $width = $img->getWidth(); - $height = $img->getHeight(); + if (! $failed && intval($result['return_code']) !== 304) { + $img = photo_factory($result['body'], $type); + if ($img && $img->is_valid()) { + $width = $img->getWidth(); + $height = $img->getHeight(); - if ($width && $height) { - if (($width / $height) > 1.2) { - // crop out the sides - $margin = $width - $height; - $img->cropImage(300, ($margin / 2), 0, $height, $height); - } - elseif (($height / $width) > 1.2) { - // crop out the bottom - $margin = $height - $width; - $img->cropImage(300, 0, 0, $width, $width); - } - else { - $img->scaleImageSquare(300); - } - } - else { - $failed = true; - } + if ($width && $height) { + if (($width / $height) > 1.2) { + // crop out the sides + $margin = $width - $height; + $img->cropImage(300, ($margin / 2), 0, $height, $height); + } elseif (($height / $width) > 1.2) { + // crop out the bottom + $margin = $height - $width; + $img->cropImage(300, 0, 0, $width, $width); + } else { + $img->scaleImageSquare(300); + } + } else { + $failed = true; + } - $p = [ - 'xchan' => $xchan, - 'resource_id' => $hash, - 'filename' => basename($photo), - 'album' => EMPTY_STR, - 'photo_usage' => 0, - 'imgscale' => 4, - 'edited' => $modified, - ]; + $p = [ + 'xchan' => $xchan, + 'resource_id' => $hash, + 'filename' => basename($photo), + 'album' => EMPTY_STR, + 'photo_usage' => 0, + 'imgscale' => 4, + 'edited' => $modified, + ]; - $savepath = $path . '-' . $p['imgscale'] . (($thing) ? '.obj' : EMPTY_STR); - $photo = z_root() . '/xp/' . $hash . '-' . $p['imgscale'] . (($thing) ? '.obj' : EMPTY_STR); - $r = $img->saveImage($savepath,$animated); - if ($r === false) { - $failed = true; - } - $img->scaleImage(80); - $p['imgscale'] = 5; - $savepath = $path . '-' . $p['imgscale'] . (($thing) ? '.obj' : EMPTY_STR); - $thumb = z_root() . '/xp/' . $hash . '-' . $p['imgscale'] . (($thing) ? '.obj' : EMPTY_STR); - $r = $img->saveImage($savepath,$animated); - if ($r === false) { - $failed = true; - } - $img->scaleImage(48); - $p['imgscale'] = 6; - $savepath = $path . '-' . $p['imgscale'] . (($thing) ? '.obj' : EMPTY_STR); - $micro = z_root() . '/xp/' . $hash . '-' . $p['imgscale'] . (($thing) ? '.obj' : EMPTY_STR); - $r = $img->saveImage($savepath,$animated); - if ($r === false) { - $failed = true; - } - } - else { - logger('Invalid image from ' . $photo); - $failed = true; - } - } - - if ($failed) { - $default = get_default_profile_photo(); - $photo = z_root() . '/' . $default; - $thumb = z_root() . '/' . get_default_profile_photo(80); - $micro = z_root() . '/' . get_default_profile_photo(48); - $type = 'image/png'; - $modified = filemtime($default); - } + $savepath = $path . '-' . $p['imgscale'] . (($thing) ? '.obj' : EMPTY_STR); + $photo = z_root() . '/xp/' . $hash . '-' . $p['imgscale'] . (($thing) ? '.obj' : EMPTY_STR); + $r = $img->saveImage($savepath, $animated); + if ($r === false) { + $failed = true; + } + $img->scaleImage(80); + $p['imgscale'] = 5; + $savepath = $path . '-' . $p['imgscale'] . (($thing) ? '.obj' : EMPTY_STR); + $thumb = z_root() . '/xp/' . $hash . '-' . $p['imgscale'] . (($thing) ? '.obj' : EMPTY_STR); + $r = $img->saveImage($savepath, $animated); + if ($r === false) { + $failed = true; + } + $img->scaleImage(48); + $p['imgscale'] = 6; + $savepath = $path . '-' . $p['imgscale'] . (($thing) ? '.obj' : EMPTY_STR); + $micro = z_root() . '/xp/' . $hash . '-' . $p['imgscale'] . (($thing) ? '.obj' : EMPTY_STR); + $r = $img->saveImage($savepath, $animated); + if ($r === false) { + $failed = true; + } + } else { + logger('Invalid image from ' . $photo); + $failed = true; + } + } - logger('HTTP code: ' . $result['return_code'] . '; modified: ' . (($modified) ? gmdate('D, d M Y H:i:s', $modified) . ' GMT' : 0 ) - . '; failure: ' . ($failed ? 'yes' : 'no') . '; URL: ' . $photo, LOGGER_DEBUG); + if ($failed) { + $default = get_default_profile_photo(); + $photo = z_root() . '/' . $default; + $thumb = z_root() . '/' . get_default_profile_photo(80); + $micro = z_root() . '/' . get_default_profile_photo(48); + $type = 'image/png'; + $modified = filemtime($default); + } - return([$photo, $thumb, $micro, $type, $failed, $modified]); + logger('HTTP code: ' . $result['return_code'] . '; modified: ' . (($modified) ? gmdate('D, d M Y H:i:s', $modified) . ' GMT' : 0 ) + . '; failure: ' . ($failed ? 'yes' : 'no') . '; URL: ' . $photo, LOGGER_DEBUG); + + return([$photo, $thumb, $micro, $type, $failed, $modified]); } @@ -495,21 +483,22 @@ function import_remote_xchan_photo($photo, $xchan, $thing = false) { * @param int $uid channel_id * @return null|string Guessed image mimetype or null. */ -function import_channel_photo_from_url($photo, $aid, $uid) { - $type = null; +function import_channel_photo_from_url($photo, $aid, $uid) +{ + $type = null; - if ($photo) { - $result = z_fetch_url($photo, true); + if ($photo) { + $result = z_fetch_url($photo, true); - if ($result['success']) { - $img_str = $result['body']; - $type = guess_image_type($photo, $result['header']); + if ($result['success']) { + $img_str = $result['body']; + $type = guess_image_type($photo, $result['header']); - import_channel_photo($img_str, $type, $aid, $uid); - } - } + import_channel_photo($img_str, $type, $aid, $uid); + } + } - return $type; + return $type; } /** @@ -519,71 +508,69 @@ function import_channel_photo_from_url($photo, $aid, $uid) { * @param string $type * @param int $aid * @param int $uid channel_id - * @return boolean|string false on failure, otherwise resource_id of photo + * @return bool|string false on failure, otherwise resource_id of photo */ -function import_channel_photo($photo, $type, $aid, $uid) { +function import_channel_photo($photo, $type, $aid, $uid) +{ - logger('Importing channel photo for ' . $uid, LOGGER_DEBUG); + logger('Importing channel photo for ' . $uid, LOGGER_DEBUG); - $r = q("select resource_id from photo where uid = %d and photo_usage = 1 and imgscale = 4", - intval($uid) - ); - if ($r) { - $hash = $r[0]['resource_id']; - } - else { - $hash = photo_new_resource(); - } - - $photo_failure = false; - $filename = $hash; + $r = q( + "select resource_id from photo where uid = %d and photo_usage = 1 and imgscale = 4", + intval($uid) + ); + if ($r) { + $hash = $r[0]['resource_id']; + } else { + $hash = photo_new_resource(); + } - $img = photo_factory($photo, $type); - if ($img->is_valid()) { + $photo_failure = false; + $filename = $hash; - // config array for image save method - $p = [ - 'aid' => $aid, - 'uid' => $uid, - 'resource_id' => $hash, - 'filename' => $filename, - 'album' => t('Profile Photos'), - 'photo_usage' => PHOTO_PROFILE, - 'imgscale' => PHOTO_RES_PROFILE_300, - ]; + $img = photo_factory($photo, $type); + if ($img->is_valid()) { + // config array for image save method + $p = [ + 'aid' => $aid, + 'uid' => $uid, + 'resource_id' => $hash, + 'filename' => $filename, + 'album' => t('Profile Photos'), + 'photo_usage' => PHOTO_PROFILE, + 'imgscale' => PHOTO_RES_PROFILE_300, + ]; - // photo size - $img->scaleImageSquare(300); - $r = $img->save($p); - if ($r === false) { - $photo_failure = true; - } - - // thumb size - $img->scaleImage(80); - $p['imgscale'] = 5; - $r = $img->save($p); - if ($r === false) { - $photo_failure = true; - } - - // micro size - $img->scaleImage(48); - $p['imgscale'] = 6; - $r = $img->save($p); - if ($r === false) { - $photo_failure = true; - } + // photo size + $img->scaleImageSquare(300); + $r = $img->save($p); + if ($r === false) { + $photo_failure = true; + } - } - else { - logger('Invalid image.'); - $photo_failure = true; - } + // thumb size + $img->scaleImage(80); + $p['imgscale'] = 5; + $r = $img->save($p); + if ($r === false) { + $photo_failure = true; + } - if ($photo_failure) { - return false; - } + // micro size + $img->scaleImage(48); + $p['imgscale'] = 6; + $r = $img->save($p); + if ($r === false) { + $photo_failure = true; + } + } else { + logger('Invalid image.'); + $photo_failure = true; + } - return $hash; + if ($photo_failure) { + return false; + } + + return $hash; } diff --git a/include/photos.php b/include/photos.php index 3da0cf6eb..0e31ec601 100644 --- a/include/photos.php +++ b/include/photos.php @@ -1,4 +1,5 @@ false ]; - $channel_id = $channel['channel_id']; - $account_id = $channel['channel_account_id']; - - if (! perm_is_allowed($channel_id, $observer['xchan_hash'], 'write_storage')) { - $ret['message'] = t('Permission denied.'); - return $ret; - } - - /* - * Determine the album to use - */ - - $album = $args['album']; - - $visible = ((intval($args['visible']) || $args['visible'] === 'true') ? 1 : 0); - $deliver = ((array_key_exists('deliver', $args)) ? intval($args['deliver']) : 1 ); - - - // Set to default channel permissions. If the parent directory (album) has permissions set, - // use those instead. If we have specific permissions supplied, they take precedence over - // all other settings. 'allow_cid' being passed from an external source takes priority over channel settings. - // ...messy... needs re-factoring once the photos/files integration stabilises - - $acl = new AccessControl($channel); - if (array_key_exists('directory',$args) && $args['directory']) { - $acl->set($args['directory']); - } - if (array_key_exists('allow_cid',$args)) { - $acl->set($args); - } - if ((array_key_exists('group_allow',$args)) - || (array_key_exists('contact_allow',$args)) - || (array_key_exists('group_deny',$args)) - || (array_key_exists('contact_deny',$args))) { - $acl->set_from_array($args); - } - - $ac = $acl->get(); - - $width = $height = 0; - - if($args['getimagesize']) { - $width = $args['getimagesize'][0]; - $height = $args['getimagesize'][1]; - } - - $os_storage = 0; - - $max_thumb = get_config('system','max_thumbnail',1600); - - if($args['os_syspath'] && $args['getimagesize']) { - if($args['getimagesize'][0] > $max_thumb || $args['getimagesize'][1] > $max_thumb) { - $imagick_path = get_config('system','imagick_convert_path'); - if($imagick_path && @file_exists($imagick_path)) { - $tmp_name = $args['os_syspath'] . '-001'; - $newsize = photo_calculate_scale(array_merge($args['getimagesize'],['max' => $max_thumb])); - $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $args['os_syspath']) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); - logger('imagick thumbnail command: ' . $cmd); - for($x = 0; $x < 4; $x ++) { - exec($cmd); - if(file_exists($tmp_name)) { - break; - } - logger('imagick scale failed. Retrying.'); - continue; - } - if(! file_exists($tmp_name)) { - logger('imagick scale failed. Abort.'); - return $ret; - } - - $imagedata = @file_get_contents($tmp_name); - $filesize = @filesize($args['os_syspath']); - } - else { - $imagedata = @file_get_contents($args['os_syspath']); - $filesize = strlen($imagedata); - } - } - else { - $imagedata = @file_get_contents($args['os_syspath']); - $filesize = strlen($imagedata); - } - $filename = $args['filename']; - // this is going to be deleted if it exists - $src = '/tmp/deletemenow'; - $type = $args['getimagesize']['mime']; - $os_storage = 1; - } - elseif ($args['data'] || $args['content']) { - - // allow an import from a binary string representing the image. - // This bypasses the upload step and max size limit checking - - $imagedata = (($args['content']) ? $args['content'] : $args['data']); - $filename = $args['filename']; - $filesize = strlen($imagedata); - // this is going to be deleted if it exists - $src = '/tmp/deletemenow'; - $type = (($args['mimetype']) ? $args['mimetype'] : $args['type']); - } else { - $f = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''); - - if (x($f,'src') && x($f,'filesize')) { - $src = $f['src']; - $filename = $f['filename']; - $filesize = $f['filesize']; - $type = $f['type']; - } else { - $src = $_FILES['userfile']['tmp_name']; - $filename = basename($_FILES['userfile']['name']); - $filesize = intval($_FILES['userfile']['size']); - $type = $_FILES['userfile']['type']; - } - - if (! $type) - $type=guess_image_type($filename); - - logger('Received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG); - - $maximagesize = get_config('system','maximagesize'); - - if (($maximagesize) && ($filesize > $maximagesize)) { - $ret['message'] = sprintf ( t('Image exceeds website size limit of %lu bytes'), $maximagesize); - @unlink($src); - /** - * @hooks photo_upload_end - * Called when a photo upload has been processed. - */ - call_hooks('photo_upload_end', $ret); - return $ret; - } - - if (! $filesize) { - $ret['message'] = t('Image file is empty.'); - @unlink($src); - /** - * @hooks photo_post_end - * Called after uploading a photo. - */ - call_hooks('photo_post_end', $ret); - return $ret; - } - - logger('Loading the contents of ' . $src , LOGGER_DEBUG); - $imagedata = @file_get_contents($src); - } - - $r = q("select sum(filesize) as total from photo where aid = %d and imgscale = 0 ", - intval($account_id) - ); - - $limit = engr_units_to_bytes(service_class_fetch($channel_id,'photo_upload_limit')); - - if (($r) && ($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) { - $ret['message'] = upgrade_message(); - @unlink($src); - /** - * @hooks photo_post_end - * Called after uploading a photo. - */ - call_hooks('photo_post_end', $ret); - return $ret; - } - - $ph = photo_factory($imagedata, $type); - - if (! ($ph && $ph->is_valid())) { - $ret['message'] = t('Unable to process image'); - logger('unable to process image'); - @unlink($src); - /** - * @hooks photo_upload_end - * Called when a photo upload has been processed. - */ - call_hooks('photo_upload_end', $ret); - return $ret; - } - - // obtain exif data from the source file if present - - $exif = $ph->exif(($args['os_syspath']) ? $args['os_syspath'] : $src); - - if($exif) { - $ph->orient($exif); - } - - $ph->clearexif(); - - if(get_pconfig($channel_id,'system','clearexif',false)) { - - // only do this on the original if it was uploaded by some method other than WebDAV. - // Otherwise Microsoft Windows will note the file size mismatch, erase the file and - // upload it again and again. - - } - - @unlink($src); - - $max_length = get_config('system','max_image_length', MAX_IMAGE_LENGTH); - if ($max_length > 0) { - $ph->scaleImage($max_length); - } - - if (! $width) { - $width = $ph->getWidth(); - } - if (! $height) { - $height = $ph->getHeight(); - } - $smallest = 0; - - $photo_hash = (($args['resource_id']) ? $args['resource_id'] : photo_new_resource()); - - $visitor = ''; - if ($channel['channel_hash'] !== $observer['xchan_hash']) - $visitor = $observer['xchan_hash']; - - $errors = false; - - $p = array('aid' => $account_id, 'uid' => $channel_id, 'xchan' => $visitor, 'resource_id' => $photo_hash, - 'filename' => $filename, 'album' => $album, 'imgscale' => 0, 'photo_usage' => PHOTO_NORMAL, - 'width' => $width, 'height' => $height, - 'allow_cid' => $ac['allow_cid'], 'allow_gid' => $ac['allow_gid'], - 'deny_cid' => $ac['deny_cid'], 'deny_gid' => $ac['deny_gid'], - 'os_storage' => $os_storage, 'os_syspath' => $args['os_syspath'], - 'os_path' => $args['os_path'], 'display_path' => $args['display_path'] - ); - if($args['created']) - $p['created'] = $args['created']; - if($args['edited']) - $p['edited'] = $args['edited']; - if($args['title']) - $p['title'] = $args['title']; - - if ($args['description']) { - $p['description'] = $args['description']; - } - - $alt_desc = ((isset($p['description']) && $p['description']) ? $p['description'] : $p['filename']); - - $url = []; - - $r0 = $ph->save($p); - $url[0] = [ - 'type' => 'Link', - 'rel' => 'alternate', - 'mediaType' => $type, - 'summary' => $alt_desc, - 'href' => z_root() . '/photo/' . $photo_hash . '-0.' . $ph->getExt(), - 'width' => $width, - 'height' => $height - ]; - if(! $r0) - $errors = true; - - unset($p['os_storage']); - unset($p['os_syspath']); - unset($p['width']); - unset($p['height']); - - if(($width > 1024 || $height > 1024) && (! $errors)) - $ph->scaleImage(1024); - - $p['imgscale'] = 1; - $r1 = $ph->storeThumbnail($p, PHOTO_RES_1024); - $url[1] = [ - 'type' => 'Link', - 'rel' => 'alternate', - 'mediaType' => $type, - 'summary' => $alt_desc, - 'href' => z_root() . '/photo/' . $photo_hash . '-1.' . $ph->getExt(), - 'width' => $ph->getWidth(), - 'height' => $ph->getHeight() - ]; - if(! $r1) - $errors = true; - - if(($width > 640 || $height > 640) && (! $errors)) - $ph->scaleImage(640); - - $p['imgscale'] = 2; - $r2 = $ph->storeThumbnail($p, PHOTO_RES_640); - $url[2] = [ - 'type' => 'Link', - 'rel' => 'alternate', - 'mediaType' => $type, - 'summary' => $alt_desc, - 'href' => z_root() . '/photo/' . $photo_hash . '-2.' . $ph->getExt(), - 'width' => $ph->getWidth(), - 'height' => $ph->getHeight() - ]; - if(! $r2) - $errors = true; - - if(($width > 320 || $height > 320) && (! $errors)) - $ph->scaleImage(320); - - $p['imgscale'] = 3; - $r3 = $ph->storeThumbnail($p, PHOTO_RES_320); - $url[3] = [ - 'type' => 'Link', - 'rel' => 'alternate', - 'mediaType' => $type, - 'summary' => $alt_desc, - 'href' => z_root() . '/photo/' . $photo_hash . '-3.' . $ph->getExt(), - 'width' => $ph->getWidth(), - 'height' => $ph->getHeight() - ]; - if(! $r3) - $errors = true; - - if($errors) { - q("delete from photo where resource_id = '%s' and uid = %d", - dbesc($photo_hash), - intval($channel_id) - ); - $ret['message'] = t('Photo storage failed.'); - logger('Photo store failed.'); - /** - * @hooks photo_upload_end - * Called when a photo upload has been processed. - */ - call_hooks('photo_upload_end', $ret); - return $ret; - } - - $url[] = [ - 'type' => 'Link', - 'rel' => 'about', - 'mediaType' => 'text/html', - 'href' => z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash - ]; - - $item_hidden = (($visible) ? 0 : 1 ); - - $lat = $lon = null; - - if($exif && Apps::system_app_installed($channel_id,'Photomap')) { - $gps = null; - if(array_key_exists('GPS',$exif)) { - $gps = $exif['GPS']; - } - elseif(array_key_exists('GPSLatitude',$exif)) { - $gps = $exif; - } - if($gps) { - $lat = getGps($gps['GPSLatitude'], $gps['GPSLatitudeRef']); - $lon = getGps($gps['GPSLongitude'], $gps['GPSLongitudeRef']); - } - } - - $title = ((isset($args['title']) && $args['title']) ? $args['title'] : $args['filename']); - - $desc = htmlspecialchars($alt_desc); - - $found_tags = linkify_tags($args['body'], $channel_id); - - $alt = ' alt="' . $desc . '"' ; - - $scale = 1; - $width = $url[1]['width']; - $height = $url[1]['height']; - $tag = (($r1) ? '[zmg width="' . $width . '" height="' . $height . '"' . $alt . ']' : '[zmg' . $alt . ']'); - - $author_link = '[zrl=' . z_root() . '/channel/' . $channel['channel_address'] . ']' . $channel['channel_name'] . '[/zrl]'; - - $photo_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' . t('a new photo') . '[/zrl]'; - - $album_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $args['directory']['hash'] . ']' . ((strlen($album)) ? $album : '/') . '[/zrl]'; - - $activity_format = sprintf(t('%1$s posted %2$s to %3$s','photo_upload'), $author_link, $photo_link, $album_link); - - $body = (($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]'; - - // If uploaded into a post, this is the text that is returned to the webapp for inclusion in the post. - - $obj_body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' - . $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]' - . '[/zrl]'; - - $attribution = (($visitor) ? $visitor['xchan_url'] : $channel['xchan_url']); - - // Create item object - $object = [ - 'type' => ACTIVITY_OBJ_PHOTO, - 'name' => $title, - 'summary' => $p['description'], - 'published' => datetime_convert('UTC','UTC',$p['created'],ATOM_TIME), - 'updated' => datetime_convert('UTC','UTC',$p['edited'],ATOM_TIME), - 'attributedTo' => $attribution, - // This is a placeholder and will get over-ridden by the item mid, which is critical for sharing as a conversational item over activitypub - 'id' => z_root() . '/photo/' . $photo_hash, - 'url' => $url, - 'source' => [ 'content' => $body, 'mediaType' => 'text/x-multicode' ], - 'content' => bbcode($body, [ 'export' => true ]) - ]; - - $public = (($ac['allow_cid'] || $ac['allow_gid'] || $ac['deny_cid'] || $ac['deny_gid']) ? false : true); - - if ($public) { - $object['to'] = [ ACTIVITY_PUBLIC_INBOX ]; - $object['cc'] = [ z_root() . '/followers/' . $channel['channel_address'] ]; +function photo_upload($channel, $observer, $args) +{ + + $ret = [ 'success' => false ]; + $channel_id = $channel['channel_id']; + $account_id = $channel['channel_account_id']; + + if (! perm_is_allowed($channel_id, $observer['xchan_hash'], 'write_storage')) { + $ret['message'] = t('Permission denied.'); + return $ret; + } + + /* + * Determine the album to use + */ + + $album = $args['album']; + + $visible = ((intval($args['visible']) || $args['visible'] === 'true') ? 1 : 0); + $deliver = ((array_key_exists('deliver', $args)) ? intval($args['deliver']) : 1 ); + + + // Set to default channel permissions. If the parent directory (album) has permissions set, + // use those instead. If we have specific permissions supplied, they take precedence over + // all other settings. 'allow_cid' being passed from an external source takes priority over channel settings. + // ...messy... needs re-factoring once the photos/files integration stabilises + + $acl = new AccessControl($channel); + if (array_key_exists('directory', $args) && $args['directory']) { + $acl->set($args['directory']); + } + if (array_key_exists('allow_cid', $args)) { + $acl->set($args); + } + if ( + (array_key_exists('group_allow', $args)) + || (array_key_exists('contact_allow', $args)) + || (array_key_exists('group_deny', $args)) + || (array_key_exists('contact_deny', $args)) + ) { + $acl->set_from_array($args); + } + + $ac = $acl->get(); + + $width = $height = 0; + + if ($args['getimagesize']) { + $width = $args['getimagesize'][0]; + $height = $args['getimagesize'][1]; + } + + $os_storage = 0; + + $max_thumb = get_config('system', 'max_thumbnail', 1600); + + if ($args['os_syspath'] && $args['getimagesize']) { + if ($args['getimagesize'][0] > $max_thumb || $args['getimagesize'][1] > $max_thumb) { + $imagick_path = get_config('system', 'imagick_convert_path'); + if ($imagick_path && @file_exists($imagick_path)) { + $tmp_name = $args['os_syspath'] . '-001'; + $newsize = photo_calculate_scale(array_merge($args['getimagesize'], ['max' => $max_thumb])); + $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $args['os_syspath']) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); + logger('imagick thumbnail command: ' . $cmd); + for ($x = 0; $x < 4; $x++) { + exec($cmd); + if (file_exists($tmp_name)) { + break; + } + logger('imagick scale failed. Retrying.'); + continue; + } + if (! file_exists($tmp_name)) { + logger('imagick scale failed. Abort.'); + return $ret; + } + + $imagedata = @file_get_contents($tmp_name); + $filesize = @filesize($args['os_syspath']); + } else { + $imagedata = @file_get_contents($args['os_syspath']); + $filesize = strlen($imagedata); + } + } else { + $imagedata = @file_get_contents($args['os_syspath']); + $filesize = strlen($imagedata); + } + $filename = $args['filename']; + // this is going to be deleted if it exists + $src = '/tmp/deletemenow'; + $type = $args['getimagesize']['mime']; + $os_storage = 1; + } elseif ($args['data'] || $args['content']) { + // allow an import from a binary string representing the image. + // This bypasses the upload step and max size limit checking + + $imagedata = (($args['content']) ? $args['content'] : $args['data']); + $filename = $args['filename']; + $filesize = strlen($imagedata); + // this is going to be deleted if it exists + $src = '/tmp/deletemenow'; + $type = (($args['mimetype']) ? $args['mimetype'] : $args['type']); + } else { + $f = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''); + + if (x($f, 'src') && x($f, 'filesize')) { + $src = $f['src']; + $filename = $f['filename']; + $filesize = $f['filesize']; + $type = $f['type']; + } else { + $src = $_FILES['userfile']['tmp_name']; + $filename = basename($_FILES['userfile']['name']); + $filesize = intval($_FILES['userfile']['size']); + $type = $_FILES['userfile']['type']; + } + + if (! $type) { + $type = guess_image_type($filename); + } + + logger('Received file: ' . $filename . ' as ' . $src . ' (' . $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG); + + $maximagesize = get_config('system', 'maximagesize'); + + if (($maximagesize) && ($filesize > $maximagesize)) { + $ret['message'] = sprintf(t('Image exceeds website size limit of %lu bytes'), $maximagesize); + @unlink($src); + /** + * @hooks photo_upload_end + * Called when a photo upload has been processed. + */ + call_hooks('photo_upload_end', $ret); + return $ret; + } + + if (! $filesize) { + $ret['message'] = t('Image file is empty.'); + @unlink($src); + /** + * @hooks photo_post_end + * Called after uploading a photo. + */ + call_hooks('photo_post_end', $ret); + return $ret; + } + + logger('Loading the contents of ' . $src, LOGGER_DEBUG); + $imagedata = @file_get_contents($src); + } + + $r = q( + "select sum(filesize) as total from photo where aid = %d and imgscale = 0 ", + intval($account_id) + ); + + $limit = engr_units_to_bytes(service_class_fetch($channel_id, 'photo_upload_limit')); + + if (($r) && ($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) { + $ret['message'] = upgrade_message(); + @unlink($src); + /** + * @hooks photo_post_end + * Called after uploading a photo. + */ + call_hooks('photo_post_end', $ret); + return $ret; + } + + $ph = photo_factory($imagedata, $type); + + if (! ($ph && $ph->is_valid())) { + $ret['message'] = t('Unable to process image'); + logger('unable to process image'); + @unlink($src); + /** + * @hooks photo_upload_end + * Called when a photo upload has been processed. + */ + call_hooks('photo_upload_end', $ret); + return $ret; + } + + // obtain exif data from the source file if present + + $exif = $ph->exif(($args['os_syspath']) ? $args['os_syspath'] : $src); + + if ($exif) { + $ph->orient($exif); + } + + $ph->clearexif(); + + if (get_pconfig($channel_id, 'system', 'clearexif', false)) { + // only do this on the original if it was uploaded by some method other than WebDAV. + // Otherwise Microsoft Windows will note the file size mismatch, erase the file and + // upload it again and again. + } + + @unlink($src); + + $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH); + if ($max_length > 0) { + $ph->scaleImage($max_length); + } + + if (! $width) { + $width = $ph->getWidth(); + } + if (! $height) { + $height = $ph->getHeight(); + } + $smallest = 0; + + $photo_hash = (($args['resource_id']) ? $args['resource_id'] : photo_new_resource()); + + $visitor = ''; + if ($channel['channel_hash'] !== $observer['xchan_hash']) { + $visitor = $observer['xchan_hash']; + } + + $errors = false; + + $p = array('aid' => $account_id, 'uid' => $channel_id, 'xchan' => $visitor, 'resource_id' => $photo_hash, + 'filename' => $filename, 'album' => $album, 'imgscale' => 0, 'photo_usage' => PHOTO_NORMAL, + 'width' => $width, 'height' => $height, + 'allow_cid' => $ac['allow_cid'], 'allow_gid' => $ac['allow_gid'], + 'deny_cid' => $ac['deny_cid'], 'deny_gid' => $ac['deny_gid'], + 'os_storage' => $os_storage, 'os_syspath' => $args['os_syspath'], + 'os_path' => $args['os_path'], 'display_path' => $args['display_path'] + ); + if ($args['created']) { + $p['created'] = $args['created']; + } + if ($args['edited']) { + $p['edited'] = $args['edited']; + } + if ($args['title']) { + $p['title'] = $args['title']; + } + + if ($args['description']) { + $p['description'] = $args['description']; + } + + $alt_desc = ((isset($p['description']) && $p['description']) ? $p['description'] : $p['filename']); + + $url = []; + + $r0 = $ph->save($p); + $url[0] = [ + 'type' => 'Link', + 'rel' => 'alternate', + 'mediaType' => $type, + 'summary' => $alt_desc, + 'href' => z_root() . '/photo/' . $photo_hash . '-0.' . $ph->getExt(), + 'width' => $width, + 'height' => $height + ]; + if (! $r0) { + $errors = true; + } + + unset($p['os_storage']); + unset($p['os_syspath']); + unset($p['width']); + unset($p['height']); + + if (($width > 1024 || $height > 1024) && (! $errors)) { + $ph->scaleImage(1024); + } + + $p['imgscale'] = 1; + $r1 = $ph->storeThumbnail($p, PHOTO_RES_1024); + $url[1] = [ + 'type' => 'Link', + 'rel' => 'alternate', + 'mediaType' => $type, + 'summary' => $alt_desc, + 'href' => z_root() . '/photo/' . $photo_hash . '-1.' . $ph->getExt(), + 'width' => $ph->getWidth(), + 'height' => $ph->getHeight() + ]; + if (! $r1) { + $errors = true; + } + + if (($width > 640 || $height > 640) && (! $errors)) { + $ph->scaleImage(640); + } + + $p['imgscale'] = 2; + $r2 = $ph->storeThumbnail($p, PHOTO_RES_640); + $url[2] = [ + 'type' => 'Link', + 'rel' => 'alternate', + 'mediaType' => $type, + 'summary' => $alt_desc, + 'href' => z_root() . '/photo/' . $photo_hash . '-2.' . $ph->getExt(), + 'width' => $ph->getWidth(), + 'height' => $ph->getHeight() + ]; + if (! $r2) { + $errors = true; + } + + if (($width > 320 || $height > 320) && (! $errors)) { + $ph->scaleImage(320); + } + + $p['imgscale'] = 3; + $r3 = $ph->storeThumbnail($p, PHOTO_RES_320); + $url[3] = [ + 'type' => 'Link', + 'rel' => 'alternate', + 'mediaType' => $type, + 'summary' => $alt_desc, + 'href' => z_root() . '/photo/' . $photo_hash . '-3.' . $ph->getExt(), + 'width' => $ph->getWidth(), + 'height' => $ph->getHeight() + ]; + if (! $r3) { + $errors = true; + } + + if ($errors) { + q( + "delete from photo where resource_id = '%s' and uid = %d", + dbesc($photo_hash), + intval($channel_id) + ); + $ret['message'] = t('Photo storage failed.'); + logger('Photo store failed.'); + /** + * @hooks photo_upload_end + * Called when a photo upload has been processed. + */ + call_hooks('photo_upload_end', $ret); + return $ret; + } + + $url[] = [ + 'type' => 'Link', + 'rel' => 'about', + 'mediaType' => 'text/html', + 'href' => z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash + ]; + + $item_hidden = (($visible) ? 0 : 1 ); + + $lat = $lon = null; + + if ($exif && Apps::system_app_installed($channel_id, 'Photomap')) { + $gps = null; + if (array_key_exists('GPS', $exif)) { + $gps = $exif['GPS']; + } elseif (array_key_exists('GPSLatitude', $exif)) { + $gps = $exif; + } + if ($gps) { + $lat = getGps($gps['GPSLatitude'], $gps['GPSLatitudeRef']); + $lon = getGps($gps['GPSLongitude'], $gps['GPSLongitudeRef']); + } + } + + $title = ((isset($args['title']) && $args['title']) ? $args['title'] : $args['filename']); + + $desc = htmlspecialchars($alt_desc); + + $found_tags = linkify_tags($args['body'], $channel_id); + + $alt = ' alt="' . $desc . '"' ; + + $scale = 1; + $width = $url[1]['width']; + $height = $url[1]['height']; + $tag = (($r1) ? '[zmg width="' . $width . '" height="' . $height . '"' . $alt . ']' : '[zmg' . $alt . ']'); + + $author_link = '[zrl=' . z_root() . '/channel/' . $channel['channel_address'] . ']' . $channel['channel_name'] . '[/zrl]'; + + $photo_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' . t('a new photo') . '[/zrl]'; + + if (array_path_exists('/directory/hash',$args)) { + $album_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $args['directory']['hash'] . ']' . ((strlen($album)) ? $album : '/') . '[/zrl]'; } else { - $object['to'] = Activity::map_acl(array_merge($ac, ['item_private' => 1 - intval($public) ])); + $album_link = EMPTY_STR; } + $activity_format = sprintf(t('%1$s posted %2$s to %3$s', 'photo_upload'), $author_link, $photo_link, $album_link); - $target = [ - 'type' => 'orderedCollection', - 'name' => ((strlen($album)) ? $album : '/'), - 'id' => z_root() . '/album/' . $channel['channel_address'] . ((isset($args['folder'])) ? '/' . $args['folder'] : EMPTY_STR) - ]; + $body = (($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]'; - $post_tags = []; + // If uploaded into a post, this is the text that is returned to the webapp for inclusion in the post. - if ($found_tags) { - foreach($found_tags as $result) { - $success = $result['success']; - if($success['replaced']) { - $post_tags[] = array( - 'uid' => $channel['channel_id'], - 'ttype' => $success['termtype'], - 'otype' => TERM_OBJ_POST, - 'term' => $success['term'], - 'url' => $success['url'] - ); - } - } - } + $obj_body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' + . $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]' + . '[/zrl]'; - // Create item container - if ($args['item']) { - foreach ($args['item'] as $i) { + $attribution = (($visitor) ? $visitor['xchan_url'] : $channel['xchan_url']); - $item = get_item_elements($i); - $force = false; + // Create item object + $object = [ + 'type' => ACTIVITY_OBJ_PHOTO, + 'name' => $title, + 'summary' => $p['description'], + 'published' => datetime_convert('UTC', 'UTC', $p['created'], ATOM_TIME), + 'updated' => datetime_convert('UTC', 'UTC', $p['edited'], ATOM_TIME), + 'attributedTo' => $attribution, + // This is a placeholder and will get over-ridden by the item mid, which is critical for sharing as a conversational item over activitypub + 'id' => z_root() . '/photo/' . $photo_hash, + 'url' => $url, + 'source' => [ 'content' => $body, 'mediaType' => 'text/x-multicode' ], + 'content' => bbcode($body) + ]; - if($item['mid'] === $item['parent_mid']) { + $public = (($ac['allow_cid'] || $ac['allow_gid'] || $ac['deny_cid'] || $ac['deny_gid']) ? false : true); - $object['id'] = $item['mid']; - $item['summary'] = $summary; - $item['body'] = $body; - $item['mimetype'] = 'text/x-multicode'; - $item['obj_type'] = ACTIVITY_OBJ_PHOTO; - $item['obj'] = json_encode($object); + if ($public) { + $object['to'] = [ ACTIVITY_PUBLIC_INBOX ]; + $object['cc'] = [ z_root() . '/followers/' . $channel['channel_address'] ]; + } else { + $object['to'] = Activity::map_acl(array_merge($ac, ['item_private' => 1 - intval($public) ])); + } - $item['tgt_type'] = 'orderedCollection'; - $item['target'] = json_encode($target); - if ($post_tags) { - $arr['term'] = $post_tags; - } - $force = true; - } - $r = q("select id, edited from item where mid = '%s' and uid = %d limit 1", - dbesc($item['mid']), - intval($channel['channel_id']) - ); - if ($r) { - if (($item['edited'] > $r[0]['edited']) || $force) { - $item['id'] = $r[0]['id']; - $item['uid'] = $channel['channel_id']; - item_store_update($item,false,$deliver); - continue; - } - } - else { - $item['aid'] = $channel['channel_account_id']; - $item['uid'] = $channel['channel_id']; - $item_result = item_store($item,false,$deliver); - } - } - } - else { - - $uuid = new_uuid(); - $mid = z_root() . '/item/' . $uuid; + $target = [ + 'type' => 'orderedCollection', + 'name' => ((strlen($album)) ? $album : '/'), + 'id' => z_root() . '/album/' . $channel['channel_address'] . ((isset($args['folder'])) ? '/' . $args['folder'] : EMPTY_STR) + ]; - $object['id'] = $mid; + $post_tags = []; - $arr = [ - 'aid' => $account_id, - 'uid' => $channel_id, - 'uuid' => $uuid, - 'mid' => $mid, - 'parent_mid' => $mid, - 'created' => $p['created'], - 'edited' => $p['edited'], - 'item_hidden' => $item_hidden, - 'resource_type' => 'photo', - 'resource_id' => $photo_hash, - 'owner_xchan' => $channel['channel_hash'], - 'author_xchan' => $observer['xchan_hash'], - 'title' => $title, - 'allow_cid' => $ac['allow_cid'], - 'allow_gid' => $ac['allow_gid'], - 'deny_cid' => $ac['deny_cid'], - 'deny_gid' => $ac['deny_gid'], - 'verb' => ACTIVITY_POST, - 'obj_type' => ACTIVITY_OBJ_PHOTO, - 'obj' => json_encode($object), - 'tgt_type' => 'orderedCollection', - 'target' => json_encode($target), - 'item_wall' => 1, - 'item_origin' => 1, - 'item_thread_top' => 1, - 'item_private' => intval($acl->is_private()), - 'summary' => $summary, - 'body' => $body - ]; + if ($found_tags) { + foreach ($found_tags as $result) { + $success = $result['success']; + if ($success['replaced']) { + $post_tags[] = array( + 'uid' => $channel['channel_id'], + 'ttype' => $success['termtype'], + 'otype' => TERM_OBJ_POST, + 'term' => $success['term'], + 'url' => $success['url'] + ); + } + } + } - if ($post_tags) { - $arr['term'] = $post_tags; - } + // Create item container + if ($args['item']) { + foreach ($args['item'] as $i) { + $item = get_item_elements($i); + $force = false; - $arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']); + if ($item['mid'] === $item['parent_mid']) { + $object['id'] = $item['mid']; + $item['summary'] = $summary; + $item['body'] = $body; + $item['mimetype'] = 'text/x-multicode'; + $item['obj_type'] = ACTIVITY_OBJ_PHOTO; + $item['obj'] = json_encode($object); - if($lat && $lon) - $arr['coord'] = $lat . ' ' . $lon; + $item['tgt_type'] = 'orderedCollection'; + $item['target'] = json_encode($target); + if ($post_tags) { + $arr['term'] = $post_tags; + } + $force = true; + } + $r = q( + "select id, edited from item where mid = '%s' and uid = %d limit 1", + dbesc($item['mid']), + intval($channel['channel_id']) + ); + if ($r) { + if (($item['edited'] > $r[0]['edited']) || $force) { + $item['id'] = $r[0]['id']; + $item['uid'] = $channel['channel_id']; + item_store_update($item, false, $deliver); + continue; + } + } else { + $item['aid'] = $channel['channel_account_id']; + $item['uid'] = $channel['channel_id']; + $item_result = item_store($item, false, $deliver); + } + } + } else { + $uuid = new_uuid(); + $mid = z_root() . '/item/' . $uuid; - // this one is tricky because the item and the photo have the same permissions, those of the photo. - // Use the channel read_stream permissions to get the correct public_policy for the item and recalculate the - // private flag accordingly. This may cause subtle bugs due to custom permissions roles. We want to use - // public policy when federating items to other sites, but should probably ignore them when accessing the item - // in the photos pages - using the photos permissions instead. We need the public policy to keep the photo - // linked item from leaking into the feed when somebody has a channel with read_stream restrictions. + $object['id'] = $mid; - $arr['public_policy'] = map_scope(PermissionLimits::Get($channel['channel_id'],'view_stream'),true); - if($arr['public_policy']) - $arr['item_private'] = 1; + $arr = [ + 'aid' => $account_id, + 'uid' => $channel_id, + 'uuid' => $uuid, + 'mid' => $mid, + 'parent_mid' => $mid, + 'created' => $p['created'], + 'edited' => $p['edited'], + 'item_hidden' => $item_hidden, + 'resource_type' => 'photo', + 'resource_id' => $photo_hash, + 'owner_xchan' => $channel['channel_hash'], + 'author_xchan' => $observer['xchan_hash'], + 'title' => $title, + 'allow_cid' => $ac['allow_cid'], + 'allow_gid' => $ac['allow_gid'], + 'deny_cid' => $ac['deny_cid'], + 'deny_gid' => $ac['deny_gid'], + 'verb' => ACTIVITY_POST, + 'obj_type' => ACTIVITY_OBJ_PHOTO, + 'obj' => json_encode($object), + 'tgt_type' => 'orderedCollection', + 'target' => json_encode($target), + 'item_wall' => 1, + 'item_origin' => 1, + 'item_thread_top' => 1, + 'item_private' => intval($acl->is_private()), + 'summary' => $summary, + 'body' => $body + ]; + + if ($post_tags) { + $arr['term'] = $post_tags; + } + + $arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']); + + if ($lat && $lon) { + $arr['coord'] = $lat . ' ' . $lon; + } + + // this one is tricky because the item and the photo have the same permissions, those of the photo. + // Use the channel read_stream permissions to get the correct public_policy for the item and recalculate the + // private flag accordingly. This may cause subtle bugs due to custom permissions roles. We want to use + // public policy when federating items to other sites, but should probably ignore them when accessing the item + // in the photos pages - using the photos permissions instead. We need the public policy to keep the photo + // linked item from leaking into the feed when somebody has a channel with read_stream restrictions. + + $arr['public_policy'] = map_scope(PermissionLimits::Get($channel['channel_id'], 'view_stream'), true); + if ($arr['public_policy']) { + $arr['item_private'] = 1; + } - $result = item_store($arr,false,$deliver); - $item_id = $result['item_id']; + $result = item_store($arr, false, $deliver); + $item_id = $result['item_id']; - if($visible && $deliver) - Run::Summon( [ 'Notifier', 'wall-new', $item_id ] ); - } + if ($visible && $deliver) { + Run::Summon([ 'Notifier', 'wall-new', $item_id ]); + } + } - $ret['success'] = true; - $ret['item'] = $arr; - $ret['body'] = $obj_body; - $ret['resource_id'] = $photo_hash; - $ret['photoitem_id'] = $item_id; + $ret['success'] = true; + $ret['item'] = $arr; + $ret['body'] = $obj_body; + $ret['resource_id'] = $photo_hash; + $ret['photoitem_id'] = $item_id; - /** - * @hooks photo_upload_end - * Called when a photo upload has been processed. - */ - call_hooks('photo_upload_end', $ret); + /** + * @hooks photo_upload_end + * Called when a photo upload has been processed. + */ + call_hooks('photo_upload_end', $ret); - return $ret; + return $ret; } -function photo_calculate_scale($arr) { +function photo_calculate_scale($arr) +{ - $max = $arr['max']; - $width = $arr[0]; - $height = $arr[1]; + $max = $arr['max']; + $width = $arr[0]; + $height = $arr[1]; - $dest_width = $dest_height = 0; + $dest_width = $dest_height = 0; - if (! ($width && $height)) { - return false; - } + if (! ($width && $height)) { + return false; + } - if ($width > $max && $height > $max) { + if ($width > $max && $height > $max) { + // very tall image (greater than 16:9) + // constrain the width - let the height float. - // very tall image (greater than 16:9) - // constrain the width - let the height float. + if ((($height * 9) / 16) > $width) { + $dest_width = $max; + $dest_height = intval(( $height * $max ) / $width); + } - if ((($height * 9) / 16) > $width) { - $dest_width = $max; - $dest_height = intval(( $height * $max ) / $width); - } + // else constrain both dimensions - // else constrain both dimensions + elseif ($width > $height) { + $dest_width = $max; + $dest_height = intval(( $height * $max ) / $width); + } else { + $dest_width = intval(( $width * $max ) / $height); + $dest_height = $max; + } + } else { + if ($width > $max) { + $dest_width = $max; + $dest_height = intval(( $height * $max ) / $width); + } else { + if ($height > $max) { + // very tall image (greater than 16:9) + // but width is OK - don't do anything - elseif ($width > $height) { - $dest_width = $max; - $dest_height = intval(( $height * $max ) / $width); - } - else { - $dest_width = intval(( $width * $max ) / $height); - $dest_height = $max; - } - } - else { - if ( $width > $max ) { - $dest_width = $max; - $dest_height = intval(( $height * $max ) / $width); - } - else { - if ( $height > $max ) { + if ((($height * 9) / 16) > $width) { + $dest_width = $width; + $dest_height = $height; + } else { + $dest_width = intval(( $width * $max ) / $height); + $dest_height = $max; + } + } else { + $dest_width = $width; + $dest_height = $height; + } + } + } - // very tall image (greater than 16:9) - // but width is OK - don't do anything - - if ((($height * 9) / 16) > $width) { - $dest_width = $width; - $dest_height = $height; - } - else { - $dest_width = intval(( $width * $max ) / $height); - $dest_height = $max; - } - } - else { - $dest_width = $width; - $dest_height = $height; - } - } - } - - return $dest_width . 'x' . $dest_height; + return $dest_width . 'x' . $dest_height; } /** @@ -659,99 +666,102 @@ function photo_calculate_scale($arr) { * * \e boolean \b success * * \e array \b albums */ -function photos_albums_list($channel, $observer, $sort_key = 'display_path', $direction = 'asc') { +function photos_albums_list($channel, $observer, $sort_key = 'display_path', $direction = 'asc') +{ - $channel_id = $channel['channel_id']; - $observer_xchan = (($observer) ? $observer['xchan_hash'] : ''); + $channel_id = $channel['channel_id']; + $observer_xchan = (($observer) ? $observer['xchan_hash'] : ''); - if (! perm_is_allowed($channel_id, $observer_xchan, 'view_storage')) { - return false; - } + if (! perm_is_allowed($channel_id, $observer_xchan, 'view_storage')) { + return false; + } - $sql_extra = permissions_sql($channel_id,$observer_xchan); + $sql_extra = permissions_sql($channel_id, $observer_xchan); - $sort_key = dbesc($sort_key); - $direction = dbesc($direction); + $sort_key = dbesc($sort_key); + $direction = dbesc($direction); - $r = q("select display_path, hash from attach where is_dir = 1 and uid = %d $sql_extra order by $sort_key $direction", - intval($channel_id) - ); + $r = q( + "select display_path, hash from attach where is_dir = 1 and uid = %d $sql_extra order by $sort_key $direction", + intval($channel_id) + ); - // add a 'root directory' to the results - - array_unshift($r,[ 'display_path' => '/', 'hash' => '' ]); - $str = ids_to_querystr($r,'hash',true); + // add a 'root directory' to the results - $albums = []; + array_unshift($r, [ 'display_path' => '/', 'hash' => '' ]); + $str = ids_to_querystr($r, 'hash', true); - if ($str) { - $x = q("select count( distinct hash ) as total, folder from attach where is_photo = 1 and uid = %d and folder in ( $str ) $sql_extra group by folder ", - intval($channel_id) - ); - if ($x) { - foreach ($r as $rv) { - foreach ($x as $xv) { - if ($xv['folder'] === $rv['hash']) { - if ($xv['total'] != 0 && attach_can_view_folder($channel_id,$observer_xchan,$xv['folder'])) { - $albums[] = [ 'album' => $rv['display_path'], 'folder' => $xv['folder'], 'total' => $xv['total'] ]; - } - continue; - } - } - } - } - } + $albums = []; - // add various encodings to the array so we can just loop through and pick them out in a template + if ($str) { + $x = q( + "select count( distinct hash ) as total, folder from attach where is_photo = 1 and uid = %d and folder in ( $str ) $sql_extra group by folder ", + intval($channel_id) + ); + if ($x) { + foreach ($r as $rv) { + foreach ($x as $xv) { + if ($xv['folder'] === $rv['hash']) { + if ($xv['total'] != 0 && attach_can_view_folder($channel_id, $observer_xchan, $xv['folder'])) { + $albums[] = [ 'album' => $rv['display_path'], 'folder' => $xv['folder'], 'total' => $xv['total'] ]; + } + continue; + } + } + } + } + } - $ret = [ 'success' => false ]; + // add various encodings to the array so we can just loop through and pick them out in a template - if ($albums) { - $ret['success'] = true; - $ret['albums'] = []; - foreach ($albums as $k => $album) { - $entry = [ - 'text' => (($album['album']) ? $album['album'] : '/'), - 'shorttext' => (($album['album']) ? ellipsify($album['album'],28) : '/'), - 'jstext' => (($album['album']) ? addslashes($album['album']) : '/'), - 'total' => $album['total'], - 'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $album['folder'], - 'urlencode' => urlencode($album['album']), - 'bin2hex' => $album['folder'] - ]; - $ret['albums'][] = $entry; - } - } + $ret = [ 'success' => false ]; - App::$data['albums'] = $ret; + if ($albums) { + $ret['success'] = true; + $ret['albums'] = []; + foreach ($albums as $k => $album) { + $entry = [ + 'text' => (($album['album']) ? $album['album'] : '/'), + 'shorttext' => (($album['album']) ? ellipsify($album['album'], 28) : '/'), + 'jstext' => (($album['album']) ? addslashes($album['album']) : '/'), + 'total' => $album['total'], + 'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $album['folder'], + 'urlencode' => urlencode($album['album']), + 'bin2hex' => $album['folder'] + ]; + $ret['albums'][] = $entry; + } + } - return $ret; + App::$data['albums'] = $ret; + + return $ret; } -function photos_album_widget($channelx,$observer,$sortkey = 'display_path',$direction = 'asc') { +function photos_album_widget($channelx, $observer, $sortkey = 'display_path', $direction = 'asc') +{ - $o = EMPTY_STR; + $o = EMPTY_STR; - if (array_key_exists('albums', App::$data)) { - $albums = App::$data['albums']; - } - else { - $albums = photos_albums_list($channelx,$observer,$sortkey,$direction); - } - - if ($albums['success']) { - $o = replace_macros(get_markup_template('photo_albums.tpl'), [ - '$nick' => $channelx['channel_address'], - '$title' => t('Photo Albums'), - '$recent' => t('Recent Photos'), - '$albums' => $albums['albums'], - '$baseurl' => z_root(), - '$upload' => ((perm_is_allowed($channelx['channel_id'],(($observer) ? $observer['xchan_hash'] : ''),'write_storage')) - ? t('Upload New Photos') : '') - ]); - } + if (array_key_exists('albums', App::$data)) { + $albums = App::$data['albums']; + } else { + $albums = photos_albums_list($channelx, $observer, $sortkey, $direction); + } - return $o; + if ($albums['success']) { + $o = replace_macros(get_markup_template('photo_albums.tpl'), [ + '$nick' => $channelx['channel_address'], + '$title' => t('Photo Albums'), + '$recent' => t('Recent Photos'), + '$albums' => $albums['albums'], + '$baseurl' => z_root(), + '$upload' => ((perm_is_allowed($channelx['channel_id'], (($observer) ? $observer['xchan_hash'] : ''), 'write_storage')) + ? t('Upload New Photos') : '') + ]); + } + + return $o; } /** @@ -760,40 +770,42 @@ function photos_album_widget($channelx,$observer,$sortkey = 'display_path',$dire * @param array $channel * @param array $observer * @param string $album (optional) default empty - * @return boolean|array + * @return bool|array */ -function photos_list_photos($channel, $observer, $album = '') { +function photos_list_photos($channel, $observer, $album = '') +{ - $channel_id = $channel['channel_id']; - $observer_xchan = (($observer) ? $observer['xchan_hash'] : ''); + $channel_id = $channel['channel_id']; + $observer_xchan = (($observer) ? $observer['xchan_hash'] : ''); - if (! perm_is_allowed($channel_id,$observer_xchan,'view_storage')) { - return false; - } + if (! perm_is_allowed($channel_id, $observer_xchan, 'view_storage')) { + return false; + } - $sql_extra = permissions_sql($channel_id); + $sql_extra = permissions_sql($channel_id); - if ($album) { - $sql_extra .= " and album = '" . protect_sprintf(dbesc($album)) . "' "; - } - - $ret = [ 'success' => false ]; + if ($album) { + $sql_extra .= " and album = '" . protect_sprintf(dbesc($album)) . "' "; + } - $r = q("select resource_id, created, edited, title, description, album, filename, mimetype, height, width, filesize, imgscale, photo_usage, allow_cid, allow_gid, deny_cid, deny_gid from photo where uid = %d and photo_usage in ( %d, %d ) $sql_extra ", - intval($channel_id), - intval(PHOTO_NORMAL), - intval(PHOTO_PROFILE) - ); + $ret = [ 'success' => false ]; - if ($r) { - for ($x = 0; $x < count($r); $x ++) { - $r[$x]['src'] = z_root() . '/photo/' . $r[$x]['resource_id'] . '-' . $r[$x]['imgscale']; - } - $ret['success'] = true; - $ret['photos'] = $r; - } + $r = q( + "select resource_id, created, edited, title, description, album, filename, mimetype, height, width, filesize, imgscale, photo_usage, allow_cid, allow_gid, deny_cid, deny_gid from photo where uid = %d and photo_usage in ( %d, %d ) $sql_extra ", + intval($channel_id), + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE) + ); - return $ret; + if ($r) { + for ($x = 0; $x < count($r); $x++) { + $r[$x]['src'] = z_root() . '/photo/' . $r[$x]['resource_id'] . '-' . $r[$x]['imgscale']; + } + $ret['success'] = true; + $ret['photos'] = $r; + } + + return $ret; } /** @@ -802,18 +814,20 @@ function photos_list_photos($channel, $observer, $album = '') { * @param int $channel_id id of the channel * @param string $observer_hash * @param string $album name of the album - * @return boolean + * @return bool */ -function photos_album_exists($channel_id, $observer_hash, $album) { +function photos_album_exists($channel_id, $observer_hash, $album) +{ - $sql_extra = permissions_sql($channel_id, $observer_hash); + $sql_extra = permissions_sql($channel_id, $observer_hash); - $r = q("SELECT folder, hash, is_dir, filename, os_path, display_path FROM attach WHERE hash = '%s' AND is_dir = 1 AND uid = %d $sql_extra limit 1", - dbesc($album), - intval($channel_id) - ); + $r = q( + "SELECT folder, hash, is_dir, filename, os_path, display_path FROM attach WHERE hash = '%s' AND is_dir = 1 AND uid = %d $sql_extra limit 1", + dbesc($album), + intval($channel_id) + ); - return (($r) ? array_shift($r) : false); + return (($r) ? array_shift($r) : false); } /** @@ -826,12 +840,14 @@ function photos_album_exists($channel_id, $observer_hash, $album) { * @param string $newname The new name of the album * @return bool|array */ -function photos_album_rename($channel_id, $oldname, $newname) { - return q("UPDATE photo SET album = '%s' WHERE album = '%s' AND uid = %d", - dbesc($newname), - dbesc($oldname), - intval($channel_id) - ); +function photos_album_rename($channel_id, $oldname, $newname) +{ + return q( + "UPDATE photo SET album = '%s' WHERE album = '%s' AND uid = %d", + dbesc($newname), + dbesc($oldname), + intval($channel_id) + ); } /** @@ -842,45 +858,50 @@ function photos_album_rename($channel_id, $oldname, $newname) { * @param int $channel_id * @param string $album * @param string $remote_xchan (optional) default empty - * @return string|boolean + * @return string|bool */ -function photos_album_get_db_idstr($channel_id, $album, $remote_xchan = '') { +function photos_album_get_db_idstr($channel_id, $album, $remote_xchan = '') +{ - if($remote_xchan) { - $r = q("SELECT hash from attach where creator = '%s' and uid = %d and folder = '%s' ", - dbesc($remote_xchan), - intval($channel_id), - dbesc($album) - ); - } - else { - $r = q("SELECT hash from attach where uid = %d and folder = '%s' ", - intval($channel_id), - dbesc($album) - ); - } - if ($r) { - return ids_to_querystr($r,'hash',true); - } + if ($remote_xchan) { + $r = q( + "SELECT hash from attach where creator = '%s' and uid = %d and folder = '%s' ", + dbesc($remote_xchan), + intval($channel_id), + dbesc($album) + ); + } else { + $r = q( + "SELECT hash from attach where uid = %d and folder = '%s' ", + intval($channel_id), + dbesc($album) + ); + } + if ($r) { + return ids_to_querystr($r, 'hash', true); + } - return false; + return false; } -function photos_album_get_db_idstr_admin($channel_id, $album) { +function photos_album_get_db_idstr_admin($channel_id, $album) +{ - if(! is_site_admin()) - return false; + if (! is_site_admin()) { + return false; + } - $r = q("SELECT hash from attach where uid = %d and folder = '%s' ", - intval($channel_id), - dbesc($album) - ); + $r = q( + "SELECT hash from attach where uid = %d and folder = '%s' ", + intval($channel_id), + dbesc($album) + ); - if ($r) { - return ids_to_querystr($r,'hash',true); - } + if ($r) { + return ids_to_querystr($r, 'hash', true); + } - return false; + return false; } @@ -891,115 +912,127 @@ function photos_album_get_db_idstr_admin($channel_id, $album) { * @param array $channel * @param string $creator_hash * @param array $photo - * @param boolean $visible (optional) default false + * @param bool $visible (optional) default false * @return int item_id */ -function photos_create_item($channel, $creator_hash, $photo, $visible = false) { +function photos_create_item($channel, $creator_hash, $photo, $visible = false) +{ - // Create item container + // Create item container - $item_hidden = (($visible) ? 0 : 1 ); + $item_hidden = (($visible) ? 0 : 1 ); - $uuid = new_uuid(); - $mid = z_root() . '/item/' . $uuid; + $uuid = new_uuid(); + $mid = z_root() . '/item/' . $uuid; - $arr = []; + $arr = []; - $arr['aid'] = $channel['channel_account_id']; - $arr['uid'] = $channel['channel_id']; - $arr['uuid'] = $uuid; - $arr['mid'] = $mid; - $arr['parent_mid'] = $mid; - $arr['item_wall'] = 1; - $arr['item_origin'] = 1; - $arr['item_thread_top'] = 1; - $arr['item_hidden'] = $item_hidden; - $arr['resource_type'] = 'photo'; - $arr['resource_id'] = $photo['resource_id']; - $arr['owner_xchan'] = $channel['channel_hash']; - $arr['author_xchan'] = $creator_hash; + $arr['aid'] = $channel['channel_account_id']; + $arr['uid'] = $channel['channel_id']; + $arr['uuid'] = $uuid; + $arr['mid'] = $mid; + $arr['parent_mid'] = $mid; + $arr['item_wall'] = 1; + $arr['item_origin'] = 1; + $arr['item_thread_top'] = 1; + $arr['item_hidden'] = $item_hidden; + $arr['resource_type'] = 'photo'; + $arr['resource_id'] = $photo['resource_id']; + $arr['owner_xchan'] = $channel['channel_hash']; + $arr['author_xchan'] = $creator_hash; - $arr['allow_cid'] = $photo['allow_cid']; - $arr['allow_gid'] = $photo['allow_gid']; - $arr['deny_cid'] = $photo['deny_cid']; - $arr['deny_gid'] = $photo['deny_gid']; + $arr['allow_cid'] = $photo['allow_cid']; + $arr['allow_gid'] = $photo['allow_gid']; + $arr['deny_cid'] = $photo['deny_cid']; + $arr['deny_gid'] = $photo['deny_gid']; - $arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']); + $arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']); - $arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' - . '[zmg]' . z_root() . '/photo/' . $photo['resource_id'] . '-' . $photo['imgscale'] . '[/zmg]' - . '[/zrl]'; + $arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' + . '[zmg]' . z_root() . '/photo/' . $photo['resource_id'] . '-' . $photo['imgscale'] . '[/zmg]' + . '[/zrl]'; - $result = item_store($arr); - $item_id = $result['item_id']; + $result = item_store($arr); + $item_id = $result['item_id']; - return $item_id; + return $item_id; } -function getGps($exifCoord, $hemi) { +function getGps($exifCoord, $hemi) +{ - $degrees = count($exifCoord) > 0 ? gps2Num($exifCoord[0]) : 0; - $minutes = count($exifCoord) > 1 ? gps2Num($exifCoord[1]) : 0; - $seconds = count($exifCoord) > 2 ? gps2Num($exifCoord[2]) : 0; + $degrees = count($exifCoord) > 0 ? gps2Num($exifCoord[0]) : 0; + $minutes = count($exifCoord) > 1 ? gps2Num($exifCoord[1]) : 0; + $seconds = count($exifCoord) > 2 ? gps2Num($exifCoord[2]) : 0; - $flip = ($hemi == 'W' or $hemi == 'S') ? -1 : 1; + $flip = ($hemi == 'W' or $hemi == 'S') ? -1 : 1; - return floatval($flip * ($degrees + ($minutes / 60) + ($seconds / 3600))); + return floatval($flip * ($degrees + ($minutes / 60) + ($seconds / 3600))); } -function getGpstimestamp($exifCoord) { +function getGpstimestamp($exifCoord) +{ - $hours = count($exifCoord) > 0 ? gps2Num($exifCoord[0]) : 0; - $minutes = count($exifCoord) > 1 ? gps2Num($exifCoord[1]) : 0; - $seconds = count($exifCoord) > 2 ? gps2Num($exifCoord[2]) : 0; + $hours = count($exifCoord) > 0 ? gps2Num($exifCoord[0]) : 0; + $minutes = count($exifCoord) > 1 ? gps2Num($exifCoord[1]) : 0; + $seconds = count($exifCoord) > 2 ? gps2Num($exifCoord[2]) : 0; - return sprintf('%02d:%02d:%02d', $hours, $minutes, $seconds); + return sprintf('%02d:%02d:%02d', $hours, $minutes, $seconds); } -function gps2Num($coordPart) { +function gps2Num($coordPart) +{ - $parts = explode('/', $coordPart); + $parts = explode('/', $coordPart); - if (count($parts) <= 0) - return 0; + if (count($parts) <= 0) { + return 0; + } - if (count($parts) == 1) - return $parts[0]; + if (count($parts) == 1) { + return $parts[0]; + } - return floatval($parts[0]) / floatval($parts[1]); + return floatval($parts[0]) / floatval($parts[1]); } -function photo_profile_setperms($channel_id,$resource_id,$profile_id) { +function photo_profile_setperms($channel_id, $resource_id, $profile_id) +{ - if(! $profile_id) - return; + if (! $profile_id) { + return; + } - $r = q("select profile_guid, is_default from profile where id = %d and uid = %d limit 1", - dbesc($profile_id), - intval($channel_id) - ); + $r = q( + "select profile_guid, is_default from profile where id = %d and uid = %d limit 1", + dbesc($profile_id), + intval($channel_id) + ); - if(! $r) - return; + if (! $r) { + return; + } - $is_default = $r[0]['is_default']; - $profile_guid = $r[0]['profile_guid']; + $is_default = $r[0]['is_default']; + $profile_guid = $r[0]['profile_guid']; - if($is_default) { - $r = q("update photo set allow_cid = '', allow_gid = '', deny_cid = '', deny_gid = '' + if ($is_default) { + $r = q( + "update photo set allow_cid = '', allow_gid = '', deny_cid = '', deny_gid = '' where resource_id = '%s' and uid = %d", - dbesc($resource_id), - intval($channel_id) - ); - $r = q("update attach set allow_cid = '', allow_gid = '', deny_cid = '', deny_gid = '' + dbesc($resource_id), + intval($channel_id) + ); + $r = q( + "update attach set allow_cid = '', allow_gid = '', deny_cid = '', deny_gid = '' where hash = '%s' and uid = %d", - dbesc($resource_id), - intval($channel_id) - ); - } + dbesc($resource_id), + intval($channel_id) + ); + } } /** @@ -1008,85 +1041,93 @@ function photo_profile_setperms($channel_id,$resource_id,$profile_id) { * @param int $uid * @param int|string $profileid */ -function profile_photo_set_profile_perms($uid, $profileid = 0) { +function profile_photo_set_profile_perms($uid, $profileid = 0) +{ - $allowcid = ''; + $allowcid = ''; - if($profileid) { - $r = q("SELECT photo, profile_guid, id, is_default, uid + if ($profileid) { + $r = q( + "SELECT photo, profile_guid, id, is_default, uid FROM profile WHERE uid = %d and ( profile.id = %d OR profile.profile_guid = '%s') LIMIT 1", - intval($uid), - intval($profileid), - dbesc($profileid) - ); - } - else { - logger('Resetting permissions on default-profile-photo for user ' . $uid); + intval($uid), + intval($profileid), + dbesc($profileid) + ); + } else { + logger('Resetting permissions on default-profile-photo for user ' . $uid); - $r = q("SELECT photo, profile_guid, id, is_default, uid FROM profile + $r = q( + "SELECT photo, profile_guid, id, is_default, uid FROM profile WHERE profile.uid = %d AND is_default = 1 LIMIT 1", - intval($uid) - ); //If no profile is given, we update the default profile - } - if(! $r) - return; + intval($uid) + ); //If no profile is given, we update the default profile + } + if (! $r) { + return; + } - $profile = $r[0]; + $profile = $r[0]; - if($profile['id'] && $profile['photo']) { - preg_match("@\w*(?=-\d*$)@i", $profile['photo'], $resource_id); - $resource_id = $resource_id[0]; + if ($profile['id'] && $profile['photo']) { + preg_match("@\w*(?=-\d*$)@i", $profile['photo'], $resource_id); + $resource_id = $resource_id[0]; - if (! intval($profile['is_default'])) { - $r0 = q("SELECT channel_hash FROM channel WHERE channel_id = %d LIMIT 1", - intval($uid) - ); - //Should not be needed in future. Catches old int-profile-ids. - $r1 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%d' ", - intval($profile['id']) - ); - $r2 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%s'", - dbesc($profile['profile_guid']) - ); - $allowcid = "<" . $r0[0]['channel_hash'] . ">"; - foreach ($r1 as $entry) { - $allowcid .= "<" . $entry['abook_xchan'] . ">"; - } - foreach ($r2 as $entry) { - $allowcid .= "<" . $entry['abook_xchan'] . ">"; - } + if (! intval($profile['is_default'])) { + $r0 = q( + "SELECT channel_hash FROM channel WHERE channel_id = %d LIMIT 1", + intval($uid) + ); + //Should not be needed in future. Catches old int-profile-ids. + $r1 = q( + "SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%d' ", + intval($profile['id']) + ); + $r2 = q( + "SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%s'", + dbesc($profile['profile_guid']) + ); + $allowcid = "<" . $r0[0]['channel_hash'] . ">"; + foreach ($r1 as $entry) { + $allowcid .= "<" . $entry['abook_xchan'] . ">"; + } + foreach ($r2 as $entry) { + $allowcid .= "<" . $entry['abook_xchan'] . ">"; + } - q("UPDATE photo SET allow_cid = '%s' WHERE resource_id = '%s' AND uid = %d", - dbesc($allowcid), - dbesc($resource_id), - intval($uid) - ); - } - else { - // Reset permissions on default profile picture to public - q("UPDATE photo SET allow_cid = '' WHERE photo_usage = %d AND uid = %d", - intval(PHOTO_PROFILE), - intval($uid) - ); - } - } + q( + "UPDATE photo SET allow_cid = '%s' WHERE resource_id = '%s' AND uid = %d", + dbesc($allowcid), + dbesc($resource_id), + intval($uid) + ); + } else { + // Reset permissions on default profile picture to public + q( + "UPDATE photo SET allow_cid = '' WHERE photo_usage = %d AND uid = %d", + intval(PHOTO_PROFILE), + intval($uid) + ); + } + } } -function fetch_image_from_url($url,&$mimetype) { +function fetch_image_from_url($url, &$mimetype) +{ - $redirects = 0; - $x = z_fetch_url($url,true,$redirects,[ 'novalidate' => true ]); - if($x['success']) { - $ht = new HTTPHeaders($x['header']); - $hdrs = $ht->fetcharr(); - if ($hdrs && array_key_exists('content-type', $hdrs)) { - $mimetype = $hdrs['content-type']; - } + $redirects = 0; + $x = z_fetch_url($url, true, $redirects, [ 'novalidate' => true ]); + if ($x['success']) { + $ht = new HTTPHeaders($x['header']); + $hdrs = $ht->fetcharr(); + if ($hdrs && array_key_exists('content-type', $hdrs)) { + $mimetype = $hdrs['content-type']; + } - return $x['body']; - } + return $x['body']; + } - return EMPTY_STR; + return EMPTY_STR; } @@ -1128,4 +1169,3 @@ function isAnimatedGif($fileName) return $totalCount > 1; } - diff --git a/include/security.php b/include/security.php index 817b2cb86..bdf87c73e 100644 --- a/include/security.php +++ b/include/security.php @@ -1,4 +1,5 @@ $atoken['atoken_id'], - 'xchan_hash' => substr($c['channel_hash'],0,16) . '.' . $atoken['atoken_guid'], - 'xchan_name' => $atoken['atoken_name'], - 'xchan_addr' => 'guest:' . $atoken['atoken_name'] . '@' . App::get_hostname(), - 'xchan_network' => 'token', - 'xchan_url' => z_root() . '/guest/' . substr($c['channel_hash'],0,16) . '.' . $atoken['atoken_guid'], - 'xchan_hidden' => 1, - 'xchan_photo_mimetype' => 'image/png', - 'xchan_photo_l' => z_root() . '/' . get_default_profile_photo(300), - 'xchan_photo_m' => z_root() . '/' . get_default_profile_photo(80), - 'xchan_photo_s' => z_root() . '/' . get_default_profile_photo(48) - ]; - } + $c = channelx_by_n($atoken['atoken_uid']); + if ($c) { + return [ + 'atoken_id' => $atoken['atoken_id'], + 'xchan_hash' => substr($c['channel_hash'], 0, 16) . '.' . $atoken['atoken_guid'], + 'xchan_name' => $atoken['atoken_name'], + 'xchan_addr' => 'guest:' . $atoken['atoken_name'] . '@' . App::get_hostname(), + 'xchan_network' => 'token', + 'xchan_url' => z_root() . '/guest/' . substr($c['channel_hash'], 0, 16) . '.' . $atoken['atoken_guid'], + 'xchan_hidden' => 1, + 'xchan_photo_mimetype' => 'image/png', + 'xchan_photo_l' => z_root() . '/' . get_default_profile_photo(300), + 'xchan_photo_m' => z_root() . '/' . get_default_profile_photo(80), + 'xchan_photo_s' => z_root() . '/' . get_default_profile_photo(48) + ]; + } - return null; + return null; } -function atoken_delete($atoken_id) { +function atoken_delete($atoken_id) +{ - $r = q("select * from atoken where atoken_id = %d", - intval($atoken_id) - ); - if (! $r) { - return; - } + $r = q( + "select * from atoken where atoken_id = %d", + intval($atoken_id) + ); + if (! $r) { + return; + } - $c = q("select channel_id, channel_hash from channel where channel_id = %d", - intval($r[0]['atoken_uid']) - ); - if (! $c) { - return; - } + $c = q( + "select channel_id, channel_hash from channel where channel_id = %d", + intval($r[0]['atoken_uid']) + ); + if (! $c) { + return; + } - $atoken_xchan = substr($c[0]['channel_hash'],0,16) . '.' . $r[0]['atoken_guid']; + $atoken_xchan = substr($c[0]['channel_hash'], 0, 16) . '.' . $r[0]['atoken_guid']; - q("delete from atoken where atoken_id = %d", - intval($atoken_id) - ); - q("delete from abook where abook_channel = %d and abook_xchan = '%s'", - intval($c[0]['channel_id']), - dbesc($atoken_xchan) - ); - - q("delete from abconfig where chan = %d and xchan = '%s'", - intval($c[0]['channel_id']), - dbesc($atoken_xchan) - ); + q( + "delete from atoken where atoken_id = %d", + intval($atoken_id) + ); + q( + "delete from abook where abook_channel = %d and abook_xchan = '%s'", + intval($c[0]['channel_id']), + dbesc($atoken_xchan) + ); + + q( + "delete from abconfig where chan = %d and xchan = '%s'", + intval($c[0]['channel_id']), + dbesc($atoken_xchan) + ); } /** @@ -180,72 +193,81 @@ function atoken_delete($atoken_id) { * @fixme we should set xchan_deleted if it's expired or removed * * @param array $xchan - * @return void|boolean + * @return void|bool */ -function atoken_create_xchan($xchan) { +function atoken_create_xchan($xchan) +{ - $r = q("select xchan_hash from xchan where xchan_hash = '%s'", - dbesc($xchan['xchan_hash']) - ); - if ($r) { - return; - } - - $xchan['xchan_guid'] = $xchan['xchan_hash']; + $r = q( + "select xchan_hash from xchan where xchan_hash = '%s'", + dbesc($xchan['xchan_hash']) + ); + if ($r) { + return; + } - $store = []; - foreach ($xchan as $k => $v) { - if (strpos($k,'xchan_') === 0) { - $store[$k] = $v; - } - } - - $r = xchan_store_lowlevel($store); + $xchan['xchan_guid'] = $xchan['xchan_hash']; - return true; + $store = []; + foreach ($xchan as $k => $v) { + if (strpos($k, 'xchan_') === 0) { + $store[$k] = $v; + } + } + + $r = xchan_store_lowlevel($store); + + return true; } -function atoken_abook($uid,$xchan_hash) { +function atoken_abook($uid, $xchan_hash) +{ - if(substr($xchan_hash,16,1) != '.') - return false; + if (substr($xchan_hash, 16, 1) != '.') { + return false; + } - $r = q("select channel_hash from channel where channel_id = %d limit 1", - intval($uid) - ); + $r = q( + "select channel_hash from channel where channel_id = %d limit 1", + intval($uid) + ); - if(! $r) - return false; + if (! $r) { + return false; + } - $x = q("select * from atoken where atoken_uid = %d and atoken_guid = '%s'", - intval($uid), - dbesc(substr($xchan_hash,17)) - ); + $x = q( + "select * from atoken where atoken_uid = %d and atoken_guid = '%s'", + intval($uid), + dbesc(substr($xchan_hash, 17)) + ); - if($x) { - $xchan = atoken_xchan($x[0]); - $xchan['abook_blocked'] = 0; - $xchan['abook_ignored'] = 0; - $xchan['abook_pending'] = 0; - return $xchan; - } + if ($x) { + $xchan = atoken_xchan($x[0]); + $xchan['abook_blocked'] = 0; + $xchan['abook_ignored'] = 0; + $xchan['abook_pending'] = 0; + return $xchan; + } - return false; + return false; } -function pseudo_abook($xchan) { - if(! $xchan) - return false; +function pseudo_abook($xchan) +{ + if (! $xchan) { + return false; + } - // set abook_pseudo to flag that we aren't really connected. + // set abook_pseudo to flag that we aren't really connected. - $xchan['abook_pseudo'] = 1; - $xchan['abook_blocked'] = 0; - $xchan['abook_ignored'] = 0; - $xchan['abook_pending'] = 0; + $xchan['abook_pseudo'] = 1; + $xchan['abook_blocked'] = 0; + $xchan['abook_ignored'] = 0; + $xchan['abook_pending'] = 0; - return $xchan; + return $xchan; } @@ -256,61 +278,65 @@ function pseudo_abook($xchan) { * * @return bool|array false or channel record of the new channel */ -function change_channel($change_channel) { +function change_channel($change_channel) +{ - $ret = false; + $ret = false; - if($change_channel) { + if ($change_channel) { + $r = q( + "select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel_id = %d and channel_account_id = %d and channel_removed = 0 limit 1", + intval($change_channel), + intval(get_account_id()) + ); - $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel_id = %d and channel_account_id = %d and channel_removed = 0 limit 1", - intval($change_channel), - intval(get_account_id()) - ); + // It's not there. Is this an administrator, and is this the sys channel? + if (! $r) { + if (is_developer() || is_site_admin()) { + $r = q( + "select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel_id = %d and channel_system = 1 and channel_removed = 0 limit 1", + intval($change_channel) + ); + } + } - // It's not there. Is this an administrator, and is this the sys channel? - if (! $r) { - if (is_developer() || is_site_admin()) { - $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel_id = %d and channel_system = 1 and channel_removed = 0 limit 1", - intval($change_channel) - ); - } - } + if ($r) { + $hash = $r[0]['channel_hash']; + $_SESSION['uid'] = intval($r[0]['channel_id']); + App::set_channel($r[0]); + $_SESSION['theme'] = $r[0]['channel_theme']; + $_SESSION['mobile_theme'] = get_pconfig(local_channel(), 'system', 'mobile_theme'); + $_SESSION['cloud_tiles'] = get_pconfig(local_channel(), 'system', 'cloud_tiles'); + date_default_timezone_set($r[0]['channel_timezone']); - if($r) { - $hash = $r[0]['channel_hash']; - $_SESSION['uid'] = intval($r[0]['channel_id']); - App::set_channel($r[0]); - $_SESSION['theme'] = $r[0]['channel_theme']; - $_SESSION['mobile_theme'] = get_pconfig(local_channel(),'system', 'mobile_theme'); - $_SESSION['cloud_tiles'] = get_pconfig(local_channel(),'system', 'cloud_tiles'); - date_default_timezone_set($r[0]['channel_timezone']); + // Update the active timestamp at most once a day - // Update the active timestamp at most once a day + if (substr($r[0]['channel_active'], 0, 10) !== substr(datetime_convert(), 0, 10) && (! (isset($_SESSION['sudo']) && $_SESSION['sudo']))) { + $z = q( + "UPDATE channel SET channel_active = '%s' WHERE channel_id = %d", + dbesc(datetime_convert()), + intval($r[0]['channel_id']) + ); + } + $ret = $r[0]; + } + $x = xchan_match([ 'xchan_hash' => $hash ]); + if ($x) { + $_SESSION['my_url'] = $x['xchan_url']; + $_SESSION['my_address'] = channel_reddress($r[0]); - if(substr($r[0]['channel_active'],0,10) !== substr(datetime_convert(),0,10) && (! (isset($_SESSION['sudo']) && $_SESSION['sudo']))) { - $z = q("UPDATE channel SET channel_active = '%s' WHERE channel_id = %d", - dbesc(datetime_convert()), - intval($r[0]['channel_id']) - ); - } - $ret = $r[0]; - } - $x = xchan_match([ 'xchan_hash' => $hash ]); - if($x) { - $_SESSION['my_url'] = $x['xchan_url']; - $_SESSION['my_address'] = channel_reddress($r[0]); + App::set_observer($x); + App::set_perms(get_all_perms(local_channel(), $hash)); + } + if (! is_dir('store/' . $r[0]['channel_address'])) { + @os_mkdir('store/' . $r[0]['channel_address'], STORAGE_DEFAULT_PERMISSIONS, true); + } - App::set_observer($x); - App::set_perms(get_all_perms(local_channel(), $hash)); - } - if(! is_dir('store/' . $r[0]['channel_address'])) - @os_mkdir('store/' . $r[0]['channel_address'], STORAGE_DEFAULT_PERMISSIONS,true); + $arr = [ 'channel_id' => $change_channel, 'chanx' => $ret ]; + call_hooks('change_channel', $arr); + } - $arr = [ 'channel_id' => $change_channel, 'chanx' => $ret ]; - call_hooks('change_channel', $arr); - } - - return $ret; + return $ret; } /** @@ -324,110 +350,107 @@ function change_channel($change_channel) { */ -function permissions_sql($owner_id, $remote_observer = null, $table = '', $token = EMPTY_STR) { +function permissions_sql($owner_id, $remote_observer = null, $table = '', $token = EMPTY_STR) +{ - $local_channel = local_channel(); + $local_channel = local_channel(); - /** - * Construct permissions - * - * default permissions - anonymous user - */ + /** + * Construct permissions + * + * default permissions - anonymous user + */ - if ($table) - $table .= '.'; + if ($table) { + $table .= '.'; + } - $sql = " AND {$table}allow_cid = '' + $sql = " AND {$table}allow_cid = '' AND {$table}allow_gid = '' AND {$table}deny_cid = '' AND {$table}deny_gid = '' "; - /** - * Profile owner - everything is visible - */ + /** + * Profile owner - everything is visible + */ - if (($local_channel) && ($local_channel == $owner_id)) { - return EMPTY_STR; - } + if (($local_channel) && ($local_channel == $owner_id)) { + return EMPTY_STR; + } - /** - * Authenticated visitor. - */ + /** + * Authenticated visitor. + */ - else { + else { + $observer = ((! is_null($remote_observer)) ? $remote_observer : get_observer_hash()); - $observer = ((! is_null($remote_observer)) ? $remote_observer : get_observer_hash()); + if ($observer) { + $sec = get_security_ids($owner_id, $observer); - if ($observer) { + if ($token) { + if (! array_key_exists('allow_cid', $sec)) { + $sec['allow_cid'] = []; + } + $sec['allow_cid'][] = 'token:' . $token; + } - $sec = get_security_ids($owner_id,$observer); + // always allow the channel owner, even if authenticated as a visitor - if ($token) { - if (! array_key_exists('allow_cid',$sec)) { - $sec['allow_cid'] = []; - } - $sec['allow_cid'][] = 'token:' . $token; - } + if ($sec['channel_id']) { + foreach ($sec['channel_id'] as $ch) { + if ($observer === $ch) { + return EMPTY_STR; + } + } + } - // always allow the channel owner, even if authenticated as a visitor + if (is_array($sec['allow_cid']) && count($sec['allow_cid'])) { + $ca = []; + foreach ($sec['allow_cid'] as $c) { + $ca[] = '<' . $c . '>'; + } + $cs = implode('|', $ca); + } else { + $cs = '<<>>'; // should be impossible to match + } - if ($sec['channel_id']) { - foreach ($sec['channel_id'] as $ch) { - if ($observer === $ch) { - return EMPTY_STR; - } - } - } + if (is_array($sec['allow_gid']) && count($sec['allow_gid'])) { + $ga = []; + foreach ($sec['allow_gid'] as $g) { + $ga[] = '<' . $g . '>'; + } + $gs = implode('|', $ga); + } else { + $gs = '<<>>'; // should be impossible to match + } - if (is_array($sec['allow_cid']) && count($sec['allow_cid'])) { - $ca = []; - foreach ($sec['allow_cid'] as $c) { - $ca[] = '<' . $c . '>'; - } - $cs = implode('|',$ca); - } - else { - $cs = '<<>>'; // should be impossible to match - } - - if (is_array($sec['allow_gid']) && count($sec['allow_gid'])) { - $ga = []; - foreach ($sec['allow_gid'] as $g) { - $ga[] = '<' . $g . '>'; - } - $gs = implode('|',$ga); - } - else { - $gs = '<<>>'; // should be impossible to match - } - - $regexop = db_getfunc('REGEXP'); - $sql = sprintf( - " AND ( NOT ({$table}deny_cid $regexop '%s' OR {$table}deny_gid $regexop '%s') + $regexop = db_getfunc('REGEXP'); + $sql = sprintf( + " AND ( NOT ({$table}deny_cid $regexop '%s' OR {$table}deny_gid $regexop '%s') AND ( {$table}allow_cid $regexop '%s' OR {$table}allow_gid $regexop '%s' OR ( {$table}allow_cid = '' AND {$table}allow_gid = '') ) ) ", - dbesc($cs), - dbesc($gs), - dbesc($cs), - dbesc($gs) - ); - } + dbesc($cs), + dbesc($gs), + dbesc($cs), + dbesc($gs) + ); + } - /* - * OCAP token access - */ - - elseif ($token) { - $sql = " and ( {$table}allow_cid like '" . protect_sprintf('%System Unavailable @@ -13,5 +14,4 @@ Apologies but this site is unavailable at the moment. Please try again later. EOT; - -} \ No newline at end of file +} diff --git a/include/taxonomy.php b/include/taxonomy.php index 230e4cfcb..549e021a2 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -1,689 +1,755 @@ -','[',']'),array('%3c','%3e','%5b','%5d'),$s); +function file_tag_encode($s) +{ + return str_replace(array('<','>','[',']'), array('%3c','%3e','%5b','%5d'), $s); } -function file_tag_decode($s) { - return str_replace(array('%3c','%3e','%5b','%5d'),array('<','>','[',']'),$s); +function file_tag_decode($s) +{ + return str_replace(array('%3c','%3e','%5b','%5d'), array('<','>','[',']'), $s); } -function file_tag_file_query($table,$s,$type = 'file') { +function file_tag_file_query($table, $s, $type = 'file') +{ - if($type == 'file') - $termtype = TERM_FILE; - else - $termtype = TERM_CATEGORY; + if ($type == 'file') { + $termtype = TERM_FILE; + } else { + $termtype = TERM_CATEGORY; + } - return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.ttype = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", - intval($termtype), - protect_sprintf(dbesc($s)) - ); + return sprintf( + " AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.ttype = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", + intval($termtype), + protect_sprintf(dbesc($s)) + ); } -function term_query($table,$s,$type = TERM_UNKNOWN, $type2 = '') { +function term_query($table, $s, $type = TERM_UNKNOWN, $type2 = '') +{ - if($type2) { - return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.ttype in (%d, %d) and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", - intval($type), - intval($type2), - protect_sprintf(dbesc($s)) - ); - } - else { - return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.ttype = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", - intval($type), - protect_sprintf(dbesc($s)) - ); - } + if ($type2) { + return sprintf( + " AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.ttype in (%d, %d) and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", + intval($type), + intval($type2), + protect_sprintf(dbesc($s)) + ); + } else { + return sprintf( + " AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.ttype = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", + intval($type), + protect_sprintf(dbesc($s)) + ); + } } -function term_item_parent_query($uid,$table,$s,$type = TERM_UNKNOWN, $type2 = '') { +function term_item_parent_query($uid, $table, $s, $type = TERM_UNKNOWN, $type2 = '') +{ - // Allow asterisks for wildcard search - // In theory this means '%' will also do a wildcard search, but there appear to be multiple escape - // issues with '%' in term names and trying to fix this with '\\%' here did not help. - // Ideally I think we want '*' to indicate wildcards and allow '%' literally in names, but that is being - // left for another developer on another day. + // Allow asterisks for wildcard search + // In theory this means '%' will also do a wildcard search, but there appear to be multiple escape + // issues with '%' in term names and trying to fix this with '\\%' here did not help. + // Ideally I think we want '*' to indicate wildcards and allow '%' literally in names, but that is being + // left for another developer on another day. - $s = str_replace('*','%',$s); + $s = str_replace('*', '%', $s); - if($type2) { - $r = q("select parent from item left join term on term.oid = item.id where term.ttype in (%d, %d) and term.term like '%s' and term.uid = %d and term.otype = 1 and item.verb != '%s'", - intval($type), - intval($type2), - dbesc($s), - intval($uid), - dbesc(ACTIVITY_UPDATE) - ); - } - else { - $r = q("select parent from item left join term on term.oid = item.id where term.ttype = %d and term.term like '%s' and term.uid = %d and term.otype = 1 and item.verb != '%s'", - intval($type), - dbesc($s), - intval($uid), - dbesc(ACTIVITY_UPDATE) - ); - } + if ($type2) { + $r = q( + "select parent from item left join term on term.oid = item.id where term.ttype in (%d, %d) and term.term like '%s' and term.uid = %d and term.otype = 1 and item.verb != '%s'", + intval($type), + intval($type2), + dbesc($s), + intval($uid), + dbesc(ACTIVITY_UPDATE) + ); + } else { + $r = q( + "select parent from item left join term on term.oid = item.id where term.ttype = %d and term.term like '%s' and term.uid = %d and term.otype = 1 and item.verb != '%s'", + intval($type), + dbesc($s), + intval($uid), + dbesc(ACTIVITY_UPDATE) + ); + } - if($r) { - $str = ''; - foreach($r as $rv) { - if($str) - $str .= ','; - $str .= intval($rv['parent']); - } - return " AND " . (($table) ? dbesc($table) . '.' : '') . "id in ( $str ) "; - } - return " AND false "; + if ($r) { + $str = ''; + foreach ($r as $rv) { + if ($str) { + $str .= ','; + } + $str .= intval($rv['parent']); + } + return " AND " . (($table) ? dbesc($table) . '.' : '') . "id in ( $str ) "; + } + return " AND false "; } -function store_item_tag($uid,$iid,$otype,$type,$term,$url = '') { - if(! $term) - return false; +function store_item_tag($uid, $iid, $otype, $type, $term, $url = '') +{ + if (! $term) { + return false; + } - $r = q("select * from term + $r = q( + "select * from term where uid = %d and oid = %d and otype = %d and ttype = %d and term = '%s' and url = '%s' ", - intval($uid), - intval($iid), - intval($otype), - intval($type), - dbesc($term), - dbesc($url) - ); - if($r) - return false; + intval($uid), + intval($iid), + intval($otype), + intval($type), + dbesc($term), + dbesc($url) + ); + if ($r) { + return false; + } - $r = q("insert into term (uid, oid, otype, ttype, term, url) + $r = q( + "insert into term (uid, oid, otype, ttype, term, url) values( %d, %d, %d, %d, '%s', '%s') ", - intval($uid), - intval($iid), - intval($otype), - intval($type), - dbesc($term), - dbesc($url) - ); + intval($uid), + intval($iid), + intval($otype), + intval($type), + dbesc($term), + dbesc($url) + ); - return $r; + return $r; } -function get_terms_oftype($arr,$type) { - $ret = []; - if(! (is_array($arr) && count($arr))) - return $ret; +function get_terms_oftype($arr, $type) +{ + $ret = []; + if (! (is_array($arr) && count($arr))) { + return $ret; + } - if(! is_array($type)) - $type = array($type); + if (! is_array($type)) { + $type = array($type); + } - foreach($type as $t) - foreach($arr as $x) - if($x['ttype'] == $t) - $ret[] = $x; + foreach ($type as $t) { + foreach ($arr as $x) { + if ($x['ttype'] == $t) { + $ret[] = $x; + } + } + } - return $ret; + return $ret; } -function format_term_for_display($term) { - $s = ''; - if(($term['ttype'] == TERM_HASHTAG) || ($term['ttype'] == TERM_COMMUNITYTAG)) - $s .= '#'; - elseif($term['ttype'] == TERM_FORUM) - $s .= '!'; - elseif($term['ttype'] == TERM_MENTION) - $s .= '@'; - else - return $s; +function format_term_for_display($term) +{ + $s = ''; + if (($term['ttype'] == TERM_HASHTAG) || ($term['ttype'] == TERM_COMMUNITYTAG)) { + $s .= '#'; + } elseif ($term['ttype'] == TERM_FORUM) { + $s .= '!'; + } elseif ($term['ttype'] == TERM_MENTION) { + $s .= '@'; + } else { + return $s; + } - if($term['url']) - $s .= '' . htmlspecialchars($term['term'], ENT_COMPAT,'UTF-8') . ''; - else - $s .= htmlspecialchars($term['term'], ENT_COMPAT,'UTF-8'); - return $s; + if ($term['url']) { + $s .= '' . htmlspecialchars($term['term'], ENT_COMPAT, 'UTF-8') . ''; + } else { + $s .= htmlspecialchars($term['term'], ENT_COMPAT, 'UTF-8'); + } + return $s; } // Tag cloud functions - need to be adpated to this database format -function tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_HASHTAG) { +function tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_HASHTAG) +{ - require_once('include/security.php'); + require_once('include/security.php'); - if(! perm_is_allowed($uid,get_observer_hash(),'view_stream')) - return []; - - - $item_normal = item_normal(); - $sql_options = item_permissions_sql($uid); - $count = intval($count); - - if($flags) { - if($flags === 'wall') - $sql_options .= " and item_wall = 1 "; - } - - if($authors) { - if(! is_array($authors)) - $authors = array($authors); - - $sql_options .= " and author_xchan in (" . stringify_array($authors,true) . ") "; - } - - if($owner) { - $sql_options .= " and owner_xchan = '" . dbesc($owner) . "' "; - } - - // Fetch tags - $r = q("select term, count(term) as total from term left join item on term.oid = item.id - where term.uid = %d and term.ttype = %d - and otype = %d and item_type = %d - $sql_options $item_normal - group by term order by total desc %s", - intval($uid), - intval($type), - intval(TERM_OBJ_POST), - intval($restrict), - ((intval($count)) ? "limit $count" : '') - ); - - - if(! $r) - return []; - - return Zotlabs\Text\Tagadelic::calc($r); - -} - - - -function card_tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_CATEGORY) { - - require_once('include/security.php'); - - if(! perm_is_allowed($uid,get_observer_hash(),'view_pages')) - return []; - - $item_normal = " and item.item_hidden = 0 and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 - and item.item_blocked = 0 and item.obj_type != 'http://purl.org/zot/activity/file' "; - - $sql_options = item_permissions_sql($uid); - $count = intval($count); - - if($flags) { - if($flags === 'wall') - $sql_options .= " and item_wall = 1 "; - } - - if($authors) { - if(! is_array($authors)) - $authors = array($authors); - - $sql_options .= " and author_xchan in (" . stringify_array($authors,true) . ") "; - } - - if($owner) { - $sql_options .= " and owner_xchan = '" . dbesc($owner) . "' "; - } - - - // Fetch tags - - $r = q("select term, count(term) as total from term left join item on term.oid = item.id - where term.uid = %d and term.ttype = %d - and otype = %d and item_type = %d - $sql_options $item_normal - group by term order by total desc %s", - intval($uid), - intval($type), - intval(TERM_OBJ_POST), - intval(ITEM_TYPE_CARD), - ((intval($count)) ? "limit $count" : '') - ); - - if(! $r) - return []; - - return Zotlabs\Text\Tagadelic::calc($r); - -} - -function article_tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_CATEGORY) { - - require_once('include/security.php'); - - if(! perm_is_allowed($uid,get_observer_hash(),'view_pages')) - return []; - - - $item_normal = " and item.item_hidden = 0 and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 - and item.item_blocked = 0 and item.obj_type != 'http://purl.org/zot/activity/file' "; - - $sql_options = item_permissions_sql($uid); - $count = intval($count); - - if($flags) { - if($flags === 'wall') - $sql_options .= " and item_wall = 1 "; - } - - if($authors) { - if(! is_array($authors)) - $authors = array($authors); - - $sql_options .= " and author_xchan in (" . stringify_array($authors,true) . ") "; - } - - if($owner) { - $sql_options .= " and owner_xchan = '" . dbesc($owner) . "' "; - } - - - // Fetch tags - $r = q("select term, count(term) as total from term left join item on term.oid = item.id - where term.uid = %d and term.ttype = %d - and otype = %d and item_type = %d - $sql_options $item_normal - group by term order by total desc %s", - intval($uid), - intval($type), - intval(TERM_OBJ_POST), - intval(ITEM_TYPE_ARTICLE), - ((intval($count)) ? "limit $count" : '') - ); - - if(! $r) - return []; - - return Zotlabs\Text\Tagadelic::calc($r); - -} - - - - -function pubtagblock($mode,$limit,$recent = 0,$safemode = 1, $type = TERM_HASHTAG) { - $o = ''; - - $r = pub_tagadelic($mode,$limit,$recent,$safemode,$type); - - $link = z_root() . '/pubstream'; - - if($r) { - $o = ''; - } - - return $o; -} - -function pub_tagadelic($mode,$limit,$recent,$safemode,$type) { - - - $item_normal = item_normal(); - $count = intval($limit); - - if (intval($mode) === PUBLIC_STREAM_SITE) { - $uids = " and item_private = 0 and item_wall = 1 "; - } - else { - $sys = get_sys_channel(); - $uids = " and item.uid = " . intval($sys['channel_id']) . " "; - $sql_extra = " and item_private = 0 "; + if (! perm_is_allowed($uid, get_observer_hash(), 'view_stream')) { + return []; } - if ($recent) { - $sql_extra .= " and item.created > '" . datetime_convert('UTC','UTC', 'now - ' . intval($recent) . ' days ') . "' "; - } - if ($safemode) { - $unsafetags = get_config('system','unsafepubtags', [ 'boobs', 'bot', 'rss', 'girl','girls', 'nsfw', 'sexy', 'nude' ]); - if($unsafetags) { - $sql_extra .= " and not term.term in ( " . stringify_array($unsafetags,true) . ") "; - } - } - + $item_normal = item_normal(); + $sql_options = item_permissions_sql($uid); + $count = intval($count); - // Fetch tags - $r = q("select term, count(term) as total from term left join item on term.oid = item.id + if ($flags) { + if ($flags === 'wall') { + $sql_options .= " and item_wall = 1 "; + } + } + + if ($authors) { + if (! is_array($authors)) { + $authors = array($authors); + } + + $sql_options .= " and author_xchan in (" . stringify_array($authors, true) . ") "; + } + + if ($owner) { + $sql_options .= " and owner_xchan = '" . dbesc($owner) . "' "; + } + + // Fetch tags + $r = q( + "select term, count(term) as total from term left join item on term.oid = item.id + where term.uid = %d and term.ttype = %d + and otype = %d and item_type = %d + $sql_options $item_normal + group by term order by total desc %s", + intval($uid), + intval($type), + intval(TERM_OBJ_POST), + intval($restrict), + ((intval($count)) ? "limit $count" : '') + ); + + + if (! $r) { + return []; + } + + return Zotlabs\Text\Tagadelic::calc($r); +} + + + +function card_tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_CATEGORY) +{ + + require_once('include/security.php'); + + if (! perm_is_allowed($uid, get_observer_hash(), 'view_pages')) { + return []; + } + + $item_normal = " and item.item_hidden = 0 and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 + and item.item_blocked = 0 and item.obj_type != 'http://purl.org/zot/activity/file' "; + + $sql_options = item_permissions_sql($uid); + $count = intval($count); + + if ($flags) { + if ($flags === 'wall') { + $sql_options .= " and item_wall = 1 "; + } + } + + if ($authors) { + if (! is_array($authors)) { + $authors = array($authors); + } + + $sql_options .= " and author_xchan in (" . stringify_array($authors, true) . ") "; + } + + if ($owner) { + $sql_options .= " and owner_xchan = '" . dbesc($owner) . "' "; + } + + + // Fetch tags + + $r = q( + "select term, count(term) as total from term left join item on term.oid = item.id + where term.uid = %d and term.ttype = %d + and otype = %d and item_type = %d + $sql_options $item_normal + group by term order by total desc %s", + intval($uid), + intval($type), + intval(TERM_OBJ_POST), + intval(ITEM_TYPE_CARD), + ((intval($count)) ? "limit $count" : '') + ); + + if (! $r) { + return []; + } + + return Zotlabs\Text\Tagadelic::calc($r); +} + +function article_tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_CATEGORY) +{ + + require_once('include/security.php'); + + if (! perm_is_allowed($uid, get_observer_hash(), 'view_pages')) { + return []; + } + + + $item_normal = " and item.item_hidden = 0 and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 + and item.item_blocked = 0 and item.obj_type != 'http://purl.org/zot/activity/file' "; + + $sql_options = item_permissions_sql($uid); + $count = intval($count); + + if ($flags) { + if ($flags === 'wall') { + $sql_options .= " and item_wall = 1 "; + } + } + + if ($authors) { + if (! is_array($authors)) { + $authors = array($authors); + } + + $sql_options .= " and author_xchan in (" . stringify_array($authors, true) . ") "; + } + + if ($owner) { + $sql_options .= " and owner_xchan = '" . dbesc($owner) . "' "; + } + + + // Fetch tags + $r = q( + "select term, count(term) as total from term left join item on term.oid = item.id + where term.uid = %d and term.ttype = %d + and otype = %d and item_type = %d + $sql_options $item_normal + group by term order by total desc %s", + intval($uid), + intval($type), + intval(TERM_OBJ_POST), + intval(ITEM_TYPE_ARTICLE), + ((intval($count)) ? "limit $count" : '') + ); + + if (! $r) { + return []; + } + + return Zotlabs\Text\Tagadelic::calc($r); +} + + + + +function pubtagblock($mode, $limit, $recent = 0, $safemode = 1, $type = TERM_HASHTAG) +{ + $o = ''; + + $r = pub_tagadelic($mode, $limit, $recent, $safemode, $type); + + $link = z_root() . '/pubstream'; + + if ($r) { + $o = ''; + } + + return $o; +} + +function pub_tagadelic($mode, $limit, $recent, $safemode, $type) +{ + + + $item_normal = item_normal(); + $count = intval($limit); + + if (intval($mode) === PUBLIC_STREAM_SITE) { + $uids = " and item_private = 0 and item_wall = 1 "; + } else { + $sys = get_sys_channel(); + $uids = " and item.uid = " . intval($sys['channel_id']) . " "; + $sql_extra = " and item_private = 0 "; + } + + if ($recent) { + $sql_extra .= " and item.created > '" . datetime_convert('UTC', 'UTC', 'now - ' . intval($recent) . ' days ') . "' "; + } + + if ($safemode) { + $unsafetags = get_config('system', 'unsafepubtags', [ 'boobs', 'bot', 'rss', 'girl','girls', 'nsfw', 'sexy', 'nude' ]); + if ($unsafetags) { + $sql_extra .= " and not term.term in ( " . stringify_array($unsafetags, true) . ") "; + } + } + + + // Fetch tags + $r = q( + "select term, count(term) as total from term left join item on term.oid = item.id where term.ttype = %d and otype = %d and item_type = %d $sql_extra $uids $item_normal group by term order by total desc %s", - intval($type), - intval(TERM_OBJ_POST), - intval(ITEM_TYPE_POST), - ((intval($count)) ? "limit $count" : '') - ); - - if (! $r) { - return []; - } - return Zotlabs\Text\Tagadelic::calc($r); + intval($type), + intval(TERM_OBJ_POST), + intval(ITEM_TYPE_POST), + ((intval($count)) ? "limit $count" : '') + ); + if (! $r) { + return []; + } + return Zotlabs\Text\Tagadelic::calc($r); } -function dir_tagadelic($count = 0, $hub = '', $type = 0, $safe = '') { +function dir_tagadelic($count = 0, $hub = '', $type = 0, $safe = '') +{ - $count = intval($count); + $count = intval($count); - $sql_extra = EMPTY_STR; + $sql_extra = EMPTY_STR; - if($type) { - return []; - } + if ($type) { + return []; + } - if($hub) { - $r = q("select xtag_term as term, count(xtag_term) as total from xtag + if ($hub) { + $r = q( + "select xtag_term as term, count(xtag_term) as total from xtag left join hubloc on xtag_hash = hubloc_hash where xtag_flags = 0 and xtag_hash in (select hubloc_hash from hubloc where hubloc_host = '%s' ) $sql_extra group by xtag_term order by total desc %s", - dbesc($hub), - ((intval($count)) ? "limit $count" : '') - ); - } - else { - $r = q("select xtag_term as term, count(xtag_term) as total from xtag left join xchan on xtag_hash = xchan_hash where xtag_flags = 0 + dbesc($hub), + ((intval($count)) ? "limit $count" : '') + ); + } else { + $r = q( + "select xtag_term as term, count(xtag_term) as total from xtag left join xchan on xtag_hash = xchan_hash where xtag_flags = 0 $sql_extra $safe group by xtag_term order by total desc %s", - ((intval($count)) ? "limit $count" : '') - ); - } - if(! $r) - return []; + ((intval($count)) ? "limit $count" : '') + ); + } + if (! $r) { + return []; + } - return Zotlabs\Text\Tagadelic::calc($r); + return Zotlabs\Text\Tagadelic::calc($r); } -function app_tagblock($link,$count = 0) { - $o = ''; +function app_tagblock($link, $count = 0) +{ + $o = ''; - $r = app_tagadelic($count); + $r = app_tagadelic($count); - if($r) { - $o = ''; - } + if ($r) { + $o = ''; + } - return $o; + return $o; } -function app_tagadelic($count = 0) { +function app_tagadelic($count = 0) +{ - if(! local_channel()) - return ''; + if (! local_channel()) { + return ''; + } - $count = intval($count); + $count = intval($count); - // Fetch tags - $r = q("select term, count(term) as total from term left join app on term.uid = app_channel where term.uid = %d + // Fetch tags + $r = q( + "select term, count(term) as total from term left join app on term.uid = app_channel where term.uid = %d and term.otype = %d group by term order by total desc %s", - intval(local_channel()), - intval(TERM_OBJ_APP), - ((intval($count)) ? "limit $count" : '') - ); + intval(local_channel()), + intval(TERM_OBJ_APP), + ((intval($count)) ? "limit $count" : '') + ); - if(! $r) - return []; - - return Zotlabs\Text\Tagadelic::calc($r); + if (! $r) { + return []; + } + return Zotlabs\Text\Tagadelic::calc($r); } -function tagblock($link,$uid,$count = 0,$authors = '',$owner = '', $flags = 0,$restrict = 0,$type = TERM_HASHTAG) { - $o = ''; +function tagblock($link, $uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_HASHTAG) +{ + $o = ''; - $r = tagadelic($uid,$count,$authors,$owner, $flags,$restrict,$type); + $r = tagadelic($uid, $count, $authors, $owner, $flags, $restrict, $type); - if($r) { - $o = ''; - } + if ($r) { + $o = ''; + } - return $o; + return $o; } -function wtagblock($uid,$count = 0,$authors = '',$owner = '', $flags = 0,$restrict = 0,$type = TERM_HASHTAG) { - $o = ''; +function wtagblock($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_HASHTAG) +{ + $o = ''; - $r = tagadelic($uid,$count,$authors,$owner, $flags,$restrict,$type); + $r = tagadelic($uid, $count, $authors, $owner, $flags, $restrict, $type); - if($r) { - $c = q("select channel_address from channel where channel_id = %d limit 1", - intval($uid) - ); - - $o = ''; - } + if ($r) { + $c = q( + "select channel_address from channel where channel_id = %d limit 1", + intval($uid) + ); - return $o; + $o = ''; + } + + return $o; } -function catblock($uid,$count = 0,$authors = '',$owner = '', $flags = 0,$restrict = 0,$type = TERM_CATEGORY) { - $o = ''; +function catblock($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_CATEGORY) +{ + $o = ''; - if(! Apps::system_app_installed($uid,'Categories')) { - return $o; - } + if (! Apps::system_app_installed($uid, 'Categories')) { + return $o; + } - $r = tagadelic($uid,$count,$authors,$owner,$flags,$restrict,$type); + $r = tagadelic($uid, $count, $authors, $owner, $flags, $restrict, $type); - if($r) { - $c = q("select channel_address from channel where channel_id = %d limit 1", - intval($uid) - ); - - $o = ''; - } + if ($r) { + $c = q( + "select channel_address from channel where channel_id = %d limit 1", + intval($uid) + ); - return $o; + $o = ''; + } + + return $o; } -function card_catblock($uid,$count = 0,$authors = '',$owner = '', $flags = 0,$restrict = 0,$type = TERM_CATEGORY) { - $o = ''; +function card_catblock($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_CATEGORY) +{ + $o = ''; - $r = card_tagadelic($uid,$count,$authors,$owner,$flags,$restrict,$type); + $r = card_tagadelic($uid, $count, $authors, $owner, $flags, $restrict, $type); - if($r) { - $c = q("select channel_address from channel where channel_id = %d limit 1", - intval($uid) - ); - - $o = ''; - } + if ($r) { + $c = q( + "select channel_address from channel where channel_id = %d limit 1", + intval($uid) + ); - return $o; + $o = ''; + } + + return $o; } -function article_catblock($uid,$count = 0,$authors = '',$owner = '', $flags = 0,$restrict = 0,$type = TERM_CATEGORY) { - $o = ''; +function article_catblock($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_CATEGORY) +{ + $o = ''; - $r = article_tagadelic($uid,$count,$authors,$owner,$flags,$restrict,$type); + $r = article_tagadelic($uid, $count, $authors, $owner, $flags, $restrict, $type); - if($r) { - $c = q("select channel_address from channel where channel_id = %d limit 1", - intval($uid) - ); - - $o = ''; - } + if ($r) { + $c = q( + "select channel_address from channel where channel_id = %d limit 1", + intval($uid) + ); - return $o; + $o = ''; + } + + return $o; } -function dir_tagblock($link,$r) { - $o = ''; +function dir_tagblock($link, $r) +{ + $o = ''; - $observer = get_observer_hash(); + $observer = get_observer_hash(); - if(! $r) - $r = App::$data['directory_keywords']; + if (! $r) { + $r = App::$data['directory_keywords']; + } - if($r) { - $o = ''; - } + if ($r) { + $o = ''; + } - return $o; + return $o; } - /** - * verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants" - * We use the first person form when creating an activity, but the third person for use in activities - * FIXME: There is no accounting for verb gender for languages where this is significant. We may eventually - * require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module. - */ + /** + * verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants" + * We use the first person form when creating an activity, but the third person for use in activities + * FIXME: There is no accounting for verb gender for languages where this is significant. We may eventually + * require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module. + */ -function obj_verbs() { - $verbs = array( - 'has' => array( t('have'), t('has')), - 'wants' => array( t('want'), t('wants')), - 'likes' => array( t('like'), t('likes')), - 'dislikes' => array( t('dislike'), t('dislikes')), - ); +function obj_verbs() +{ + $verbs = array( + 'has' => array( t('have'), t('has')), + 'wants' => array( t('want'), t('wants')), + 'likes' => array( t('like'), t('likes')), + 'dislikes' => array( t('dislike'), t('dislikes')), + ); - $arr = array('verbs' => $verbs); - call_hooks('obj_verbs', $arr); + $arr = array('verbs' => $verbs); + call_hooks('obj_verbs', $arr); - return $arr['verbs']; + return $arr['verbs']; } -function obj_verb_selector($current = '') { - $verbs = obj_verbs(); - $o = ''; +function obj_verb_selector($current = '') +{ + $verbs = obj_verbs(); + $o = ''; - return $o; + return $o; } -function get_things($profile_hash,$uid) { +function get_things($profile_hash, $uid) +{ - $sql_extra = (($profile_hash) ? " and obj_page = '" . $profile_hash . "' " : ''); + $sql_extra = (($profile_hash) ? " and obj_page = '" . $profile_hash . "' " : ''); - $r = q("select * from obj where obj_channel = %d and obj_type = %d $sql_extra order by obj_verb, obj_term", - intval($uid), - intval(TERM_OBJ_THING) - ); + $r = q( + "select * from obj where obj_channel = %d and obj_type = %d $sql_extra order by obj_verb, obj_term", + intval($uid), + intval(TERM_OBJ_THING) + ); - $things = $sorted_things = null; + $things = $sorted_things = null; - $profile_hashes = []; + $profile_hashes = []; - if($r) { + if ($r) { + // if no profile_hash was specified (display on profile page mode), match each of the things to a profile name + // (list all my things mode). This is harder than it sounds. - // if no profile_hash was specified (display on profile page mode), match each of the things to a profile name - // (list all my things mode). This is harder than it sounds. + foreach ($r as $rr) { + $rr['profile_name'] = ''; + if (! in_array($rr['obj_obj'], $profile_hashes)) { + $profile_hashes[] = $rr['obj_obj']; + } + } + if (! $profile_hash) { + $exp = stringify_array($profile_hashes, true); + $p = q("select profile_guid as hash, profile_name as name from profile where profile_guid in ( $exp ) "); + if ($p) { + foreach ($r as $rr) { + foreach ($p as $pp) { + if ($rr['obj_page'] == $pp['hash']) { + $rr['profile_name'] == $pp['name']; + } + } + } + } + } - foreach($r as $rr) { - $rr['profile_name'] = ''; - if(! in_array($rr['obj_obj'],$profile_hashes)) - $profile_hashes[] = $rr['obj_obj']; - } - if(! $profile_hash) { - $exp = stringify_array($profile_hashes,true); - $p = q("select profile_guid as hash, profile_name as name from profile where profile_guid in ( $exp ) "); - if($p) { - foreach($r as $rr) { - foreach($p as $pp) { - if($rr['obj_page'] == $pp['hash']) { - $rr['profile_name'] == $pp['name']; - } - } - } - } - } + $things = []; - $things = []; + // Use the system obj_verbs array as a sort key, since we don't really + // want an alphabetic sort. To change the order, use a plugin to + // alter the obj_verbs() array or alter it in code. Unknown verbs come + // after the known ones - in no particular order. - // Use the system obj_verbs array as a sort key, since we don't really - // want an alphabetic sort. To change the order, use a plugin to - // alter the obj_verbs() array or alter it in code. Unknown verbs come - // after the known ones - in no particular order. - - $v = obj_verbs(); - foreach($v as $k => $foo) - $things[$k] = null; - foreach($r as $rr) { - - $l = q("select xchan_name, xchan_photo_s, xchan_url from likes left join xchan on liker = xchan_hash where + $v = obj_verbs(); + foreach ($v as $k => $foo) { + $things[$k] = null; + } + foreach ($r as $rr) { + $l = q( + "select xchan_name, xchan_photo_s, xchan_url from likes left join xchan on liker = xchan_hash where target_type = '%s' and target_id = '%s' and channel_id = %d", - dbesc(ACTIVITY_OBJ_THING), - dbesc($rr['obj_obj']), - intval($uid) - ); + dbesc(ACTIVITY_OBJ_THING), + dbesc($rr['obj_obj']), + intval($uid) + ); - for($x = 0; $x < count($l); $x ++) { - $l[$x]['xchan_url'] = zid($l[$x]['xchan_url']); - $l[$x]['xchan_photo_s'] = zid($l[$x]['xchan_photo_s']); - } - if(! $things[$rr['obj_verb']]) - $things[$rr['obj_verb']] = []; + for ($x = 0; $x < count($l); $x++) { + $l[$x]['xchan_url'] = zid($l[$x]['xchan_url']); + $l[$x]['xchan_photo_s'] = zid($l[$x]['xchan_photo_s']); + } + if (! $things[$rr['obj_verb']]) { + $things[$rr['obj_verb']] = []; + } - $things[$rr['obj_verb']][] = array('term' => $rr['obj_term'],'url' => $rr['obj_url'],'img' => $rr['obj_imgurl'], 'editurl' => z_root() . '/thing/' . $rr['obj_obj'], 'profile' => $rr['profile_name'],'term_hash' => $rr['obj_obj'], 'likes' => $l,'like_count' => count($l),'like_label' => tt('Like','Likes',count($l),'noun')); - } - $sorted_things = []; - if($things) { - foreach($things as $k => $v) { - if(is_array($things[$k])) { - $sorted_things[$k] = $v; - } - } - } - } + $things[$rr['obj_verb']][] = array('term' => $rr['obj_term'],'url' => $rr['obj_url'],'img' => $rr['obj_imgurl'], 'editurl' => z_root() . '/thing/' . $rr['obj_obj'], 'profile' => $rr['profile_name'],'term_hash' => $rr['obj_obj'], 'likes' => $l,'like_count' => count($l),'like_label' => tt('Like', 'Likes', count($l), 'noun')); + } + $sorted_things = []; + if ($things) { + foreach ($things as $k => $v) { + if (is_array($things[$k])) { + $sorted_things[$k] = $v; + } + } + } + } //logger('things: ' . print_r($sorted_things,true)); - return $sorted_things; + return $sorted_things; } diff --git a/include/text.php b/include/text.php index 067b841e4..02a82abc1 100644 --- a/include/text.php +++ b/include/text.php @@ -1,8 +1,9 @@ $s, - 'params' => $r - ]; +function replace_macros($s, $r) +{ + $arr = [ + 'template' => $s, + 'params' => $r + ]; - /** - * @hooks replace_macros - * * \e string \b template - * * \e array \b params - */ + /** + * @hooks replace_macros + * * \e string \b template + * * \e array \b params + */ - call_hooks('replace_macros', $arr); + call_hooks('replace_macros', $arr); - $t = App::template_engine(); + $t = App::template_engine(); - try { - $output = $t->replace_macros($arr['template'], $arr['params']); - } - catch (Exception $e) { - btlogger("Unable to render template: " . $e->getMessage()); - $output = "ERROR: there was an error creating the output.
"; - } + try { + $output = $t->replace_macros($arr['template'], $arr['params']); + } catch (Exception $e) { + btlogger("Unable to render template: " . $e->getMessage()); + $output = "ERROR: there was an error creating the output.
"; + } - return $output; + return $output; } /** @@ -67,15 +66,16 @@ function replace_macros($s, $r) { */ -define('RANDOM_STRING_HEX', 0x00 ); -define('RANDOM_STRING_TEXT', 0x01 ); +define('RANDOM_STRING_HEX', 0x00); +define('RANDOM_STRING_TEXT', 0x01); -function random_string($size = 64, $type = RANDOM_STRING_HEX) { - // generate a bit of entropy and run it through the whirlpool - $s = hash('whirlpool', (string) rand() . uniqid(rand(),true) . (string) rand(),(($type == RANDOM_STRING_TEXT) ? true : false)); - $s = (($type == RANDOM_STRING_TEXT) ? str_replace("\n","",base64url_encode($s,true)) : $s); +function random_string($size = 64, $type = RANDOM_STRING_HEX) +{ + // generate a bit of entropy and run it through the whirlpool + $s = hash('whirlpool', (string) rand() . uniqid(rand(), true) . (string) rand(), (($type == RANDOM_STRING_TEXT) ? true : false)); + $s = (($type == RANDOM_STRING_TEXT) ? str_replace("\n", "", base64url_encode($s, true)) : $s); - return(substr($s, 0, $size)); + return(substr($s, 0, $size)); } /** @@ -86,8 +86,9 @@ function random_string($size = 64, $type = RANDOM_STRING_HEX) { * @return string Filtered string * */ -function notags($string) { - return(str_replace(array("<",">"), array('[',']'), $string)); +function notags($string) +{ + return(str_replace(array("<",">"), array('[',']'), $string)); } @@ -99,40 +100,46 @@ function notags($string) { * * @return string */ -function escape_tags($string) { - return(htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false)); +function escape_tags($string) +{ + return(htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false)); } -function z_input_filter($s, $type = 'text/x-multicode', $allow_code = false) { +function z_input_filter($s, $type = 'text/x-multicode', $allow_code = false) +{ - if (in_array($type, [ 'text/bbcode', 'text/x-multicode' ])) { - return (multicode_purify($s)); - } - if($type == 'text/plain') - return escape_tags($s); - if($type == 'application/x-pdl') - return escape_tags($s); + if (in_array($type, [ 'text/bbcode', 'text/x-multicode' ])) { + return (multicode_purify($s)); + } + if ($type == 'text/plain') { + return escape_tags($s); + } + if ($type == 'application/x-pdl') { + return escape_tags($s); + } - if(App::$is_sys) { - return $s; - } + if (App::$is_sys) { + return $s; + } - if($allow_code) { - if($type === 'text/markdown') - return htmlspecialchars($s,ENT_QUOTES); - return $s; - } + if ($allow_code) { + if ($type === 'text/markdown') { + return htmlspecialchars($s, ENT_QUOTES); + } + return $s; + } - if($type === 'text/markdown') { - $x = new MarkdownSoap($s); - return $x->clean(); - } + if ($type === 'text/markdown') { + $x = new MarkdownSoap($s); + return $x->clean(); + } - if($type === 'text/html') - return purify_html($s); + if ($type === 'text/html') { + return purify_html($s); + } - return escape_tags($s); + return escape_tags($s); } @@ -145,180 +152,181 @@ function z_input_filter($s, $type = 'text/x-multicode', $allow_code = false) { * @see HTMLPurifier * * @param string $s raw HTML - * @param boolean $allow_position allow CSS position + * @param bool $allow_position allow CSS position * @return string standards compliant filtered HTML */ -function purify_html($s, $opts = []) { +function purify_html($s, $opts = []) +{ - $config = HTMLPurifier_Config::createDefault(); - $config->set('Cache.DefinitionImpl', null); - $config->set('Attr.EnableID', true); + $config = HTMLPurifier_Config::createDefault(); + $config->set('Cache.DefinitionImpl', null); + $config->set('Attr.EnableID', true); - // disable Unicode version of RTL over-ride - $s = str_replace([ '', '', html_entity_decode('', ENT_QUOTES,'UTF-8') ],[ '','','' ],$s); + // disable Unicode version of RTL over-ride + $s = str_replace([ '', '', html_entity_decode('', ENT_QUOTES, 'UTF-8') ], [ '','','' ], $s); - // This will escape invalid tags in the output instead of removing. - // This is necessary for mixed format (text+bbcode+html+markdown) messages or - // some angle brackets in plaintext may get stripped if they look like an HTML tag - - if (in_array('escape',$opts)) { - $config->set('Core.EscapeInvalidChildren', true); - $config->set('Core.EscapeInvalidTags', true); - } + // This will escape invalid tags in the output instead of removing. + // This is necessary for mixed format (text+bbcode+html+markdown) messages or + // some angle brackets in plaintext may get stripped if they look like an HTML tag - // If enabled, target=blank attributes are added to all links. - //$config->set('HTML.TargetBlank', true); - //$config->set('Attr.AllowedFrameTargets', ['_blank', '_self', '_parent', '_top']); - // restore old behavior of HTMLPurifier < 4.8, only used when targets allowed at all - // do not add rel="noreferrer" to all links with target attributes - //$config->set('HTML.TargetNoreferrer', false); - // do not add noopener rel attributes to links which have a target attribute associated with them - //$config->set('HTML.TargetNoopener', false); + if (in_array('escape', $opts)) { + $config->set('Core.EscapeInvalidChildren', true); + $config->set('Core.EscapeInvalidTags', true); + } - //Allow some custom data- attributes used by built-in libs. - //In this way members which do not have allowcode set can still use the built-in js libs in webpages to some extent. + // If enabled, target=blank attributes are added to all links. + //$config->set('HTML.TargetBlank', true); + //$config->set('Attr.AllowedFrameTargets', ['_blank', '_self', '_parent', '_top']); + // restore old behavior of HTMLPurifier < 4.8, only used when targets allowed at all + // do not add rel="noreferrer" to all links with target attributes + //$config->set('HTML.TargetNoreferrer', false); + // do not add noopener rel attributes to links which have a target attribute associated with them + //$config->set('HTML.TargetNoopener', false); - $def = $config->getHTMLDefinition(true); + //Allow some custom data- attributes used by built-in libs. + //In this way members which do not have allowcode set can still use the built-in js libs in webpages to some extent. - //data- attributes used by the foundation library + $def = $config->getHTMLDefinition(true); - // f6 navigation + //data- attributes used by the foundation library - //dropdown menu - $def->info_global_attr['data-dropdown-menu'] = new HTMLPurifier_AttrDef_Text; - //drilldown menu - $def->info_global_attr['data-drilldown'] = new HTMLPurifier_AttrDef_Text; - //accordion menu - $def->info_global_attr['data-accordion-menu'] = new HTMLPurifier_AttrDef_Text; - //responsive navigation - $def->info_global_attr['data-responsive-menu'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-responsive-toggle'] = new HTMLPurifier_AttrDef_Text; - //magellan - $def->info_global_attr['data-magellan'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-magellan-target'] = new HTMLPurifier_AttrDef_Text; + // f6 navigation - // f6 containers + //dropdown menu + $def->info_global_attr['data-dropdown-menu'] = new HTMLPurifier_AttrDef_Text(); + //drilldown menu + $def->info_global_attr['data-drilldown'] = new HTMLPurifier_AttrDef_Text(); + //accordion menu + $def->info_global_attr['data-accordion-menu'] = new HTMLPurifier_AttrDef_Text(); + //responsive navigation + $def->info_global_attr['data-responsive-menu'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-responsive-toggle'] = new HTMLPurifier_AttrDef_Text(); + //magellan + $def->info_global_attr['data-magellan'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-magellan-target'] = new HTMLPurifier_AttrDef_Text(); - //accordion - $def->info_global_attr['data-accordion'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-accordion-item'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-tab-content'] = new HTMLPurifier_AttrDef_Text; - //dropdown - $def->info_global_attr['data-dropdown'] = new HTMLPurifier_AttrDef_Text; - //off-canvas - $def->info_global_attr['data-off-canvas-wrapper'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-off-canvas'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-off-canvas-content'] = new HTMLPurifier_AttrDef_Text; - //reveal - $def->info_global_attr['data-reveal'] = new HTMLPurifier_AttrDef_Text; - //tabs - $def->info_global_attr['data-tabs'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-tabs-content'] = new HTMLPurifier_AttrDef_Text; + // f6 containers - // f6 media + //accordion + $def->info_global_attr['data-accordion'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-accordion-item'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-tab-content'] = new HTMLPurifier_AttrDef_Text(); + //dropdown + $def->info_global_attr['data-dropdown'] = new HTMLPurifier_AttrDef_Text(); + //off-canvas + $def->info_global_attr['data-off-canvas-wrapper'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-off-canvas'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-off-canvas-content'] = new HTMLPurifier_AttrDef_Text(); + //reveal + $def->info_global_attr['data-reveal'] = new HTMLPurifier_AttrDef_Text(); + //tabs + $def->info_global_attr['data-tabs'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-tabs-content'] = new HTMLPurifier_AttrDef_Text(); - //orbit - $def->info_global_attr['data-orbit'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-slide'] = new HTMLPurifier_AttrDef_Text; - //tooltip - $def->info_global_attr['data-tooltip'] = new HTMLPurifier_AttrDef_Text; + // f6 media - // f6 plugins + //orbit + $def->info_global_attr['data-orbit'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-slide'] = new HTMLPurifier_AttrDef_Text(); + //tooltip + $def->info_global_attr['data-tooltip'] = new HTMLPurifier_AttrDef_Text(); - //abide - the use is pointless since we can't do anything with forms + // f6 plugins - //equalizer - $def->info_global_attr['data-equalizer'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-equalizer-watch'] = new HTMLPurifier_AttrDef_Text; + //abide - the use is pointless since we can't do anything with forms - //interchange - potentially dangerous since it can load content + //equalizer + $def->info_global_attr['data-equalizer'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-equalizer-watch'] = new HTMLPurifier_AttrDef_Text(); - //toggler - $def->info_global_attr['data-toggler'] = new HTMLPurifier_AttrDef_Text; + //interchange - potentially dangerous since it can load content - //sticky - $def->info_global_attr['data-sticky'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-sticky-container'] = new HTMLPurifier_AttrDef_Text; + //toggler + $def->info_global_attr['data-toggler'] = new HTMLPurifier_AttrDef_Text(); - // f6 common + //sticky + $def->info_global_attr['data-sticky'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-sticky-container'] = new HTMLPurifier_AttrDef_Text(); - $def->info_global_attr['data-options'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-toggle'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-close'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-open'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-position'] = new HTMLPurifier_AttrDef_Text; + // f6 common + + $def->info_global_attr['data-options'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-toggle'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-close'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-open'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-position'] = new HTMLPurifier_AttrDef_Text(); - //data- attributes used by the bootstrap library - $def->info_global_attr['data-dismiss'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-target'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-toggle'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-backdrop'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-keyboard'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-show'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-spy'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-offset'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-animation'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-container'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-delay'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-placement'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-title'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-trigger'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-content'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-trigger'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-parent'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-ride'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-slide-to'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-slide'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-interval'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-pause'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-wrap'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-offset-top'] = new HTMLPurifier_AttrDef_Text; - $def->info_global_attr['data-offset-bottom'] = new HTMLPurifier_AttrDef_Text; + //data- attributes used by the bootstrap library + $def->info_global_attr['data-dismiss'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-target'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-toggle'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-backdrop'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-keyboard'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-show'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-spy'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-offset'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-animation'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-container'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-delay'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-placement'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-title'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-trigger'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-content'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-trigger'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-parent'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-ride'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-slide-to'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-slide'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-interval'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-pause'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-wrap'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-offset-top'] = new HTMLPurifier_AttrDef_Text(); + $def->info_global_attr['data-offset-bottom'] = new HTMLPurifier_AttrDef_Text(); - //some html5 elements - //Block - $def->addElement('section', 'Block', 'Flow', 'Common'); - $def->addElement('nav', 'Block', 'Flow', 'Common'); - $def->addElement('article', 'Block', 'Flow', 'Common'); - $def->addElement('aside', 'Block', 'Flow', 'Common'); - $def->addElement('header', 'Block', 'Flow', 'Common'); - $def->addElement('footer', 'Block', 'Flow', 'Common'); - //Inline - $def->addElement('button', 'Inline', 'Inline', 'Common'); - $def->addElement('mark', 'Inline', 'Inline', 'Common'); + //some html5 elements + //Block + $def->addElement('section', 'Block', 'Flow', 'Common'); + $def->addElement('nav', 'Block', 'Flow', 'Common'); + $def->addElement('article', 'Block', 'Flow', 'Common'); + $def->addElement('aside', 'Block', 'Flow', 'Common'); + $def->addElement('header', 'Block', 'Flow', 'Common'); + $def->addElement('footer', 'Block', 'Flow', 'Common'); + //Inline + $def->addElement('button', 'Inline', 'Inline', 'Common'); + $def->addElement('mark', 'Inline', 'Inline', 'Common'); - if(in_array('allow_position', $opts)) { - $cssDefinition = $config->getCSSDefinition(); + if (in_array('allow_position', $opts)) { + $cssDefinition = $config->getCSSDefinition(); - $cssDefinition->info['position'] = new HTMLPurifier_AttrDef_Enum(array('absolute', 'fixed', 'relative', 'static', 'inherit'), false); + $cssDefinition->info['position'] = new HTMLPurifier_AttrDef_Enum(array('absolute', 'fixed', 'relative', 'static', 'inherit'), false); - $cssDefinition->info['left'] = new HTMLPurifier_AttrDef_CSS_Composite(array( - new HTMLPurifier_AttrDef_CSS_Length(), - new HTMLPurifier_AttrDef_CSS_Percentage() - )); + $cssDefinition->info['left'] = new HTMLPurifier_AttrDef_CSS_Composite(array( + new HTMLPurifier_AttrDef_CSS_Length(), + new HTMLPurifier_AttrDef_CSS_Percentage() + )); - $cssDefinition->info['right'] = new HTMLPurifier_AttrDef_CSS_Composite(array( - new HTMLPurifier_AttrDef_CSS_Length(), - new HTMLPurifier_AttrDef_CSS_Percentage() - )); + $cssDefinition->info['right'] = new HTMLPurifier_AttrDef_CSS_Composite(array( + new HTMLPurifier_AttrDef_CSS_Length(), + new HTMLPurifier_AttrDef_CSS_Percentage() + )); - $cssDefinition->info['top'] = new HTMLPurifier_AttrDef_CSS_Composite(array( - new HTMLPurifier_AttrDef_CSS_Length(), - new HTMLPurifier_AttrDef_CSS_Percentage() - )); + $cssDefinition->info['top'] = new HTMLPurifier_AttrDef_CSS_Composite(array( + new HTMLPurifier_AttrDef_CSS_Length(), + new HTMLPurifier_AttrDef_CSS_Percentage() + )); - $cssDefinition->info['bottom'] = new HTMLPurifier_AttrDef_CSS_Composite(array( - new HTMLPurifier_AttrDef_CSS_Length(), - new HTMLPurifier_AttrDef_CSS_Percentage() - )); - } + $cssDefinition->info['bottom'] = new HTMLPurifier_AttrDef_CSS_Composite(array( + new HTMLPurifier_AttrDef_CSS_Length(), + new HTMLPurifier_AttrDef_CSS_Percentage() + )); + } - $purifier = new HTMLPurifier($config); + $purifier = new HTMLPurifier($config); - return $purifier->purify($s); + return $purifier->purify($s); } @@ -334,76 +342,82 @@ function purify_html($s, $opts = []) { * @param int $len max length of generated string * @return string Genereated random, but usually pronounceable string */ -function autoname($len) { +function autoname($len) +{ - if ($len <= 0) - return ''; + if ($len <= 0) { + return ''; + } - $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); - if (mt_rand(0, 5) == 4) - $vowels[] = 'y'; + $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); + if (mt_rand(0, 5) == 4) { + $vowels[] = 'y'; + } - $cons = array( - 'b','bl','br', - 'c','ch','cl','cr', - 'd','dr', - 'f','fl','fr', - 'g','gh','gl','gr', - 'h', - 'j', - 'k','kh','kl','kr', - 'l', - 'm', - 'n', - 'p','ph','pl','pr', - 'qu', - 'r','rh', - 's','sc','sh','sm','sp','st', - 't','th','tr', - 'v', - 'w','wh', - 'x', - 'z','zh' - ); + $cons = array( + 'b','bl','br', + 'c','ch','cl','cr', + 'd','dr', + 'f','fl','fr', + 'g','gh','gl','gr', + 'h', + 'j', + 'k','kh','kl','kr', + 'l', + 'm', + 'n', + 'p','ph','pl','pr', + 'qu', + 'r','rh', + 's','sc','sh','sm','sp','st', + 't','th','tr', + 'v', + 'w','wh', + 'x', + 'z','zh' + ); - $midcons = array('ck','ct','gn','ld','lf','lm','lt','mb','mm', 'mn','mp', - 'nd','ng','nk','nt','rn','rp','rt'); + $midcons = array('ck','ct','gn','ld','lf','lm','lt','mb','mm', 'mn','mp', + 'nd','ng','nk','nt','rn','rp','rt'); - // avoid these consonant pairs at the end of the string - $noend = array('bl', 'br', 'cl','cr','dr','fl','fr','gl','gr', - 'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh'); + // avoid these consonant pairs at the end of the string + $noend = array('bl', 'br', 'cl','cr','dr','fl','fr','gl','gr', + 'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh'); - $start = mt_rand(0, 2); - if ($start == 0) - $table = $vowels; - else - $table = $cons; + $start = mt_rand(0, 2); + if ($start == 0) { + $table = $vowels; + } else { + $table = $cons; + } - $word = ''; + $word = ''; - for ($x = 0; $x < $len; $x ++) { - $r = mt_rand(0, count($table) - 1); - $word .= $table[$r]; + for ($x = 0; $x < $len; $x++) { + $r = mt_rand(0, count($table) - 1); + $word .= $table[$r]; - if ($table == $vowels) - $table = array_merge($cons, $midcons); - else - $table = $vowels; - } + if ($table == $vowels) { + $table = array_merge($cons, $midcons); + } else { + $table = $vowels; + } + } - $word = substr($word, 0, $len); + $word = substr($word, 0, $len); - foreach ($noend as $noe) { - if ((strlen($word) > 2) && (substr($word, -2) == $noe)) { - $word = substr($word, 0, -1); - break; - } - } - // avoid the letter 'q' as it does not make a very good word ending - if (substr($word, -1) == 'q') - $word = substr($word, 0, -1); + foreach ($noend as $noe) { + if ((strlen($word) > 2) && (substr($word, -2) == $noe)) { + $word = substr($word, 0, -1); + break; + } + } + // avoid the letter 'q' as it does not make a very good word ending + if (substr($word, -1) == 'q') { + $word = substr($word, 0, -1); + } - return $word; + return $word; } @@ -413,50 +427,50 @@ function autoname($len) { * @param string $str * @return string Escaped text. */ -function xmlify($str) { - $buffer = ''; +function xmlify($str) +{ + $buffer = ''; - if(is_array($str)) { + if (is_array($str)) { + // allow to fall through so we ge a PHP error, as the log statement will + // probably get lost in the noise unless we're specifically looking for it. - // allow to fall through so we ge a PHP error, as the log statement will - // probably get lost in the noise unless we're specifically looking for it. + btlogger('xmlify called with array: ' . print_r($str, true), LOGGER_NORMAL, LOG_WARNING); + } - btlogger('xmlify called with array: ' . print_r($str,true), LOGGER_NORMAL, LOG_WARNING); - } + $len = mb_strlen($str); + for ($x = 0; $x < $len; $x++) { + $char = mb_substr($str, $x, 1); - $len = mb_strlen($str); - for($x = 0; $x < $len; $x ++) { - $char = mb_substr($str,$x,1); + switch ($char) { + case "\r": + break; + case "&": + $buffer .= '&'; + break; + case "'": + $buffer .= '''; + break; + case "\"": + $buffer .= '"'; + break; + case '<': + $buffer .= '<'; + break; + case '>': + $buffer .= '>'; + break; + case "\n": + $buffer .= "\n"; + break; + default: + $buffer .= $char; + break; + } + } + $buffer = trim($buffer); - switch( $char ) { - case "\r" : - break; - case "&" : - $buffer .= '&'; - break; - case "'" : - $buffer .= '''; - break; - case "\"" : - $buffer .= '"'; - break; - case '<' : - $buffer .= '<'; - break; - case '>' : - $buffer .= '>'; - break; - case "\n" : - $buffer .= "\n"; - break; - default : - $buffer .= $char; - break; - } - } - $buffer = trim($buffer); - - return($buffer); + return($buffer); } /** @@ -468,11 +482,12 @@ function xmlify($str) { * * @return string */ -function unxmlify($s) { - $ret = str_replace('&', '&', $s); - $ret = str_replace(array('<', '>', '"', '''), array('<', '>', '"', "'"), $ret); +function unxmlify($s) +{ + $ret = str_replace('&', '&', $s); + $ret = str_replace(array('<', '>', '"', '''), array('<', '>', '"', "'"), $ret); - return $ret; + return $ret; } /** @@ -489,85 +504,92 @@ function unxmlify($s) { * * @param App &$a */ -function paginate(&$a) { - $o = ''; - $stripped = preg_replace('/(&page=[0-9]*)/','',App::$query_string); +function paginate(&$a) +{ + $o = ''; + $stripped = preg_replace('/(&page=[0-9]*)/', '', App::$query_string); -// $stripped = preg_replace('/&zid=(.*?)([\?&]|$)/ism','',$stripped); +// $stripped = preg_replace('/&zid=(.*?)([\?&]|$)/ism','',$stripped); - $stripped = str_replace('q=','',$stripped); - $stripped = trim($stripped,'/'); - $pagenum = App::$pager['page']; - $url = z_root() . '/' . $stripped; + $stripped = str_replace('q=', '', $stripped); + $stripped = trim($stripped, '/'); + $pagenum = App::$pager['page']; + $url = z_root() . '/' . $stripped; - if(App::$pager['total'] > App::$pager['itemspage']) { - $o .= ''; - if(App::$pager['page'] != 1) - $o .= ''."' . t('prev') . ' '; + if (App::$pager['total'] > App::$pager['itemspage']) { + $o .= '' . "\r\n"; + } - return $o; + return $o; } -function alt_pager($i, $more = '', $less = '') { +function alt_pager($i, $more = '', $less = '') +{ - if(! $more) - $more = t('older'); - if(! $less) - $less = t('newer'); + if (! $more) { + $more = t('older'); + } + if (! $less) { + $less = t('newer'); + } - $stripped = preg_replace('/(&page=[0-9]*)/','',App::$query_string); - $stripped = str_replace('q=','',$stripped); - $stripped = trim($stripped,'/'); - //$pagenum = App::$pager['page']; - $url = z_root() . '/' . $stripped; - - return replace_macros(get_markup_template('alt_pager.tpl'), array( - '$has_less' => ((App::$pager['page'] > 1) ? true : false), - '$has_more' => (($i > 0 && $i >= App::$pager['itemspage']) ? true : false), - '$less' => $less, - '$more' => $more, - '$url' => $url, - '$prevpage' => App::$pager['page'] - 1, - '$nextpage' => App::$pager['page'] + 1, - )); + $stripped = preg_replace('/(&page=[0-9]*)/', '', App::$query_string); + $stripped = str_replace('q=', '', $stripped); + $stripped = trim($stripped, '/'); + //$pagenum = App::$pager['page']; + $url = z_root() . '/' . $stripped; + return replace_macros(get_markup_template('alt_pager.tpl'), array( + '$has_less' => ((App::$pager['page'] > 1) ? true : false), + '$has_more' => (($i > 0 && $i >= App::$pager['itemspage']) ? true : false), + '$less' => $less, + '$more' => $more, + '$url' => $url, + '$prevpage' => App::$pager['page'] - 1, + '$nextpage' => App::$pager['page'] + 1, + )); } @@ -578,17 +600,18 @@ function alt_pager($i, $more = '', $less = '') { * * @return string a unique id */ -function item_message_id() { +function item_message_id() +{ - try { - $hash = Uuid::uuid4()->toString(); - } catch (UnsatisfiedDependencyException $e) { - $hash = random_string(48); - } + try { + $hash = Uuid::uuid4()->toString(); + } catch (UnsatisfiedDependencyException $e) { + $hash = random_string(48); + } - $mid = z_root() . '/item/' . $hash; + $mid = z_root() . '/item/' . $hash; - return $mid; + return $mid; } /** @@ -598,32 +621,34 @@ function item_message_id() { * * @return string a unique hash */ -function photo_new_resource() { +function photo_new_resource() +{ - try { - $hash = Uuid::uuid4()->toString(); - } catch (UnsatisfiedDependencyException $e) { - $hash = random_string(48); - } + try { + $hash = Uuid::uuid4()->toString(); + } catch (UnsatisfiedDependencyException $e) { + $hash = random_string(48); + } - return $hash; + return $hash; } // provide psuedo random token (string) consisting entirely of US-ASCII letters/numbers // and with possibly variable length -function new_token($minlen = 36,$maxlen = 48) { +function new_token($minlen = 36, $maxlen = 48) +{ - $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'; - $str = EMPTY_STR; + $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'; + $str = EMPTY_STR; - $len = (($minlen === $maxlen) ? $minlen : mt_rand($minlen,$maxlen)); + $len = (($minlen === $maxlen) ? $minlen : mt_rand($minlen, $maxlen)); - for($a = 0; $a < $len; $a ++) { - $str .= $chars[mt_rand(0,62)]; - } - return $str; + for ($a = 0; $a < $len; $a++) { + $str .= $chars[mt_rand(0, 62)]; + } + return $str; } /** @@ -631,15 +656,16 @@ function new_token($minlen = 36,$maxlen = 48) { * * @return string */ -function new_uuid() { +function new_uuid() +{ - try { - $hash = Uuid::uuid4()->toString(); - } catch (UnsatisfiedDependencyException $e) { - $hash = random_string(48); - } + try { + $hash = Uuid::uuid4()->toString(); + } catch (UnsatisfiedDependencyException $e) { + $hash = random_string(48); + } - return $hash; + return $hash; } /** @@ -657,16 +683,18 @@ function new_uuid() { * * @param string $attr attribute string * @param string $s attribute you are looking for - * @return boolean true if found + * @return bool true if found */ -function attribute_contains($attr, $s) { - // remove quotes - $attr = str_replace([ '"',"'" ],['',''],$attr); - $a = explode(' ', $attr); - if($a && in_array($s, $a)) - return true; +function attribute_contains($attr, $s) +{ + // remove quotes + $attr = str_replace([ '"',"'" ], ['',''], $attr); + $a = explode(' ', $attr); + if ($a && in_array($s, $a)) { + return true; + } - return false; + return false; } /** @@ -686,42 +714,47 @@ function attribute_contains($attr, $s) { * @param int $level A log level * @param int $priority - compatible with syslog */ -function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) { +function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) +{ - if(App::$module == 'setup' && is_writable('install.log')) { - $debugging = true; - $logfile = 'install.log'; - $loglevel = LOGGER_ALL; - } - else { - $debugging = get_config('system', 'debugging'); - $loglevel = intval(get_config('system', 'loglevel')); - $logfile = get_config('system', 'logfile'); - } + if (App::$module == 'setup' && is_writable('install.log')) { + $debugging = true; + $logfile = 'install.log'; + $loglevel = LOGGER_ALL; + } else { + $debugging = get_config('system', 'debugging'); + $loglevel = intval(get_config('system', 'loglevel')); + $logfile = get_config('system', 'logfile'); + } - if((! $debugging) || (! $logfile) || ($level > $loglevel)) - return; + if ((! $debugging) || (! $logfile) || ($level > $loglevel)) { + return; + } - $where = ''; + $where = ''; - $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2); - $where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': '; + $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2); + $where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': '; - $s = datetime_convert('UTC','UTC', 'now', ATOM_TIME) . ':' . log_priority_str($priority) . ':' . logid() . ':' . $where . $msg . PHP_EOL; - $pluginfo = array('filename' => $logfile, 'loglevel' => $level, 'message' => $s,'priority' => $priority, 'logged' => false); + $s = datetime_convert('UTC', 'UTC', 'now', ATOM_TIME) . ':' . log_priority_str($priority) . ':' . logid() . ':' . $where . $msg . PHP_EOL; + $pluginfo = array('filename' => $logfile, 'loglevel' => $level, 'message' => $s,'priority' => $priority, 'logged' => false); - if(! (App::$module == 'setup')) - call_hooks('logger',$pluginfo); + if (! (App::$module == 'setup')) { + call_hooks('logger', $pluginfo); + } - if(! $pluginfo['logged']) - @file_put_contents($pluginfo['filename'], $pluginfo['message'], FILE_APPEND); + if (! $pluginfo['logged']) { + @file_put_contents($pluginfo['filename'], $pluginfo['message'], FILE_APPEND); + } } -function logid() { - $x = session_id(); - if(! $x) - $x = getmypid(); - return substr(hash('whirlpool',$x),0,10); +function logid() +{ + $x = session_id(); + if (! $x) { + $x = getmypid(); + } + return substr(hash('whirlpool', $x), 0, 10); } /** @@ -732,48 +765,52 @@ function logid() { * @param int $level A log level * @param int $priority - compatible with syslog */ -function btlogger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) { +function btlogger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) +{ - if(! defined('BTLOGGER_DEBUG_FILE')) - define('BTLOGGER_DEBUG_FILE','btlogger.out'); + if (! defined('BTLOGGER_DEBUG_FILE')) { + define('BTLOGGER_DEBUG_FILE', 'btlogger.out'); + } - logger($msg, $level, $priority); + logger($msg, $level, $priority); - if(file_exists(BTLOGGER_DEBUG_FILE) && is_writable(BTLOGGER_DEBUG_FILE)) { - $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2); - $where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': '; - $s = datetime_convert('UTC','UTC', 'now', ATOM_TIME) . ':' . log_priority_str($priority) . ':' . logid() . ':' . $where . $msg . PHP_EOL; - @file_put_contents(BTLOGGER_DEBUG_FILE, $s, FILE_APPEND); - } + if (file_exists(BTLOGGER_DEBUG_FILE) && is_writable(BTLOGGER_DEBUG_FILE)) { + $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2); + $where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': '; + $s = datetime_convert('UTC', 'UTC', 'now', ATOM_TIME) . ':' . log_priority_str($priority) . ':' . logid() . ':' . $where . $msg . PHP_EOL; + @file_put_contents(BTLOGGER_DEBUG_FILE, $s, FILE_APPEND); + } - $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); - if($stack) { - for($x = 1; $x < count($stack); $x ++) { - $s = 'stack: ' . basename($stack[$x]['file']) . ':' . $stack[$x]['line'] . ':' . $stack[$x]['function'] . '()'; - logger($s,$level, $priority); + $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); + if ($stack) { + for ($x = 1; $x < count($stack); $x++) { + $s = 'stack: ' . basename($stack[$x]['file']) . ':' . $stack[$x]['line'] . ':' . $stack[$x]['function'] . '()'; + logger($s, $level, $priority); - if(file_exists(BTLOGGER_DEBUG_FILE) && is_writable(BTLOGGER_DEBUG_FILE)) { - @file_put_contents(BTLOGGER_DEBUG_FILE, $s . PHP_EOL, FILE_APPEND); - } - } - } + if (file_exists(BTLOGGER_DEBUG_FILE) && is_writable(BTLOGGER_DEBUG_FILE)) { + @file_put_contents(BTLOGGER_DEBUG_FILE, $s . PHP_EOL, FILE_APPEND); + } + } + } } -function log_priority_str($priority) { - $parr = array( - LOG_EMERG => 'LOG_EMERG', - LOG_ALERT => 'LOG_ALERT', - LOG_CRIT => 'LOG_CRIT', - LOG_ERR => 'LOG_ERR', - LOG_WARNING => 'LOG_WARNING', - LOG_NOTICE => 'LOG_NOTICE', - LOG_INFO => 'LOG_INFO', - LOG_DEBUG => 'LOG_DEBUG' - ); +function log_priority_str($priority) +{ + $parr = array( + LOG_EMERG => 'LOG_EMERG', + LOG_ALERT => 'LOG_ALERT', + LOG_CRIT => 'LOG_CRIT', + LOG_ERR => 'LOG_ERR', + LOG_WARNING => 'LOG_WARNING', + LOG_NOTICE => 'LOG_NOTICE', + LOG_INFO => 'LOG_INFO', + LOG_DEBUG => 'LOG_DEBUG' + ); - if($parr[$priority]) - return $parr[$priority]; - return 'LOG_UNDEFINED'; + if ($parr[$priority]) { + return $parr[$priority]; + } + return 'LOG_UNDEFINED'; } /** @@ -791,49 +828,56 @@ function log_priority_str($priority) { * @param string $msg Message to log * @param int $level A log level. */ -function dlogger($msg, $level = 0) { +function dlogger($msg, $level = 0) +{ - // turn off logger in install mode + // turn off logger in install mode - if(App::$module == 'setup') - return; + if (App::$module == 'setup') { + return; + } - $debugging = get_config('system','debugging'); - $loglevel = intval(get_config('system','loglevel')); - $logfile = get_config('system','dlogfile'); + $debugging = get_config('system', 'debugging'); + $loglevel = intval(get_config('system', 'loglevel')); + $logfile = get_config('system', 'dlogfile'); - if((! $debugging) || (! $logfile) || ($level > $loglevel)) - return; + if ((! $debugging) || (! $logfile) || ($level > $loglevel)) { + return; + } - $where = ''; + $where = ''; - $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2); - $where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': '; + $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2); + $where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': '; - @file_put_contents($logfile, datetime_convert('UTC','UTC', 'now', ATOM_TIME) . ':' . logid() . ' ' . $where . $msg . PHP_EOL, FILE_APPEND); + @file_put_contents($logfile, datetime_convert('UTC', 'UTC', 'now', ATOM_TIME) . ':' . logid() . ' ' . $where . $msg . PHP_EOL, FILE_APPEND); } -function profiler($t1,$t2,$label) { - if(file_exists('profiler.out') && $t1 && t2) - @file_put_contents('profiler.out', sprintf('%01.4f %s',$t2 - $t1,$label) . PHP_EOL, FILE_APPEND); +function profiler($t1, $t2, $label) +{ + if (file_exists('profiler.out') && $t1 && t2) { + @file_put_contents('profiler.out', sprintf('%01.4f %s', $t2 - $t1, $label) . PHP_EOL, FILE_APPEND); + } } -function activity_match($haystack,$needle) { +function activity_match($haystack, $needle) +{ - if(! is_array($needle)) - $needle = [ $needle ]; + if (! is_array($needle)) { + $needle = [ $needle ]; + } - if($needle) { - foreach($needle as $n) { - if(($haystack === $n) || (strtolower(basename($n)) === strtolower(basename($haystack)))) { - return true; - } - } - } - return false; + if ($needle) { + foreach ($needle as $n) { + if (($haystack === $n) || (strtolower(basename($n)) === strtolower(basename($haystack)))) { + return true; + } + } + } + return false; } /** @@ -847,97 +891,105 @@ function activity_match($haystack,$needle) { * @param string $s * @return Returns array of tags found, or empty array. */ -function get_tags($s) { - $ret = []; - $match = []; +function get_tags($s) +{ + $ret = []; + $match = []; - // ignore anything in a code or svg block or HTML tag + // ignore anything in a code or svg block or HTML tag - $s = preg_replace('/\[code(.*?)\](.*?)\[\/code\]/sm','',$s); - $s = preg_replace('/\<(.*?)\>/sm','',$s); - $s = preg_replace('/\[svg(.*?)\](.*?)\[\/svg\]/sm','',$s); + $s = preg_replace('/\[code(.*?)\](.*?)\[\/code\]/sm', '', $s); + $s = preg_replace('/\<(.*?)\>/sm', '', $s); + $s = preg_replace('/\[svg(.*?)\](.*?)\[\/svg\]/sm', '', $s); - // ignore anything in [style= ] - $s = preg_replace('/\[style=(.*?)\]/sm','',$s); + // ignore anything in [style= ] + $s = preg_replace('/\[style=(.*?)\]/sm', '', $s); - // ignore anything in [color= ], because it may contain color codes which are mistaken for tags - $s = preg_replace('/\[color=(.*?)\]/sm','',$s); + // ignore anything in [color= ], because it may contain color codes which are mistaken for tags + $s = preg_replace('/\[color=(.*?)\]/sm', '', $s); - // skip anchors in URL - $s = preg_replace('/\[url=(.*?)\]/sm','',$s); + // skip anchors in URL + $s = preg_replace('/\[url=(.*?)\]/sm', '', $s); - // match any double quoted tags + // match any double quoted tags - if(preg_match_all('/([@#\!]\"\;.*?\"\;)/',$s,$match)) { - foreach($match[1] as $mtch) { - $ret[] = $mtch; - } - } + if (preg_match_all('/([@#\!]\"\;.*?\"\;)/', $s, $match)) { + foreach ($match[1] as $mtch) { + $ret[] = $mtch; + } + } - // match any unescaped double quoted tags (rare) - - if(preg_match_all('/([@#\!]\".*?\")/',$s,$match)) { - foreach($match[1] as $mtch) { - $ret[] = $mtch; - } - } + // match any unescaped double quoted tags (rare) - // match bracket mentions + if (preg_match_all('/([@#\!]\".*?\")/', $s, $match)) { + foreach ($match[1] as $mtch) { + $ret[] = $mtch; + } + } - if(preg_match_all('/([@!]\!?\{.*?\})/',$s,$match)) { - foreach($match[1] as $mtch) { - $ret[] = $mtch; - } - } + // match bracket mentions - // Pull out single word tags. These can be @nickname, @first_last - // and #hash tags. + if (preg_match_all('/([@!]\!?\{.*?\})/', $s, $match)) { + foreach ($match[1] as $mtch) { + $ret[] = $mtch; + } + } - if(preg_match_all('/(? $a['total']) ? 1 : (-1)); +function total_sort($a, $b) +{ + if ($a['total'] == $b['total']) { + return 0; + } + return(($b['total'] > $a['total']) ? 1 : (-1)); } @@ -947,74 +999,82 @@ function total_sort($a,$b) { * @param string $s * @return string */ -function qp($s) { - return str_replace ("%", "=", rawurlencode($s)); +function qp($s) +{ + return str_replace("%", "=", rawurlencode($s)); } -function chanlink_hash($s) { - return z_root() . '/chanview?f=&hash=' . urlencode($s); +function chanlink_hash($s) +{ + return z_root() . '/chanview?f=&hash=' . urlencode($s); } -function chanlink_url($s) { - return z_root() . '/chanview?f=&url=' . urlencode($s); +function chanlink_url($s) +{ + return z_root() . '/chanview?f=&url=' . urlencode($s); } -function chanlink_cid($d) { - return z_root() . '/chanview?f=&cid=' . intval($d); +function chanlink_cid($d) +{ + return z_root() . '/chanview?f=&cid=' . intval($d); } -function magiclink_url($observer,$myaddr,$url) { - return (($observer) - ? z_root() . '/magic?f=&owa=1&bdest=' . bin2hex($url) . '&addr=' . $myaddr - : $url - ); +function magiclink_url($observer, $myaddr, $url) +{ + return (($observer) + ? z_root() . '/magic?f=&owa=1&bdest=' . bin2hex($url) . '&addr=' . $myaddr + : $url + ); } -function search($s,$id='search-box',$url='/search',$save = false) { +function search($s, $id = 'search-box', $url = '/search', $save = false) +{ - return replace_macros(get_markup_template('searchbox.tpl'),array( - '$s' => $s, - '$id' => $id, - '$action_url' => z_root() . $url, - '$search_label' => t('Search'), - '$save_label' => t('Save'), - '$savedsearch' => feature_enabled(local_channel(),'savedsearch') - )); + return replace_macros(get_markup_template('searchbox.tpl'), array( + '$s' => $s, + '$id' => $id, + '$action_url' => z_root() . $url, + '$search_label' => t('Search'), + '$save_label' => t('Save'), + '$savedsearch' => feature_enabled(local_channel(), 'savedsearch') + )); } -function searchbox($s,$id='search-box',$url='/search',$save = false) { - return replace_macros(get_markup_template('searchbox.tpl'),array( - '$s' => $s, - '$id' => $id, - '$action_url' => z_root() . '/' . $url, - '$search_label' => t('Search'), - '$save_label' => t('Save'), - '$savedsearch' => ($save && feature_enabled(local_channel(),'savedsearch')) - )); +function searchbox($s, $id = 'search-box', $url = '/search', $save = false) +{ + return replace_macros(get_markup_template('searchbox.tpl'), array( + '$s' => $s, + '$id' => $id, + '$action_url' => z_root() . '/' . $url, + '$search_label' => t('Search'), + '$save_label' => t('Save'), + '$savedsearch' => ($save && feature_enabled(local_channel(), 'savedsearch')) + )); } /** * @brief Replace naked text hyperlink with HTML formatted hyperlink. * * @param string $s - * @param boolean $me (optional) default false + * @param bool $me (optional) default false * @return string */ -function linkify($s, $me = false) { - $rel = 'nofollow noopener'; - if ($me) { - $rel .= ' me'; - } - $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\@\~\#\'\%\$\!\+\,\@]*)/u", '$1', $s); - $s = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$s); +function linkify($s, $me = false) +{ + $rel = 'nofollow noopener'; + if ($me) { + $rel .= ' me'; + } + $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\@\~\#\'\%\$\!\+\,\@]*)/u", '$1', $s); + $s = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism", '<$1$2=$3&$4>', $s); - return($s); + return($s); } /** @@ -1027,83 +1087,83 @@ function linkify($s, $me = false) { * @param string $s * @returns string */ -function sslify($s, $cache_enable = true) { +function sslify($s, $cache_enable = true) +{ - if (! $cache_enable) { + if (! $cache_enable) { + // we're fetching an old item and we are no longer + // caching photos for it. Remove any existing cached photos. + // Cron_weekly tasks will also remove these, but if the cache + // entry was updated recently they might not get removed for + // another couple of months. - // we're fetching an old item and we are no longer - // caching photos for it. Remove any existing cached photos. - // Cron_weekly tasks will also remove these, but if the cache - // entry was updated recently they might not get removed for - // another couple of months. - - uncache($s); - } + uncache($s); + } - if ((! $cache_enable) || (! intval(get_config('system','cache_images', 1)))) { + if ((! $cache_enable) || (! intval(get_config('system', 'cache_images', 1)))) { + // if caching is prevented for whatever reason, proxy any non-SSL photos - // if caching is prevented for whatever reason, proxy any non-SSL photos + if (strpos(z_root(), 'https:') === false) { + return $s; + } - if (strpos(z_root(),'https:') === false) { - return $s; - } + // we'll only sslify img tags because media files will probably choke. - // we'll only sslify img tags because media files will probably choke. + $pattern = "/\'; + if (App::$pager['page'] != 1) { + $o .= '' . "' . t('prev') . ' '; + } - $o .= "" . t('first') . " "; + $o .= "" . t('first') . " "; - $numpages = App::$pager['total'] / App::$pager['itemspage']; + $numpages = App::$pager['total'] / App::$pager['itemspage']; - $numstart = 1; - $numstop = $numpages; + $numstart = 1; + $numstop = $numpages; - if($numpages > 14) { - $numstart = (($pagenum > 7) ? ($pagenum - 7) : 1); - $numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 14)); - } + if ($numpages > 14) { + $numstart = (($pagenum > 7) ? ($pagenum - 7) : 1); + $numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 14)); + } - for($i = $numstart; $i <= $numstop; $i++){ - if($i == App::$pager['page']) - $o .= ''.(($i < 10) ? ' '.$i : $i); - else - $o .= "".(($i < 10) ? ' '.$i : $i).""; - $o .= ' '; - } + for ($i = $numstart; $i <= $numstop; $i++) { + if ($i == App::$pager['page']) { + $o .= '' . (($i < 10) ? ' ' . $i : $i); + } else { + $o .= "" . (($i < 10) ? ' ' . $i : $i) . ""; + } + $o .= ' '; + } - if((App::$pager['total'] % App::$pager['itemspage']) != 0) { - if($i == App::$pager['page']) - $o .= ''.(($i < 10) ? ' '.$i : $i); - else - $o .= "".(($i < 10) ? ' '.$i : $i).""; - $o .= ' '; - } + if ((App::$pager['total'] % App::$pager['itemspage']) != 0) { + if ($i == App::$pager['page']) { + $o .= '' . (($i < 10) ? ' ' . $i : $i); + } else { + $o .= "" . (($i < 10) ? ' ' . $i : $i) . ""; + } + $o .= ' '; + } - $lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages); - $o .= "" . t('last') . " "; + $lastpage = (($numpages > intval($numpages)) ? intval($numpages) + 1 : $numpages); + $o .= "" . t('last') . " "; - if((App::$pager['total'] - (App::$pager['itemspage'] * App::$pager['page'])) > 0) - $o .= ''."' . t('next') . ''; - $o .= ''."\r\n"; - } + if ((App::$pager['total'] - (App::$pager['itemspage'] * App::$pager['page'])) > 0) { + $o .= '' . "' . t('next') . ''; + } + $o .= ' . '/images/emoticons/smiley-heart.gif)
',
- ' . '/images/emoticons/smiley-brokenheart.gif)
',
- ' . '/images/emoticons/smiley-smile.gif)
',
- ' . '/images/emoticons/smiley-wink.gif)
',
- ' . '/images/emoticons/smiley-frown.gif)
',
- ' . '/images/emoticons/smiley-tongue-out.gif)
',
- '',
- ' . '/images/emoticons/smiley-kiss.gif)
',
- '',
- '',
- '',
- ' . '/images/emoticons/smiley-laughing.gif)
',
- ' . '/images/emoticons/smiley-surprised.gif)
',
- '',
- '',
- ' . '/images/emoticons/smiley-thumbsup.gif)
',
- ' . '/images/emoticons/smiley-Oo.gif)
',
- '',
- '',
- '',
- ' . '/images/emoticons/smiley-cry.gif)
',
- ' . '/images/emoticons/smiley-foot-in-mouth.gif)
',
- ' . '/images/emoticons/smiley-undecided.gif)
',
- ' . '/images/emoticons/smiley-embarassed.gif)
',
- ' . '/images/emoticons/smiley-cool.gif)
',
- ' . '/images/emoticons/beer_mug.gif)
',
- '',
- ' . '/images/emoticons/coffee.gif)
',
- ' . '/images/emoticons/smiley-facepalm.gif)
',
- ' . '/images/emoticons/like.gif)
',
- ' . '/images/emoticons/dislike.gif)
'
+ $icons = array(
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ ''
- );
+ );
- $params = array('texts' => $texts, 'icons' => $icons);
+ $params = array('texts' => $texts, 'icons' => $icons);
- if($default_only)
- return $params;
+ if ($default_only) {
+ return $params;
+ }
- call_hooks('smilie', $params);
+ call_hooks('smilie', $params);
- return $params;
+ return $params;
}
/**
@@ -1280,36 +1344,40 @@ function list_smilies($default_only = false) {
* bbcode source for HTML display.
*
* @param string $s
- * @param boolean $sample (optional) default false
+ * @param bool $sample (optional) default false
* @return string
*/
-function smilies($s, $sample = false) {
+function smilies($s, $sample = false)
+{
- if(intval(get_config('system', 'no_smilies'))
- || (local_channel() && intval(get_pconfig(local_channel(), 'system', 'no_smilies'))))
- return $s;
+ if (
+ intval(get_config('system', 'no_smilies'))
+ || (local_channel() && intval(get_pconfig(local_channel(), 'system', 'no_smilies')))
+ ) {
+ return $s;
+ }
- $s = preg_replace_callback('{<(pre|code)>.*?}ism', 'smile_shield', $s);
- $s = preg_replace_callback('/<[a-z]+ .*?>/ism', 'smile_shield', $s);
+ $s = preg_replace_callback('{<(pre|code)>.*?}ism', 'smile_shield', $s);
+ $s = preg_replace_callback('/<[a-z]+ .*?>/ism', 'smile_shield', $s);
- $params = list_smilies();
- $params['string'] = $s;
+ $params = list_smilies();
+ $params['string'] = $s;
- if ($sample) {
- $s = ''; - for ($x = 0; $x < count($params['texts']); $x ++) { - $s .= '- ' . $params['texts'][$x] . '
- ' . $params['icons'][$x] . '
'; + for ($x = 0; $x < count($params['texts']); $x++) { + $s .= '- ' . $params['texts'][$x] . '
- ' . $params['icons'][$x] . '
';
+ $t = '';
+ for ($cnt = 0; $cnt < strlen($x[1]); $cnt++) {
+ $t .= '';
+ }
- $r = str_replace($x[0],$t,$x[0]);
+ $r = str_replace($x[0], $t, $x[0]);
- return $r;
+ return $r;
}
-function day_translate($s) {
- $ret = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'),
- array( t('Monday'), t('Tuesday'), t('Wednesday'), t('Thursday'), t('Friday'), t('Saturday'), t('Sunday')),
- $s);
+function day_translate($s)
+{
+ $ret = str_replace(
+ array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'),
+ array( t('Monday'), t('Tuesday'), t('Wednesday'), t('Thursday'), t('Friday'), t('Saturday'), t('Sunday')),
+ $s
+ );
- $ret = str_replace(array('January','February','March','April','May','June','July','August','September','October','November','December'),
- array( t('January'), t('February'), t('March'), t('April'), t('May'), t('June'), t('July'), t('August'), t('September'), t('October'), t('November'), t('December')),
- $ret);
+ $ret = str_replace(
+ array('January','February','March','April','May','June','July','August','September','October','November','December'),
+ array( t('January'), t('February'), t('March'), t('April'), t('May'), t('June'), t('July'), t('August'), t('September'), t('October'), t('November'), t('December')),
+ $ret
+ );
- return $ret;
+ return $ret;
}
/**
@@ -1365,10 +1443,11 @@ function day_translate($s) {
* @param string $url
* @return string
*/
-function normalise_link($url) {
- $ret = str_replace(array('https:', '//www.'), array('http:', '//'), $url);
+function normalise_link($url)
+{
+ $ret = str_replace(array('https:', '//www.'), array('http:', '//'), $url);
- return(rtrim($ret, '/'));
+ return(rtrim($ret, '/'));
}
/**
@@ -1384,127 +1463,134 @@ function normalise_link($url) {
* @param string $b
* @return true if the URLs match, otherwise false
*/
-function link_compare($a, $b) {
- if (strcasecmp(normalise_link($a), normalise_link($b)) === 0)
- return true;
+function link_compare($a, $b)
+{
+ if (strcasecmp(normalise_link($a), normalise_link($b)) === 0) {
+ return true;
+ }
- return false;
+ return false;
}
// Given an item array, convert the body element from bbcode to html and add smilie icons.
// If attach is true, also add icons for item attachments
-function unobscure(&$item) {
- return;
+function unobscure(&$item)
+{
+ return;
}
-function unobscure_mail(&$item) {
- if(array_key_exists('mail_obscured',$item) && intval($item['mail_obscured'])) {
- if($item['title'])
- $item['title'] = base64url_decode(str_rot47($item['title']));
- if($item['body'])
- $item['body'] = base64url_decode(str_rot47($item['body']));
- }
+function unobscure_mail(&$item)
+{
+ if (array_key_exists('mail_obscured', $item) && intval($item['mail_obscured'])) {
+ if ($item['title']) {
+ $item['title'] = base64url_decode(str_rot47($item['title']));
+ }
+ if ($item['body']) {
+ $item['body'] = base64url_decode(str_rot47($item['body']));
+ }
+ }
}
-function theme_attachments(&$item) {
+function theme_attachments(&$item)
+{
- $s = EMPTY_STR;
+ $s = EMPTY_STR;
- $arr = json_decode($item['attach'],true);
+ $arr = json_decode($item['attach'], true);
- if (is_array($arr) && count($arr)) {
- $attaches = [];
- foreach ($arr as $r) {
+ if (is_array($arr) && count($arr)) {
+ $attaches = [];
+ foreach ($arr as $r) {
+ $label = EMPTY_STR;
+ $icon = getIconFromType($r['type']);
- $label = EMPTY_STR;
- $icon = getIconFromType($r['type']);
-
- if (isset($r['title']) && $r['title']) {
- $label = urldecode(htmlspecialchars($r['title'], ENT_COMPAT, 'UTF-8'));
- }
+ if (isset($r['title']) && $r['title']) {
+ $label = urldecode(htmlspecialchars($r['title'], ENT_COMPAT, 'UTF-8'));
+ }
- if (isset($r['name']) && $r['name']) {
- $label = urldecode(htmlspecialchars($r['name'], ENT_COMPAT, 'UTF-8'));
- }
+ if (isset($r['name']) && $r['name']) {
+ $label = urldecode(htmlspecialchars($r['name'], ENT_COMPAT, 'UTF-8'));
+ }
- if (isset($r['href']) && $r['href']) {
- $m = parse_url($r['href']);
- }
- if (! $label) {
- if (isset($r['href']) && $r['href']) {
- if (isset($m) && $m && $m['path']) {
- $label = basename($m['path']);
- }
- }
- }
+ if (isset($r['href']) && $r['href']) {
+ $m = parse_url($r['href']);
+ }
+ if (! $label) {
+ if (isset($r['href']) && $r['href']) {
+ if (isset($m) && $m && $m['path']) {
+ $label = basename($m['path']);
+ }
+ }
+ }
- // some feeds provide an attachment where title is an empty space
- if (! trim($label)) {
- $label = t('Unknown Attachment');
- }
+ // some feeds provide an attachment where title is an empty space
+ if (! trim($label)) {
+ $label = t('Unknown Attachment');
+ }
- $title = t('Size') . ' ' . ((isset($r['length']) && $r['length']) ? userReadableSize($r['length']) : t('unknown'));
+ $title = t('Size') . ' ' . ((isset($r['length']) && $r['length']) ? userReadableSize($r['length']) : t('unknown'));
- if (! (isset($r['href']))) {
- continue;
- }
+ if (! (isset($r['href']))) {
+ continue;
+ }
- if (isset($m) && $m && $m['scheme'] === 'data') {
- continue;
- }
+ if (isset($m) && $m && $m['scheme'] === 'data') {
+ continue;
+ }
- if (is_foreigner($item['author_xchan'])) {
- $url = $r['href'];
- }
- else {
- $url = z_root() . '/magic?f=&owa=1&hash=' . $item['author_xchan'] . '&bdest=' . bin2hex($r['href'] . ((isset($r['revision']) ? '/' . $r['revision'] : '')));
- }
- $attaches[] = [
- 'label' => $label,
- 'url' => $url,
- 'icon' => $icon,
- 'title' => $title
- ];
- }
+ if (is_foreigner($item['author_xchan'])) {
+ $url = $r['href'];
+ } else {
+ $url = z_root() . '/magic?f=&owa=1&hash=' . $item['author_xchan'] . '&bdest=' . bin2hex($r['href'] . ((isset($r['revision']) ? '/' . $r['revision'] : '')));
+ }
+ $attaches[] = [
+ 'label' => $label,
+ 'url' => $url,
+ 'icon' => $icon,
+ 'title' => $title
+ ];
+ }
- $s = replace_macros(get_markup_template('item_attach.tpl'), [
- '$attaches' => $attaches
- ]);
- }
+ $s = replace_macros(get_markup_template('item_attach.tpl'), [
+ '$attaches' => $attaches
+ ]);
+ }
- return $s;
+ return $s;
}
-function format_categories(&$item,$writeable) {
+function format_categories(&$item, $writeable)
+{
- $s = EMPTY_STR;
+ $s = EMPTY_STR;
- if (! (isset($item['term']) && $item['term'])) {
- return $s;
- }
+ if (! (isset($item['term']) && $item['term'])) {
+ return $s;
+ }
- $terms = get_terms_oftype($item['term'],TERM_CATEGORY);
- if($terms) {
- $categories = [];
- foreach($terms as $t) {
- $term = htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8',false) ;
- if(! trim($term))
- continue;
- $removelink = (($writeable) ? z_root() . '/filerm/' . $item['id'] . '?f=&cat=' . urlencode($t['term']) : '');
- $categories[] = array('term' => $term, 'writeable' => $writeable, 'removelink' => $removelink, 'url' => zid($t['url']));
- }
+ $terms = get_terms_oftype($item['term'], TERM_CATEGORY);
+ if ($terms) {
+ $categories = [];
+ foreach ($terms as $t) {
+ $term = htmlspecialchars($t['term'], ENT_COMPAT, 'UTF-8', false) ;
+ if (! trim($term)) {
+ continue;
+ }
+ $removelink = (($writeable) ? z_root() . '/filerm/' . $item['id'] . '?f=&cat=' . urlencode($t['term']) : '');
+ $categories[] = array('term' => $term, 'writeable' => $writeable, 'removelink' => $removelink, 'url' => zid($t['url']));
+ }
- $s = replace_macros(get_markup_template('item_categories.tpl'),array(
- '$remove' => t('remove category'),
- '$categories' => $categories
- ));
- }
+ $s = replace_macros(get_markup_template('item_categories.tpl'), array(
+ '$remove' => t('remove category'),
+ '$categories' => $categories
+ ));
+ }
- return $s;
+ return $s;
}
/**
@@ -1514,464 +1600,468 @@ function format_categories(&$item,$writeable) {
* @return string HTML link of hashtag
*/
-function format_hashtags(&$item) {
- $s = '';
+function format_hashtags(&$item)
+{
+ $s = '';
- if (! isset($item['term'])) {
- return $s;
- }
+ if (! isset($item['term'])) {
+ return $s;
+ }
- $terms = get_terms_oftype($item['term'], array(TERM_HASHTAG,TERM_COMMUNITYTAG));
- if($terms) {
- foreach($terms as $t) {
- $term = htmlspecialchars($t['term'], ENT_COMPAT, 'UTF-8', false) ;
- if(! trim($term))
- continue;
+ $terms = get_terms_oftype($item['term'], array(TERM_HASHTAG,TERM_COMMUNITYTAG));
+ if ($terms) {
+ foreach ($terms as $t) {
+ $term = htmlspecialchars($t['term'], ENT_COMPAT, 'UTF-8', false) ;
+ if (! trim($term)) {
+ continue;
+ }
- // Pleroma uses example.com/tags/xxx in the taglist but example.com/tag/xxx in the body. Possibly a bug because one of these leads to
- // an error page, but it messes up our detection of whether the tag was already present in the body.
-
- if($t['url'] && ((stripos($item['body'], $t['url']) !== false) || (stripos($item['body'], str_replace('/tags/','/tag/',$t['url']))))) {
- continue;
- }
- if($s)
- $s .= ' ';
+ // Pleroma uses example.com/tags/xxx in the taglist but example.com/tag/xxx in the body. Possibly a bug because one of these leads to
+ // an error page, but it messes up our detection of whether the tag was already present in the body.
- $s .= ' ' . $term . '';
- }
- }
+ if ($t['url'] && ((stripos($item['body'], $t['url']) !== false) || (stripos($item['body'], str_replace('/tags/', '/tag/', $t['url']))))) {
+ continue;
+ }
+ if ($s) {
+ $s .= ' ';
+ }
- return $s;
+ $s .= ' ' . $term . '';
+ }
+ }
+
+ return $s;
}
-function format_mentions(&$item) {
- $s = EMPTY_STR;
+function format_mentions(&$item)
+{
+ $s = EMPTY_STR;
- $pref = intval(PConfig::Get($item['uid'],'system','tag_username',Config::Get('system','tag_username',false)));
+ $pref = intval(PConfig::Get($item['uid'], 'system', 'tag_username', Config::Get('system', 'tag_username', false)));
- // hide "auto mentions" by default - this hidden pref let's you display them.
+ // hide "auto mentions" by default - this hidden pref let's you display them.
- $show = intval(PConfig::Get($item['uid'],'system','show_auto_mentions',false));
- if ((! $show) && (! $item['resource_type'])) {
- return $s;
- }
+ $show = intval(PConfig::Get($item['uid'], 'system', 'show_auto_mentions', false));
+ if ((! $show) && (! $item['resource_type'])) {
+ return $s;
+ }
- if ($pref === 127) {
- return $s;
- }
+ if ($pref === 127) {
+ return $s;
+ }
- if (! (isset($item['term']) && is_array($item['term']) && $item['term'])) {
- return $s;
- }
- $terms = get_terms_oftype($item['term'],TERM_MENTION);
- if($terms) {
- foreach($terms as $t) {
+ if (! (isset($item['term']) && is_array($item['term']) && $item['term'])) {
+ return $s;
+ }
+ $terms = get_terms_oftype($item['term'], TERM_MENTION);
+ if ($terms) {
+ foreach ($terms as $t) {
+ $term = htmlspecialchars($t['term'], ENT_COMPAT, 'UTF-8', false) ;
+ if (! trim($term)) {
+ continue;
+ }
- $term = htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8',false) ;
- if(! trim($term))
- continue;
+ if ($t['url'] && stripos($item['body'], $t['url']) !== false) {
+ continue;
+ }
- if($t['url'] && stripos($item['body'], $t['url']) !== false)
- continue;
+ // some platforms put the identity url into href rather than the profile url. Accept either form.
+ $x = q(
+ "select * from xchan where xchan_url = '%s' or xchan_hash = '%s' limit 1",
+ dbesc($t['url']),
+ dbesc($t['url'])
+ );
+ if ($x) {
+ switch ($pref) {
+ case 0:
+ $txt = $x[0]['xchan_name'];
+ break;
+ case 1:
+ $txt = (($x[0]['xchan_addr']) ? $x[0]['xchan_addr'] : $x[0]['xchan_name']);
+ break;
+ case 2:
+ default;
+ if ($x[0]['xchan_addr']) {
+ $txt = sprintf(t('%1$s (%2$s)'), $x[0]['xchan_name'], $x[0]['xchan_addr']);
+ } else {
+ $txt = $x[0]['xchan_name'];
+ }
+ break;
+ }
+ }
- // some platforms put the identity url into href rather than the profile url. Accept either form.
- $x = q("select * from xchan where xchan_url = '%s' or xchan_hash = '%s' limit 1",
- dbesc($t['url']),
- dbesc($t['url'])
- );
- if ($x) {
- switch ($pref) {
- case 0:
- $txt = $x[0]['xchan_name'];
- break;
- case 1:
- $txt = (($x[0]['xchan_addr']) ? $x[0]['xchan_addr'] : $x[0]['xchan_name']);
- break;
- case 2:
- default;
- if ($x[0]['xchan_addr']) {
- $txt = sprintf( t('%1$s (%2$s)'), $x[0]['xchan_name'], $x[0]['xchan_addr']);
- }
- else {
- $txt = $x[0]['xchan_name'];
- }
- break;
- }
- }
-
- if ($s) {
- $s .= ' ';
- }
- $s .= ' ' . $txt . '';
- }
- }
+ if ($s) {
+ $s .= ' ';
+ }
+ $s .= ' ' . $txt . '';
+ }
+ }
- return $s;
+ return $s;
}
-function format_filer(&$item) {
- $s = EMPTY_STR;
+function format_filer(&$item)
+{
+ $s = EMPTY_STR;
- if (! (isset($item['term']) && $item['term'])) {
- return $s;
- }
+ if (! (isset($item['term']) && $item['term'])) {
+ return $s;
+ }
- $terms = get_terms_oftype($item['term'],TERM_FILE);
- if($terms) {
- $categories = [];
- foreach($terms as $t) {
- $term = htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8',false) ;
- if(! trim($term))
- continue;
- $removelink = z_root() . '/filerm/' . $item['id'] . '?f=&term=' . urlencode($t['term']);
- $categories[] = array('term' => $term, 'removelink' => $removelink);
- }
+ $terms = get_terms_oftype($item['term'], TERM_FILE);
+ if ($terms) {
+ $categories = [];
+ foreach ($terms as $t) {
+ $term = htmlspecialchars($t['term'], ENT_COMPAT, 'UTF-8', false) ;
+ if (! trim($term)) {
+ continue;
+ }
+ $removelink = z_root() . '/filerm/' . $item['id'] . '?f=&term=' . urlencode($t['term']);
+ $categories[] = array('term' => $term, 'removelink' => $removelink);
+ }
- $s = replace_macros(get_markup_template('item_filer.tpl'),array(
- '$remove' => t('remove from file'),
- '$categories' => $categories
- ));
- }
+ $s = replace_macros(get_markup_template('item_filer.tpl'), array(
+ '$remove' => t('remove from file'),
+ '$categories' => $categories
+ ));
+ }
- return $s;
+ return $s;
}
-function generate_map($coord) {
+function generate_map($coord)
+{
- $coord = str_replace(array(',','/',' '),array(' ',' ',' '),trim($coord));
+ $coord = str_replace(array(',','/',' '), array(' ',' ',' '), trim($coord));
-
- $zoom = ((strpos($coord,'?z=') !== false) ? substr($coord,strpos($coord,'?z=')+3) : 0);
- if ($zoom) {
- $coord = substr($coord,0,strpos($coord,'?'));
- }
- else {
- $zoom = 16;
- }
+ $zoom = ((strpos($coord, '?z=') !== false) ? substr($coord, strpos($coord, '?z=') + 3) : 0);
- $arr = [
- 'lat' => trim(substr($coord, 0, strpos($coord, ' '))),
- 'lon' => trim(substr($coord, strpos($coord, ' ')+1)),
- 'zoom' => $zoom,
- 'html' => ''
- ];
+ if ($zoom) {
+ $coord = substr($coord, 0, strpos($coord, '?'));
+ } else {
+ $zoom = 16;
+ }
- /**
- * @hooks generate_map
- * * \e string \b lat
- * * \e string \b lon
- * * \e string \b html the parsed HTML to return
- */
- call_hooks('generate_map', $arr);
+ $arr = [
+ 'lat' => trim(substr($coord, 0, strpos($coord, ' '))),
+ 'lon' => trim(substr($coord, strpos($coord, ' ') + 1)),
+ 'zoom' => $zoom,
+ 'html' => ''
+ ];
- return (($arr['html']) ? $arr['html'] : $coord);
+ /**
+ * @hooks generate_map
+ * * \e string \b lat
+ * * \e string \b lon
+ * * \e string \b html the parsed HTML to return
+ */
+ call_hooks('generate_map', $arr);
+
+ return (($arr['html']) ? $arr['html'] : $coord);
}
-function generate_named_map($location) {
- $arr = [
- 'location' => $location,
- 'html' => ''
- ];
+function generate_named_map($location)
+{
+ $arr = [
+ 'location' => $location,
+ 'html' => ''
+ ];
- /**
- * @hooks generate_named_map
- * * \e string \b location
- * * \e string \b html the parsed HTML to return
- */
- call_hooks('generate_named_map', $arr);
+ /**
+ * @hooks generate_named_map
+ * * \e string \b location
+ * * \e string \b html the parsed HTML to return
+ */
+ call_hooks('generate_named_map', $arr);
- return (($arr['html']) ? $arr['html'] : $location);
+ return (($arr['html']) ? $arr['html'] : $location);
}
-function prepare_body(&$item,$attach = false,$opts = false) {
+function prepare_body(&$item, $attach = false, $opts = false)
+{
- call_hooks('prepare_body_init', $item);
+ call_hooks('prepare_body_init', $item);
- $censored = ((($item['author']['abook_censor'] || $item['owner']['abook_censor'] || $item['author']['xchan_selfcensored'] || $item['owner']['xchan_selfcensored'] || $item['author']['xchan_censored'] || $item['owner']['xchan_censored'] || intval($item['item_nsfw'])) && (get_safemode()))
- ? true
- : false
- );
+ $censored = ((($item['author']['abook_censor'] || $item['owner']['abook_censor'] || $item['author']['xchan_selfcensored'] || $item['owner']['xchan_selfcensored'] || $item['author']['xchan_censored'] || $item['owner']['xchan_censored'] || intval($item['item_nsfw'])) && (get_safemode()))
+ ? true
+ : false
+ );
- if ($censored) {
- if (! $opts) {
- $opts = [];
- }
- $opts['censored'] = true;
- }
-
- $s = '';
- $photo = '';
+ if ($censored) {
+ if (! $opts) {
+ $opts = [];
+ }
+ $opts['censored'] = true;
+ }
- $is_photo = ((($item['verb'] === ACTIVITY_POST) && ($item['obj_type'] === ACTIVITY_OBJ_PHOTO)) ? true : false);
+ $s = '';
+ $photo = '';
- if ($is_photo && ! $censored) {
+ $is_photo = ((($item['verb'] === ACTIVITY_POST) && ($item['obj_type'] === ACTIVITY_OBJ_PHOTO)) ? true : false);
- $object = json_decode($item['obj'],true);
- $ptr = null;
+ if ($is_photo && ! $censored) {
+ $object = json_decode($item['obj'], true);
+ $ptr = null;
- if (is_array($object) && array_key_exists('url',$object) && is_array($object['url'])) {
- if (array_key_exists(0,$object['url'])) {
- foreach ($object['url'] as $link) {
- if(array_key_exists('width',$link) && $link['width'] >= 640 && $link['width'] <= 1024) {
- $ptr = $link;
- }
- }
- if (! $ptr) {
- $ptr = $object['url'][0];
- }
- }
- else {
- $ptr = $object['url'];
- }
+ if (is_array($object) && array_key_exists('url', $object) && is_array($object['url'])) {
+ if (array_key_exists(0, $object['url'])) {
+ foreach ($object['url'] as $link) {
+ if (array_key_exists('width', $link) && $link['width'] >= 640 && $link['width'] <= 1024) {
+ $ptr = $link;
+ }
+ }
+ if (! $ptr) {
+ $ptr = $object['url'][0];
+ }
+ } else {
+ $ptr = $object['url'];
+ }
- // if original photo width is > 640px make it a cover photo
- if ($ptr) {
- $alt_text = ' alt="' . ((isset($ptr['summary']) && $ptr['summary']) ? htmlspecialchars($ptr['summary'], ENT_QUOTES, 'UTF-8') : t('Image/photo')) . '"';
- $title_text = ' title="' . ((isset($ptr['summary']) && $ptr['summary']) ? htmlspecialchars($ptr['summary'], ENT_QUOTES, 'UTF-8') : t('Image/photo')) . '"';
+ // if original photo width is > 640px make it a cover photo
+ if ($ptr) {
+ $alt_text = ' alt="' . ((isset($ptr['summary']) && $ptr['summary']) ? htmlspecialchars($ptr['summary'], ENT_QUOTES, 'UTF-8') : t('Image/photo')) . '"';
+ $title_text = ' title="' . ((isset($ptr['summary']) && $ptr['summary']) ? htmlspecialchars($ptr['summary'], ENT_QUOTES, 'UTF-8') : t('Image/photo')) . '"';
- if (array_key_exists('width',$ptr) && $ptr['width'] > 640) {
- $photo = ''; - } - else { - $item['body'] = '[zmg' . $alt_text . ']' . $ptr['href'] . '[/zmg]' . "\n\n" . $item['body']; - } - } - } - } + if (array_key_exists('width', $ptr) && $ptr['width'] > 640) { + $photo = '
') !== false && $item['coord']) { - $x = generate_map(trim($item['coord'])); - if($x) { - $s = preg_replace('/\/','$0' . $x,$s); - } - } + if (strpos($s, '') !== false && $item['coord']) { + $x = generate_map(trim($item['coord'])); + if ($x) { + $s = preg_replace('/\/', '$0' . $x, $s); + } + } - $attachments = theme_attachments($item); + $attachments = theme_attachments($item); - $writeable = ((get_observer_hash() == $item['owner_xchan']) ? true : false); + $writeable = ((get_observer_hash() == $item['owner_xchan']) ? true : false); - $tags = format_hashtags($item); + $tags = format_hashtags($item); - $mentions = format_mentions($item); + $mentions = format_mentions($item); - $categories = format_categories($item,$writeable); + $categories = format_categories($item, $writeable); - if(local_channel() == $item['uid']) - $filer = format_filer($item); + if (local_channel() == $item['uid']) { + $filer = format_filer($item); + } - // Caching photos can use absurd amounts of space. - // Don't cache photos if somebody is just browsing the stream to the - // beginning of time. This optimises performance for viewing things created - // recently. Also catch an explicit expiration of 0 or "no cache". + // Caching photos can use absurd amounts of space. + // Don't cache photos if somebody is just browsing the stream to the + // beginning of time. This optimises performance for viewing things created + // recently. Also catch an explicit expiration of 0 or "no cache". - $cache_expire = intval(get_config('system', 'default_expire_days')); - if ($cache_expire <= 0) { - $cache_expire = 60; - } - $cache_enable = ((($cache_expire) && ($item['created'] < datetime_convert('UTC','UTC', 'now - ' . $cache_expire . ' days'))) ? false : true); + $cache_expire = intval(get_config('system', 'default_expire_days')); + if ($cache_expire <= 0) { + $cache_expire = 60; + } + $cache_enable = ((($cache_expire) && ($item['created'] < datetime_convert('UTC', 'UTC', 'now - ' . $cache_expire . ' days'))) ? false : true); - // disable Unicode RTL over-ride since it can destroy presentation in some cases, use HTML or CSS instead - $s = str_replace([ '', '', html_entity_decode('', ENT_QUOTES,'UTF-8') ],[ '','','' ],$s); + // disable Unicode RTL over-ride since it can destroy presentation in some cases, use HTML or CSS instead + $s = str_replace([ '', '', html_entity_decode('', ENT_QUOTES, 'UTF-8') ], [ '','','' ], $s); - if($s) - $s = sslify($s, $cache_enable); - if($photo) - $photo = sslify($photo, $cache_enable); - if($event) - $event = sslify($event, $cache_enable); - - $prep_arr = array( - 'item' => $item, - 'photo' => $photo, - 'html' => $s, - 'event' => $event, - 'categories' => $categories, - 'folders' => $filer, - 'tags' => $tags, - 'mentions' => $mentions, - 'attachments' => $attachments - ); + if ($s) { + $s = sslify($s, $cache_enable); + } + if ($photo) { + $photo = sslify($photo, $cache_enable); + } + if ($event) { + $event = sslify($event, $cache_enable); + } - call_hooks('prepare_body_final', $prep_arr); + $prep_arr = array( + 'item' => $item, + 'photo' => $photo, + 'html' => $s, + 'event' => $event, + 'categories' => $categories, + 'folders' => $filer, + 'tags' => $tags, + 'mentions' => $mentions, + 'attachments' => $attachments + ); - unset($prep_arr['item']); + call_hooks('prepare_body_final', $prep_arr); - return $prep_arr; + unset($prep_arr['item']); + + return $prep_arr; } -function separate_img_links($s) { - $x = preg_replace('/\\
' . t('Link') . '
',$s); +function separate_img_links($s) +{ + $x = preg_replace( + '/\\
' . t('Link') . '
', + $s + ); - return $x; -} + return $x; +} -function format_poll($item,$s,$opts) { +function format_poll($item, $s, $opts) +{ - if (! is_array($item['obj'])) { - $act = json_decode($item['obj'],true); - } - else { - $act = $item['obj']; - } + if (! is_array($item['obj'])) { + $act = json_decode($item['obj'], true); + } else { + $act = $item['obj']; + } - if (! is_array($act)) { - return EMPTY_STR; - } + if (! is_array($act)) { + return EMPTY_STR; + } - $commentable = can_comment_on_post(((local_channel()) ? get_observer_hash() : EMPTY_STR),$item); + $commentable = can_comment_on_post(((local_channel()) ? get_observer_hash() : EMPTY_STR), $item); - //logger('format_poll: ' . print_r($item,true)); - $activated = ((local_channel() && local_channel() == $item['uid']) ? true : false); - $output = $s . EOL. EOL; + //logger('format_poll: ' . print_r($item,true)); + $activated = ((local_channel() && local_channel() == $item['uid']) ? true : false); + $output = $s . EOL . EOL; - $closed = false; - $closing = false; + $closed = false; + $closing = false; - if ($item['comments_closed'] > NULL_DATE) { - $closing = true; - $t = datetime_convert('UTC',date_default_timezone_get(), $item['comments_closed'], 'Y-m-d H:i'); - $closed = ((datetime_convert() > $item['comments_closed']) ? true : false); - if ($closed) { - $commentable = false; - } - } + if ($item['comments_closed'] > NULL_DATE) { + $closing = true; + $t = datetime_convert('UTC', date_default_timezone_get(), $item['comments_closed'], 'Y-m-d H:i'); + $closed = ((datetime_convert() > $item['comments_closed']) ? true : false); + if ($closed) { + $commentable = false; + } + } - if ($act['type'] === 'Question') { - if ($activated and $commentable) { - $output .= ''; - } - - - } - return $output; + if ($activated and $commentable) { + $output .= EOL . '' . ''; + } + } + return $output; } -function prepare_binary($item) { - return replace_macros(get_markup_template('item_binary.tpl'), [ - '$download' => t('Download binary/encrypted content'), - '$url' => z_root() . '/viewsrc/' . $item['id'] . '/download' - ]); +function prepare_binary($item) +{ + return replace_macros(get_markup_template('item_binary.tpl'), [ + '$download' => t('Download binary/encrypted content'), + '$url' => z_root() . '/viewsrc/' . $item['id'] . '/download' + ]); } @@ -1980,202 +2070,225 @@ function prepare_binary($item) { * * @param string $text * @param string $content_type (optional) default text/bbcode - * @param boolean $cache (optional) default false + * @param bool $cache (optional) default false * * @return string */ -function prepare_text($text, $content_type = 'text/x-multicode', $opts = false) { +function prepare_text($text, $content_type = 'text/x-multicode', $opts = false) +{ - switch($content_type) { - case 'text/plain': - $s = escape_tags($text); - break; + switch ($content_type) { + case 'text/plain': + $s = escape_tags($text); + break; - case 'text/html': - $s = $text; - break; + case 'text/html': + $s = $text; + break; - case 'text/markdown': - $text = MarkdownSoap::unescape($text); - $s = MarkdownExtra::defaultTransform($text); - break; + case 'text/markdown': + $text = MarkdownSoap::unescape($text); + $s = MarkdownExtra::defaultTransform($text); + break; - case 'application/x-pdl'; - $s = escape_tags($text); - break; + case 'application/x-pdl'; + $s = escape_tags($text); + break; - // No security checking is done here at display time - so we need to verify - // that the author is allowed to use PHP before storing. We also cannot allow - // importation of PHP text bodies from other sites. Therefore this content - // type is only valid for web pages (and profile details). + // No security checking is done here at display time - so we need to verify + // that the author is allowed to use PHP before storing. We also cannot allow + // importation of PHP text bodies from other sites. Therefore this content + // type is only valid for web pages (and profile details). - // It may be possible to provide a PHP message body which is evaluated on the - // sender's site before sending it elsewhere. In that case we will have a - // different content-type here. + // It may be possible to provide a PHP message body which is evaluated on the + // sender's site before sending it elsewhere. In that case we will have a + // different content-type here. - case 'application/x-php': - ob_start(); - eval($text); - $s = ob_get_contents(); - ob_end_clean(); - break; + case 'application/x-php': + ob_start(); + eval($text); + $s = ob_get_contents(); + ob_end_clean(); + break; - case 'text/bbcode': - case 'text/x-multicode': - case '': - default: - require_once('include/bbcode.php'); + case 'text/bbcode': + case 'text/x-multicode': + case '': + default: + require_once('include/bbcode.php'); - if(stristr($text,'[nosmile]')) - $s = bbcode($text, [ 'cache' => $cache ]); - else - $s = smilies(bbcode($text, ((is_array($opts)) ? $opts : [] ))); + if (stristr($text, '[nosmile]')) { + $s = bbcode($text, [ 'cache' => $cache ]); + } else { + $s = smilies(bbcode($text, ((is_array($opts)) ? $opts : [] ))); + } - $s = zidify_links($s); + $s = zidify_links($s); - break; - } + break; + } //logger('prepare_text: ' . $s); - return $s; + return $s; } -function create_export_photo_body(&$item) { - if(($item['verb'] === ACTIVITY_POST) && ($item['obj_type'] === ACTIVITY_OBJ_PHOTO)) { - $j = json_decode($item['obj'],true); - if($j) { - $item['body'] .= "\n\n" . (($j['source']['content']) ? $j['source']['content'] : $item['content']); - $item['sig'] = ''; - } - } +function create_export_photo_body(&$item) +{ + if (($item['verb'] === ACTIVITY_POST) && ($item['obj_type'] === ACTIVITY_OBJ_PHOTO)) { + $j = json_decode($item['obj'], true); + if ($j) { + $item['body'] .= "\n\n" . (($j['source']['content']) ? $j['source']['content'] : $item['content']); + $item['sig'] = ''; + } + } } -function get_plink($item,$conversation_mode = true) { - if($conversation_mode) - $key = 'plink'; - else - $key = 'llink'; +function get_plink($item, $conversation_mode = true) +{ + if ($conversation_mode) { + $key = 'plink'; + } else { + $key = 'llink'; + } - $zidify = true; + $zidify = true; - if(array_key_exists('author',$item) && ! in_array($item['author']['xchan_network'],['nomad','zot6'])) + + if (array_key_exists('author', $item) && ! in_array($item['author']['xchan_network'], [ 'nomad', 'zot6' ])) { $zidify = false; + } - if(x($item,$key)) { - return [ - 'href' => (($zidify) ? zid($item[$key]) : $item[$key]), - 'title' => t('Link to Source'), - ]; - } - else { - return false; - } + if (x($item, $key)) { + return [ + 'href' => (($zidify) ? zid($item[$key]) : $item[$key]), + 'title' => t('Link to Source'), + ]; + } else { + return false; + } } -function layout_select($channel_id, $current = '') { - $r = q("select mid, v from item left join iconfig on iconfig.iid = item.id +function layout_select($channel_id, $current = '') +{ + $r = q( + "select mid, v from item left join iconfig on iconfig.iid = item.id where iconfig.cat = 'system' and iconfig.k = 'PDL' and item.uid = %d and item_type = %d ", - intval($channel_id), - intval(ITEM_TYPE_PDL) - ); + intval($channel_id), + intval(ITEM_TYPE_PDL) + ); - if($r) { - $empty_selected = (($current === false) ? ' selected="selected" ' : ''); - $options .= ''; - foreach($r as $rr) { - $selected = (($rr['mid'] == $current) ? ' selected="selected" ' : ''); - $options .= ''; - } - } + if ($r) { + $empty_selected = (($current === false) ? ' selected="selected" ' : ''); + $options .= ''; + foreach ($r as $rr) { + $selected = (($rr['mid'] == $current) ? ' selected="selected" ' : ''); + $options .= ''; + } + } - $o = replace_macros(get_markup_template('field_select_raw.tpl'), array( - '$field' => array('layout_mid', t('Page layout'), $selected, t('You can create your own with the layouts tool'), $options) - )); + $o = replace_macros(get_markup_template('field_select_raw.tpl'), array( + '$field' => array('layout_mid', t('Page layout'), $selected, t('You can create your own with the layouts tool'), $options) + )); - return $o; + return $o; } -function mimetype_select($channel_id, $current = 'text/x-multicode', $choices = null, $element = 'mimetype') { +function mimetype_select($channel_id, $current = 'text/x-multicode', $choices = null, $element = 'mimetype') +{ - $x = (($choices) ? $choices : [ - 'text/bbcode' => t('BBcode'), + $x = (($choices) ? $choices : [ + 'text/bbcode' => t('BBcode'), 'text/x-multicode' => t('Multicode'), - 'text/html' => t('HTML'), - 'text/markdown' => t('Markdown'), - 'text/plain' => t('Text'), - 'application/x-pdl' => t('Comanche Layout') - ]); + 'text/html' => t('HTML'), + 'text/markdown' => t('Markdown'), + 'text/plain' => t('Text'), + 'application/x-pdl' => t('Comanche Layout') + ]); + if ((App::$is_sys) || (channel_codeallowed($channel_id) && $channel_id == local_channel())) { + $x['application/x-php'] = t('PHP'); + } - if((App::$is_sys) || (channel_codeallowed($channel_id) && $channel_id == local_channel())){ - $x['application/x-php'] = t('PHP'); - } + foreach ($x as $y => $z) { + $selected = (($y == $current) ? ' selected="selected" ' : ''); + $options .= ''; + } - foreach($x as $y => $z) { - $selected = (($y == $current) ? ' selected="selected" ' : ''); - $options .= ''; - } + $o = replace_macros(get_markup_template('field_select_raw.tpl'), array( + '$field' => array( $element, t('Page content type'), $selected, '', $options) + )); - $o = replace_macros(get_markup_template('field_select_raw.tpl'), array( - '$field' => array( $element, t('Page content type'), $selected, '', $options) - )); - - return $o; + return $o; } -function engr_units_to_bytes ($size_str) { - if(! $size_str) - return $size_str; - switch (substr(trim($size_str), -1)) { - case 'M': case 'm': return (int)$size_str * 1048576; - case 'K': case 'k': return (int)$size_str * 1024; - case 'G': case 'g': return (int)$size_str * 1073741824; - default: return $size_str; - } +function engr_units_to_bytes($size_str) +{ + if (! $size_str) { + return $size_str; + } + switch (substr(trim($size_str), -1)) { + case 'M': + case 'm': + return (int)$size_str * 1048576; + case 'K': + case 'k': + return (int)$size_str * 1024; + case 'G': + case 'g': + return (int)$size_str * 1073741824; + default: + return $size_str; + } } -function base64url_encode($s, $strip_padding = true) { +function base64url_encode($s, $strip_padding = true) +{ - $s = strtr(base64_encode($s),'+/','-_'); + $s = strtr(base64_encode($s), '+/', '-_'); - if($strip_padding) - $s = str_replace('=','',$s); + if ($strip_padding) { + $s = str_replace('=', '', $s); + } - return $s; + return $s; } -function base64url_decode($s) { - if(is_array($s)) { - logger('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true)); - return $s; - } - return base64_decode(strtr($s,'-_','+/')); +function base64url_decode($s) +{ + if (is_array($s)) { + logger('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true)); + return $s; + } + return base64_decode(strtr($s, '-_', '+/')); } -function base64special_encode($s, $strip_padding = true) { +function base64special_encode($s, $strip_padding = true) +{ - $s = strtr(base64_encode($s),'+/',',.'); + $s = strtr(base64_encode($s), '+/', ',.'); - if($strip_padding) - $s = str_replace('=','',$s); + if ($strip_padding) { + $s = str_replace('=', '', $s); + } - return $s; + return $s; } -function base64special_decode($s) { - if(is_array($s)) { - logger('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true)); - return $s; - } - return base64_decode(strtr($s,',.','+/')); +function base64special_decode($s) +{ + if (is_array($s)) { + logger('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true)); + return $s; + } + return base64_decode(strtr($s, ',.', '+/')); } /** @@ -2183,269 +2296,295 @@ function base64special_decode($s) { * * @return string */ -function cleardiv() { - return ''; +function cleardiv() +{ + return ''; } -function bb_translate_video($s) { - $arr = array('string' => $s); - call_hooks('bb_translate_video',$arr); - return $arr['string']; +function bb_translate_video($s) +{ + $arr = array('string' => $s); + call_hooks('bb_translate_video', $arr); + return $arr['string']; } -function html2bb_video($s) { - $arr = array('string' => $s); - call_hooks('html2bb_video',$arr); - return $arr['string']; +function html2bb_video($s) +{ + $arr = array('string' => $s); + call_hooks('html2bb_video', $arr); + return $arr['string']; } /** * apply xmlify() to all values of array $val, recursively */ -function array_xmlify($val) { - if (is_bool($val)) return $val?"true":"false"; - if (is_array($val)) return array_map('array_xmlify', $val); - return xmlify((string) $val); +function array_xmlify($val) +{ + if (is_bool($val)) { + return $val ? "true" : "false"; + } + if (is_array($val)) { + return array_map('array_xmlify', $val); + } + return xmlify((string) $val); } -function reltoabs($text, $base) { - if (empty($base)) - return $text; +function reltoabs($text, $base) +{ + if (empty($base)) { + return $text; + } - $base = rtrim($base,'/'); + $base = rtrim($base, '/'); - $base2 = $base . "/"; + $base2 = $base . "/"; - // Replace links - $pattern = "/' . $o . ''); + return('' . $o . ''); } // function to convert multi-dimensional array to xml @@ -3487,26 +3671,28 @@ function text_highlight($s, $lang, $options) { // save as xml file // echo (($xml->asXML('data.xml')) ? 'Your XML file has been generated successfully!' : 'Error generating XML file!'); -function arrtoxml($root_elem,$arr) { - $xml = new SimpleXMLElement('<' . $root_elem . '>', null, false); - array2XML($xml,$arr); +function arrtoxml($root_elem, $arr) +{ + $xml = new SimpleXMLElement('<' . $root_elem . '>', null, false); + array2XML($xml, $arr); - return $xml->asXML(); + return $xml->asXML(); } -function array2XML($obj, $array) { - foreach ($array as $key => $value) { - if(is_numeric($key)) - $key = 'item' . $key; +function array2XML($obj, $array) +{ + foreach ($array as $key => $value) { + if (is_numeric($key)) { + $key = 'item' . $key; + } - if(is_array($value)) { - $node = $obj->addChild($key); - array2XML($node, $value); - } - else { - $obj->addChild($key, htmlspecialchars($value)); - } - } + if (is_array($value)) { + $node = $obj->addChild($key); + array2XML($node, $value); + } else { + $obj->addChild($key, htmlspecialchars($value)); + } + } } /** @@ -3517,179 +3703,195 @@ function array2XML($obj, $array) { * @param string $table * @param array $arr * @param array $binary_fields - fields which will be cleansed with dbescbin rather than dbesc; this is critical for postgres - * @return boolean|PDOStatement + * @return bool|PDOStatement */ -function create_table_from_array($table, $arr, $binary_fields = []) { +function create_table_from_array($table, $arr, $binary_fields = []) +{ - if(! ($arr && $table)) - return false; + if (! ($arr && $table)) { + return false; + } - $columns = db_columns($table); + $columns = db_columns($table); - $clean = []; - foreach($arr as $k => $v) { + $clean = []; + foreach ($arr as $k => $v) { + if (! in_array($k, $columns)) { + continue; + } - if(! in_array($k,$columns)) { - continue; - } + $matches = false; + if (preg_match('/([^a-zA-Z0-9\-\_\.])/', $k, $matches)) { + return false; + } + if (in_array($k, $binary_fields)) { + $clean[$k] = dbescbin($v); + } else { + $clean[$k] = dbesc($v); + } + } + $r = dbq("INSERT INTO " . TQUOT . $table . TQUOT . " (" . TQUOT + . implode(TQUOT . ', ' . TQUOT, array_keys($clean)) + . TQUOT . ") VALUES ('" + . implode("', '", array_values($clean)) + . "')"); - $matches = false; - if(preg_match('/([^a-zA-Z0-9\-\_\.])/',$k,$matches)) { - return false; - } - if(in_array($k,$binary_fields)) { - $clean[$k] = dbescbin($v); - } - else { - $clean[$k] = dbesc($v); - } - } - $r = dbq("INSERT INTO " . TQUOT . $table . TQUOT . " (" . TQUOT - . implode(TQUOT . ', ' . TQUOT, array_keys($clean)) - . TQUOT . ") VALUES ('" - . implode("', '", array_values($clean)) - . "')" - ); - - return $r; + return $r; } -function share_shield($m) { - return str_replace($m[1],'!=+=+=!' . base64url_encode($m[1]) . '=+!=+!=',$m[0]); +function share_shield($m) +{ + return str_replace($m[1], '!=+=+=!' . base64url_encode($m[1]) . '=+!=+!=', $m[0]); } -function share_unshield($m) { - $x = str_replace(array('!=+=+=!','=+!=+!='),array('',''),$m[1]); - return str_replace($m[1], base64url_decode($x), $m[0]); +function share_unshield($m) +{ + $x = str_replace(array('!=+=+=!','=+!=+!='), array('',''), $m[1]); + return str_replace($m[1], base64url_decode($x), $m[0]); } -function cleanup_bbcode($body) { +function cleanup_bbcode($body) +{ - /** - * fix naked links by passing through a callback to see if this is a zot site of some kind - * (already known to us) which will get a zrl, otherwise link with url, add bookmark tag to both. - * First protect any url inside certain bbcode tags so we don't double link it. - */ + /** + * fix naked links by passing through a callback to see if this is a zot site of some kind + * (already known to us) which will get a zrl, otherwise link with url, add bookmark tag to both. + * First protect any url inside certain bbcode tags so we don't double link it. + */ - // markdown code blocks are slightly more complicated - - $body = preg_replace_callback('#(^|\n)([`~]{3,})(?: *\.?([a-zA-Z0-9\-.]+))?\n+([\s\S]+?)\n+\2(\n|$)#', function ($match) { - return $match[1] . $match[2] . "\n" . bb_code_protect($match[4]) . "\n" . $match[2] . (($match[5]) ? $match[5] : "\n"); - }, $body); + // markdown code blocks are slightly more complicated - $body = preg_replace_callback('/\[code(.*?)\[\/(code)\]/ism','\red_escape_codeblock',$body); - $body = preg_replace_callback('/\[url(.*?)\[\/(url)\]/ism','\red_escape_codeblock',$body); - $body = preg_replace_callback('/\[zrl(.*?)\[\/(zrl)\]/ism','\red_escape_codeblock',$body); - $body = preg_replace_callback('/\[svg(.*?)\[\/(svg)\]/ism','\red_escape_codeblock',$body); - $body = preg_replace_callback('/\[img(.*?)\[\/(img)\]/ism','\red_escape_codeblock',$body); - $body = preg_replace_callback('/\[zmg(.*?)\[\/(zmg)\]/ism','\red_escape_codeblock',$body); + $body = preg_replace_callback('#(^|\n)([`~]{3,})(?: *\.?([a-zA-Z0-9\-.]+))?\n+([\s\S]+?)\n+\2(\n|$)#', function ($match) { + return $match[1] . $match[2] . "\n" . bb_code_protect($match[4]) . "\n" . $match[2] . (($match[5]) ? $match[5] : "\n"); + }, $body); - $body = preg_replace_callback("/([^\]\='".'"'."\;\/\{\(]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\+\,\(\)]+)/ismu", '\nakedoembed', $body); + $body = preg_replace_callback('/\[code(.*?)\[\/(code)\]/ism', '\red_escape_codeblock', $body); + $body = preg_replace_callback('/\[url(.*?)\[\/(url)\]/ism', '\red_escape_codeblock', $body); + $body = preg_replace_callback('/\[zrl(.*?)\[\/(zrl)\]/ism', '\red_escape_codeblock', $body); + $body = preg_replace_callback('/\[svg(.*?)\[\/(svg)\]/ism', '\red_escape_codeblock', $body); + $body = preg_replace_callback('/\[img(.*?)\[\/(img)\]/ism', '\red_escape_codeblock', $body); + $body = preg_replace_callback('/\[zmg(.*?)\[\/(zmg)\]/ism', '\red_escape_codeblock', $body); - $body = preg_replace_callback("/([^\]\='".'"'."\;\/\{\(]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\+\,\(\)]+)/ismu", '\red_zrl_callback', $body); + $body = preg_replace_callback("/([^\]\='" . '"' . "\;\/\{\(]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\+\,\(\)]+)/ismu", '\nakedoembed', $body); + + $body = preg_replace_callback("/([^\]\='" . '"' . "\;\/\{\(]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\+\,\(\)]+)/ismu", '\red_zrl_callback', $body); - $body = preg_replace_callback('/\[\$b64code(.*?)\[\/(code)\]/ism','\red_unescape_codeblock',$body); - $body = preg_replace_callback('/\[\$b64url(.*?)\[\/(url)\]/ism','\red_unescape_codeblock',$body); - $body = preg_replace_callback('/\[\$b64zrl(.*?)\[\/(zrl)\]/ism','\red_unescape_codeblock',$body); - $body = preg_replace_callback('/\[\$b64svg(.*?)\[\/(svg)\]/ism','\red_unescape_codeblock',$body); - $body = preg_replace_callback('/\[\$b64img(.*?)\[\/(img)\]/ism','\red_unescape_codeblock',$body); - $body = preg_replace_callback('/\[\$b64zmg(.*?)\[\/(zmg)\]/ism','\red_unescape_codeblock',$body); + $body = preg_replace_callback('/\[\$b64code(.*?)\[\/(code)\]/ism', '\red_unescape_codeblock', $body); + $body = preg_replace_callback('/\[\$b64url(.*?)\[\/(url)\]/ism', '\red_unescape_codeblock', $body); + $body = preg_replace_callback('/\[\$b64zrl(.*?)\[\/(zrl)\]/ism', '\red_unescape_codeblock', $body); + $body = preg_replace_callback('/\[\$b64svg(.*?)\[\/(svg)\]/ism', '\red_unescape_codeblock', $body); + $body = preg_replace_callback('/\[\$b64img(.*?)\[\/(img)\]/ism', '\red_unescape_codeblock', $body); + $body = preg_replace_callback('/\[\$b64zmg(.*?)\[\/(zmg)\]/ism', '\red_unescape_codeblock', $body); - $body = bb_code_unprotect($body); + $body = bb_code_unprotect($body); - // fix any img tags that should be zmg + // fix any img tags that should be zmg - $body = preg_replace_callback('/\[img(.*?)\](.*?)\[\/img\]/ism','\red_zrlify_img_callback',$body); + $body = preg_replace_callback('/\[img(.*?)\](.*?)\[\/img\]/ism', '\red_zrlify_img_callback', $body); - $body = bb_translate_video($body); + $body = bb_translate_video($body); - /** - * Fold multi-line [code] sequences - */ + /** + * Fold multi-line [code] sequences + */ - $body = preg_replace('/\[\/code\]\s*\[code\]/ism',"\n",$body); + $body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body); - return $body; + return $body; } -function gen_link_id($mid) { - if (strpbrk($mid,':/&?<>"\'') !== false) { - return 'b64.' . base64url_encode($mid); - } - return $mid; +function gen_link_id($mid) +{ + if (strpbrk($mid, ':/&?<>"\'') !== false) { + return 'b64.' . base64url_encode($mid); + } + return $mid; } -function unpack_link_id($mid) { - if (strpos($mid,'b64.') === 0) { - $mid = base64url_decode(preg_replace('/[^A-Za-z0-9\-_].*/','',substr($mid,4))); - } - return $mid; +function unpack_link_id($mid) +{ + if (strpos($mid, 'b64.') === 0) { + $mid = base64url_decode(preg_replace('/[^A-Za-z0-9\-_].*/', '', substr($mid, 4))); + } + return $mid; } // callback for array_walk -function array_trim(&$v,$k) { - $v = trim($v); +function array_trim(&$v, $k) +{ + $v = trim($v); } -function array_escape_tags(&$v,$k) { - $v = escape_tags($v); +function array_escape_tags(&$v, $k) +{ + $v = escape_tags($v); } -function ellipsify($s,$maxlen) { - if($maxlen & 1) - $maxlen --; - if($maxlen < 4) - $maxlen = 4; +function ellipsify($s, $maxlen) +{ + if ($maxlen & 1) { + $maxlen--; + } + if ($maxlen < 4) { + $maxlen = 4; + } - if(mb_strlen($s) < $maxlen) - return $s; + if (mb_strlen($s) < $maxlen) { + return $s; + } - return mb_substr($s,0,$maxlen / 2) . '...' . mb_substr($s,mb_strlen($s) - ($maxlen / 2)); + return mb_substr($s, 0, $maxlen / 2) . '...' . mb_substr($s, mb_strlen($s) - ($maxlen / 2)); } -function purify_filename($s) { - if(($s[0] === '.') || strpos($s,'/') !== false) - return ''; - return $s; +function purify_filename($s) +{ + if (($s[0] === '.') || strpos($s, '/') !== false) { + return ''; + } + return $s; } // callback for sorting the settings/featured entries. -function featured_sort($a,$b) { - $s1 = substr($a,strpos($a,'id='),20); - $s2 = substr($b,strpos($b,'id='),20); - return(strcmp($s1,$s2)); +function featured_sort($a, $b) +{ + $s1 = substr($a, strpos($a, 'id='), 20); + $s2 = substr($b, strpos($b, 'id='), 20); + return(strcmp($s1, $s2)); } -function unpunify($s) { - if (function_exists('idn_to_utf8')) { - return idn_to_utf8($s); - } - return $s; +function unpunify($s) +{ + if (function_exists('idn_to_utf8')) { + return idn_to_utf8($s); + } + return $s; } -function punify($s) { - if (function_exists('idn_to_ascii')) { - return idn_to_ascii($s); - } - return $s; +function punify($s) +{ + if (function_exists('idn_to_ascii')) { + return idn_to_ascii($s); + } + return $s; } -function unique_multidim_array($array, $key) { +function unique_multidim_array($array, $key) +{ $temp_array = []; $i = 0; $key_array = []; - - foreach($array as $val) { + + foreach ($array as $val) { if (!in_array($val[$key], $key_array)) { $key_array[$i] = $val[$key]; $temp_array[$i] = $val; @@ -3697,161 +3899,167 @@ function unique_multidim_array($array, $key) { $i++; } return $temp_array; - -} +} // Much prettier formatting than print_r() // This assumes the output will be a web page and escapes angle-chars appropriately by default. -function print_array($arr, $escape = true, $level = 0) { +function print_array($arr, $escape = true, $level = 0) +{ - $o = EMPTY_STR; - $tabs = EMPTY_STR; + $o = EMPTY_STR; + $tabs = EMPTY_STR; - if(is_array($arr)) { - for($x = 0; $x <= $level; $x ++) { - $tabs .= "\t"; - } - $o .= '[' . "\n"; - if(count($arr)) { - foreach($arr as $k => $v) { - if(is_array($v)) { - $o .= $tabs . '[' . (($escape) ? escape_tags($k) : $k) . '] => ' . print_array($v, $escape, $level + 1) . "\n"; - } - else { - $o .= $tabs . '[' . (($escape) ? escape_tags($k) : $k) . '] => ' . print_val($v, $escape) . ",\n"; - } - } - } - $o .= substr($tabs,0,-1) . ']' . (($level) ? ',' : ';' ). "\n"; - return $o; - } - + if (is_array($arr)) { + for ($x = 0; $x <= $level; $x++) { + $tabs .= "\t"; + } + $o .= '[' . "\n"; + if (count($arr)) { + foreach ($arr as $k => $v) { + if (is_array($v)) { + $o .= $tabs . '[' . (($escape) ? escape_tags($k) : $k) . '] => ' . print_array($v, $escape, $level + 1) . "\n"; + } else { + $o .= $tabs . '[' . (($escape) ? escape_tags($k) : $k) . '] => ' . print_val($v, $escape) . ",\n"; + } + } + } + $o .= substr($tabs, 0, -1) . ']' . (($level) ? ',' : ';' ) . "\n"; + return $o; + } } -function print_val($v, $escape = true) { - if (is_bool($v)) { - if ($v) { - return 'true'; - } - return 'false'; - } - if (is_string($v)) { - return "'" . (($escape) ? escape_tags($v) : $v) . "'"; - } - return $v; +function print_val($v, $escape = true) +{ + if (is_bool($v)) { + if ($v) { + return 'true'; + } + return 'false'; + } + if (is_string($v)) { + return "'" . (($escape) ? escape_tags($v) : $v) . "'"; + } + return $v; } -function array_path_exists($str,$arr) { +function array_path_exists($str, $arr) +{ - if (! ($arr && is_array($arr))) { - return false; - } + if (! ($arr && is_array($arr))) { + return false; + } - $ptr = $arr; - $search = explode('/', $str); + $ptr = $arr; + $search = explode('/', $str); - if ($search) { - foreach ($search as $s) { - if ($ptr && is_array($ptr) && array_key_exists($s,$ptr)) { - $ptr = $ptr[$s]; - } - else { - return false; - } - } - return true; - } - return false; + if ($search) { + foreach ($search as $s) { + if ($ptr && is_array($ptr) && array_key_exists($s, $ptr)) { + $ptr = $ptr[$s]; + } else { + return false; + } + } + return true; + } + return false; } -function get_forum_channels($uid,$collections = 0) { +function get_forum_channels($uid, $collections = 0) +{ - if (! $uid) - return; + if (! $uid) { + return; + } - if ($collections) { - $pagetype = $collections; - } - else { - $pagetype = 1; - } + if ($collections) { + $pagetype = $collections; + } else { + $pagetype = 1; + } - $r = q("select abook_id, xchan_hash, xchan_network, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 and abook_self = 0 and xchan_type = %d order by xchan_name", - intval($uid), - intval($pagetype) - ); - - return $r; + $r = q( + "select abook_id, xchan_hash, xchan_network, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 and abook_self = 0 and xchan_type = %d order by xchan_name", + intval($uid), + intval($pagetype) + ); + return $r; } -function serialise($x) { - return ((is_array($x)) ? 'json:' . json_encode($x) : $x); +function serialise($x) +{ + return ((is_array($x)) ? 'json:' . json_encode($x) : $x); } -function unserialise($x) { - if (is_array($x)) { - return $x; - } - $y = ((substr($x,0,5) === 'json:') ? json_decode(substr($x,5),true) : ''); - return ((is_array($y)) ? $y : $x); +function unserialise($x) +{ + if (is_array($x)) { + return $x; + } + $y = ((substr($x, 0, 5) === 'json:') ? json_decode(substr($x, 5), true) : ''); + return ((is_array($y)) ? $y : $x); } -function obscurify($s) { - return str_rot47(base64url_encode($s)); +function obscurify($s) +{ + return str_rot47(base64url_encode($s)); } -function unobscurify($s) { - return base64url_decode(str_rot47($s)); +function unobscurify($s) +{ + return base64url_decode(str_rot47($s)); } -function svg2bb($s) { +function svg2bb($s) +{ - $s = preg_replace("/\(.*?)\<(.*?)\<\/text\>/", ' $2<$3 ', $s); - $s = preg_replace("/\(.*?)\>(.*?)\<\/text\>/", ' $2>$3 ', $s); - $s = preg_replace("/\(.*?)\[(.*?)\<\/text\>/", ' $2[$3 ', $s); - $s = preg_replace("/\(.*?)\](.*?)\<\/text\>/", ' $2]$3 ', $s); - $s = utf8_encode($s); - $purify = new SvgSanitizer(); - if ($purify->loadXML($s)) { - $purify->sanitize(); - $output = $purify->saveSVG(); - $output = preg_replace("/\<\?xml(.*?)\>/",'',$output); - $output = preg_replace("/\<\!\-\-(.*?)\-\-\>/",'',$output); - $output = str_replace(['<','>'],['[',']'],$output); - return $output; - } - return EMPTY_STR; + $s = preg_replace("/\(.*?)\<(.*?)\<\/text\>/", ' $2<$3 ', $s); + $s = preg_replace("/\(.*?)\>(.*?)\<\/text\>/", ' $2>$3 ', $s); + $s = preg_replace("/\(.*?)\[(.*?)\<\/text\>/", ' $2[$3 ', $s); + $s = preg_replace("/\(.*?)\](.*?)\<\/text\>/", ' $2]$3 ', $s); + $s = utf8_encode($s); + $purify = new SvgSanitizer(); + if ($purify->loadXML($s)) { + $purify->sanitize(); + $output = $purify->saveSVG(); + $output = preg_replace("/\<\?xml(.*?)\>/", '', $output); + $output = preg_replace("/\<\!\-\-(.*?)\-\-\>/", '', $output); + $output = str_replace(['<','>'], ['[',']'], $output); + return $output; + } + return EMPTY_STR; } // Takes something that looks like a phone number and returns a string suitable for tel: protocol or false. -function is_phone_number($s) { - $ext = substr($s,strpos($s,'x')+1); - if (! $ext) { - $ext = substr($s,strpos($s,'X')+1); - } - if ($ext && ctype_digit($ext)) { - $rext = ';ext=' . $ext; - $s = str_replace(['x' . $ext, 'X' . $ext],['',''],$s); - } - else { - $ext = EMPTY_STR; - } - $s = str_replace(['(',')',' ','-','+'],['','','','',''],$s); - return ((ctype_digit($s)) ? $s . $rext : false); +function is_phone_number($s) +{ + $ext = substr($s, strpos($s, 'x') + 1); + if (! $ext) { + $ext = substr($s, strpos($s, 'X') + 1); + } + if ($ext && ctype_digit($ext)) { + $rext = ';ext=' . $ext; + $s = str_replace(['x' . $ext, 'X' . $ext], ['',''], $s); + } else { + $ext = EMPTY_STR; + } + $s = str_replace(['(',')',' ','-','+'], ['','','','',''], $s); + return ((ctype_digit($s)) ? $s . $rext : false); } /** * fnmatch seems a bit unpredictable, so use this instead. */ -function wildmat($pattern,$string) { - return preg_match("#^".strtr(preg_quote($pattern, '#'), [ '\*' => '.*', '\?' => '.', '\[' => '[', '\]' => ']' ] ) . "$#i", $string); +function wildmat($pattern, $string) +{ + return preg_match("#^" . strtr(preg_quote($pattern, '#'), [ '\*' => '.*', '\?' => '.', '\[' => '[', '\]' => ']' ]) . "$#i", $string); } diff --git a/include/xchan.php b/include/xchan.php index 14e3156d9..f995562a4 100644 --- a/include/xchan.php +++ b/include/xchan.php @@ -3,372 +3,399 @@ use Zotlabs\Lib\Libzot; use Zotlabs\Web\HTTPSig; -function xchan_store_lowlevel($arr) { +function xchan_store_lowlevel($arr) +{ - $store = [ - 'xchan_hash' => ((array_key_exists('xchan_hash',$arr)) ? $arr['xchan_hash'] : ''), - 'xchan_guid' => ((array_key_exists('xchan_guid',$arr)) ? $arr['xchan_guid'] : ''), - 'xchan_guid_sig' => ((array_key_exists('xchan_guid_sig',$arr)) ? $arr['xchan_guid_sig'] : ''), - 'xchan_pubkey' => ((array_key_exists('xchan_pubkey',$arr)) ? $arr['xchan_pubkey'] : ''), - 'xchan_photo_mimetype' => ((array_key_exists('xchan_photo_mimetype',$arr)) ? $arr['xchan_photo_mimetype'] : ''), - 'xchan_photo_l' => ((array_key_exists('xchan_photo_l',$arr)) ? $arr['xchan_photo_l'] : ''), - 'xchan_photo_m' => ((array_key_exists('xchan_photo_m',$arr)) ? $arr['xchan_photo_m'] : ''), - 'xchan_photo_s' => ((array_key_exists('xchan_photo_s',$arr)) ? $arr['xchan_photo_s'] : ''), - 'xchan_addr' => ((array_key_exists('xchan_addr',$arr)) ? $arr['xchan_addr'] : ''), - 'xchan_url' => ((array_key_exists('xchan_url',$arr)) ? $arr['xchan_url'] : ''), - 'xchan_connurl' => ((array_key_exists('xchan_connurl',$arr)) ? $arr['xchan_connurl'] : ''), - 'xchan_follow' => ((array_key_exists('xchan_follow',$arr)) ? $arr['xchan_follow'] : ''), - 'xchan_connpage' => ((array_key_exists('xchan_connpage',$arr)) ? $arr['xchan_connpage'] : ''), - 'xchan_name' => ((array_key_exists('xchan_name',$arr)) ? $arr['xchan_name'] : ''), - 'xchan_network' => ((array_key_exists('xchan_network',$arr)) ? $arr['xchan_network'] : ''), - 'xchan_created' => ((array_key_exists('xchan_created',$arr)) ? datetime_convert('UTC','UTC',$arr['xchan_created']) : datetime_convert()), - 'xchan_updated' => ((array_key_exists('xchan_updated',$arr)) ? datetime_convert('UTC','UTC',$arr['xchan_updated']) : datetime_convert()), - 'xchan_photo_date' => ((array_key_exists('xchan_photo_date',$arr)) ? datetime_convert('UTC','UTC',$arr['xchan_photo_date']) : NULL_DATE), - 'xchan_name_date' => ((array_key_exists('xchan_name_date',$arr)) ? datetime_convert('UTC','UTC',$arr['xchan_name_date']) : NULL_DATE), - 'xchan_hidden' => ((array_key_exists('xchan_hidden',$arr)) ? intval($arr['xchan_hidden']) : 0), - 'xchan_orphan' => ((array_key_exists('xchan_orphan',$arr)) ? intval($arr['xchan_orphan']) : 0), - 'xchan_censored' => ((array_key_exists('xchan_censored',$arr)) ? intval($arr['xchan_censored']) : 0), - 'xchan_selfcensored' => ((array_key_exists('xchan_selfcensored',$arr)) ? intval($arr['xchan_selfcensored']) : 0), - 'xchan_system' => ((array_key_exists('xchan_system',$arr)) ? intval($arr['xchan_system']) : 0), - 'xchan_type' => ((array_key_exists('xchan_type',$arr)) ? intval($arr['xchan_type']) : XCHAN_TYPE_PERSON), - 'xchan_deleted' => ((array_key_exists('xchan_deleted',$arr)) ? intval($arr['xchan_deleted']) : 0) - ]; + $store = [ + 'xchan_hash' => ((array_key_exists('xchan_hash', $arr)) ? $arr['xchan_hash'] : ''), + 'xchan_guid' => ((array_key_exists('xchan_guid', $arr)) ? $arr['xchan_guid'] : ''), + 'xchan_guid_sig' => ((array_key_exists('xchan_guid_sig', $arr)) ? $arr['xchan_guid_sig'] : ''), + 'xchan_pubkey' => ((array_key_exists('xchan_pubkey', $arr)) ? $arr['xchan_pubkey'] : ''), + 'xchan_photo_mimetype' => ((array_key_exists('xchan_photo_mimetype', $arr)) ? $arr['xchan_photo_mimetype'] : ''), + 'xchan_photo_l' => ((array_key_exists('xchan_photo_l', $arr)) ? $arr['xchan_photo_l'] : ''), + 'xchan_photo_m' => ((array_key_exists('xchan_photo_m', $arr)) ? $arr['xchan_photo_m'] : ''), + 'xchan_photo_s' => ((array_key_exists('xchan_photo_s', $arr)) ? $arr['xchan_photo_s'] : ''), + 'xchan_addr' => ((array_key_exists('xchan_addr', $arr)) ? $arr['xchan_addr'] : ''), + 'xchan_url' => ((array_key_exists('xchan_url', $arr)) ? $arr['xchan_url'] : ''), + 'xchan_connurl' => ((array_key_exists('xchan_connurl', $arr)) ? $arr['xchan_connurl'] : ''), + 'xchan_follow' => ((array_key_exists('xchan_follow', $arr)) ? $arr['xchan_follow'] : ''), + 'xchan_connpage' => ((array_key_exists('xchan_connpage', $arr)) ? $arr['xchan_connpage'] : ''), + 'xchan_name' => ((array_key_exists('xchan_name', $arr)) ? $arr['xchan_name'] : ''), + 'xchan_network' => ((array_key_exists('xchan_network', $arr)) ? $arr['xchan_network'] : ''), + 'xchan_created' => ((array_key_exists('xchan_created', $arr)) ? datetime_convert('UTC', 'UTC', $arr['xchan_created']) : datetime_convert()), + 'xchan_updated' => ((array_key_exists('xchan_updated', $arr)) ? datetime_convert('UTC', 'UTC', $arr['xchan_updated']) : datetime_convert()), + 'xchan_photo_date' => ((array_key_exists('xchan_photo_date', $arr)) ? datetime_convert('UTC', 'UTC', $arr['xchan_photo_date']) : NULL_DATE), + 'xchan_name_date' => ((array_key_exists('xchan_name_date', $arr)) ? datetime_convert('UTC', 'UTC', $arr['xchan_name_date']) : NULL_DATE), + 'xchan_hidden' => ((array_key_exists('xchan_hidden', $arr)) ? intval($arr['xchan_hidden']) : 0), + 'xchan_orphan' => ((array_key_exists('xchan_orphan', $arr)) ? intval($arr['xchan_orphan']) : 0), + 'xchan_censored' => ((array_key_exists('xchan_censored', $arr)) ? intval($arr['xchan_censored']) : 0), + 'xchan_selfcensored' => ((array_key_exists('xchan_selfcensored', $arr)) ? intval($arr['xchan_selfcensored']) : 0), + 'xchan_system' => ((array_key_exists('xchan_system', $arr)) ? intval($arr['xchan_system']) : 0), + 'xchan_type' => ((array_key_exists('xchan_type', $arr)) ? intval($arr['xchan_type']) : XCHAN_TYPE_PERSON), + 'xchan_deleted' => ((array_key_exists('xchan_deleted', $arr)) ? intval($arr['xchan_deleted']) : 0) + ]; - return create_table_from_array('xchan',$store); + return create_table_from_array('xchan', $store); } // called from the zot api // Anybody can enter an identity into the system, but zot or zot6 identities must be validated // and existing zot6 identities cannot be altered via API -function xchan_store($arr) { - - $update_photo = false; - $update_name = false; - - if(! ($arr['guid'] || $arr['hash'])) { - $arr = json_decode(file_get_contents('php://input'),true); - } - - logger('xchan_store: ' . print_r($arr,true)); - - if(! $arr['hash']) - $arr['hash'] = $arr['guid']; - if(! $arr['hash']) - return false; - - $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($arr['hash']) - ); - if(! $r) { - - $update_photo = true; - - if(! $arr['network']) - $arr['network'] = 'unknown'; - if(! $arr['name']) - $arr['name'] = 'unknown'; - if(! $arr['url']) - $arr['url'] = z_root(); - if(! $arr['photo']) - $arr['photo'] = z_root() . '/' . get_default_profile_photo(); +function xchan_store($arr) +{ - if(in_array($arr['network'],['nomad','zot6'])) { - if((! $arr['key']) || (! Libzot::verify($arr['id'],$arr['id_sig'],$arr['key']))) { - logger('Unable to verify signature for ' . $arr['hash']); - return false; - } - } + $update_photo = false; + $update_name = false; - if($arr['network'] === 'zot') { - if((! $arr['key']) || (! Libzot::verify($arr['id'],'sha256.' . $arr['id_sig'],$arr['key']))) { - logger('Unable to verify signature for ' . $arr['hash']); - return false; - } - } - - $columns = db_columns('xchan'); - - $x = []; - foreach($arr as $k => $v) { - if($k === 'key') { - $x['xchan_pubkey'] = HTTPSig::convertKey(escape_tags($v)); - continue; - } - if($k === 'photo') { - continue; - } - - if(in_array($columns,'xchan_' . $k)) - $x['xchan_' . $k] = escape_tags($v); - } - - $x['xchan_updated'] = datetime_convert(); - $x['xchan_name_date'] = datetime_convert(); - $x['xchan_photo_date'] = datetime_convert(); - $x['xchan_system'] = false; - - $result = xchan_store_lowlevel($x); - - if(! $result) { - return $result; - } - } - else { - if(in_array($r[0]['network'],['nomad','zot6'])) { - return true; - } - if($r[0]['xchan_photo_date'] < datetime_convert('UTC','UTC',$arr['photo_date'])) { - $update_photo = true; - } - if($r[0]['xchan_name_date'] < datetime_convert('UTC','UTC',$arr['name_date'])) { - $update_name = true; - } - - } - - if($update_photo && $arr['photo']) { - $photos = import_remote_xchan_photo($arr['photo'],$arr['hash']); - if ($photos) { - $x = q("update xchan set xchan_updated = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'", - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc($photos[3]), - dbesc($arr['hash']) - ); - } - } - if($update_name && $arr['name']) { - $x = q("update xchan set xchan_updated = '%s', xchan_name = '%s', xchan_name_date = '%s' where xchan_hash = '%s'", - dbesc(datetime_convert()), - dbesc(escape_tags($arr['name'])), - dbesc(datetime_convert()), - dbesc($arr['hash']) - ); - } - - return $true; - -} - - -function xchan_match($arr) { - - if(! $arr) - return false; - - $str = ''; - - foreach($arr as $k => $v) { - if($str) { - $str .= " AND "; - } - $str .= " " . TQUOT . dbesc($k) . TQUOT . " = '" . dbesc($v) . "' "; + if (! ($arr['guid'] || $arr['hash'])) { + $arr = json_decode(file_get_contents('php://input'), true); } - $r = q("select * from xchan where $str limit 1"); - - return (($r) ? $r[0] : false); + logger('xchan_store: ' . print_r($arr, true)); + if (! $arr['hash']) { + $arr['hash'] = $arr['guid']; + } + if (! $arr['hash']) { + return false; + } + + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($arr['hash']) + ); + if (! $r) { + $update_photo = true; + + if (! $arr['network']) { + $arr['network'] = 'unknown'; + } + if (! $arr['name']) { + $arr['name'] = 'unknown'; + } + if (! $arr['url']) { + $arr['url'] = z_root(); + } + if (! $arr['photo']) { + $arr['photo'] = z_root() . '/' . get_default_profile_photo(); + } + + if (in_array($arr['network'], [ 'nomad','zot6' ])) { + if ((! $arr['key']) || (! Libzot::verify($arr['id'], $arr['id_sig'], $arr['key']))) { + logger('Unable to verify signature for ' . $arr['hash']); + return false; + } + } + + if ($arr['network'] === 'zot') { + if ((! $arr['key']) || (! Libzot::verify($arr['id'], 'sha256.' . $arr['id_sig'], $arr['key']))) { + logger('Unable to verify signature for ' . $arr['hash']); + return false; + } + } + + $columns = db_columns('xchan'); + + $x = []; + foreach ($arr as $k => $v) { + if ($k === 'key') { + $x['xchan_pubkey'] = HTTPSig::convertKey(escape_tags($v)); + continue; + } + if ($k === 'photo') { + continue; + } + + if (in_array($columns, 'xchan_' . $k)) { + $x['xchan_' . $k] = escape_tags($v); + } + } + + $x['xchan_updated'] = datetime_convert(); + $x['xchan_name_date'] = datetime_convert(); + $x['xchan_photo_date'] = datetime_convert(); + $x['xchan_system'] = false; + + $result = xchan_store_lowlevel($x); + + if (! $result) { + return $result; + } + } else { + if (in_array($r[0]['network'] , [ 'zot6', 'nomad' ])) { + return true; + } + if ($r[0]['xchan_photo_date'] < datetime_convert('UTC', 'UTC', $arr['photo_date'])) { + $update_photo = true; + } + if ($r[0]['xchan_name_date'] < datetime_convert('UTC', 'UTC', $arr['name_date'])) { + $update_name = true; + } + } + + if ($update_photo && $arr['photo']) { + $photos = import_remote_xchan_photo($arr['photo'], $arr['hash']); + if ($photos) { + $x = q( + "update xchan set xchan_updated = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'", + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc($photos[3]), + dbesc($arr['hash']) + ); + } + } + if ($update_name && $arr['name']) { + $x = q( + "update xchan set xchan_updated = '%s', xchan_name = '%s', xchan_name_date = '%s' where xchan_hash = '%s'", + dbesc(datetime_convert()), + dbesc(escape_tags($arr['name'])), + dbesc(datetime_convert()), + dbesc($arr['hash']) + ); + } + + return $true; +} + + +function xchan_match($arr) +{ + + if (! $arr) { + return false; + } + + $str = ''; + + foreach ($arr as $k => $v) { + if ($str) { + $str .= " AND "; + } + $str .= " " . TQUOT . dbesc($k) . TQUOT . " = '" . dbesc($v) . "' "; + } + + $r = q("select * from xchan where $str limit 1"); + + return (($r) ? $r[0] : false); } -function xchan_fetch($arr) { +function xchan_fetch($arr) +{ - $key = ''; - if($arr['hash']) { - $key = 'xchan_hash'; - $v = dbesc($arr['hash']); - } - elseif($arr['guid']) { - $key = 'xchan_guid'; - $v = dbesc($arr['guid']); - } - elseif($arr['address']) { - $key = 'xchan_addr'; - $v = dbesc($arr['address']); - } + $key = ''; + if ($arr['hash']) { + $key = 'xchan_hash'; + $v = dbesc($arr['hash']); + } elseif ($arr['guid']) { + $key = 'xchan_guid'; + $v = dbesc($arr['guid']); + } elseif ($arr['address']) { + $key = 'xchan_addr'; + $v = dbesc($arr['address']); + } - if(! $key) - return false; + if (! $key) { + return false; + } - $r = q("select * from xchan where $key = '$v' limit 1"); - if(! $r) - return false; + $r = q("select * from xchan where $key = '$v' limit 1"); + if (! $r) { + return false; + } - $ret = []; - foreach($r[0] as $k => $v) { - if($k === 'xchan_addr') - $ret['address'] = $v; - else - $ret[str_replace('xchan_','',$k)] = $v; - } - - return $ret; + $ret = []; + foreach ($r[0] as $k => $v) { + if ($k === 'xchan_addr') { + $ret['address'] = $v; + } else { + $ret[str_replace('xchan_', '', $k)] = $v; + } + } + return $ret; } -function xchan_keychange_table($table,$column,$oldxchan,$newxchan) { - $r = q("update $table set $column = '%s' where $column = '%s'", - dbesc($newxchan['xchan_hash']), - dbesc($oldxchan['xchan_hash']) - ); - return $r; +function xchan_keychange_table($table, $column, $oldxchan, $newxchan) +{ + $r = q( + "update $table set $column = '%s' where $column = '%s'", + dbesc($newxchan['xchan_hash']), + dbesc($oldxchan['xchan_hash']) + ); + return $r; } -function xchan_keychange_acl($table,$column,$oldxchan,$newxchan) { +function xchan_keychange_acl($table, $column, $oldxchan, $newxchan) +{ - $allow = (($table === 'channel') ? 'channel_allow_cid' : 'allow_cid'); - $deny = (($table === 'channel') ? 'channel_deny_cid' : 'deny_cid'); + $allow = (($table === 'channel') ? 'channel_allow_cid' : 'allow_cid'); + $deny = (($table === 'channel') ? 'channel_deny_cid' : 'deny_cid'); - $r = q("select $column, $allow, $deny from $table where ($allow like '%s' or $deny like '%s') ", - dbesc('<' . $oldxchan['xchan_hash'] . '>'), - dbesc('<' . $oldxchan['xchan_hash'] . '>') - ); + $r = q( + "select $column, $allow, $deny from $table where ($allow like '%s' or $deny like '%s') ", + dbesc('<' . $oldxchan['xchan_hash'] . '>'), + dbesc('<' . $oldxchan['xchan_hash'] . '>') + ); - if($r) { - foreach($r as $rv) { - $z = q("update $table set $allow = '%s', $deny = '%s' where $column = %d", - dbesc(str_replace('<' . $oldxchan['xchan_hash'] . '>', '<' . $newxchan['xchan_hash'] . '>', - $rv[$allow])), - dbesc(str_replace('<' . $oldxchan['xchan_hash'] . '>', '<' . $newxchan['xchan_hash'] . '>', - $rv[$deny])), - intval($rv[$column]) - ); - } - } - return $z; + if ($r) { + foreach ($r as $rv) { + $z = q( + "update $table set $allow = '%s', $deny = '%s' where $column = %d", + dbesc(str_replace( + '<' . $oldxchan['xchan_hash'] . '>', + '<' . $newxchan['xchan_hash'] . '>', + $rv[$allow] + )), + dbesc(str_replace( + '<' . $oldxchan['xchan_hash'] . '>', + '<' . $newxchan['xchan_hash'] . '>', + $rv[$deny] + )), + intval($rv[$column]) + ); + } + } + return $z; } -function xchan_change_key($oldx,$newx,$data) { +function xchan_change_key($oldx, $newx, $data) +{ - $tables = [ - 'abook' => 'abook_xchan', - 'abconfig' => 'xchan', - 'pgrp_member' => 'xchan', - 'chat' => 'chat_xchan', - 'chatpresence' => 'cp_xchan', - 'event' => 'event_xchan', - 'item' => 'owner_xchan', - 'item' => 'author_xchan', - 'item' => 'source_xchan', - 'mail' => 'from_xchan', - 'mail' => 'to_xchan', - 'shares' => 'share_xchan', - 'source' => 'src_channel_xchan', - 'source' => 'src_xchan', - 'xchat' => 'xchat_xchan', - 'xconfig' => 'xchan', - 'xign' => 'xchan', - 'xlink' => 'xlink_xchan', - 'xprof' => 'xprof_hash', - 'xtag' => 'xtag_hash' - ]; - - - $acls = [ - 'channel' => 'channel_id', - 'attach' => 'id', - 'chatroom' => 'cr_id', - 'event' => 'id', - 'item' => 'id', - 'menu_item' => 'mitem_id', - 'obj' => 'obj_id', - 'photo' => 'id' - ]; + $tables = [ + 'abook' => 'abook_xchan', + 'abconfig' => 'xchan', + 'pgrp_member' => 'xchan', + 'chat' => 'chat_xchan', + 'chatpresence' => 'cp_xchan', + 'event' => 'event_xchan', + 'item' => 'owner_xchan', + 'item' => 'author_xchan', + 'item' => 'source_xchan', + 'mail' => 'from_xchan', + 'mail' => 'to_xchan', + 'shares' => 'share_xchan', + 'source' => 'src_channel_xchan', + 'source' => 'src_xchan', + 'xchat' => 'xchat_xchan', + 'xconfig' => 'xchan', + 'xign' => 'xchan', + 'xlink' => 'xlink_xchan', + 'xprof' => 'xprof_hash', + 'xtag' => 'xtag_hash' + ]; - foreach($tables as $k => $v) { - xchan_keychange_table($k,$v,$oldx,$newx); - } + $acls = [ + 'channel' => 'channel_id', + 'attach' => 'id', + 'chatroom' => 'cr_id', + 'event' => 'id', + 'item' => 'id', + 'menu_item' => 'mitem_id', + 'obj' => 'obj_id', + 'photo' => 'id' + ]; - foreach($acls as $k => $v) { - xchan_keychange_acl($k,$v,$oldx,$newx); - } + + foreach ($tables as $k => $v) { + xchan_keychange_table($k, $v, $oldx, $newx); + } + + foreach ($acls as $k => $v) { + xchan_keychange_acl($k, $v, $oldx, $newx); + } } -function migrate_xchan_photos($limit = 100) { +function migrate_xchan_photos($limit = 100) +{ - $r = q("select xchan_photo_l, xchan_hash, photo.xchan, photo.resource_id from photo left join xchan on photo.xchan = xchan_hash where photo.xchan != '' and uid = 0 and imgscale = 4 and photo_usage = 2 and xchan_photo_l like ('%s') limit %d", - dbesc(z_root() . '/photo/%'), - intval($limit) - ); - if ($r) { - foreach ($r as $rv) { - logger('migrating xchan_photo for ' . $rv['xchan_hash']); - $photos = import_remote_xchan_photo($rv['xchan_photo_l'], $rv['xchan_hash']); - if ($photos) { - $r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' + $r = q( + "select xchan_photo_l, xchan_hash, photo.xchan, photo.resource_id from photo left join xchan on photo.xchan = xchan_hash where photo.xchan != '' and uid = 0 and imgscale = 4 and photo_usage = 2 and xchan_photo_l like ('%s') limit %d", + dbesc(z_root() . '/photo/%'), + intval($limit) + ); + if ($r) { + foreach ($r as $rv) { + logger('migrating xchan_photo for ' . $rv['xchan_hash']); + $photos = import_remote_xchan_photo($rv['xchan_photo_l'], $rv['xchan_hash']); + if ($photos) { + $r = q( + "update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc($photos[3]), - dbesc($rv['xchan_hash']) - ); - } - } - } - + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc($photos[3]), + dbesc($rv['xchan_hash']) + ); + } + } + } } -function cleanup_xchan_photos($limit = 500) { +function cleanup_xchan_photos($limit = 500) +{ - $r = q("select photo.xchan, photo.resource_id from photo left join xchan on photo.xchan = xchan_hash where photo.xchan != '' and uid = 0 and imgscale = 4 and photo_usage = 2 and xchan_photo_l like ('%s') limit %d", - dbesc(z_root() . '/xp/%'), - intval($limit) - ); - if ($r) { - foreach ($r as $rv) { - q("delete from photo where xchan = '%s' and resource_id = '%s' and photo_usage = 2 and uid = 0", - dbesc($rv['xchan']), - dbesc($rv['resource_id']) - ); - } - } + $r = q( + "select photo.xchan, photo.resource_id from photo left join xchan on photo.xchan = xchan_hash where photo.xchan != '' and uid = 0 and imgscale = 4 and photo_usage = 2 and xchan_photo_l like ('%s') limit %d", + dbesc(z_root() . '/xp/%'), + intval($limit) + ); + if ($r) { + foreach ($r as $rv) { + q( + "delete from photo where xchan = '%s' and resource_id = '%s' and photo_usage = 2 and uid = 0", + dbesc($rv['xchan']), + dbesc($rv['resource_id']) + ); + } + } } -function xprof_store_lowlevel($profile) { +function xprof_store_lowlevel($profile) +{ - if (! $profile['hash']) { - return false; - } + if (! $profile['hash']) { + return false; + } - $store = [ - $arr['xprof_hash'] => $profile['hash'], - $arr['xprof_dob'] => (($profile['birthday'] === '0000-00-00') ? $profile['birthday'] : datetime_convert('','',$profile['birthday'],'Y-m-d')), - $arr['xprof_age'] => (($profile['age']) ? intval($profile['age']) : 0), - $arr['xprof_desc'] => (($profile['description']) ? htmlspecialchars($profile['description'], ENT_COMPAT,'UTF-8',false) : ''), - $arr['xprof_gender'] => (($profile['gender']) ? htmlspecialchars($profile['gender'], ENT_COMPAT,'UTF-8',false) : ''), - $arr['xprof_marital'] => (($profile['marital']) ? htmlspecialchars($profile['marital'], ENT_COMPAT,'UTF-8',false) : ''), - $arr['xprof_sexual'] => (($profile['sexual']) ? htmlspecialchars($profile['sexual'], ENT_COMPAT,'UTF-8',false) : ''), - $arr['xprof_locale'] => (($profile['locale']) ? htmlspecialchars($profile['locale'], ENT_COMPAT,'UTF-8',false) : ''), - $arr['xprof_region'] => (($profile['region']) ? htmlspecialchars($profile['region'], ENT_COMPAT,'UTF-8',false) : ''), - $arr['xprof_postcode'] => (($profile['postcode']) ? htmlspecialchars($profile['postcode'], ENT_COMPAT,'UTF-8',false) : ''), - $arr['xprof_country'] => (($profile['country']) ? htmlspecialchars($profile['country'], ENT_COMPAT,'UTF-8',false) : ''), - $arr['xprof_about'] => (($profile['about']) ? htmlspecialchars($profile['about'], ENT_COMPAT,'UTF-8',false) : ''), - $arr['xprof_homepage'] => (($profile['homepage']) ? htmlspecialchars($profile['homepage'], ENT_COMPAT,'UTF-8',false) : ''), - $arr['xprof_hometown'] => (($profile['hometown']) ? htmlspecialchars($profile['hometown'], ENT_COMPAT,'UTF-8',false) : ''), - $arr['xprof_keywords'] => (($profile['keywords']) ? htmlspecialchars($profile['keywords'], ENT_COMPAT,'UTF-8',false) : ''), + $store = [ + $arr['xprof_hash'] => $profile['hash'], + $arr['xprof_dob'] => (($profile['birthday'] === '0000-00-00') ? $profile['birthday'] : datetime_convert('', '', $profile['birthday'], 'Y-m-d')), + $arr['xprof_age'] => (($profile['age']) ? intval($profile['age']) : 0), + $arr['xprof_desc'] => (($profile['description']) ? htmlspecialchars($profile['description'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_gender'] => (($profile['gender']) ? htmlspecialchars($profile['gender'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_marital'] => (($profile['marital']) ? htmlspecialchars($profile['marital'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_sexual'] => (($profile['sexual']) ? htmlspecialchars($profile['sexual'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_locale'] => (($profile['locale']) ? htmlspecialchars($profile['locale'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_region'] => (($profile['region']) ? htmlspecialchars($profile['region'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_postcode'] => (($profile['postcode']) ? htmlspecialchars($profile['postcode'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_country'] => (($profile['country']) ? htmlspecialchars($profile['country'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_about'] => (($profile['about']) ? htmlspecialchars($profile['about'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_homepage'] => (($profile['homepage']) ? htmlspecialchars($profile['homepage'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_hometown'] => (($profile['hometown']) ? htmlspecialchars($profile['hometown'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_keywords'] => (($profile['keywords']) ? htmlspecialchars($profile['keywords'], ENT_COMPAT, 'UTF-8', false) : ''), - ]; + ]; - return create_table_from_array('xchan',$store); - -} \ No newline at end of file + return create_table_from_array('xchan', $store); +} diff --git a/include/zid.php b/include/zid.php index 045957cb0..76bb86675 100644 --- a/include/zid.php +++ b/include/zid.php @@ -3,30 +3,28 @@ use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Verify; +function is_matrix_url($url) +{ -function is_matrix_url($url) { + // in-memory cache to avoid repeated queries for the same host + static $remembered = []; - // in-memory cache to avoid repeated queries for the same host - static $remembered = []; - - $m = @parse_url($url); - if (isset($m['host']) && $m['host']) { - - if (in_array($m['host'],$remembered)) { - return true; - } + $m = @parse_url($url); + if (isset($m['host']) && $m['host']) { + if (in_array($m['host'], $remembered)) { + return true; + } $r = q("select hubloc_url from hubloc where hubloc_host = '%s' and hubloc_network in ('nomad','zot6') limit 1", - dbesc($m['host']) - ); - if ($r) { - $remembered[] = $m['host']; - return true; - } + dbesc($m['host']) + ); + if ($r) { + $remembered[] = $m['host']; + return true; + } + } - } - - return false; + return false; } /** @@ -34,102 +32,110 @@ function is_matrix_url($url) { * * @param string $s * The url to accept the zid - * @param boolean $address + * @param bool $address * $address to use instead of session environment * @return string */ -function zid($s, $address = '') { +function zid($s, $address = '') +{ - if (! strlen($s) || strpos($s,'zid=')) { - return $s; - } + if (! strlen($s) || strpos($s, 'zid=')) { + return $s; + } - $m = parse_url($s); - $fragment = ((array_key_exists('fragment',$m) && $m['fragment']) ? $m['fragment'] : false); - if ($fragment !== false) { - $s = str_replace('#' . $fragment,'',$s); - } + $m = parse_url($s); + $fragment = ((array_key_exists('fragment', $m) && $m['fragment']) ? $m['fragment'] : false); + if ($fragment !== false) { + $s = str_replace('#' . $fragment, '', $s); + } - $has_params = ((strpos($s,'?')) ? true : false); - $num_slashes = substr_count($s, '/'); - if (! $has_params) { - $has_params = ((strpos($s, '&')) ? true : false); - } + $has_params = ((strpos($s, '?')) ? true : false); + $num_slashes = substr_count($s, '/'); + if (! $has_params) { + $has_params = ((strpos($s, '&')) ? true : false); + } - $achar = strpos($s,'?') ? '&' : '?'; + $achar = strpos($s, '?') ? '&' : '?'; - $mine = get_my_url(); - $myaddr = (($address) ? $address : get_my_address()); + $mine = get_my_url(); + $myaddr = (($address) ? $address : get_my_address()); - $mine_parsed = parse_url($mine); - $s_parsed = parse_url($s); - $url_match = false; + $mine_parsed = parse_url($mine); + $s_parsed = parse_url($s); + $url_match = false; - if (isset($mine_parsed['host']) && isset($s_parsed['host']) - && $mine_parsed['host'] === $s_parsed['host']) { - $url_match = true; - } + if ( + isset($mine_parsed['host']) && isset($s_parsed['host']) + && $mine_parsed['host'] === $s_parsed['host'] + ) { + $url_match = true; + } - if ($mine && $myaddr && (! $url_match)) { - $zurl = $s . (($num_slashes >= 3) ? '' : '/') . (($achar === '?') ? '?f=&' : '&') . 'zid=' . urlencode($myaddr); - } - else { - $zurl = $s; - } + if ($mine && $myaddr && (! $url_match)) { + $zurl = $s . (($num_slashes >= 3) ? '' : '/') . (($achar === '?') ? '?f=&' : '&') . 'zid=' . urlencode($myaddr); + } else { + $zurl = $s; + } - // put fragment at the end + // put fragment at the end - if ($fragment) { - $zurl .= '#' . $fragment; - } + if ($fragment) { + $zurl .= '#' . $fragment; + } - $arr = [ - 'url' => $s, - 'zid' => urlencode($myaddr), - 'result' => $zurl - ]; - /** - * @hooks zid - * Called when adding the observer's zid to a URL. - * * \e string \b url - url to accept zid - * * \e string \b zid - urlencoded zid - * * \e string \b result - the return string we calculated, change it if you want to return something else - */ - call_hooks('zid', $arr); + $arr = [ + 'url' => $s, + 'zid' => urlencode($myaddr), + 'result' => $zurl + ]; + /** + * @hooks zid + * Called when adding the observer's zid to a URL. + * * \e string \b url - url to accept zid + * * \e string \b zid - urlencoded zid + * * \e string \b result - the return string we calculated, change it if you want to return something else + */ + call_hooks('zid', $arr); - return $arr['result']; + return $arr['result']; } -function strip_query_param($s,$param) { - return preg_replace('/[\?&]' . $param . '=(.*?)(&|$)/ism','$2',$s); +function strip_query_param($s, $param) +{ + return preg_replace('/[\?&]' . $param . '=(.*?)(&|$)/ism', '$2', $s); } -function strip_zids($s) { - return preg_replace('/[\?&]zid=(.*?)(&|$)/ism','$2',$s); +function strip_zids($s) +{ + return preg_replace('/[\?&]zid=(.*?)(&|$)/ism', '$2', $s); } -function strip_owt($s) { - return preg_replace('/[\?&]owt=(.*?)(&|$)/ism','$2',$s); +function strip_owt($s) +{ + return preg_replace('/[\?&]owt=(.*?)(&|$)/ism', '$2', $s); } -function strip_zats($s) { - return preg_replace('/[\?&]zat=(.*?)(&|$)/ism','$2',$s); +function strip_zats($s) +{ + return preg_replace('/[\?&]zat=(.*?)(&|$)/ism', '$2', $s); } -function strip_escaped_zids($s) { - $x = preg_replace('/&\;zid=(.*?)(&|$)/ism','$2',$s); - return strip_query_param($x,'f'); +function strip_escaped_zids($s) +{ + $x = preg_replace('/&\;zid=(.*?)(&|$)/ism', '$2', $s); + return strip_query_param($x, 'f'); } -function clean_query_string($s = '') { - $x = strip_zids(($s) ? $s : App::$query_string); - $x = strip_owt($x); - $x = strip_zats($x); - $x = strip_query_param($x,'sort'); +function clean_query_string($s = '') +{ + $x = strip_zids(($s) ? $s : App::$query_string); + $x = strip_owt($x); + $x = strip_zats($x); + $x = strip_query_param($x, 'sort'); - return strip_query_param($x,'f'); + return strip_query_param($x, 'f'); } @@ -144,63 +150,69 @@ function clean_query_string($s = '') { * @return string */ -function zidify_callback($match) { +function zidify_callback($match) +{ - $arr = [ 'zid' => ((strpos($match[1],'zrl') || strpos($match[3],'zrl')) ? true : false), 'url' => $match[2] ]; - call_hooks('zidify', $arr); + $arr = [ 'zid' => ((strpos($match[1], 'zrl') || strpos($match[3], 'zrl')) ? true : false), 'url' => $match[2] ]; + call_hooks('zidify', $arr); - $replace = '\n"; - exit(); - } - $starttable = $argv[2]; - $startrow = $argv[3]; - $cfgfile = '.htconfig.php-mysql'; +if ($argc >= 2 && $argv[1] == '--resume') { + if ($argc < 4) { + echo "Resume usage {$argv[0]} --resume
\n"; + exit(); + } + $starttable = $argv[2]; + $startrow = $argv[3]; + $cfgfile = '.htconfig.php-mysql'; } $cfg = parse_htconfig($cfgfile); $type = get_configtype($cfg); -if($type != 'mysql') { - echo "Error. Must start with standard mysql installation in .htconfig.php.\n"; - exit(); +if ($type != 'mysql') { + echo "Error. Must start with standard mysql installation in .htconfig.php.\n"; + exit(); } -if(!$cfg['port']) - $cfg['port'] = 3306; +if (!$cfg['port']) { + $cfg['port'] = 3306; +} try { - $mydb = new PDO("mysql:host={$cfg['host']};dbname={$cfg['data']};port={$cfg['port']}", $cfg['user'], $cfg['pass']); + $mydb = new PDO("mysql:host={$cfg['host']};dbname={$cfg['data']};port={$cfg['port']}", $cfg['user'], $cfg['pass']); } catch (PDOException $e) { - echo "Error connecting to mysql DB: " . $e->getMessage() . "\n"; - exit(); + echo "Error connecting to mysql DB: " . $e->getMessage() . "\n"; + exit(); } // mysql insists on buffering even when you use fetch() instead of fetchAll() for some stupid reason // http://stackoverflow.com/questions/6895098/pdo-mysql-memory-consumption-with-large-result-set -$mydb->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, false); +$mydb->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, false); -if(!file_exists('.htconfig.php-pgsql')) { - echo "Enter postgres server info:\n"; - $p['host'] = get_data("Hostname: ", '/[\w.]+/'); - $p['port'] = get_data("Enter port (0 for default): ", '/\d+/'); - $p['user'] = get_data("Username: ", '/\w+/'); - $p['pass'] = get_data("Password: ", '/[[:print:]]+/'); - $p['data'] = get_data("Database name: ", '/\w+/'); - $old = file_get_contents('.htconfig.php'); - $new = preg_replace( - array( - '/^(\$db_host\s*=\s*\')([\w.]+)(\';)$/m', - '/^(\$db_port\s*=\s*\')(\d+)(\';)$/m', - '/^(\$db_user\s*=\s*\')(\w+)(\';)$/m', - '/^(\$db_pass\s*=\s*\')([[:print:]]+)(\';)/m', - '/^(\$db_data\s*=\s*\')(\w+)(\';)$/m', - '/^(\$db_type\s*=\s*\')(\d)(\';)$/m' // in case they already have it - ), array( - "$1{$p['host']}$3", - "\${1}{$p['port']}$3", - "$1{$p['user']}$3", - "$1{$p['pass']}$3", - "$1{$p['data']}$3\n\$db_type = '1';\n", // they probably don't - "\${1}1$3" - ), - $old, - 1, - $repl - ); - if($new === false || $repl < 5) { - echo "Failed. Please make a postgres config file named .htconfig.php-pgsql - Be sure to add \"\$db_type = '1';\" to your config.\n"; - exit(); - } - file_put_contents('.htconfig.php-pgsql', $new); +if (!file_exists('.htconfig.php-pgsql')) { + echo "Enter postgres server info:\n"; + $p['host'] = get_data("Hostname: ", '/[\w.]+/'); + $p['port'] = get_data("Enter port (0 for default): ", '/\d+/'); + $p['user'] = get_data("Username: ", '/\w+/'); + $p['pass'] = get_data("Password: ", '/[[:print:]]+/'); + $p['data'] = get_data("Database name: ", '/\w+/'); + $old = file_get_contents('.htconfig.php'); + $new = preg_replace( + array( + '/^(\$db_host\s*=\s*\')([\w.]+)(\';)$/m', + '/^(\$db_port\s*=\s*\')(\d+)(\';)$/m', + '/^(\$db_user\s*=\s*\')(\w+)(\';)$/m', + '/^(\$db_pass\s*=\s*\')([[:print:]]+)(\';)/m', + '/^(\$db_data\s*=\s*\')(\w+)(\';)$/m', + '/^(\$db_type\s*=\s*\')(\d)(\';)$/m' // in case they already have it + ), + array( + "$1{$p['host']}$3", + "\${1}{$p['port']}$3", + "$1{$p['user']}$3", + "$1{$p['pass']}$3", + "$1{$p['data']}$3\n\$db_type = '1';\n", // they probably don't + "\${1}1$3" + ), + $old, + 1, + $repl + ); + if ($new === false || $repl < 5) { + echo "Failed. Please make a postgres config file named .htconfig.php-pgsql - Be sure to add \"\$db_type = '1';\" to your config.\n"; + exit(); + } + file_put_contents('.htconfig.php-pgsql', $new); } $pcfg = parse_htconfig('.htconfig.php-pgsql'); $ptype = get_configtype($pcfg); -if($ptype != 'pgsql') { - echo "Error. Must have a valid pgsql config named .htconfig.php-pgsql. Be sure to add \"\$db_type = '1';\" to your config.\n"; - exit(); +if ($ptype != 'pgsql') { + echo "Error. Must have a valid pgsql config named .htconfig.php-pgsql. Be sure to add \"\$db_type = '1';\" to your config.\n"; + exit(); } -if(!$pcfg['port']) - $pcfg['port'] = 5432; +if (!$pcfg['port']) { + $pcfg['port'] = 5432; +} try { - $pgdb = new PDO("pgsql:host={$pcfg['host']};dbname={$pcfg['data']};port={$pcfg['port']}", $pcfg['user'], $pcfg['pass']); + $pgdb = new PDO("pgsql:host={$pcfg['host']};dbname={$pcfg['data']};port={$pcfg['port']}", $pcfg['user'], $pcfg['pass']); } catch (PDOException $e) { - echo "Error connecting to pgsql DB: " . $e->getMessage() . "\n"; - echo "cfg string: " . "pgsql:host={$pcfg['host']};dbname={$pcfg['data']};port={$pcfg['port']}\n"; - exit(); + echo "Error connecting to pgsql DB: " . $e->getMessage() . "\n"; + echo "cfg string: " . "pgsql:host={$pcfg['host']};dbname={$pcfg['data']};port={$pcfg['port']}\n"; + exit(); } $B = "\033[0;34m"; $H = "\033[0;35m"; @@ -199,159 +223,172 @@ $W = "\033[1;37m"; $M = "\033[1;31m"; $N = "\033[0m"; -if(isset($starttable)) { - $r = ask_question("Ready to migrate {$W}Red{$M}(#){$W}Matrix$N from mysql db @$B{$cfg['host']}$N/$B{$cfg['data']}$N to postgres db @$B{$pcfg['host']}$N/$B{$pcfg['data']}$N. +if (isset($starttable)) { + $r = ask_question( + "Ready to migrate {$W}Red{$M}(#){$W}Matrix$N from mysql db @$B{$cfg['host']}$N/$B{$cfg['data']}$N to postgres db @$B{$pcfg['host']}$N/$B{$pcfg['data']}$N. Resuming failed migration ({$M}experimental$N) starting at table '$starttable' row $startrow. -Are you ready to begin (N/y)? ", - array('y', 'n'), - 'n' - ); - if($r == 'n') - exit(); +Are you ready to begin (N/y)? ", + array('y', 'n'), + 'n' + ); + if ($r == 'n') { + exit(); + } } else { - $r = ask_question("Ready to migrate {$W}Red{$M}(#){$W}Matrix$N from mysql db @$B{$cfg['host']}$N/$B{$cfg['data']}$N to postgres db @$B{$pcfg['host']}$N/$B{$pcfg['data']}$N. + $r = ask_question("Ready to migrate {$W}Red{$M}(#){$W}Matrix$N from mysql db @$B{$cfg['host']}$N/$B{$cfg['data']}$N to postgres db @$B{$pcfg['host']}$N/$B{$pcfg['data']}$N. The site will be disabled during the migration by moving the $H.htconfig.php$N file to $H.htconfig.php-mysql$N. If for any reason the migration fails, you will need to move the config file back into place manually before trying again. -Are you ready to begin (N/y)? ", array('y','n'), 'n' - ); +Are you ready to begin (N/y)? ", array('y','n'), 'n'); - if($r == 'n') - exit(); + if ($r == 'n') { + exit(); + } - rename('.htconfig.php', '.htconfig.php-mysql'); + rename('.htconfig.php', '.htconfig.php-mysql'); - run_sql('install/schema_postgres.sql', $pgdb, $err, $n); - if($err) { - echo "There were $err errors creating the pgsql schema. Unable to continue.\n"; - exit(); - } + run_sql('install/schema_postgres.sql', $pgdb, $err, $n); + if ($err) { + echo "There were $err errors creating the pgsql schema. Unable to continue.\n"; + exit(); + } - echo "pgsql schema created. $n queries executed successfully.\n"; + echo "pgsql schema created. $n queries executed successfully.\n"; } $res = $pgdb->query("select relname, attname, pg_type.typname from ((pg_attribute inner join pg_class on attrelid=pg_class.oid) inner join pg_type on atttypid=pg_type.oid) inner join pg_namespace on relnamespace=pg_namespace.oid where nspname='public' and atttypid not in (26,27,28,29) and relkind='r' and attname <> 'item_search_vector';"); -if($res === false) { - echo "Error reading back schema. Unable to continue.\n"; - var_export($pgdb->errorInfo()); - exit(); +if ($res === false) { + echo "Error reading back schema. Unable to continue.\n"; + var_export($pgdb->errorInfo()); + exit(); } $schema = []; -while(($row = $res->fetch()) !== false) - $schema[$row[0]][$row[1]] = $row[2]; - +while (($row = $res->fetch()) !== false) { + $schema[$row[0]][$row[1]] = $row[2]; +} + $res = $pgdb->query("select relname, attname from pg_attribute inner join pg_class on attrelid=pg_class.oid inner join pg_constraint on conrelid=pg_class.oid and pg_attribute.attnum = any (conkey) where contype='p';"); -if($res === false) { - echo "Error reading back primary keys. Unable to continue.\n"; - var_export($pgdb->errorInfo()); - exit(); +if ($res === false) { + echo "Error reading back primary keys. Unable to continue.\n"; + var_export($pgdb->errorInfo()); + exit(); } $pkeys = []; -while(($row = $res->fetch()) !== false) - $pkeys[$row[0]] = $row[1]; +while (($row = $res->fetch()) !== false) { + $pkeys[$row[0]] = $row[1]; +} -$err = 0; $n = 0; +$err = 0; +$n = 0; $reserved = array('ignore','key','with'); -foreach($schema as $table=>$fields) { - if(isset($starttable) && !$n && $table != $starttable) { - echo "Skipping table $table\n"; - continue; - } - $fnames = array_keys($fields); - $pfnames = array_keys($fields); - - foreach($fnames as &$fname) - if(in_array($fname, $reserved)) - $fname = '`' . $fname . '`'; - $fstr = implode(',', $fnames); - - foreach($pfnames as &$pfname) - if(in_array($pfname, $reserved)) - $pfname = '"' . $pfname . '"'; - $pfstr = implode(',', $pfnames); - - $cres = $mydb->query("SELECT count(*) FROM $table;"); - if($cres === false) { - echo "Fatal error counting table $table: ".var_export($mydb->errorInfo(), true)."\n"; - exit(); - } - $nrows = $cres->fetchColumn(0); - $cres->closeCursor(); - - if(!$nrows) { - echo "TABLE $table has 0 rows in mysql db.\n"; - continue; - } - - $pstr = ''; - for($x=0, $c=count($fields); $x < $c; $x++) - $pstr .= ($x ? ',?' : '?'); +foreach ($schema as $table => $fields) { + if (isset($starttable) && !$n && $table != $starttable) { + echo "Skipping table $table\n"; + continue; + } + $fnames = array_keys($fields); + $pfnames = array_keys($fields); - if(isset($starttable) && $table == $starttable) { - $selectsql = "SELECT $fstr FROM $table ORDER BY {$pkeys[$table]} LIMIT $nrows OFFSET $startrow;"; - $crow = $startrow; - } else { - $selectsql = "SELECT $fstr FROM $table ORDER BY {$pkeys[$table]};"; - $crow = 0; - } + foreach ($fnames as &$fname) { + if (in_array($fname, $reserved)) { + $fname = '`' . $fname . '`'; + } + } + $fstr = implode(',', $fnames); - echo "\033[255DTABLE: $table [$c fields] $crow/$nrows (".number_format(($crow/$nrows)*100,2)."%)\033[K"; - - $res = $mydb->query($selectsql); - if($res === false) { - echo "Fatal Error importing table $table: ".var_export($mydb->errorInfo(), true)."\n"; - exit(); - } + foreach ($pfnames as &$pfname) { + if (in_array($pfname, $reserved)) { + $pfname = '"' . $pfname . '"'; + } + } + $pfstr = implode(',', $pfnames); - $istmt = $pgdb->prepare("INSERT INTO $table ($pfstr) VALUES ($pstr);"); - if($istmt === false) { - echo "Fatal error preparing query. Aborting.\n"; - var_export($pgdb->errorInfo()); - exit(); - } + $cres = $mydb->query("SELECT count(*) FROM $table;"); + if ($cres === false) { + echo "Fatal error counting table $table: " . var_export($mydb->errorInfo(), true) . "\n"; + exit(); + } + $nrows = $cres->fetchColumn(0); + $cres->closeCursor(); - while(($row = $res->fetch(PDO::FETCH_NUM)) !== false) { - foreach($row as $idx => &$val) - if(array_slice(array_values($fields),$idx,1)[0] == 'timestamp' && $val == '0000-00-00 00:00:00') - $istmt->bindParam($idx+1, ($nulldate='0001-01-01 00:00:00')); - else if(array_slice(array_values($fields),$idx,1)[0] == 'bytea') - $istmt->bindParam($idx+1, $val, PDO::PARAM_LOB); - else - $istmt->bindParam($idx+1, $val); - $r = $istmt->execute(); - if($r === false) { - $err++; - echo "Insert error: ".var_export(array($pgdb->errorInfo(), $table, $fields, $row), true)."\nResume with {$argv[0]} --resume $table $crow\n"; - exit(); - } else - $n++; - $crow++; - if(($crow % 10) == 0 || $crow == $nrows) - echo "\033[255DTABLE: $table [$c fields] $crow/$nrows (".number_format(($crow/$nrows)*100,2)."%)\033[K"; - } - $res->closeCursor(); - echo "\n"; + if (!$nrows) { + echo "TABLE $table has 0 rows in mysql db.\n"; + continue; + } + + $pstr = ''; + for ($x = 0, $c = count($fields); $x < $c; $x++) { + $pstr .= ($x ? ',?' : '?'); + } + + if (isset($starttable) && $table == $starttable) { + $selectsql = "SELECT $fstr FROM $table ORDER BY {$pkeys[$table]} LIMIT $nrows OFFSET $startrow;"; + $crow = $startrow; + } else { + $selectsql = "SELECT $fstr FROM $table ORDER BY {$pkeys[$table]};"; + $crow = 0; + } + + echo "\033[255DTABLE: $table [$c fields] $crow/$nrows (" . number_format(($crow / $nrows) * 100, 2) . "%)\033[K"; + + $res = $mydb->query($selectsql); + if ($res === false) { + echo "Fatal Error importing table $table: " . var_export($mydb->errorInfo(), true) . "\n"; + exit(); + } + + $istmt = $pgdb->prepare("INSERT INTO $table ($pfstr) VALUES ($pstr);"); + if ($istmt === false) { + echo "Fatal error preparing query. Aborting.\n"; + var_export($pgdb->errorInfo()); + exit(); + } + + while (($row = $res->fetch(PDO::FETCH_NUM)) !== false) { + foreach ($row as $idx => &$val) { + if (array_slice(array_values($fields), $idx, 1)[0] == 'timestamp' && $val == '0000-00-00 00:00:00') { + $istmt->bindParam($idx + 1, ($nulldate = '0001-01-01 00:00:00')); + } elseif (array_slice(array_values($fields), $idx, 1)[0] == 'bytea') { + $istmt->bindParam($idx + 1, $val, PDO::PARAM_LOB); + } else { + $istmt->bindParam($idx + 1, $val); + } + } + $r = $istmt->execute(); + if ($r === false) { + $err++; + echo "Insert error: " . var_export(array($pgdb->errorInfo(), $table, $fields, $row), true) . "\nResume with {$argv[0]} --resume $table $crow\n"; + exit(); + } else { + $n++; + } + $crow++; + if (($crow % 10) == 0 || $crow == $nrows) { + echo "\033[255DTABLE: $table [$c fields] $crow/$nrows (" . number_format(($crow / $nrows) * 100, 2) . "%)\033[K"; + } + } + $res->closeCursor(); + echo "\n"; } echo "Done with $err errors and $n inserts.\n"; -if($err) { - echo "Migration had errors. Aborting.\n"; - exit(); +if ($err) { + echo "Migration had errors. Aborting.\n"; + exit(); } run_sql('install/migrate_mypg_fixseq.sql', $pgdb, $err, $n); echo "Sequences updated with $err errors and $n inserts.\n"; -if($err) - exit(); - +if ($err) { + exit(); +} + $r = ask_question("Everything successful. Once you connect up the pg database there is no going back. Do you want to make it live (N,y)?", array('y', 'n'), 'n'); -if($r == 'n') { - echo "You can make active by renaming .htconfig.php-pgsql to .htconfig.php, or start over by renaming .htconfig.php-mysql to .htconfig.php\n"; - exit(); -} +if ($r == 'n') { + echo "You can make active by renaming .htconfig.php-pgsql to .htconfig.php, or start over by renaming .htconfig.php-mysql to .htconfig.php\n"; + exit(); +} rename('.htconfig.php-pgsql', '.htconfig.php'); echo "Done. {$W}Red{$M}(#){$W}Matrix$N now running on postgres.\n"; - - diff --git a/install/testargs.php b/install/testargs.php index 4c9bce4e9..a05405944 100644 --- a/install/testargs.php +++ b/install/testargs.php @@ -8,14 +8,14 @@ * During installation we need to check if register_argc_argv is * enabled for the command line PHP processor, because otherwise * deliveries will fail. So we will do a shell exec of php and - * execute this file with a command line argument, and see if it - * echoes the argument back to us. Otherwise notify the person + * execute this file with a command line argument, and see if it + * echoes the argument back to us. Otherwise notify the person * that their installation doesn't meet the system requirements. * - */ + */ - -if(($argc > 1) && isset($argv[1])) - echo $argv[1]; -else - echo ''; +if (($argc > 1) && isset($argv[1])) { + echo $argv[1]; +} else { + echo ''; +} diff --git a/tests/unit/Access/AccessListTest.php b/tests/unit/Access/AccessListTest.php index ee9623a7f..ea3fc5570 100644 --- a/tests/unit/Access/AccessListTest.php +++ b/tests/unit/Access/AccessListTest.php @@ -1,4 +1,5 @@ '
', - 'allow_gid' => ' ', - 'deny_cid' => '', - 'deny_gid' => ' ' - ]; + /** + * @brief Expected result for most tests. + * @var array + */ + protected $expectedResult = [ + 'allow_cid' => ' ', + 'allow_gid' => ' ', + 'deny_cid' => '', + 'deny_gid' => ' ' + ]; - public function testConstructor() { - $channel = [ - 'channel_allow_cid' => ' ', - 'channel_allow_gid' => ' ', - 'channel_deny_cid' => '', - 'channel_deny_gid' => ' ' - ]; + public function testConstructor() + { + $channel = [ + 'channel_allow_cid' => ' ', + 'channel_allow_gid' => ' ', + 'channel_deny_cid' => '', + 'channel_deny_gid' => ' ' + ]; - $accessList = new AccessControl($channel); + $accessList = new AccessControl($channel); - $this->assertEquals($this->expectedResult, $accessList->get()); - $this->assertFalse($accessList->get_explicit()); - } + $this->assertEquals($this->expectedResult, $accessList->get()); + $this->assertFalse($accessList->get_explicit()); + } - /** - * @expectedException PHPUnit\Framework\Error\Error - */ - public function testPHPErrorOnInvalidConstructor() { - $accessList = new AccessControl('invalid'); - // Causes: "Illegal string offset 'channel_allow_cid'" - } + /** + * @expectedException PHPUnit\Framework\Error\Error + */ + public function testPHPErrorOnInvalidConstructor() + { + $accessList = new AccessControl('invalid'); + // Causes: "Illegal string offset 'channel_allow_cid'" + } - public function testDefaultGetExplicit() { - $accessList = new AccessControl([]); + public function testDefaultGetExplicit() + { + $accessList = new AccessControl([]); - $this->assertFalse($accessList->get_explicit()); - } + $this->assertFalse($accessList->get_explicit()); + } - public function testDefaultGet() { - $arr = [ - 'allow_cid' => '', - 'allow_gid' => '', - 'deny_cid' => '', - 'deny_gid' => '' - ]; + public function testDefaultGet() + { + $arr = [ + 'allow_cid' => '', + 'allow_gid' => '', + 'deny_cid' => '', + 'deny_gid' => '' + ]; - $accessList = new AccessControl([]); + $accessList = new AccessControl([]); - $this->assertEquals($arr, $accessList->get()); - } + $this->assertEquals($arr, $accessList->get()); + } - public function testSet() { - $arr = [ - 'allow_cid' => ' ', - 'allow_gid' => ' ', - 'deny_cid' => '', - 'deny_gid' => ' ' - ]; - $accessList = new AccessControl([]); + public function testSet() + { + $arr = [ + 'allow_cid' => ' ', + 'allow_gid' => ' ', + 'deny_cid' => '', + 'deny_gid' => ' ' + ]; + $accessList = new AccessControl([]); - // default explicit true - $accessList->set($arr); + // default explicit true + $accessList->set($arr); - $this->assertEquals($this->expectedResult, $accessList->get()); - $this->assertTrue($accessList->get_explicit()); + $this->assertEquals($this->expectedResult, $accessList->get()); + $this->assertTrue($accessList->get_explicit()); - // set explicit false - $accessList->set($arr, false); + // set explicit false + $accessList->set($arr, false); - $this->assertEquals($this->expectedResult, $accessList->get()); - $this->assertFalse($accessList->get_explicit()); - } + $this->assertEquals($this->expectedResult, $accessList->get()); + $this->assertFalse($accessList->get_explicit()); + } - /** - * @expectedException PHPUnit\Framework\Error\Error - */ - public function testPHPErrorOnInvalidSet() { - $accessList = new AccessControl([]); + /** + * @expectedException PHPUnit\Framework\Error\Error + */ + public function testPHPErrorOnInvalidSet() + { + $accessList = new AccessControl([]); - $accessList->set('invalid'); - // Causes: "Illegal string offset 'allow_cid'" - } + $accessList->set('invalid'); + // Causes: "Illegal string offset 'allow_cid'" + } - /** - * set_from_[] calls some other functions, too which are not yet unit tested. - * @uses ::perms2str - * @uses ::sanitise_acl - * @uses ::notags - */ - public function testSetFromArray() { - // array - $arraySetFromArray = [ - 'contact_allow' => ['acid', 'acid2'], - 'group_allow' => ['agid'], - 'contact_deny' => [], - 'group_deny' => ['dgid', 'dgid2'] - ]; - $accessList = new AccessControl([]); - $accessList->set_from_array($arraySetFromArray); + /** + * set_from_[] calls some other functions, too which are not yet unit tested. + * @uses ::perms2str + * @uses ::sanitise_acl + * @uses ::notags + */ + public function testSetFromArray() + { + // array + $arraySetFromArray = [ + 'contact_allow' => ['acid', 'acid2'], + 'group_allow' => ['agid'], + 'contact_deny' => [], + 'group_deny' => ['dgid', 'dgid2'] + ]; + $accessList = new AccessControl([]); + $accessList->set_from_array($arraySetFromArray); - $this->assertEquals($this->expectedResult, $accessList->get()); - $this->assertTrue($accessList->get_explicit()); + $this->assertEquals($this->expectedResult, $accessList->get()); + $this->assertTrue($accessList->get_explicit()); - // string - $stringSetFromArray = [ - 'contact_allow' => 'acid,acid2', - 'group_allow' => 'agid', - 'contact_deny' => '', - 'group_deny' => 'dgid, dgid2' - ]; - $accessList2 = new AccessControl([]); - $accessList2->set_from_array($stringSetFromArray, false); + // string + $stringSetFromArray = [ + 'contact_allow' => 'acid,acid2', + 'group_allow' => 'agid', + 'contact_deny' => '', + 'group_deny' => 'dgid, dgid2' + ]; + $accessList2 = new AccessControl([]); + $accessList2->set_from_array($stringSetFromArray, false); - $this->assertEquals($this->expectedResult, $accessList2->get()); - $this->assertFalse($accessList2->get_explicit()); - } + $this->assertEquals($this->expectedResult, $accessList2->get()); + $this->assertFalse($accessList2->get_explicit()); + } - /** - * @dataProvider isprivateProvider - */ - public function testIsPrivate($channel) { - $accessListPublic = new AccessControl([]); - $this->assertFalse($accessListPublic->is_private()); + /** + * @dataProvider isprivateProvider + */ + public function testIsPrivate($channel) + { + $accessListPublic = new AccessControl([]); + $this->assertFalse($accessListPublic->is_private()); - $accessListPrivate = new AccessControl($channel); - $this->assertTrue($accessListPrivate->is_private()); - } + $accessListPrivate = new AccessControl($channel); + $this->assertTrue($accessListPrivate->is_private()); + } - public function isprivateProvider() { - return [ - 'all set' => [[ - 'channel_allow_cid' => ' ', - 'channel_allow_gid' => ' ', - 'channel_deny_cid' => ' ', - 'channel_deny_gid' => ' ' - ]], - 'only one set' => [[ - 'channel_allow_cid' => ' ', - 'channel_allow_gid' => '', - 'channel_deny_cid' => '', - 'channel_deny_gid' => '' - ]], - 'acid+null' => [[ - 'channel_allow_cid' => ' ', - 'channel_allow_gid' => null, - 'channel_deny_cid' => '', - 'channel_deny_gid' => '' - ]] - ]; - } - -} \ No newline at end of file + public function isprivateProvider() + { + return [ + 'all set' => [[ + 'channel_allow_cid' => ' ', + 'channel_allow_gid' => ' ', + 'channel_deny_cid' => ' ', + 'channel_deny_gid' => ' ' + ]], + 'only one set' => [[ + 'channel_allow_cid' => ' ', + 'channel_allow_gid' => '', + 'channel_deny_cid' => '', + 'channel_deny_gid' => '' + ]], + 'acid+null' => [[ + 'channel_allow_cid' => ' ', + 'channel_allow_gid' => null, + 'channel_deny_cid' => '', + 'channel_deny_gid' => '' + ]] + ]; + } +} diff --git a/tests/unit/Access/PermissionLimitsTest.php b/tests/unit/Access/PermissionLimitsTest.php index 57ad42a19..03c9b055b 100644 --- a/tests/unit/Access/PermissionLimitsTest.php +++ b/tests/unit/Access/PermissionLimitsTest.php @@ -1,4 +1,5 @@ getFunctionMock('Zotlabs\Access', 't'); + $t->expects($this->exactly($permsCount)); - // Create a stub for global function t() with expectation - $t = $this->getFunctionMock('Zotlabs\Access', 't'); - $t->expects($this->exactly($permsCount)); + $stdlimits = PermissionLimits::Std_Limits(); + $this->assertCount($permsCount, $stdlimits, "There should be $permsCount permissions."); - $stdlimits = PermissionLimits::Std_Limits(); - $this->assertCount($permsCount, $stdlimits, "There should be $permsCount permissions."); - - $this->assertEquals(PERMS_PUBLIC, $stdlimits['view_stream']); - $this->assertEquals(PERMS_SPECIFIC, $stdlimits['send_stream']); - $this->assertEquals(PERMS_PUBLIC, $stdlimits['view_profile']); - $this->assertEquals(PERMS_PUBLIC, $stdlimits['view_contacts']); - $this->assertEquals(PERMS_PUBLIC, $stdlimits['view_storage']); - $this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_storage']); - $this->assertEquals(PERMS_PUBLIC, $stdlimits['view_pages']); - $this->assertEquals(PERMS_PUBLIC, $stdlimits['view_wiki']); - $this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_pages']); - $this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_wiki']); - $this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_wall']); - $this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_comments']); - $this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_mail']); - $this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_like']); - $this->assertEquals(PERMS_SPECIFIC, $stdlimits['tag_deliver']); - $this->assertEquals(PERMS_SPECIFIC, $stdlimits['chat']); - $this->assertEquals(PERMS_SPECIFIC, $stdlimits['republish']); - $this->assertEquals(PERMS_SPECIFIC, $stdlimits['delegate']); - } - -} \ No newline at end of file + $this->assertEquals(PERMS_PUBLIC, $stdlimits['view_stream']); + $this->assertEquals(PERMS_SPECIFIC, $stdlimits['send_stream']); + $this->assertEquals(PERMS_PUBLIC, $stdlimits['view_profile']); + $this->assertEquals(PERMS_PUBLIC, $stdlimits['view_contacts']); + $this->assertEquals(PERMS_PUBLIC, $stdlimits['view_storage']); + $this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_storage']); + $this->assertEquals(PERMS_PUBLIC, $stdlimits['view_pages']); + $this->assertEquals(PERMS_PUBLIC, $stdlimits['view_wiki']); + $this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_pages']); + $this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_wiki']); + $this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_wall']); + $this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_comments']); + $this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_mail']); + $this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_like']); + $this->assertEquals(PERMS_SPECIFIC, $stdlimits['tag_deliver']); + $this->assertEquals(PERMS_SPECIFIC, $stdlimits['chat']); + $this->assertEquals(PERMS_SPECIFIC, $stdlimits['republish']); + $this->assertEquals(PERMS_SPECIFIC, $stdlimits['delegate']); + } +} diff --git a/tests/unit/Access/PermissionRolesTest.php b/tests/unit/Access/PermissionRolesTest.php index d2189afc9..4ef9b2d8b 100644 --- a/tests/unit/Access/PermissionRolesTest.php +++ b/tests/unit/Access/PermissionRolesTest.php @@ -1,4 +1,5 @@ assertEquals($expectedVersion, PermissionRoles::version()); - $this->assertEquals($expectedVersion, PermissionRoles::version()); - - $pr = new PermissionRoles(); - $this->assertEquals($expectedVersion, $pr->version()); - } + $pr = new PermissionRoles(); + $this->assertEquals($expectedVersion, $pr->version()); + } - public function testRoles() { - // Create a stub for global function t() with expectation - $t = $this->getFunctionMock('Zotlabs\Access', 't'); - $t->expects($this->atLeastOnce())->willReturnCallback( - function ($string) { - return $string; - } - ); + public function testRoles() + { + // Create a stub for global function t() with expectation + $t = $this->getFunctionMock('Zotlabs\Access', 't'); + $t->expects($this->atLeastOnce())->willReturnCallback( + function ($string) { + return $string; + } + ); - $roles = PermissionRoles::roles(); - $r = new PermissionRoles(); - $this->assertEquals($roles, $r->roles()); + $roles = PermissionRoles::roles(); + $r = new PermissionRoles(); + $this->assertEquals($roles, $r->roles()); - $socialNetworking = [ - 'social_federation' => 'Social - Federation', - 'social' => 'Social - Mostly Public', - 'social_restricted' => 'Social - Restricted', - 'social_private' => 'Social - Private' - ]; + $socialNetworking = [ + 'social_federation' => 'Social - Federation', + 'social' => 'Social - Mostly Public', + 'social_restricted' => 'Social - Restricted', + 'social_private' => 'Social - Private' + ]; - $this->assertArraySubset(['Social Networking' => $socialNetworking], $roles); - $this->assertEquals($socialNetworking, $roles['Social Networking']); + $this->assertArraySubset(['Social Networking' => $socialNetworking], $roles); + $this->assertEquals($socialNetworking, $roles['Social Networking']); - $this->assertCount(5, $roles, 'There should be 5 permission groups.'); + $this->assertCount(5, $roles, 'There should be 5 permission groups.'); - $this->assertCount(1, $roles['Other'], "In the 'Other' group should be just one permission role"); - } + $this->assertCount(1, $roles['Other'], "In the 'Other' group should be just one permission role"); + } - /** - * @uses ::call_hooks - * @uses Zotlabs\Access\PermissionLimits::Std_Limits - * @uses Zotlabs\Access\Permissions::Perms - */ - public function testRole_perms() { - // Create a stub for global function t() - $t = $this->getFunctionMock('Zotlabs\Access', 't'); - $t = $this->getFunctionMock('Zotlabs\Access', 'get_config'); + /** + * @uses ::call_hooks + * @uses Zotlabs\Access\PermissionLimits::Std_Limits + * @uses Zotlabs\Access\Permissions::Perms + */ + public function testRole_perms() + { + // Create a stub for global function t() + $t = $this->getFunctionMock('Zotlabs\Access', 't'); + $t = $this->getFunctionMock('Zotlabs\Access', 'get_config'); - $rp_social = PermissionRoles::role_perms('social'); - $this->assertEquals('social', $rp_social['role']); + $rp_social = PermissionRoles::role_perms('social'); + $this->assertEquals('social', $rp_social['role']); - $rp_custom = PermissionRoles::role_perms('custom'); - $this->assertEquals(['role' => 'custom'], $rp_custom); - - $rp_nonexistent = PermissionRoles::role_perms('nonexistent'); - $this->assertEquals(['role' => 'nonexistent'], $rp_nonexistent); - } + $rp_custom = PermissionRoles::role_perms('custom'); + $this->assertEquals(['role' => 'custom'], $rp_custom); + $rp_nonexistent = PermissionRoles::role_perms('nonexistent'); + $this->assertEquals(['role' => 'nonexistent'], $rp_nonexistent); + } } diff --git a/tests/unit/Access/PermissionsTest.php b/tests/unit/Access/PermissionsTest.php index 9052ef4a7..cb643bb5a 100644 --- a/tests/unit/Access/PermissionsTest.php +++ b/tests/unit/Access/PermissionsTest.php @@ -1,4 +1,5 @@ assertEquals($expectedVersion, Permissions::version()); - // static call - $this->assertEquals($expectedVersion, Permissions::version()); + // instance call + $p = new Permissions(); + $this->assertEquals($expectedVersion, $p->version()); + } - // instance call - $p = new Permissions(); - $this->assertEquals($expectedVersion, $p->version()); - } + /** + * @coversNothing + */ + public function testVersionEqualsPermissionRoles() + { + $p = new Permissions(); + $pr = new PermissionRoles(); + $this->assertEquals($p->version(), $pr->version()); + } - /** - * @coversNothing - */ - public function testVersionEqualsPermissionRoles() { - $p = new Permissions(); - $pr = new \Zotlabs\Access\PermissionRoles(); - $this->assertEquals($p->version(), $pr->version()); - } + /** + * @uses ::call_hooks + */ + public function testPerms() + { + // There are 18 default perms + $permsCount = 18; - /** - * @uses ::call_hooks - */ - public function testPerms() { - // There are 18 default perms - $permsCount = 18; + // Create a stub for global function t() with expectation + $t = $this->getFunctionMock('Zotlabs\Access', 't'); + $t->expects($this->exactly(2 * $permsCount))->willReturnCallback( + function ($string) { + return $string; + } + ); - // Create a stub for global function t() with expectation - $t = $this->getFunctionMock('Zotlabs\Access', 't'); - $t->expects($this->exactly(2*$permsCount))->willReturnCallback( - function ($string) { - return $string; - } - ); + // static method Perms() + $perms = Permissions::Perms(); - // static method Perms() - $perms = Permissions::Perms(); + $p = new Permissions(); + $this->assertEquals($perms, $p->Perms()); - $p = new Permissions(); - $this->assertEquals($perms, $p->Perms()); + $this->assertEquals($permsCount, count($perms), "There should be $permsCount permissions."); - $this->assertEquals($permsCount, count($perms), "There should be $permsCount permissions."); + $this->assertEquals('Can view my channel stream and posts', $perms['view_stream']); - $this->assertEquals('Can view my channel stream and posts', $perms['view_stream']); + // non existent perm should not be set + $this->assertFalse(isset($perms['invalid_perm'])); + } - // non existent perm should not be set - $this->assertFalse(isset($perms['invalid_perm'])); - } + /** + * filter parmeter is only used in hook \b permissions_list. So the result + * in this test should be the same as if there was no filter parameter. + * + * @todo Stub call_hooks() function and also test filter + * + * @uses ::call_hooks + */ + public function testPermsFilter() + { + // There are 18 default perms + $permsCount = 18; - /** - * filter parmeter is only used in hook \b permissions_list. So the result - * in this test should be the same as if there was no filter parameter. - * - * @todo Stub call_hooks() function and also test filter - * - * @uses ::call_hooks - */ - public function testPermsFilter() { - // There are 18 default perms - $permsCount = 18; + // Create a stub for global function t() with expectation + $t = $this->getFunctionMock('Zotlabs\Access', 't'); + $t->expects($this->exactly(2 * $permsCount))->willReturnCallback( + function ($string) { + return $string; + } + ); - // Create a stub for global function t() with expectation - $t = $this->getFunctionMock('Zotlabs\Access', 't'); - $t->expects($this->exactly(2*$permsCount))->willReturnCallback( - function ($string) { - return $string; - } - ); + $perms = Permissions::Perms('view_'); + $this->assertEquals($permsCount, count($perms)); - $perms = Permissions::Perms('view_'); - $this->assertEquals($permsCount, count($perms)); + $this->assertEquals('Can view my channel stream and posts', $perms['view_stream']); - $this->assertEquals('Can view my channel stream and posts', $perms['view_stream']); + $perms = Permissions::Perms('invalid_perm'); + $this->assertEquals($permsCount, count($perms)); + } - $perms = Permissions::Perms('invalid_perm'); - $this->assertEquals($permsCount, count($perms)); - } + /** + * Better should mock Permissions::Perms, but not possible with static methods. + * + * @uses ::call_hooks + * + * @dataProvider FilledPermsProvider + * + * @param array $permarr An indexed permissions array to pass + * @param array $expected The expected result perms array + */ + public function testFilledPerms($permarr, $expected) + { + // Create a stub for global function t() + $t = $this->getFunctionMock('Zotlabs\Access', 't'); - /** - * Better should mock Permissions::Perms, but not possible with static methods. - * - * @uses ::call_hooks - * - * @dataProvider FilledPermsProvider - * - * @param array $permarr An indexed permissions array to pass - * @param array $expected The expected result perms array - */ - public function testFilledPerms($permarr, $expected) { - // Create a stub for global function t() - $t = $this->getFunctionMock('Zotlabs\Access', 't'); + $this->assertEquals($expected, Permissions::FilledPerms($permarr)); + } + /** + * @return array An associative array with test values for FilledPerms() + * * \e array Indexed array which is passed as parameter to FilledPerms() + * * \e array Expected associative result array with filled perms + */ + public function FilledPermsProvider() + { + return [ + 'Empty param array' => [ + [], + [ + 'view_stream' => 0, + 'send_stream' => 0, + 'view_profile' => 0, + 'view_contacts' => 0, + 'view_storage' => 0, + 'write_storage' => 0, + 'view_pages' => 0, + 'view_wiki' => 0, + 'write_pages' => 0, + 'write_wiki' => 0, + 'post_wall' => 0, + 'post_comments' => 0, + 'post_mail' => 0, + 'post_like' => 0, + 'tag_deliver' => 0, + 'chat' => 0, + 'republish' => 0, + 'delegate' => 0 + ] + ], + 'provide view_stream and view_pages as param' => [ + ['view_stream', 'view_pages'], + [ + 'view_stream' => 1, + 'send_stream' => 0, + 'view_profile' => 0, + 'view_contacts' => 0, + 'view_storage' => 0, + 'write_storage' => 0, + 'view_pages' => 1, + 'view_wiki' => 0, + 'write_pages' => 0, + 'write_wiki' => 0, + 'post_wall' => 0, + 'post_comments' => 0, + 'post_mail' => 0, + 'post_like' => 0, + 'tag_deliver' => 0, + 'chat' => 0, + 'republish' => 0, + 'delegate' => 0 + ] + ], + 'provide an unknown param' => [ + ['view_stream', 'unknown_perm'], + [ + 'view_stream' => 1, + 'send_stream' => 0, + 'view_profile' => 0, + 'view_contacts' => 0, + 'view_storage' => 0, + 'write_storage' => 0, + 'view_pages' => 0, + 'view_wiki' => 0, + 'write_pages' => 0, + 'write_wiki' => 0, + 'post_wall' => 0, + 'post_comments' => 0, + 'post_mail' => 0, + 'post_like' => 0, + 'tag_deliver' => 0, + 'chat' => 0, + 'republish' => 0, + 'delegate' => 0 + ] + ] + ]; + } + /** + * @uses ::call_hooks + */ + public function testFilledPermsNull() + { + // Create a stub for global function t() with expectation + $t = $this->getFunctionMock('Zotlabs\Access', 't'); + $t->expects($this->atLeastOnce()); + // Create a stub for global function bt() with expectations + $bt = $this->getFunctionMock('Zotlabs\Access', 'btlogger'); + $bt->expects($this->once())->with($this->equalTo('FilledPerms: null')); - $this->assertEquals($expected, Permissions::FilledPerms($permarr)); - } - /** - * @return array An associative array with test values for FilledPerms() - * * \e array Indexed array which is passed as parameter to FilledPerms() - * * \e array Expected associative result array with filled perms - */ - public function FilledPermsProvider() { - return [ - 'Empty param array' => [ - [], - [ - 'view_stream' => 0, - 'send_stream' => 0, - 'view_profile' => 0, - 'view_contacts' => 0, - 'view_storage' => 0, - 'write_storage' => 0, - 'view_pages' => 0, - 'view_wiki' => 0, - 'write_pages' => 0, - 'write_wiki' => 0, - 'post_wall' => 0, - 'post_comments' => 0, - 'post_mail' => 0, - 'post_like' => 0, - 'tag_deliver' => 0, - 'chat' => 0, - 'republish' => 0, - 'delegate' => 0 - ] - ], - 'provide view_stream and view_pages as param' => [ - ['view_stream', 'view_pages'], - [ - 'view_stream' => 1, - 'send_stream' => 0, - 'view_profile' => 0, - 'view_contacts' => 0, - 'view_storage' => 0, - 'write_storage' => 0, - 'view_pages' => 1, - 'view_wiki' => 0, - 'write_pages' => 0, - 'write_wiki' => 0, - 'post_wall' => 0, - 'post_comments' => 0, - 'post_mail' => 0, - 'post_like' => 0, - 'tag_deliver' => 0, - 'chat' => 0, - 'republish' => 0, - 'delegate' => 0 - ] - ], - 'provide an unknown param' => [ - ['view_stream', 'unknown_perm'], - [ - 'view_stream' => 1, - 'send_stream' => 0, - 'view_profile' => 0, - 'view_contacts' => 0, - 'view_storage' => 0, - 'write_storage' => 0, - 'view_pages' => 0, - 'view_wiki' => 0, - 'write_pages' => 0, - 'write_wiki' => 0, - 'post_wall' => 0, - 'post_comments' => 0, - 'post_mail' => 0, - 'post_like' => 0, - 'tag_deliver' => 0, - 'chat' => 0, - 'republish' => 0, - 'delegate' => 0 - ] - ] - ]; - } - /** - * @uses ::call_hooks - */ - public function testFilledPermsNull() { - // Create a stub for global function t() with expectation - $t = $this->getFunctionMock('Zotlabs\Access', 't'); - $t->expects($this->atLeastOnce()); - // Create a stub for global function bt() with expectations - $bt = $this->getFunctionMock('Zotlabs\Access', 'btlogger'); - $bt->expects($this->once())->with($this->equalTo('FilledPerms: null')); + $result = [ + 'view_stream' => 0, + 'send_stream' => 0, + 'view_profile' => 0, + 'view_contacts' => 0, + 'view_storage' => 0, + 'write_storage' => 0, + 'view_pages' => 0, + 'view_wiki' => 0, + 'write_pages' => 0, + 'write_wiki' => 0, + 'post_wall' => 0, + 'post_comments' => 0, + 'post_mail' => 0, + 'post_like' => 0, + 'tag_deliver' => 0, + 'chat' => 0, + 'republish' => 0, + 'delegate' => 0 + ]; - $result = [ - 'view_stream' => 0, - 'send_stream' => 0, - 'view_profile' => 0, - 'view_contacts' => 0, - 'view_storage' => 0, - 'write_storage' => 0, - 'view_pages' => 0, - 'view_wiki' => 0, - 'write_pages' => 0, - 'write_wiki' => 0, - 'post_wall' => 0, - 'post_comments' => 0, - 'post_mail' => 0, - 'post_like' => 0, - 'tag_deliver' => 0, - 'chat' => 0, - 'republish' => 0, - 'delegate' => 0 - ]; + $this->assertEquals($result, Permissions::FilledPerms(null)); + } - $this->assertEquals($result, Permissions::FilledPerms(null)); - } + /** + * @dataProvider OPermsProvider + * + * @param array $permarr The params to pass to the OPerms method + * @param array $expected The expected result + */ + public function testOPerms($permarr, $expected) + { + $this->assertEquals($expected, Permissions::OPerms($permarr)); + } + /** + * @return array An associative array with test values for OPerms() + * * \e array Array with perms to test + * * \e array Expected result array + */ + public function OPermsProvider() + { + return [ + 'empty' => [ + [], + [] + ], + 'valid' => [ + ['perm1' => 1, 'perm2' => 0], + [['name' => 'perm1', 'value' => 1], ['name' => 'perm2', 'value' => 0]] + ], + 'null array' => [ + null, + [] + ] + ]; + } - /** - * @dataProvider OPermsProvider - * - * @param array $permarr The params to pass to the OPerms method - * @param array $expected The expected result - */ - public function testOPerms($permarr, $expected) { - $this->assertEquals($expected, Permissions::OPerms($permarr)); - } - /** - * @return array An associative array with test values for OPerms() - * * \e array Array with perms to test - * * \e array Expected result array - */ - public function OPermsProvider() { - return [ - 'empty' => [ - [], - [] - ], - 'valid' => [ - ['perm1' => 1, 'perm2' => 0], - [['name' => 'perm1', 'value' => 1], ['name' => 'perm2', 'value' => 0]] - ], - 'null array' => [ - null, - [] - ] - ]; - } - - /** - * @dataProvider permsCompareProvider - * - * @param array $p1 The first permission - * @param array $p2 The second permission - * @param boolean $expectedresult The expected result of the tested method - */ - public function testPermsCompare($p1, $p2, $expectedresult) { - $this->assertEquals($expectedresult, Permissions::PermsCompare($p1, $p2)); - } - /** - * @return array An associative array with test values for PermsCompare() - * * \e array 1st array with perms - * * \e array 2nd array with perms - * * \e boolean expected result for the perms comparison - */ - public function permsCompareProvider() { - return [ - 'equal' => [ - ['perm1' => 1, 'perm2' => 0], - ['perm1' => 1, 'perm2' => 0], - true - ], - 'different values' => [ - ['perm1' => 1, 'perm2' => 0], - ['perm1' => 0, 'perm2' => 1], - false - ], - 'different order' => [ - ['perm1' => 1, 'perm2' => 0], - ['perm2' => 0, 'perm1' => 1], - true - ], - 'partial first in second' => [ - ['perm1' => 1], - ['perm1' => 1, 'perm2' => 0], - true - ], - 'partial second in first' => [ - ['perm1' => 1, 'perm2' => 0], - ['perm1' => 1], - false - ] - ]; - } + /** + * @dataProvider permsCompareProvider + * + * @param array $p1 The first permission + * @param array $p2 The second permission + * @param bool $expectedresult The expected result of the tested method + */ + public function testPermsCompare($p1, $p2, $expectedresult) + { + $this->assertEquals($expectedresult, Permissions::PermsCompare($p1, $p2)); + } + /** + * @return array An associative array with test values for PermsCompare() + * * \e array 1st array with perms + * * \e array 2nd array with perms + * * \e boolean expected result for the perms comparison + */ + public function permsCompareProvider() + { + return [ + 'equal' => [ + ['perm1' => 1, 'perm2' => 0], + ['perm1' => 1, 'perm2' => 0], + true + ], + 'different values' => [ + ['perm1' => 1, 'perm2' => 0], + ['perm1' => 0, 'perm2' => 1], + false + ], + 'different order' => [ + ['perm1' => 1, 'perm2' => 0], + ['perm2' => 0, 'perm1' => 1], + true + ], + 'partial first in second' => [ + ['perm1' => 1], + ['perm1' => 1, 'perm2' => 0], + true + ], + 'partial second in first' => [ + ['perm1' => 1, 'perm2' => 0], + ['perm1' => 1], + false + ] + ]; + } } diff --git a/tests/unit/AntiXSSTest.php b/tests/unit/AntiXSSTest.php index ebe0678a3..503d9963a 100644 --- a/tests/unit/AntiXSSTest.php +++ b/tests/unit/AntiXSSTest.php @@ -1,4 +1,5 @@ '; + /** + * test, that tags are escaped + */ + public function testEscapeTags() + { + $invalidstring = ' '; - $validstring=notags($invalidstring); - $escapedString=escape_tags($invalidstring); + $validstring = notags($invalidstring); + $escapedString = escape_tags($invalidstring); - $this->assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring); - $this->assertEquals("<submit type="button" onclick="alert('failed!');" />", $escapedString); - } + $this->assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring); + $this->assertEquals("<submit type="button" onclick="alert('failed!');" />", $escapedString); + } - /** - *xmlify and unxmlify - */ - public function testXmlify() { - $text=" I want to break\n this!11! "; - $xml=xmlify($text); - $retext=unxmlify($text); + /** + *xmlify and unxmlify + */ + public function testXmlify() + { + $text = "I want to break\n this!11! "; + $xml = xmlify($text); + $retext = unxmlify($text); - $this->assertEquals($text, $retext); - } + $this->assertEquals($text, $retext); + } - /** - * xmlify and put in a document - */ - public function testXmlifyDocument() { - $tag="I want to break "; - $xml=xmlify($tag); - $text=''.$xml.' '; + /** + * xmlify and put in a document + */ + public function testXmlifyDocument() + { + $tag = "I want to break "; + $xml = xmlify($tag); + $text = '' . $xml . ' '; - $xml_parser=xml_parser_create(); - //should be possible to parse it - $values=[]; $index=[]; - $this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index)); + $xml_parser = xml_parser_create(); + //should be possible to parse it + $values = []; + $index = []; + $this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index)); - $this->assertEquals(array('TEXT'=>array(0)), - $index); - $this->assertEquals(array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)), - $values); + $this->assertEquals( + array('TEXT' => array(0)), + $index + ); + $this->assertEquals( + array(array('tag' => 'TEXT', 'type' => 'complete', 'level' => 1, 'value' => $tag)), + $values + ); - xml_parser_free($xml_parser); - } + xml_parser_free($xml_parser); + } - /** - * test hex2bin and reverse - */ - public function testHex2Bin() { - $this->assertEquals(-3, hex2bin(bin2hex(-3))); - $this->assertEquals(0, hex2bin(bin2hex(0))); - $this->assertEquals(12, hex2bin(bin2hex(12))); - $this->assertEquals(PHP_INT_MAX, hex2bin(bin2hex(PHP_INT_MAX))); - } + /** + * test hex2bin and reverse + */ + public function testHex2Bin() + { + $this->assertEquals(-3, hex2bin(bin2hex(-3))); + $this->assertEquals(0, hex2bin(bin2hex(0))); + $this->assertEquals(12, hex2bin(bin2hex(12))); + $this->assertEquals(PHP_INT_MAX, hex2bin(bin2hex(PHP_INT_MAX))); + } - //function qp, quick and dirty?? - //get_mentions - //get_contact_block, bis Zeile 538 + //function qp, quick and dirty?? + //get_mentions + //get_contact_block, bis Zeile 538 } -?> diff --git a/tests/unit/AutonameTest.php b/tests/unit/AutonameTest.php index 566fe6149..6f0a697c7 100644 --- a/tests/unit/AutonameTest.php +++ b/tests/unit/AutonameTest.php @@ -1,4 +1,5 @@ assertNotEquals($autoname1, $autoname2); - } + $this->assertNotEquals($autoname1, $autoname2); + } - /** - *autonames should be random, odd length - */ - public function testAutonameOdd() { - $autoname1=autoname(9); - $autoname2=autoname(9); + /** + *autonames should be random, odd length + */ + public function testAutonameOdd() + { + $autoname1 = autoname(9); + $autoname2 = autoname(9); - $this->assertNotEquals($autoname1, $autoname2); - } + $this->assertNotEquals($autoname1, $autoname2); + } - /** - * try to fail autonames - */ - public function testAutonameNoLength() { - $autoname1=autoname(0); - $this->assertEquals(0, strlen($autoname1)); - } + /** + * try to fail autonames + */ + public function testAutonameNoLength() + { + $autoname1 = autoname(0); + $this->assertEquals(0, strlen($autoname1)); + } - /** - * try to fail it with invalid input - * - * TODO: What's corect behaviour here? An exception? - */ - public function testAutonameNegativeLength() { - $autoname1=autoname(-23); - $this->assertEquals(0, strlen($autoname1)); - } + /** + * try to fail it with invalid input + * + * TODO: What's corect behaviour here? An exception? + */ + public function testAutonameNegativeLength() + { + $autoname1 = autoname(-23); + $this->assertEquals(0, strlen($autoname1)); + } - // public function testAutonameMaxLength() { - // $autoname2=autoname(PHP_INT_MAX); - // $this->assertEquals(PHP_INT_MAX, strlen($autoname2)); - // } + // public function testAutonameMaxLength() { + // $autoname2=autoname(PHP_INT_MAX); + // $this->assertEquals(PHP_INT_MAX, strlen($autoname2)); + // } - /** - * test with a length, that may be too short - * length is maximum - autoname can return something shorter. - */ - public function testAutonameLength1() { - $autoname1=autoname(1); - $test = ((strlen($autoname1) < 2) ? 1 : 0); - $this->assertEquals(1, $test); + /** + * test with a length, that may be too short + * length is maximum - autoname can return something shorter. + */ + public function testAutonameLength1() + { + $autoname1 = autoname(1); + $test = ((strlen($autoname1) < 2) ? 1 : 0); + $this->assertEquals(1, $test); - $autoname2=autoname(1); - $test = ((strlen($autoname2) < 2) ? 1 : 0); - $this->assertEquals(1, $test); + $autoname2 = autoname(1); + $test = ((strlen($autoname2) < 2) ? 1 : 0); + $this->assertEquals(1, $test); - // The following test is problematic, with only 26 possibilities - // generating the same thing twice happens often aka - // birthday paradox -// $this->assertFalse($autoname1==$autoname2); - } + // The following test is problematic, with only 26 possibilities + // generating the same thing twice happens often aka + // birthday paradox +// $this->assertFalse($autoname1==$autoname2); + } } diff --git a/tests/unit/ContainsAttributeTest.php b/tests/unit/ContainsAttributeTest.php index 0930d9837..96bb9dc88 100644 --- a/tests/unit/ContainsAttributeTest.php +++ b/tests/unit/ContainsAttributeTest.php @@ -1,4 +1,5 @@ assertTrue(attribute_contains($testAttr, "class3")); - $this->assertFalse(attribute_contains($testAttr, "class2")); - } +class ContainsAttributeTest extends TestCase +{ + /** + * test attribute contains + */ + public function testAttributeContains1() + { + $testAttr = "class1 notclass2 class3"; + $this->assertTrue(attribute_contains($testAttr, "class3")); + $this->assertFalse(attribute_contains($testAttr, "class2")); + } - /** - * test attribute contains - */ - public function testAttributeContains2() { - $testAttr="class1 not-class2 class3"; - $this->assertTrue(attribute_contains($testAttr, "class3")); - $this->assertFalse(attribute_contains($testAttr, "class2")); - } + /** + * test attribute contains + */ + public function testAttributeContains2() + { + $testAttr = "class1 not-class2 class3"; + $this->assertTrue(attribute_contains($testAttr, "class3")); + $this->assertFalse(attribute_contains($testAttr, "class2")); + } - /** - * test with empty input - */ - public function testAttributeContainsEmpty() { - $testAttr=""; - $this->assertFalse(attribute_contains($testAttr, "class2")); - } + /** + * test with empty input + */ + public function testAttributeContainsEmpty() + { + $testAttr = ""; + $this->assertFalse(attribute_contains($testAttr, "class2")); + } - /** - * test input with special chars - */ - public function testAttributeContainsSpecialChars() { - $testAttr="--... %\$ä() /(=?}"; - $this->assertFalse(attribute_contains($testAttr, "class2")); - } -} \ No newline at end of file + /** + * test input with special chars + */ + public function testAttributeContainsSpecialChars() + { + $testAttr = "--... %\$ä() /(=?}"; + $this->assertFalse(attribute_contains($testAttr, "class2")); + } +} diff --git a/tests/unit/DatabaseTestCase.php b/tests/unit/DatabaseTestCase.php index 18c1cfb17..60f3cd405 100644 --- a/tests/unit/DatabaseTestCase.php +++ b/tests/unit/DatabaseTestCase.php @@ -1,4 +1,5 @@ conn === null) { - if (self::$pdo === null) { - $dsn = \getenv('hz_db_scheme') . ':host=' . \getenv('hz_db_server') - . ';port=' . \getenv('hz_db_port') . ';dbname=' . \getenv('hz_db_database'); + final public function getConnection() + { + if ($this->conn === null) { + if (self::$pdo === null) { + $dsn = getenv('hz_db_scheme') . ':host=' . getenv('hz_db_server') + . ';port=' . getenv('hz_db_port') . ';dbname=' . getenv('hz_db_database'); - self::$pdo = new \PDO($dsn, \getenv('hz_db_user'), \getenv('hz_db_pass')); - } - $this->conn = $this->createDefaultDBConnection(self::$pdo, \getenv('hz_db_database')); - } + self::$pdo = new PDO($dsn, getenv('hz_db_user'), getenv('hz_db_pass')); + } + $this->conn = $this->createDefaultDBConnection(self::$pdo, getenv('hz_db_database')); + } - return $this->conn; - } + return $this->conn; + } } diff --git a/tests/unit/Lib/MarkdownTest.php b/tests/unit/Lib/MarkdownTest.php index da1d82877..c350397a2 100644 --- a/tests/unit/Lib/MarkdownTest.php +++ b/tests/unit/Lib/MarkdownTest.php @@ -1,4 +1,5 @@ assertEquals($markdown, Markdown::from_html($html)); - } + /** + * @covers ::html2markdown + * @dataProvider html2markdownProvider + */ + public function testHtml2markdown($html, $markdown) + { + $this->assertEquals($markdown, Markdown::from_html($html)); + } - public function html2markdownProvider() { - return [ - 'empty text' => [ - '', - '' - ], - 'space and nbsp only' => [ - ' ', - '' - ], + public function html2markdownProvider() + { + return [ + 'empty text' => [ + '', + '' + ], + 'space and nbsp only' => [ + ' ', + '' + ], - 'strong, b, em, i, bib' => [ - 'strong bold em italic boitalicld', - '**strong** **bold** *em* *italic* **bo*italic*ld**' - ], + 'strong, b, em, i, bib' => [ + 'strong bold em italic boitalicld', + '**strong** **bold** *em* *italic* **bo*italic*ld**' + ], - 'empty tags' => [ - 'text1 text2 ', - 'text1 text2' - ], - 'HTML entities, lt does not work' => [ - '& gt > lt <', - '& gt > lt' - ], - 'escaped HTML entities' => [ - '& lt < gt >', - '& lt < gt >' - ], - 'linebreak' => [ - "line1
line2\nline3", - "line1 \nline2 line3" - ], - 'headlines' => [ - 'header1
Header 3
', - "header1\n=======\n\n### Header 3" - ], - 'unordered list' => [ - '- Item 1
- Item 2
- Item 3
- Item 1
- Item 2
- Item 3
- Item 1
- Item 1a
- Item 1b
- Item 2
',
- ''
- ],
- 'link' => [
- 'link',
- '[link](http://hubzilla.org "Hubzilla")'
- ],
- 'img link' => [
- '
',
- '[](http://hubzilla.org "Hubzilla")'
- ],
- 'script' => [
- "",
- ""
- ],
- 'blockquote, issue #793' => [
- 'something
blah', - "> something\n\nblah" - ], - 'code' => [ - '<p>HTML text</p>', - '`HTML text
`' - ], - 'pre' => [ - 'one line with spaces
', - "```\n one line with spaces \n```" - ], - 'div p' => [ - 'div', - "p
divp\n\n" - ] - ]; - } + 'empty tags' => [ + 'text1 text2 ', + 'text1 text2' + ], + 'HTML entities, lt does not work' => [ + '& gt > lt <', + '& gt > lt' + ], + 'escaped HTML entities' => [ + '& lt < gt >', + '& lt < gt >' + ], + 'linebreak' => [ + "line1
line2\nline3", + "line1 \nline2 line3" + ], + 'headlines' => [ + 'header1
Header 3
', + "header1\n=======\n\n### Header 3" + ], + 'unordered list' => [ + '- Item 1
- Item 2
- Item 3
- Item 1
- Item 2
- Item 3
- Item 1
- Item 1a
- Item 1b
- Item 2
',
+ ''
+ ],
+ 'link' => [
+ 'link',
+ '[link](http://hubzilla.org "Hubzilla")'
+ ],
+ 'img link' => [
+ '',
+ '[](http://hubzilla.org "Hubzilla")'
+ ],
+ 'script' => [
+ "",
+ ""
+ ],
+ 'blockquote, issue #793' => [
+ 'something
blah', + "> something\n\nblah" + ], + 'code' => [ + '<p>HTML text</p>', + '`HTML text
`' + ], + 'pre' => [ + 'one line with spaces
', + "```\n one line with spaces \n```" + ], + 'div p' => [ + 'div', + "p
divp\n\n" + ] + ]; + } - /*public function testHtml2markdownException() { - //$this->expectException(\InvalidArgumentException::class); - // need to stub logger() for this to work - $this->assertEquals('', Markdown::from_html('<
i- li1
- li2
'); + // php-mock can not mock global functions which is called by a global function. + // If the calling function is in a namespace it does work. + $bbc = $this->getFunctionMock(__NAMESPACE__, "bbcode"); + $bbc->expects($this->once())->willReturn('testbold
i- li1
- li2
'); - $this->assertEquals($bb1, Markdown::from_bbcode($html1)); - } + $this->assertEquals($bb1, Markdown::from_bbcode($html1)); + } */ } diff --git a/tests/unit/Lib/PermissionDescriptionTest.php b/tests/unit/Lib/PermissionDescriptionTest.php index 96c381d0c..ce7853e41 100644 --- a/tests/unit/Lib/PermissionDescriptionTest.php +++ b/tests/unit/Lib/PermissionDescriptionTest.php @@ -1,4 +1,5 @@ assertEquals($permDesc, $permDesc2); + $this->assertNotEquals($permDesc, $permDesc3); + } - $this->assertEquals($permDesc, $permDesc2); - $this->assertNotEquals($permDesc, $permDesc3); - } + public function testFromStandalonePermission() + { + // Create a stub for global function t() + $t = $this->getFunctionMock('Zotlabs\Lib', 't'); + $t->expects($this->atLeastOnce())->willReturnCallback( + function ($string) { + return $string; + } + ); + // Create a mock for global function logger() + $this->getFunctionMock('Zotlabs\Lib', 'logger'); - public function testFromStandalonePermission() { - // Create a stub for global function t() - $t = $this->getFunctionMock('Zotlabs\Lib', 't'); - $t->expects($this->atLeastOnce())->willReturnCallback( - function ($string) { - return $string; - } - ); - // Create a mock for global function logger() - $this->getFunctionMock('Zotlabs\Lib', 'logger'); + $permDescUnknown = PermissionDescription::fromStandalonePermission(-1); + $permDescSelf = PermissionDescription::fromStandalonePermission(0); - $permDescUnknown = PermissionDescription::fromStandalonePermission(-1); - $permDescSelf = PermissionDescription::fromStandalonePermission(0); + $this->assertNull($permDescUnknown); + $this->assertNotNull($permDescSelf); + } - $this->assertNull($permDescUnknown); - $this->assertNotNull($permDescSelf); - } + public function testFromGlobalPermission() + { + //$permDesc = PermissionDescription::fromGlobalPermission('view_profile'); - public function testFromGlobalPermission() { - //$permDesc = PermissionDescription::fromGlobalPermission('view_profile'); + $this->markTestIncomplete( + 'The method fromGlobalPermission() is not yet testable ...' + ); + } - $this->markTestIncomplete( - 'The method fromGlobalPermission() is not yet testable ...' - ); - } + public function testGetPermissionDescription() + { + // Create a stub for global function t() + $t = $this->getFunctionMock('Zotlabs\Lib', 't'); + $t->expects($this->atLeastOnce())->willReturnCallback( + function ($string) { + return $string; + } + ); + // Create a mock for global function logger() + $this->getFunctionMock('Zotlabs\Lib', 'logger'); - public function testGetPermissionDescription() { - // Create a stub for global function t() - $t = $this->getFunctionMock('Zotlabs\Lib', 't'); - $t->expects($this->atLeastOnce())->willReturnCallback( - function ($string) { - return $string; - } - ); - // Create a mock for global function logger() - $this->getFunctionMock('Zotlabs\Lib', 'logger'); + // Create a stub for the PermissionDescription class + $stub = $this->createMock(PermissionDescription::class); + $stub->method('get_permission_description') + ->will($this->returnArgument(0)); - // Create a stub for the PermissionDescription class - $stub = $this->createMock(PermissionDescription::class); - $stub->method('get_permission_description') - ->will($this->returnArgument(0)); + $permDescSelf = PermissionDescription::fromStandalonePermission(0); + $this->assertInstanceOf(PermissionDescription::class, $permDescSelf); + $this->assertEquals($permDescSelf->get_permission_description(), 'Only me'); - $permDescSelf = PermissionDescription::fromStandalonePermission(0); - $this->assertInstanceOf(PermissionDescription::class, $permDescSelf); - $this->assertEquals($permDescSelf->get_permission_description(), 'Only me'); - - $permDescPublic = PermissionDescription::fromStandalonePermission(PERMS_PUBLIC); - $this->assertEquals($permDescPublic->get_permission_description(), 'Public'); - } + $permDescPublic = PermissionDescription::fromStandalonePermission(PERMS_PUBLIC); + $this->assertEquals($permDescPublic->get_permission_description(), 'Public'); + } } diff --git a/tests/unit/UnitTestCase.php b/tests/unit/UnitTestCase.php index 7d706d5be..16d49c618 100644 --- a/tests/unit/UnitTestCase.php +++ b/tests/unit/UnitTestCase.php @@ -1,4 +1,5 @@ assertEquals("audio/ogg", z_mime_content_type($multidots)); - $this->assertNotEquals("application/octet-stream", z_mime_content_type($multidots)); - } +class UploadTest extends TestCase +{ + public function testFileNameMutipleDots() + { + $multidots = "foo.bar.baz.0.1.3.ogg"; + $this->assertEquals("audio/ogg", z_mime_content_type($multidots)); + $this->assertNotEquals("application/octet-stream", z_mime_content_type($multidots)); + } - public function testFileNameOneDot() { - $multidots = "foo.ogg"; - $this->assertEquals("audio/ogg", z_mime_content_type($multidots)); - $this->assertNotEquals("application/octet-stream", z_mime_content_type($multidots)); - } -} \ No newline at end of file + public function testFileNameOneDot() + { + $multidots = "foo.ogg"; + $this->assertEquals("audio/ogg", z_mime_content_type($multidots)); + $this->assertNotEquals("application/octet-stream", z_mime_content_type($multidots)); + } +} diff --git a/tests/unit/Web/HttpSigTest.php b/tests/unit/Web/HttpSigTest.php index 18f2ce92b..1de250843 100644 --- a/tests/unit/Web/HttpSigTest.php +++ b/tests/unit/Web/HttpSigTest.php @@ -33,93 +33,104 @@ use Zotlabs\Web\HTTPSig; * * @covers Zotlabs\Web\HTTPSig */ -class PermissionDescriptionTest extends UnitTestCase { +class PermissionDescriptionTest extends UnitTestCase +{ - use PHPMock; + use PHPMock; - /** - * @dataProvider generate_digestProvider - */ - function testGenerate_digest($text, $digest) { - $this->assertSame( - $digest, - HTTPSig::generate_digest($text, false) - ); - } - public function generate_digestProvider() { - return [ - 'empty body text' => [ - '', - '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' - ], - 'sample body text' => [ - 'body text', - '2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=' - ], - 'NULL body text' => [ - null, - '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' - ], - ]; - } + /** + * @dataProvider generate_digestProvider + */ + public function testGenerate_digest($text, $digest) + { + $this->assertSame( + $digest, + HTTPSig::generate_digest($text, false) + ); + } - function testGeneratedDigestsOfDifferentTextShouldNotBeEqual() { - $this->assertNotSame( - HTTPSig::generate_digest('text1', false), - HTTPSig::generate_digest('text2', false) - ); - } + public function generate_digestProvider() + { + return [ + 'empty body text' => [ + '', + '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' + ], + 'sample body text' => [ + 'body text', + '2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=' + ], + 'NULL body text' => [ + null, + '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' + ], + ]; + } - /** - * Process separation needed for header() check. - * @runInSeparateProcess - */ - function testGenerate_digestSendsHttpHeader() { - $ret = HTTPSig::generate_digest('body text', true); + public function testGeneratedDigestsOfDifferentTextShouldNotBeEqual() + { + $this->assertNotSame( + HTTPSig::generate_digest('text1', false), + HTTPSig::generate_digest('text2', false) + ); + } - $this->assertSame('2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=', $ret); - $this->assertContains( - 'Digest: SHA-256=2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=', - xdebug_get_headers(), - 'HTTP header Digest does not match' - ); - } + /** + * Process separation needed for header() check. + * @runInSeparateProcess + */ + public function testGenerate_digestSendsHttpHeader() + { + $ret = HTTPSig::generate_digest('body text', true); - /** - * @uses ::crypto_unencapsulate - */ - function testDecrypt_sigheader() { - $header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"'; - $result = [ - 'iv' => 'value_iv', - 'key' => 'value_key', - 'alg' => 'value_alg', - 'data' => 'value_data' - ]; + $this->assertSame('2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=', $ret); + $this->assertContains( + 'Digest: SHA-256=2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=', + xdebug_get_headers(), + 'HTTP header Digest does not match' + ); + } - $this->assertSame($result, HTTPSig::decrypt_sigheader($header, 'site private key')); - } - /** - * @uses ::crypto_unencapsulate - */ - function testDecrypt_sigheaderUseSitePrivateKey() { - // Create a stub for global function get_config() with expectation - $t = $this->getFunctionMock('Zotlabs\Web', 'get_config'); - $t->expects($this->once())->willReturn('system.prvkey'); + /** + * @uses ::crypto_unencapsulate + */ + public function testDecrypt_sigheader() + { + $header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"'; + $result = [ + 'iv' => 'value_iv', + 'key' => 'value_key', + 'alg' => 'value_alg', + 'data' => 'value_data' + ]; - $header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"'; - $result = [ - 'iv' => 'value_iv', - 'key' => 'value_key', - 'alg' => 'value_alg', - 'data' => 'value_data' - ]; + $this->assertSame($result, HTTPSig::decrypt_sigheader($header, 'site private key')); + } - $this->assertSame($result, HTTPSig::decrypt_sigheader($header)); - } - function testDecrypt_sigheaderIncompleteHeaderShouldReturnEmptyString() { - $header = 'Header: iv="value_iv" key="value_key"'; + /** + * @uses ::crypto_unencapsulate + */ + public function testDecrypt_sigheaderUseSitePrivateKey() + { + // Create a stub for global function get_config() with expectation + $t = $this->getFunctionMock('Zotlabs\Web', 'get_config'); + $t->expects($this->once())->willReturn('system.prvkey'); - $this->assertEmpty(HTTPSig::decrypt_sigheader($header, 'site private key')); - } + $header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"'; + $result = [ + 'iv' => 'value_iv', + 'key' => 'value_key', + 'alg' => 'value_alg', + 'data' => 'value_data' + ]; + + $this->assertSame($result, HTTPSig::decrypt_sigheader($header)); + } + + public function testDecrypt_sigheaderIncompleteHeaderShouldReturnEmptyString() + { + $header = 'Header: iv="value_iv" key="value_key"'; + + $this->assertEmpty(HTTPSig::decrypt_sigheader($header, 'site private key')); + } } diff --git a/tests/unit/expand_acl_test.php b/tests/unit/expand_acl_test.php index 700fea46e..790ce58e5 100644 --- a/tests/unit/expand_acl_test.php +++ b/tests/unit/expand_acl_test.php @@ -1,4 +1,5 @@ <2><3>'; - $this->assertEquals(array(1, 2, 3), expand_acl($text)); - } - - /** - * test with a big number - */ - public function testExpandAclBigNumber() { - $text='<1><'.PHP_INT_MAX.'><15>'; - $this->assertEquals(array(1, PHP_INT_MAX, 15), expand_acl($text)); - } - - /** - * test with a string in it. - * - * TODO: is this valid input? Otherwise: should there be an exception? - */ - public function testExpandAclString() { - $text="<1><279012>"; - $this->assertEquals(array(1, 279012), expand_acl($text)); - } - - /** - * test with a ' ' in it. - * - * TODO: is this valid input? Otherwise: should there be an exception? - */ - public function testExpandAclSpace() { - $text="<1><279 012><32>"; - $this->assertEquals(array(1, "279", "32"), expand_acl($text)); - } - - /** - * test empty input - */ - public function testExpandAclEmpty() { - $text=""; - $this->assertEquals([], expand_acl($text)); - } - - /** - * test invalid input, no < at all - * - * TODO: should there be an exception? - */ - public function testExpandAclNoBrackets() { - $text="According to documentation, that's invalid. "; //should be invalid - $this->assertEquals([], expand_acl($text)); - } - - /** - * test invalid input, just open < - * - * TODO: should there be an exception? - */ - public function testExpandAclJustOneBracket1() { - $text="assertEquals([], expand_acl($text)); - } - - /** - * test invalid input, just close > - * - * TODO: should there be an exception? - */ - public function testExpandAclJustOneBracket2() { - $text="Another invalid> string"; //should be invalid - $this->assertEquals([], expand_acl($text)); - } - - /** - * test invalid input, just close > - * - * TODO: should there be an exception? - */ - public function testExpandAclCloseOnly() { - $text="Another> invalid> string>"; //should be invalid - $this->assertEquals([], expand_acl($text)); - } - - /** - * test invalid input, just open < - * - * TODO: should there be an exception? - */ - public function testExpandAclOpenOnly() { - $text=" "; //should be invalid - $this->assertEquals([], expand_acl($text)); - } - - /** - * test invalid input, open and close do not match - * - * TODO: should there be an exception? - */ - public function testExpandAclNoMatching2() { - $text="<1>2><3>"; +/** + * TestCase for the expand_acl function + * + * @author Alexander Kampmann + * @package test.util + */ +class ExpandAclTest extends PHPUnit_Framework_TestCase +{ + + /** + * test expand_acl, perfect input + */ + public function testExpandAclNormal() + { + $text = '<1><2><3>'; + $this->assertEquals(array(1, 2, 3), expand_acl($text)); + } + + /** + * test with a big number + */ + public function testExpandAclBigNumber() + { + $text = '<1><' . PHP_INT_MAX . '><15>'; + $this->assertEquals(array(1, PHP_INT_MAX, 15), expand_acl($text)); + } + + /** + * test with a string in it. + * + * TODO: is this valid input? Otherwise: should there be an exception? + */ + public function testExpandAclString() + { + $text = "<1><279012>"; + $this->assertEquals(array(1, 279012), expand_acl($text)); + } + + /** + * test with a ' ' in it. + * + * TODO: is this valid input? Otherwise: should there be an exception? + */ + public function testExpandAclSpace() + { + $text = "<1><279 012><32>"; + $this->assertEquals(array(1, "279", "32"), expand_acl($text)); + } + + /** + * test empty input + */ + public function testExpandAclEmpty() + { + $text = ""; + $this->assertEquals([], expand_acl($text)); + } + + /** + * test invalid input, no < at all + * + * TODO: should there be an exception? + */ + public function testExpandAclNoBrackets() + { + $text = "According to documentation, that's invalid. "; //should be invalid + $this->assertEquals([], expand_acl($text)); + } + + /** + * test invalid input, just open < + * + * TODO: should there be an exception? + */ + public function testExpandAclJustOneBracket1() + { + $text = " assertEquals([], expand_acl($text)); + } + + /** + * test invalid input, just close > + * + * TODO: should there be an exception? + */ + public function testExpandAclJustOneBracket2() + { + $text = "Another invalid> string"; //should be invalid + $this->assertEquals([], expand_acl($text)); + } + + /** + * test invalid input, just close > + * + * TODO: should there be an exception? + */ + public function testExpandAclCloseOnly() + { + $text = "Another> invalid> string>"; //should be invalid + $this->assertEquals([], expand_acl($text)); + } + + /** + * test invalid input, just open < + * + * TODO: should there be an exception? + */ + public function testExpandAclOpenOnly() + { + $text = " "; //should be invalid + $this->assertEquals([], expand_acl($text)); + } + + /** + * test invalid input, open and close do not match + * + * TODO: should there be an exception? + */ + public function testExpandAclNoMatching2() + { + $text = "<1>2><3>"; // The angles are delimiters which aren't important // the important thing is the numeric content, this returns array(1,2,3) currently // we may wish to eliminate 2 from the results, though it isn't harmful // It would be a better test to figure out if there is any ACL input which can // produce this $text and fix that instead. -// $this->assertEquals([], expand_acl($text)); - } - - /** - * test invalid input, empty <> - * - * TODO: should there be an exception? Or array(1, 3) - * (This should be array(1,3) - mike) - */ - public function testExpandAclEmptyMatch() { - $text="<1><><3>"; - $this->assertEquals(array(1,3), expand_acl($text)); - } -} \ No newline at end of file +// $this->assertEquals([], expand_acl($text)); + } + + /** + * test invalid input, empty <> + * + * TODO: should there be an exception? Or array(1, 3) + * (This should be array(1,3) - mike) + */ + public function testExpandAclEmptyMatch() + { + $text = "<1><><3>"; + $this->assertEquals(array(1,3), expand_acl($text)); + } +} diff --git a/tests/unit/get_tags_test.php b/tests/unit/get_tags_test.php index bdffd8311..2c20eeb1a 100644 --- a/tests/unit/get_tags_test.php +++ b/tests/unit/get_tags_test.php @@ -1,7 +1,8 @@ 15, - 'attag'=>'', 'network'=>'dfrn', - 'name'=>'Mike Lastname', 'alias'=>'Mike', - 'nick'=>'Mike', 'url'=>"http://justatest.de")); - - $args=func_get_args(); - - //last parameter is always (in this test) uid, so, it should be 11 - if($args[count($args)-1]!=11) { - return; - } - - - if(3==count($args)) { - //first call in handle_body, id only - if($result[0]['id']==$args[1]) { - return $result; - } - //second call in handle_body, name - if($result[0]['name']===$args[1]) { - return $result; - } - } - //third call in handle_body, nick or attag - if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) { - return $result; - } +class MockApp +{ + public function get_baseurl() + { + return "baseurl"; + } } /** - * replacement for dbesc. + * the test should not rely on a database, + * so this is a replacement for the database access method q. + * + * It simulates the user with uid 11 has one contact, named Mike Lastname. + * + * @param string $sql + */ +function q($sql) +{ + $result = array(array('id' => 15, + 'attag' => '', 'network' => 'dfrn', + 'name' => 'Mike Lastname', 'alias' => 'Mike', + 'nick' => 'Mike', 'url' => "http://justatest.de")); + + $args = func_get_args(); + + //last parameter is always (in this test) uid, so, it should be 11 + if ($args[count($args) - 1] != 11) { + return; + } + + + if (3 == count($args)) { + //first call in handle_body, id only + if ($result[0]['id'] == $args[1]) { + return $result; + } + //second call in handle_body, name + if ($result[0]['name'] === $args[1]) { + return $result; + } + } + //third call in handle_body, nick or attag + if ($result[0]['nick'] === $args[2] || $result[0]['attag'] === $args[1]) { + return $result; + } +} + +/** + * replacement for dbesc. * I don't want to test dbesc here, so - * I just return the input. It won't be a problem, because - * the test does not use a real database. - * + * I just return the input. It won't be a problem, because + * the test does not use a real database. + * * DON'T USE HAT FUNCTION OUTSIDE A TEST! - * + * * @param string $str * @return input */ -function dbesc($str) { - return $str; +function dbesc($str) +{ + return $str; } /** - * TestCase for tag handling. - * + * TestCase for tag handling. + * * @author alexander * @package test.util */ -class GetTagsTest extends PHPUnit_Framework_TestCase { - /** the mock to use as app */ - private $a; +class GetTagsTest extends PHPUnit_Framework_TestCase +{ + /** the mock to use as app */ + private $a; - /** - * initialize the test. That's a phpUnit function, - * don't change its name. - */ - public function setUp() { - $this->a=new MockApp(); - } + /** + * initialize the test. That's a phpUnit function, + * don't change its name. + */ + public function setUp() + { + $this->a = new MockApp(); + } - /** - * test with one Person tag - */ - public function testGetTagsShortPerson() { - $text="hi @Mike"; - - $tags=get_tags($text); + /** + * test with one Person tag + */ + public function testGetTagsShortPerson() + { + $text = "hi @Mike"; - $str_tags=''; - foreach($tags as $tag) { - handle_tag($text, $str_tags, 11, $tag); - } + $tags = get_tags($text); - //correct tags found? - $this->assertEquals(1, count($tags)); - $this->assertTrue(in_array("@Mike", $tags)); - - //correct output from handle_tag? - $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); - $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url]", $text); - } - - /** - * test with one Person tag. - * There's a minor spelling mistake... - */ - public function testGetTagsShortPersonSpelling() { - $text="hi @Mike.because"; - - $tags=get_tags($text); - - //correct tags found? - $this->assertEquals(1, count($tags)); - $this->assertTrue(in_array("@Mike.because", $tags)); - - $str_tags=''; - handle_tag($text, $str_tags, 11, $tags[0]); - - // (mike) - This is a tricky case. - // we support mentions as in @mike@example.com - which contains a period. - // This shouldn't match anything unless you have a contact named "Mike.because". - // We may need another test for "@Mike. because" - which should return the contact - // as we ignore trailing periods in tags. - -// $this->assertEquals("cid:15", $inform); -// $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); -// $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text); + $str_tags = ''; + foreach ($tags as $tag) { + handle_tag($text, $str_tags, 11, $tag); + } - $this->assertEquals("", $str_tags); + //correct tags found? + $this->assertEquals(1, count($tags)); + $this->assertTrue(in_array("@Mike", $tags)); - } - - /** - * test with two Person tags. - * There's a minor spelling mistake... - */ + //correct output from handle_tag? + $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); + $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url]", $text); + } - public function testGetTagsPerson2Spelling() { - $text="hi @Mike@campino@friendica.eu"; - - $tags=get_tags($text); + /** + * test with one Person tag. + * There's a minor spelling mistake... + */ + public function testGetTagsShortPersonSpelling() + { + $text = "hi @Mike.because"; -// This construct is not supported. Results are indeterminate -// $this->assertEquals(2, count($tags)); -// $this->assertTrue(in_array("@Mike", $tags)); -// $this->assertTrue(in_array("@campino@friendica.eu", $tags)); - } + $tags = get_tags($text); - /** - * Test with one hash tag. - */ - public function testGetTagsShortTag() { - $text="This is a #test_case"; - - $tags=get_tags($text); + //correct tags found? + $this->assertEquals(1, count($tags)); + $this->assertTrue(in_array("@Mike.because", $tags)); - $this->assertEquals(1, count($tags)); - $this->assertTrue(in_array("#test_case", $tags)); - } + $str_tags = ''; + handle_tag($text, $str_tags, 11, $tags[0]); - /** - * test with a person and a hash tag - */ - public function testGetTagsShortTagAndPerson() { - $text="hi @Mike This is a #test_case"; - - $tags=get_tags($text); + // (mike) - This is a tricky case. + // we support mentions as in @mike@example.com - which contains a period. + // This shouldn't match anything unless you have a contact named "Mike.because". + // We may need another test for "@Mike. because" - which should return the contact + // as we ignore trailing periods in tags. - $this->assertEquals(3, count($tags)); - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("@Mike This", $tags)); - $this->assertTrue(in_array("#test_case", $tags)); +// $this->assertEquals("cid:15", $inform); +// $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); +// $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text); - $str_tags=''; - foreach($tags as $tag) { - handle_tag($text, $str_tags, 11, $tag); - } - - $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?tag=test%20case]test case[/url]", $str_tags); - $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?tag=test%20case]test case[/url]", $text); - - } + $this->assertEquals("", $str_tags); + } - /** - * test with a person, a hash tag and some special chars. - */ - public function testGetTagsShortTagAndPersonSpecialChars() { - $text="hi @Mike, This is a #test_case."; - - $tags=get_tags($text); - - $this->assertEquals(2, count($tags)); - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("#test_case", $tags)); - } + /** + * test with two Person tags. + * There's a minor spelling mistake... + */ - /** - * Test with a person tag and text behind it. - */ - public function testGetTagsPersonOnly() { - $text="@Test I saw the Theme Dev group was created."; - - $tags=get_tags($text); + public function testGetTagsPerson2Spelling() + { + $text = "hi @Mike@campino@friendica.eu"; - $this->assertEquals(2, count($tags)); - $this->assertTrue(in_array("@Test I", $tags)); - $this->assertTrue(in_array("@Test", $tags)); - } + $tags = get_tags($text); - /** - * this test demonstrates strange behaviour by intval. - * It makes the next test fail. - */ - public function testIntval() { - $this->assertEquals(15, intval("15 it")); - } - - /** - * test a tag with an id in it - */ - public function testIdTag() { - $text="Test with @mike+15 id tag"; - - $tags=get_tags($text); - - $this->assertEquals(2, count($tags)); - $this->assertTrue(in_array("@mike+15", $tags)); - - //happens right now, but it shouldn't be necessary - $this->assertTrue(in_array("@mike+15 id", $tags)); - - $str_tags=''; - foreach($tags as $tag) { - handle_tag($text, $str_tags, 11, $tag); - } - - $this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text); - $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); - } - - /** - * test with two persons and one special tag. - */ - public function testGetTags2Persons1TagSpecialChars() { - $text="hi @Mike, I'm just writing #test_cases, so" - ." so @somebody@friendica.com may change #things."; - - $tags=get_tags($text); +// This construct is not supported. Results are indeterminate +// $this->assertEquals(2, count($tags)); +// $this->assertTrue(in_array("@Mike", $tags)); +// $this->assertTrue(in_array("@campino@friendica.eu", $tags)); + } - $this->assertEquals(5, count($tags)); - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("#test_cases", $tags)); - $this->assertTrue(in_array("@somebody@friendica.com", $tags)); - $this->assertTrue(in_array("@somebody@friendica.com may", $tags)); - $this->assertTrue(in_array("#things", $tags)); - } + /** + * Test with one hash tag. + */ + public function testGetTagsShortTag() + { + $text = "This is a #test_case"; - /** - * test with a long text. - */ - public function testGetTags() { - $text="hi @Mike, I'm just writing #test_cases, " - ." so @somebody@friendica.com may change #things. Of course I " - ."look for a lot of #pitfalls, like #tags at the end of a sentence " - ."@comment. I hope noone forgets about @fullstops.because that might" - ." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? " - ."Now, add a @first_last tag. "; - - $tags=get_tags($text); - - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("#test_cases", $tags)); - $this->assertTrue(in_array("@somebody@friendica.com", $tags)); - $this->assertTrue(in_array("#things", $tags)); - $this->assertTrue(in_array("#pitfalls", $tags)); - $this->assertTrue(in_array("#tags", $tags)); - $this->assertTrue(in_array("@comment", $tags)); - $this->assertTrue(in_array("@fullstops.because", $tags)); - $this->assertTrue(in_array("#things", $tags)); - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("#nice", $tags)); - $this->assertTrue(in_array("@first_last", $tags)); - - //right now, none of the is matched (unsupported) -// $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags)); -// $this->assertTrue(in_array("@campino@friendica.eu", $tags)); -// $this->assertTrue(in_array("@campino@friendica.eu is", $tags)); - } + $tags = get_tags($text); - /** - * test with an empty string - */ - public function testGetTagsEmpty() { - $tags=get_tags(""); - $this->assertEquals(0, count($tags)); - } -} \ No newline at end of file + $this->assertEquals(1, count($tags)); + $this->assertTrue(in_array("#test_case", $tags)); + } + + /** + * test with a person and a hash tag + */ + public function testGetTagsShortTagAndPerson() + { + $text = "hi @Mike This is a #test_case"; + + $tags = get_tags($text); + + $this->assertEquals(3, count($tags)); + $this->assertTrue(in_array("@Mike", $tags)); + $this->assertTrue(in_array("@Mike This", $tags)); + $this->assertTrue(in_array("#test_case", $tags)); + + $str_tags = ''; + foreach ($tags as $tag) { + handle_tag($text, $str_tags, 11, $tag); + } + + $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?tag=test%20case]test case[/url]", $str_tags); + $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?tag=test%20case]test case[/url]", $text); + } + + /** + * test with a person, a hash tag and some special chars. + */ + public function testGetTagsShortTagAndPersonSpecialChars() + { + $text = "hi @Mike, This is a #test_case."; + + $tags = get_tags($text); + + $this->assertEquals(2, count($tags)); + $this->assertTrue(in_array("@Mike", $tags)); + $this->assertTrue(in_array("#test_case", $tags)); + } + + /** + * Test with a person tag and text behind it. + */ + public function testGetTagsPersonOnly() + { + $text = "@Test I saw the Theme Dev group was created."; + + $tags = get_tags($text); + + $this->assertEquals(2, count($tags)); + $this->assertTrue(in_array("@Test I", $tags)); + $this->assertTrue(in_array("@Test", $tags)); + } + + /** + * this test demonstrates strange behaviour by intval. + * It makes the next test fail. + */ + public function testIntval() + { + $this->assertEquals(15, intval("15 it")); + } + + /** + * test a tag with an id in it + */ + public function testIdTag() + { + $text = "Test with @mike+15 id tag"; + + $tags = get_tags($text); + + $this->assertEquals(2, count($tags)); + $this->assertTrue(in_array("@mike+15", $tags)); + + //happens right now, but it shouldn't be necessary + $this->assertTrue(in_array("@mike+15 id", $tags)); + + $str_tags = ''; + foreach ($tags as $tag) { + handle_tag($text, $str_tags, 11, $tag); + } + + $this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text); + $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); + } + + /** + * test with two persons and one special tag. + */ + public function testGetTags2Persons1TagSpecialChars() + { + $text = "hi @Mike, I'm just writing #test_cases, so" + . " so @somebody@friendica.com may change #things."; + + $tags = get_tags($text); + + $this->assertEquals(5, count($tags)); + $this->assertTrue(in_array("@Mike", $tags)); + $this->assertTrue(in_array("#test_cases", $tags)); + $this->assertTrue(in_array("@somebody@friendica.com", $tags)); + $this->assertTrue(in_array("@somebody@friendica.com may", $tags)); + $this->assertTrue(in_array("#things", $tags)); + } + + /** + * test with a long text. + */ + public function testGetTags() + { + $text = "hi @Mike, I'm just writing #test_cases, " + . " so @somebody@friendica.com may change #things. Of course I " + . "look for a lot of #pitfalls, like #tags at the end of a sentence " + . "@comment. I hope noone forgets about @fullstops.because that might" + . " break #things. @Mike@campino@friendica.eu is also #nice, isn't it? " + . "Now, add a @first_last tag. "; + + $tags = get_tags($text); + + $this->assertTrue(in_array("@Mike", $tags)); + $this->assertTrue(in_array("#test_cases", $tags)); + $this->assertTrue(in_array("@somebody@friendica.com", $tags)); + $this->assertTrue(in_array("#things", $tags)); + $this->assertTrue(in_array("#pitfalls", $tags)); + $this->assertTrue(in_array("#tags", $tags)); + $this->assertTrue(in_array("@comment", $tags)); + $this->assertTrue(in_array("@fullstops.because", $tags)); + $this->assertTrue(in_array("#things", $tags)); + $this->assertTrue(in_array("@Mike", $tags)); + $this->assertTrue(in_array("#nice", $tags)); + $this->assertTrue(in_array("@first_last", $tags)); + + //right now, none of the is matched (unsupported) +// $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags)); +// $this->assertTrue(in_array("@campino@friendica.eu", $tags)); +// $this->assertTrue(in_array("@campino@friendica.eu is", $tags)); + } + + /** + * test with an empty string + */ + public function testGetTagsEmpty() + { + $tags = get_tags(""); + $this->assertEquals(0, count($tags)); + } +} diff --git a/tests/unit/includes/LanguageTest.php b/tests/unit/includes/LanguageTest.php index 777b5ac14..b713b5d4c 100644 --- a/tests/unit/includes/LanguageTest.php +++ b/tests/unit/includes/LanguageTest.php @@ -1,4 +1,5 @@ getFunctionMock(__NAMESPACE__, 'get_config'); - //$gc->expects($this->once())->willReturn(10) - //$cg = $this->getFunctionMock('Zotlabs\Lib\Config', 'Get'); - //$cg->expects($this->once())->willReturn(10); - //$this->assertEquals($langCode, detect_language($text)); + // php-mock can not mock global functions which is called by a global function. + // If the calling function is in a namespace it would work. + //$gc = $this->getFunctionMock(__NAMESPACE__, 'get_config'); + //$gc->expects($this->once())->willReturn(10) + //$cg = $this->getFunctionMock('Zotlabs\Lib\Config', 'Get'); + //$cg->expects($this->once())->willReturn(10); + //$this->assertEquals($langCode, detect_language($text)); - // Can not unit test detect_language(), therefore test the used library - // only for now to find regressions on library updates. - $l = new Text_LanguageDetect; - // return 2-letter ISO 639-1 (en) language code - $l->setNameMode(2); - $lng = $l->detectConfidence($text); + // Can not unit test detect_language(), therefore test the used library + // only for now to find regressions on library updates. + $l = new Text_LanguageDetect(); + // return 2-letter ISO 639-1 (en) language code + $l->setNameMode(2); + $lng = $l->detectConfidence($text); - $this->assertEquals($langCode, $lng['language']); - $this->assertEquals($confidence, round($lng['confidence'], 6)); - } + $this->assertEquals($langCode, $lng['language']); + $this->assertEquals($confidence, round($lng['confidence'], 6)); + } - public function languageExamplesProvider() { - return [ - 'empty text' => [ - '', - '', - null - ], - 'English' => [ - 'English is a West Germanic language that was first spoken in early medieval England and is now a global lingua franca.[4][5] Named after the Angles, one of the Germanic tribes that migrated to England, it ultimately derives its name from the Anglia (Angeln) peninsula in the Baltic Sea. It is closely related to the Frisian languages, but its vocabulary has been significantly influenced by other Germanic languages, particularly Norse (a North Germanic language), as well as by Latin and Romance languages, especially French.', - 'en', - 0.078422 - ], - 'German' => [ - 'Deutschland ist ein Bundesstaat in Mitteleuropa. Er besteht aus 16 Ländern und ist als freiheitlich-demokratischer und sozialer Rechtsstaat verfasst. Die Bundesrepublik Deutschland stellt die jüngste Ausprägung des deutschen Nationalstaates dar. Mit rund 82,8 Millionen Einwohnern (31. Dezember 2016) zählt Deutschland zu den dicht besiedelten Flächenstaaten.', - 'de', - 0.134339 - ], - 'Norwegian' => [ - 'Kongeriket Norge er et nordisk, europeisk land og en selvstendig stat vest på Den skandinaviske halvøy. Landet er langt og smalt, og kysten strekker seg langs Nord-Atlanteren, hvor også Norges kjente fjorder befinner seg. Totalt dekker det relativt tynt befolkede landet 385 000 kvadratkilometer med litt over fem millioner innbyggere (2016).', - 'no', - 0.007076 - ] - ]; - } + public function languageExamplesProvider() + { + return [ + 'empty text' => [ + '', + '', + null + ], + 'English' => [ + 'English is a West Germanic language that was first spoken in early medieval England and is now a global lingua franca.[4][5] Named after the Angles, one of the Germanic tribes that migrated to England, it ultimately derives its name from the Anglia (Angeln) peninsula in the Baltic Sea. It is closely related to the Frisian languages, but its vocabulary has been significantly influenced by other Germanic languages, particularly Norse (a North Germanic language), as well as by Latin and Romance languages, especially French.', + 'en', + 0.078422 + ], + 'German' => [ + 'Deutschland ist ein Bundesstaat in Mitteleuropa. Er besteht aus 16 Ländern und ist als freiheitlich-demokratischer und sozialer Rechtsstaat verfasst. Die Bundesrepublik Deutschland stellt die jüngste Ausprägung des deutschen Nationalstaates dar. Mit rund 82,8 Millionen Einwohnern (31. Dezember 2016) zählt Deutschland zu den dicht besiedelten Flächenstaaten.', + 'de', + 0.134339 + ], + 'Norwegian' => [ + 'Kongeriket Norge er et nordisk, europeisk land og en selvstendig stat vest på Den skandinaviske halvøy. Landet er langt og smalt, og kysten strekker seg langs Nord-Atlanteren, hvor også Norges kjente fjorder befinner seg. Totalt dekker det relativt tynt befolkede landet 385 000 kvadratkilometer med litt over fem millioner innbyggere (2016).', + 'no', + 0.007076 + ] + ]; + } - /** - * @covers ::get_language_name - * @dataProvider getLanguageNameProvider - */ - public function testGetLanguageName($lang, $name, $trans) { - $this->assertEquals($name, get_language_name($lang)); - foreach ($trans as $k => $v) { - //echo "$k -> $v"; - $this->assertEquals($v, get_language_name($lang, $k)); - } - } + /** + * @covers ::get_language_name + * @dataProvider getLanguageNameProvider + */ + public function testGetLanguageName($lang, $name, $trans) + { + $this->assertEquals($name, get_language_name($lang)); + foreach ($trans as $k => $v) { + //echo "$k -> $v"; + $this->assertEquals($v, get_language_name($lang, $k)); + } + } - public function getLanguageNameProvider() { - return [ - 'empty language code' => [ - '', - '', - ['de' => ''] - ], - 'invalid language code' => [ - 'zz', - 'zz', - ['de' => 'zz'] - ], - 'de' => [ - 'de', - 'German', - [ - 'de' => 'Deutsch', - 'nb' => 'tysk' - ] - ], - 'de-de' => [ - 'de-de', - 'German', - [ - 'de-de' => 'Deutsch', - 'nb' => 'Deutsch' // should be tysk, seems to be a bug upstream - ] - ], - 'en' => [ - 'en', - 'English', - [ - 'de' => 'Englisch', - 'nb' => 'engelsk' - ] - ], - 'en-gb' => [ - 'en-gb', - 'British English', - [ - 'de' => 'Britisches Englisch', - 'nb' => 'engelsk (Storbritannia)' - ] - ], - 'en-au' => [ - 'en-au', - 'Australian English', - [ - 'de' => 'Australisches Englisch', - 'nb' => 'engelsk (Australia)' - ] - ], - 'nb' => [ - 'nb', - 'Norwegian Bokmål', - [ - 'de' => 'Norwegisch Bokmål', - 'nb' => 'norsk bokmål' - ] - ] - ]; - } -} \ No newline at end of file + public function getLanguageNameProvider() + { + return [ + 'empty language code' => [ + '', + '', + ['de' => ''] + ], + 'invalid language code' => [ + 'zz', + 'zz', + ['de' => 'zz'] + ], + 'de' => [ + 'de', + 'German', + [ + 'de' => 'Deutsch', + 'nb' => 'tysk' + ] + ], + 'de-de' => [ + 'de-de', + 'German', + [ + 'de-de' => 'Deutsch', + 'nb' => 'Deutsch' // should be tysk, seems to be a bug upstream + ] + ], + 'en' => [ + 'en', + 'English', + [ + 'de' => 'Englisch', + 'nb' => 'engelsk' + ] + ], + 'en-gb' => [ + 'en-gb', + 'British English', + [ + 'de' => 'Britisches Englisch', + 'nb' => 'engelsk (Storbritannia)' + ] + ], + 'en-au' => [ + 'en-au', + 'Australian English', + [ + 'de' => 'Australisches Englisch', + 'nb' => 'engelsk (Australia)' + ] + ], + 'nb' => [ + 'nb', + 'Norwegian Bokmål', + [ + 'de' => 'Norwegisch Bokmål', + 'nb' => 'norsk bokmål' + ] + ] + ]; + } +} diff --git a/tests/unit/includes/TextTest.php b/tests/unit/includes/TextTest.php index 97fa64895..b23624354 100644 --- a/tests/unit/includes/TextTest.php +++ b/tests/unit/includes/TextTest.php @@ -9,112 +9,121 @@ use Zotlabs\Tests\Unit\UnitTestCase; * * @author ken restivo */ -class TextTest extends UnitTestCase { +class TextTest extends UnitTestCase +{ - public function testPurifyHTML() { - // linebreaks - $htmlbr = 'first line
+ public function testPurifyHTML() + { + // linebreaks + $htmlbr = 'first line
one tab preserved empty line above'; - $this->assertEquals($htmlbr, purify_html($htmlbr)); + $this->assertEquals($htmlbr, purify_html($htmlbr)); - // HTML5 is not supported by HTMLPurifier yet, test our own configuration - $html5elements = 'section '; - $this->assertEquals($html5elements, purify_html($html5elements)); - $this->assertEquals('', purify_html('')); + // HTML5 is not supported by HTMLPurifier yet, test our own configuration + $html5elements = 'mainhubzilla.org section '; + $this->assertEquals($html5elements, purify_html($html5elements)); + $this->assertEquals('', purify_html('')); - // unsupported HTML5 elements - $this->assertEquals('Your HTML parser does not support HTML5 video.', purify_html('')); - $this->assertEquals('Your HTML parser does not support HTML5 audio.', purify_html('')); + // unsupported HTML5 elements + $this->assertEquals('Your HTML parser does not support HTML5 video.', purify_html('')); + $this->assertEquals('Your HTML parser does not support HTML5 audio.', purify_html('')); - // preserve f6 and bootstrap additional data attributes from our own configuration - $this->assertEquals('mainhubzilla.org text', purify_html('text')); - $this->assertEquals('- item1
- item1
- item1
- item1
text', purify_html('text')); + $this->assertEquals('- item1
- item1
- item1
- item1
', purify_html('ids und classes
')); - $this->assertEquals('ids und classes
', purify_html('close missing tags
- {{if $item.lock}}close missing tags')); - $this->assertEquals('
deprecated tag ', purify_html('deprecated tag ')); - $this->assertEquals('illegal nesting', purify_html('illegal nesting')); - $this->assertEquals('link with target', purify_html('link with target')); - $this->assertEquals('link with rel="nofollow"', purify_html('link with rel="nofollow"')); - $this->assertEquals('a b', purify_html('a b')); - $this->assertEquals('ä ä € €', purify_html('ä ä € €')); - $this->assertEquals('
', purify_html(''));
- $this->assertEquals('', purify_html(''));
- }
+ /**
+ * @covers ::purify_html
+ */
+ public function testPurifyHTML_html()
+ {
+ $this->assertEquals('', purify_html('ids und classes
')); + $this->assertEquals('ids und classes
', purify_html('close missing tags
- {{if $item.lock}}close missing tags')); + $this->assertEquals('
deprecated tag ', purify_html('deprecated tag ')); + $this->assertEquals('illegal nesting', purify_html('illegal nesting')); + $this->assertEquals('link with target', purify_html('link with target')); + $this->assertEquals('link with rel="nofollow"', purify_html('link with rel="nofollow"')); + $this->assertEquals('a b', purify_html('a b')); + $this->assertEquals('ä ä € €', purify_html('ä ä € €')); + $this->assertEquals('', purify_html(''));
+ $this->assertEquals('', purify_html(''));
+ }
- /**
- * @covers ::purify_html
- */
- public function testPurifyHTML_js() {
- $this->assertEquals('', purify_html('')); - $this->assertEquals('link', purify_html('link')); - $this->assertEquals('', purify_html('')); - $this->assertEquals('', purify_html('')); - } + /** + * @covers ::purify_html + */ + public function testPurifyHTML_js() + { + $this->assertEquals('', purify_html('
')); + $this->assertEquals('link', purify_html('link')); + $this->assertEquals('', purify_html('red
', purify_html('red
')); - $this->assertEquals('invalid color
', purify_html('invalid color
')); - $this->assertEquals('invalid style
', purify_html('invalid style
')); + /** + * @covers ::purify_html + */ + public function testPurifyHTML_css() + { + $this->assertEquals('red
', purify_html('red
')); + $this->assertEquals('invalid color
', purify_html('invalid color
')); + $this->assertEquals('invalid style
', purify_html('invalid style
')); - // test our own CSS configuration - $this->assertEquals('position removed', purify_html('position removed')); - $this->assertEquals('position preserved', purify_html('position preserved', true)); - $this->assertEquals('invalid position removed', purify_html('invalid position removed', true)); + // test our own CSS configuration + $this->assertEquals('position removed', purify_html('position removed')); + $this->assertEquals('position preserved', purify_html('position preserved', true)); + $this->assertEquals('invalid position removed', purify_html('invalid position removed', true)); - $this->assertEquals('position removed', purify_html('position removed')); - $this->assertEquals('position preserved', purify_html('position preserved', true)); - $this->assertEquals('invalid position removed', purify_html('invalid position removed', true)); - } + $this->assertEquals('position removed', purify_html('position removed')); + $this->assertEquals('position preserved', purify_html('position preserved', true)); + $this->assertEquals('invalid position removed', purify_html('invalid position removed', true)); + } - /** - * @dataProvider notagsProvider - */ - public function testNotags($string, $expected) { - $this->assertEquals($expected, notags($string)); - } - public function notagsProvider() { - return [ - 'empty string' => ['', ''], - 'simple tag' => ['', '[value]'], - 'tag pair' => ['text', '[b]text[/b]'], - 'double angle bracket' => ['< ', '[value]'], + 'tag pair' => ['text', '[b]text[/b]'], + 'double angle bracket' => ['< '], - 'text with angle bracket' => [' ', '<[value]>'], - 'comma separated acls' => ['value1,value2', ' '], + 'text with angle bracket' => [' ', '<[value]>'], + 'comma separated acls' => ['value1,value2', ' \n" - ." \n" - ." \n" - ." help\n" - ."\n", $text); - } + public function testConditionalFor() + { + $tpl = '{{ if $enabled }}new messages:{{for $messages as $message}} $message.text{{ endfor }}{{endif}}'; - public function testIncNoVar() { - $tpl='{{inc field_input.tpl }}{{ endinc }}'; - - $text=replace_macros($tpl, array('$field'=>array('myfield', 'label', 'value', 'help'))); - - $this->assertEquals(" \n\n \n" - ." \n" - ." help\n" - ."\n", $text); - } - - public function testDoubleUse() { - $tpl='Hello $name! {{ if $enabled }} I love you! {{ endif }}'; - - $text=replace_macros($tpl, array('$name'=>'Anna', '$enabled'=>false)); - - $this->assertEquals('Hello Anna! ', $text); - - $tpl='Hey $name! {{ if $enabled }} I hate you! {{ endif }}'; - - $text=replace_macros($tpl, array('$name'=>'Max', '$enabled'=>true)); - - $this->assertEquals('Hey Max! I hate you! ', $text); - } - - public function testIncDouble() { - $tpl='{{inc field_input.tpl with $field=$var1}}{{ endinc }}' - .'{{inc field_input.tpl with $field=$var2}}{{ endinc }}'; - - $text=replace_macros($tpl, array('$var1'=>array('myfield', 'label', 'value', 'help'), - '$var2'=>array('myfield2', 'label2', 'value2', 'help2'))); - - $this->assertEquals(" \n" - ."\n" - ." \n" - ." \n" - ." help\n" - ."\n" - ." \n" - ."\n" - ." \n" - ." \n" - ." help2\n" - ."\n", $text); - } -} \ No newline at end of file + $text = replace_macros($tpl, array('$enabled' => true, + '$messages' => array( + array('new' => true, 'text' => 'new message'), + array('new' => false, 'text' => 'old message')))); + + $this->assertEquals('new messages: new message old message', $text); + } + + public function testFantasy() + { + $tpl = 'Fantasy: {{fantasy $messages}}'; + $text = replace_macros($tpl, array('$messages' => 'no no')); + $this->assertEquals('Fantasy: {{fantasy no no}}', $text); + } + + public function testInc() + { + $tpl = '{{inc field_input.tpl with $field=$myvar}}{{ endinc }}'; + $text = replace_macros($tpl, array('$myvar' => array('myfield', 'label', 'value', 'help'))); + $this->assertEquals(" \n" + . "\n" + . " \n" + . " \n" + . " help\n" + . "\n", $text); + } + + public function testIncNoVar() + { + $tpl = '{{inc field_input.tpl }}{{ endinc }}'; + $text = replace_macros($tpl, array('$field' => array('myfield', 'label', 'value', 'help'))); + $this->assertEquals(" \n\n \n" + . " \n" + . " help\n" + . "\n", $text); + } + + public function testDoubleUse() + { + $tpl = 'Hello $name! {{ if $enabled }} I love you! {{ endif }}'; + + $text = replace_macros($tpl, array('$name' => 'Anna', '$enabled' => false)); + + $this->assertEquals('Hello Anna! ', $text); + + $tpl = 'Hey $name! {{ if $enabled }} I hate you! {{ endif }}'; + + $text = replace_macros($tpl, array('$name' => 'Max', '$enabled' => true)); + + $this->assertEquals('Hey Max! I hate you! ', $text); + } + + public function testIncDouble() + { + $tpl = '{{inc field_input.tpl with $field=$var1}}{{ endinc }}' + . '{{inc field_input.tpl with $field=$var2}}{{ endinc }}'; + + $text = replace_macros($tpl, array('$var1' => array('myfield', 'label', 'value', 'help'), + '$var2' => array('myfield2', 'label2', 'value2', 'help2'))); + + $this->assertEquals(" \n" + . "\n" + . " \n" + . " \n" + . " help\n" + . "\n" + . " \n" + . "\n" + . " \n" + . " \n" + . " help2\n" + . "\n", $text); + } +} diff --git a/util/addons b/util/addons index dadc29bb6..8100bbef3 100755 --- a/util/addons +++ b/util/addons @@ -41,7 +41,7 @@ cli_startup(); if ($idz !== false) { unset(App::$plugins[$idz]); uninstall_plugin($id); - set_config("system","addon", implode(", ",App::$plugins)); + set_config('system', 'addon', implode(', ',App::$plugins)); } } $info['disabled'] = 1-intval($x); @@ -92,7 +92,7 @@ if($argc == 3 && $argv[1] === 'install') { else { App::$plugins[] = $p[0]; install_plugin($p[0]); - set_config("system","addon", implode(", ",App::$plugins)); + set_config('system', 'addon', implode(', ',App::$plugins)); echo $p[0] . ' installed.' . "\n"; } } @@ -121,7 +121,7 @@ if($argc == 3 && $argv[1] === 'uninstall') { if ($idx !== false) unset(App::$plugins[$idx]); uninstall_plugin($p[0]); - set_config("system","addon", implode(", ",App::$plugins)); + set_config('system', 'addon', implode(', ',App::$plugins)); echo $p[0] . ' uninstalled.' . "\n"; } } @@ -135,7 +135,7 @@ if($argc == 3 && $argv[1] === 'uninstall') { if ($idx !== false) unset(App::$plugins[$idx]); uninstall_plugin($argv[2]); - set_config("system","addon", implode(", ",App::$plugins)); + set_config('system', 'addon', implode(', ',App::$plugins)); echo $argv[2] . ' uninstalled.' . "\n"; } diff --git a/util/admins b/util/admins index ecc672a78..8e0fd3f1d 100755 --- a/util/admins +++ b/util/admins @@ -26,7 +26,7 @@ EndOfOutput; } if($argc == 1) { - $r = q("select account_id, account_roles, account_email from account"); + $r = q('select account_id, account_roles, account_email from account'); if($r) { foreach($r as $rr) { echo sprintf('%4u %s %s', $rr['account_id'], $rr['account_email'],(($rr['account_roles'] & 4096) ? '*' : '')) . PHP_EOL; @@ -37,7 +37,7 @@ if($argc == 1) { if($argc > 1 && $argv[1] === 'list') { - $r = q("select account_id, account_roles, account_email from account where (account_roles & 4096) > 0"); + $r = q('select account_id, account_roles, account_email from account where (account_roles & 4096) > 0'); if($r) { foreach($r as $rr) { echo sprintf('%4u %s %s', $rr['account_id'], $rr['account_email'],(($rr['account_roles'] & 4096) ? '*' : '')) . PHP_EOL; @@ -47,13 +47,13 @@ if($argc > 1 && $argv[1] === 'list') { if($argc > 2 && $argv[1] === 'add' && intval($argv[2])) { - $r = q("update account set account_roles = (account_roles | 4096) where account_id = %d", + $r = q('update account set account_roles = (account_roles | 4096) where account_id = %d', intval($argv[2]) ); } if($argc > 2 && $argv[1] === 'remove' && intval($argv[2])) { - $r = q("update account set account_roles = (account_roles - 4096) where account_id = %d and (account_roles & 4096) > 0", + $r = q('update account set account_roles = (account_roles - 4096) where account_id = %d and (account_roles & 4096) > 0', intval($argv[2]) ); } diff --git a/util/config b/util/config index 328b294b4..26e797ce1 100755 --- a/util/config +++ b/util/config @@ -71,7 +71,7 @@ if($argc == 2) { } if($argc == 1) { - $r = q("select * from config where true"); + $r = q('select * from config where true'); if($r) { foreach($r as $rr) { echo "config[{$rr['cat']}][{$rr['k']}] = " . printable_config($rr['v']) . "\n"; diff --git a/util/db_update b/util/db_update index 46a98b4db..9862540be 100755 --- a/util/db_update +++ b/util/db_update @@ -12,12 +12,12 @@ require_once('include/cli_startup.php'); cli_startup(); $build = get_config('system','db_version'); -echo "Old DB VERSION: " . $build . "\n"; -echo "New DB VERSION: " . DB_UPDATE_VERSION . "\n"; +echo 'Old DB VERSION: ' . $build . "\n"; +echo 'New DB VERSION: ' . DB_UPDATE_VERSION . "\n"; if($build != DB_UPDATE_VERSION) { - echo "Updating database..."; + echo 'Updating database...'; check_config(); echo "Done\n"; } diff --git a/util/dcp b/util/dcp index 5ffde886b..a78ac6d1b 100755 --- a/util/dcp +++ b/util/dcp @@ -3,6 +3,8 @@ // file import to DAV utility +use Zotlabs\Daemon\Run; + if(!file_exists('include/cli_startup.php')) { echo 'Run dcp from the top level Hubzilla web directory, as util/dcp' . PHP_EOL; exit(1); @@ -15,7 +17,7 @@ cli_startup(); if($argc < 3) { - echo "Usage: " . $argv[0] . ' src dstdir' . "\n"; + echo 'Usage: ' . $argv[0] . ' src dstdir' . "\n"; echo 'Always run from the toplevel web directory.' . "\n"; echo 'destination should begin with store/$nickname/desired/path or $nickname/desired/path' . "\n"; echo 'Example: util/dcp /etc/motd store/joe/etc' . "\n"; @@ -106,7 +108,7 @@ if($argc < 3) { else { $dstname = (($isadir) ? '' : basename($dstfile)); $cmd = [ 'Importfile', $channel['channel_id'], $argv[$x], $folder, $dstname ]; - \Zotlabs\Daemon\Run::Summon($cmd); + Run::Summon($cmd); } } @@ -147,7 +149,7 @@ if($argc < 3) { } else { $cmd = [ 'Importfile', $channel['channel_id'], $src . '/' . $entry, $folder ]; - \Zotlabs\Daemon\Run::Summon($cmd); + Run::Summon($cmd); } } closedir($dir); diff --git a/util/dmkdir b/util/dmkdir index a476ca02f..92f01db62 100755 --- a/util/dmkdir +++ b/util/dmkdir @@ -19,7 +19,7 @@ cli_startup(); $dstfile = $argv[1]; if($argc != 2) { - echo "Usage: " . $argv[0] . ' directory' . "\n"; + echo 'Usage: ' . $argv[0] . ' directory' . "\n"; echo 'Always run from the toplevel web directory.' . "\n"; echo 'directory should begin with store/$nickname/desired/path or $nickname/desired/path' . "\n"; echo 'Example: util/dmkdir store/bob/photos/2017' . "\n"; diff --git a/util/docblox_errorchecker.php b/util/docblox_errorchecker.php index 565ac5e1f..259486514 100644 --- a/util/docblox_errorchecker.php +++ b/util/docblox_errorchecker.php @@ -1,4 +1,5 @@ -\n" "Language-Team: LANGUAGE
https://www.youtube.com/
https://youtu.be/" +"
https://vimeo.com/
https://soundcloud.com/
" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:131 +msgid "" +"All other embedded content will be filtered, unless " +"embedded content from that site is explicitly blocked." +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:135 Zotlabs/Module/Admin/Site.php:310 +#: Zotlabs/Module/Admin/Themes.php:134 Zotlabs/Module/Admin/Themes.php:168 +#: Zotlabs/Module/Admin/Accounts.php:175 Zotlabs/Module/Admin/Addons.php:343 +#: Zotlabs/Module/Admin/Addons.php:443 Zotlabs/Module/Admin/Channels.php:169 +#: Zotlabs/Module/Admin/Logs.php:82 Zotlabs/Module/Admin.php:179 +msgid "Administration" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:136 Zotlabs/Widget/Admin.php:31 +msgid "Security" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:138 +msgid "Block public" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:138 +msgid "" +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently authenticated." +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:139 +msgid "Block public search" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:139 +msgid "" +"Prevent access to search content unless you are currently authenticated." +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:140 Zotlabs/Module/Admin/Site.php:339 +msgid "Block directory from visitors" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:140 Zotlabs/Module/Admin/Site.php:339 +msgid "Only allow authenticated access to directory." +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:141 +msgid "Hide local directory" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:141 +msgid "Only use the global directory" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:142 +msgid "Provide a cloud root directory" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:142 +msgid "" +"The cloud root directory lists all channel names which provide public files. " +"Otherwise only the names of connections are shown." +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:143 +msgid "Show total disk space available to cloud uploads" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:144 +msgid "Allow SVG thumbnails in file browser" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:144 +msgid "WARNING: SVG images may contain malicious code." +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:146 +msgid "Allow embedded (inline) PDF files" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:147 +msgid "Permit anonymous comments" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:147 +msgid "" +"Moderation will be performed by channels that select this comment option." +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:148 +msgid "Set \"Transport Security\" HTTP header" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:149 +msgid "Set \"Content Security Policy\" HTTP header" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:150 +msgid "Allowed email domains" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:150 +msgid "" +"Comma separated list of domains which are allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:151 +msgid "Not allowed email domains" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:151 +msgid "" +"Comma separated list of domains which are not allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains, unless allowed domains have been defined." +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:152 +msgid "Allow communications only from these sites" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:152 Zotlabs/Module/Admin/Security.php:157 +msgid "" +"One site per line. Leave empty to allow communication from anywhere by " +"default" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:153 +msgid "Block communications from these sites" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:154 +msgid "Allow communications only from these channels" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:154 Zotlabs/Module/Admin/Security.php:159 +msgid "" +"One channel (hash) per line. Leave empty to allow communication from any " +"channel by default" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:155 +msgid "Block communications from these channels" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:157 +msgid "Allow public stream communications only from these sites" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:158 +msgid "Block public stream communications from these sites" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:159 +msgid "Allow public stream communications only from these channels" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:160 +msgid "Block public stream communications from these channels" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:163 +msgid "Only allow embeds from secure (SSL) websites and links." +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:164 +msgid "Allow unfiltered embedded HTML content only from these domains" +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:164 +msgid "One site per line. By default embedded content is filtered." +msgstr "" + +#: Zotlabs/Module/Admin/Security.php:165 +msgid "Block embedded HTML from these domains" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:192 +msgid "Site settings updated." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:221 include/text.php:3568 +#: view/theme/redbasic/php/config.php:15 +msgid "Default" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:232 Zotlabs/Module/Settings/Display.php:147 +#, php-format +msgid "%s - (Incompatible)" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:240 +msgid "mobile" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:243 +msgid "experimental" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:246 +msgid "unsupported" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:288 +msgid "Yes - with approval" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:294 +msgid "My site is not a public server" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:295 +msgid "My site provides free public access" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:296 +msgid "My site provides paid public access" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:297 +msgid "My site provides free public access and premium paid plans" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:303 +msgid "Default permission role for new accounts" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:303 +msgid "" +"This role will be used for the first channel created after registration." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:311 Zotlabs/Widget/Admin.php:26 +msgid "Site" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:313 +msgid "Site Configuration" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:314 Zotlabs/Module/Register.php:287 +msgid "Registration" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:315 +msgid "File upload" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:316 +msgid "Policies" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:317 Zotlabs/Widget/Findpeople.php:26 +msgid "Advanced" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:319 +msgid "Site name" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:320 +msgid "Administrator Information" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:320 +msgid "" +"Contact information for site administrators. Displayed on siteinfo page. " +"BBCode may be used here." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:321 Zotlabs/Module/Siteinfo.php:38 +msgid "Site Information" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:321 +msgid "" +"Publicly visible description of this site. Displayed on siteinfo page. " +"BBCode may be used here." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:322 +msgid "System language" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:323 +msgid "System theme" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:323 +msgid "" +"Default system theme - may be over-ridden by user profiles - change theme settings" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:326 +msgid "ActivityPub protocol" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:326 +msgid "Provides access to software supporting the ActivityPub protocol." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:327 +msgid "Maximum image size" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:327 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:328 +msgid "Cache all public images" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:328 +msgid "If disabled, proxy non-SSL images, but do not store locally" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:329 +msgid "Does this site allow new member registration?" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:330 +msgid "Invitation only" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:330 +msgid "" +"Only allow new member registrations with an invitation code. New member " +"registration must be allowed for this to work." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:332 +msgid "Minimum age" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:332 +msgid "Minimum age (in years) for who may register on this site." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:333 +msgid "Which best describes the types of account offered by this hub?" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:333 +msgid "" +"If a public server policy is selected, this information may be displayed on " +"the public server site list." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:334 +msgid "Register text" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:334 +msgid "Will be displayed prominently on the registration page." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:336 +msgid "Site homepage to show visitors (default: login box)" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:336 +msgid "" +"example: 'public' to show public stream, 'page/sys/home' to show a system " +"webpage called 'home' or 'include:home.html' to include a file." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:337 +msgid "Preserve site homepage URL" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:337 +msgid "" +"Present the site homepage in a frame at the original location instead of " +"redirecting" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:338 +msgid "Accounts abandoned after x days" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:338 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:340 +msgid "Verify Email Addresses" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:340 +msgid "" +"Check to verify email addresses used in account registration (recommended)." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:341 +msgid "Force publish in directory" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:341 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:343 +msgid "Public stream" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:343 +msgid "Provide a Public stream on your site. This content is unmoderated." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:344 +msgid "the Public stream is disabled" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:345 +msgid "the Public stream contains public conversations from this site only" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:346 +msgid "" +"the Public stream contains public conversations from anywhere on the internet" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:349 +msgid "Allow anybody on the internet to access the Public stream" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:349 +msgid "" +"Default is to only allow viewing by site members. Warning: this content is " +"unmoderated." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:350 +msgid "Show numbers of likes and dislikes in conversations" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:350 +msgid "" +"If disabled, the presence of likes and dislikes will be shown, but without " +"totals." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:351 +msgid "Permit animated profile photos" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:351 +msgid "Changing this may take several days to work through the system" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:352 +msgid "Only import Public stream posts with this text" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:352 Zotlabs/Module/Admin/Site.php:353 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:353 +msgid "Do not import Public stream posts with this text" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:354 +msgid "Maximum number of imported friends of friends" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:354 +msgid "" +"Warning: higher numbers will improve the quality of friend suggestions and " +"directory results but can exponentially increase resource usage" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:355 +msgid "Login on Homepage" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:355 +msgid "" +"Present a login box to visitors on the home page if no other content has " +"been configured." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:356 +msgid "Enable context help" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:356 +msgid "" +"Display contextual help for the current page when the help button is pressed." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:357 +msgid "Reply-to email address for system generated email." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:358 +msgid "Sender (From) email address for system generated email." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:359 +msgid "Display name of email sender for system generated email." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:360 +msgid "Directory Server URL" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:360 +msgid "Default directory server" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:361 +msgid "Proxy user" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:362 +msgid "Proxy URL" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:363 +msgid "Network fetch timeout" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:363 Zotlabs/Module/Admin/Site.php:364 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:364 +msgid "Network post timeout" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:365 +msgid "Delivery interval" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:365 +msgid "" +"Delay background delivery processes by this many seconds to reduce system " +"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " +"for large dedicated servers." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:366 +msgid "Deliveries per process" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:366 +msgid "" +"Number of deliveries to attempt in a single operating system process. Adjust " +"if necessary to tune system performance. Recommend: 1-5." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:367 +msgid "Queue Threshold" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:367 +msgid "" +"Always defer immediate delivery if queue contains more than this number of " +"entries." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:368 +msgid "Poll interval" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:368 +msgid "" +"Delay background polling processes by this many seconds to reduce system " +"load. If 0, use delivery interval." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:369 +msgid "Path to ImageMagick convert program" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:369 +msgid "" +"If set, use this program to generate photo thumbnails for huge images ( > " +"4000 pixels in either dimension), otherwise memory exhaustion may occur. " +"Example: /usr/bin/convert" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:370 +msgid "Maximum Load Average" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:370 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:371 +msgid "Expiration period in days for imported streams and cached images" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:371 +msgid "0 for no expiration of imported content" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:372 +msgid "" +"Do not expire any posts which have comments less than this many days ago" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:373 +msgid "" +"Public servers: Optional landing (marketing) webpage for new registrants" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:373 +#, php-format +msgid "Create this page first. Default is %s/register" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:374 +msgid "Page to display after creating a new channel" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:374 +msgid "Default: profiles" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:375 +msgid "Site location" +msgstr "" + +#: Zotlabs/Module/Admin/Site.php:375 +msgid "Region or country - shared with other sites" +msgstr "" + +#: Zotlabs/Module/Admin/Themes.php:29 +msgid "Theme settings updated." +msgstr "" + +#: Zotlabs/Module/Admin/Themes.php:69 +msgid "No themes found." +msgstr "" + +#: Zotlabs/Module/Admin/Themes.php:80 Zotlabs/Module/Admin/Addons.php:259 +#: Zotlabs/Module/Admin.php:89 Zotlabs/Module/Display.php:64 +#: Zotlabs/Module/Display.php:512 Zotlabs/Module/Filestorage.php:37 +#: Zotlabs/Module/Thing.php:108 Zotlabs/Module/Viewsrc.php:28 +#: Zotlabs/Module/Inspect.php:34 +#: extend/addon/a/flashcards/Mod_Flashcards.php:284 +#: extend/addon/a/flashcards/Mod_Flashcards.php:285 include/items.php:3894 +msgid "Item not found." +msgstr "" + +#: Zotlabs/Module/Admin/Themes.php:105 Zotlabs/Module/Admin/Addons.php:311 +msgid "Disable" +msgstr "" + +#: Zotlabs/Module/Admin/Themes.php:108 Zotlabs/Module/Admin/Addons.php:314 +msgid "Enable" +msgstr "" + +#: Zotlabs/Module/Admin/Themes.php:127 +msgid "Screenshot" +msgstr "" + +#: Zotlabs/Module/Admin/Themes.php:135 Zotlabs/Module/Admin/Themes.php:169 +#: Zotlabs/Widget/Admin.php:34 +msgid "Themes" +msgstr "" + +#: Zotlabs/Module/Admin/Themes.php:136 Zotlabs/Module/Admin/Addons.php:345 +msgid "Toggle" +msgstr "" + +#: Zotlabs/Module/Admin/Themes.php:146 Zotlabs/Module/Admin/Addons.php:353 +msgid "Author: " +msgstr "" + +#: Zotlabs/Module/Admin/Themes.php:147 Zotlabs/Module/Admin/Addons.php:354 +msgid "Maintainer: " +msgstr "" + +#: Zotlabs/Module/Admin/Themes.php:174 +msgid "[Experimental]" +msgstr "" + +#: Zotlabs/Module/Admin/Themes.php:175 +msgid "[Unsupported]" +msgstr "" + +#: Zotlabs/Module/Admin/Account_edit.php:31 +#, php-format +msgid "Password changed for account %d." +msgstr "" + +#: Zotlabs/Module/Admin/Account_edit.php:47 +msgid "Account settings updated." +msgstr "" + +#: Zotlabs/Module/Admin/Account_edit.php:66 +msgid "Account not found." +msgstr "" + +#: Zotlabs/Module/Admin/Account_edit.php:73 +msgid "Account Edit" +msgstr "" + +#: Zotlabs/Module/Admin/Account_edit.php:74 +msgid "New Password" +msgstr "" + +#: Zotlabs/Module/Admin/Account_edit.php:75 +msgid "New Password again" +msgstr "" + +#: Zotlabs/Module/Admin/Account_edit.php:76 +msgid "Account language (for emails)" +msgstr "" + +#: Zotlabs/Module/Admin/Account_edit.php:77 +msgid "Service class" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:40 +#, php-format +msgid "%s account blocked/unblocked" +msgid_plural "%s accounts blocked/unblocked" +msgstr[0] "" +msgstr[1] "" + +#: Zotlabs/Module/Admin/Accounts.php:48 +#, php-format +msgid "%s account deleted" +msgid_plural "%s accounts deleted" +msgstr[0] "" +msgstr[1] "" + +#: Zotlabs/Module/Admin/Accounts.php:88 +msgid "Account not found" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:99 include/channel.php:2312 +#, php-format +msgid "Account '%s' deleted" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:108 +#, php-format +msgid "Account '%s' blocked" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:117 +#, php-format +msgid "Account '%s' unblocked" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:176 Zotlabs/Module/Admin/Accounts.php:189 +#: Zotlabs/Module/Admin.php:123 Zotlabs/Widget/Admin.php:29 +msgid "Accounts" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:178 Zotlabs/Module/Admin/Channels.php:172 +msgid "select all" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:179 +msgid "Registrations waiting for confirm" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:180 +msgid "Request date" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:180 Zotlabs/Module/Admin/Accounts.php:192 +#: Zotlabs/Module/Cdav.php:1354 Zotlabs/Module/Connedit.php:867 +#: Zotlabs/Module/Profiles.php:836 include/network.php:1690 +msgid "Email" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:181 +msgid "No registrations." +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:182 Zotlabs/Module/Connections.php:341 +#: include/conversation.php:653 +msgid "Approve" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:183 Zotlabs/Module/Authorize.php:39 +msgid "Deny" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:185 Zotlabs/Module/Connedit.php:576 +#: Zotlabs/Widget/Sblock.php:21 +msgid "Block" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:186 Zotlabs/Module/Connedit.php:576 +msgid "Unblock" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:191 +msgid "ID" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:193 +msgid "All Channels" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:194 +msgid "Register date" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:195 +msgid "Last login" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:196 +msgid "Expires" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:197 +msgid "Service Class" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:199 +msgid "" +"Selected accounts will be deleted!\\n\\nEverything these accounts had posted " +"on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: Zotlabs/Module/Admin/Accounts.php:200 +msgid "" +"The account {0} will be deleted!\\n\\nEverything this account has posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:289 +#, php-format +msgid "Plugin %s disabled." +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:294 +#, php-format +msgid "Plugin %s enabled." +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:344 Zotlabs/Module/Admin/Addons.php:444 +#: Zotlabs/Widget/Admin.php:33 +msgid "Addons" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:355 +msgid "Minimum project version: " +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:356 +msgid "Maximum project version: " +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:357 +msgid "Minimum PHP version: " +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:358 +msgid "Compatible Server Roles: " +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:359 +msgid "Requires: " +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:360 Zotlabs/Module/Admin/Addons.php:449 +msgid "Disabled - version incompatibility" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:417 +msgid "Enter the public git repository URL of the addon repo." +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:418 +msgid "Addon repo git URL" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:419 +msgid "Custom repo name" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:419 +msgid "(optional)" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:420 +msgid "Download Addon Repo" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:428 +msgid "Install new repo" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:430 Zotlabs/Module/Admin/Cover_photo.php:378 +#: Zotlabs/Module/Admin/Profile_photo.php:474 Zotlabs/Module/Cdav.php:1060 +#: Zotlabs/Module/Cdav.php:1368 Zotlabs/Module/Connedit.php:881 +#: Zotlabs/Module/Cover_photo.php:424 Zotlabs/Module/Editlayout.php:152 +#: Zotlabs/Module/Editwebpage.php:184 Zotlabs/Module/Filer.php:62 +#: Zotlabs/Module/Fbrowser.php:73 Zotlabs/Module/Fbrowser.php:96 +#: Zotlabs/Module/Card_edit.php:140 Zotlabs/Module/Editblock.php:154 +#: Zotlabs/Module/Editpost.php:147 Zotlabs/Module/Profiles.php:850 +#: Zotlabs/Module/Profile_photo.php:513 Zotlabs/Module/Settings/Oauth.php:96 +#: Zotlabs/Module/Settings/Oauth.php:124 Zotlabs/Module/Settings/Oauth2.php:114 +#: Zotlabs/Module/Settings/Oauth2.php:144 Zotlabs/Module/Tagrm.php:21 +#: Zotlabs/Module/Tagrm.php:152 include/conversation.php:1427 +#: include/conversation.php:1493 include/conversation.php:1495 +#: include/conversation.php:1497 +msgid "Cancel" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:452 +msgid "Manage Repos" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:453 +msgid "Installed Addon Repositories" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:454 +msgid "Install a New Addon Repository" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:460 Zotlabs/Module/Cdav.php:1055 +#: Zotlabs/Module/Cdav.php:1366 Zotlabs/Module/Connedit.php:879 +#: Zotlabs/Module/Profiles.php:848 Zotlabs/Module/Settings/Oauth.php:45 +#: Zotlabs/Module/Settings/Oauth.php:123 Zotlabs/Module/Settings/Oauth2.php:55 +#: Zotlabs/Module/Settings/Oauth2.php:143 +msgid "Update" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:461 +msgid "Switch branch" +msgstr "" + +#: Zotlabs/Module/Admin/Addons.php:462 Zotlabs/Module/Photos.php:1068 +#: Zotlabs/Module/Tagrm.php:151 Zotlabs/Module/Superblock.php:234 +#: Zotlabs/Module/Superblock.php:251 +msgid "Remove" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:37 +#, php-format +msgid "%s channel censored/uncensored" +msgid_plural "%s channels censored/uncensored" +msgstr[0] "" +msgstr[1] "" + +#: Zotlabs/Module/Admin/Channels.php:47 +#, php-format +msgid "%s channel code allowed/disallowed" +msgid_plural "%s channels code allowed/disallowed" +msgstr[0] "" +msgstr[1] "" + +#: Zotlabs/Module/Admin/Channels.php:53 +#, php-format +msgid "%s channel deleted" +msgid_plural "%s channels deleted" +msgstr[0] "" +msgstr[1] "" + +#: Zotlabs/Module/Admin/Channels.php:74 +msgid "Channel not found" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:85 +#, php-format +msgid "Channel '%s' deleted" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:100 +#, php-format +msgid "Channel '%s' censored" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:100 +#, php-format +msgid "Channel '%s' uncensored" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:114 +#, php-format +msgid "Channel '%s' code allowed" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:114 +#, php-format +msgid "Channel '%s' code disallowed" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:170 Zotlabs/Module/Admin.php:142 +#: Zotlabs/Module/Manage.php:182 Zotlabs/Widget/Admin.php:30 +#: include/nav.php:100 +msgid "Channels" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:174 Zotlabs/Module/Connedit.php:592 +#: Zotlabs/Module/Directory.php:391 +msgid "Censor" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:175 Zotlabs/Module/Connedit.php:592 +#: Zotlabs/Module/Directory.php:391 +msgid "Uncensor" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:176 +msgid "Allow Code" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:177 +msgid "Disallow Code" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:178 include/conversation.php:1978 +#: include/nav.php:400 +msgid "Channel" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:182 +msgid "UID" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:183 Zotlabs/Module/Cdav.php:1350 +#: Zotlabs/Module/Connedit.php:863 Zotlabs/Module/Connections.php:236 +#: Zotlabs/Module/Chat.php:256 Zotlabs/Module/Lists.php:202 +#: Zotlabs/Module/Settings/Oauth.php:97 Zotlabs/Module/Settings/Oauth.php:125 +#: Zotlabs/Module/Settings/Oauth2.php:115 +#: Zotlabs/Module/Settings/Oauth2.php:145 Zotlabs/Module/Sharedwithme.php:107 +#: Zotlabs/Storage/Browser.php:313 Zotlabs/Widget/Activity_filter.php:294 +msgid "Name" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:184 Zotlabs/Module/Cdav.php:1357 +#: Zotlabs/Module/Connedit.php:870 Zotlabs/Module/Locs.php:133 +#: Zotlabs/Module/Profiles.php:527 Zotlabs/Module/Profiles.php:839 +msgid "Address" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:186 +msgid "" +"Selected channels will be deleted!\\n\\nEverything that was posted in these " +"channels on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: Zotlabs/Module/Admin/Channels.php:187 +msgid "" +"The channel {0} will be deleted!\\n\\nEverything that was posted in this " +"channel on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:64 +#: Zotlabs/Module/Admin/Profile_photo.php:67 Zotlabs/Module/Cover_photo.php:64 +#: Zotlabs/Module/Profile_photo.php:64 +msgid "Image uploaded but image cropping failed." +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:175 +#: Zotlabs/Module/Admin/Cover_photo.php:259 Zotlabs/Module/Cover_photo.php:175 +#: Zotlabs/Module/Cover_photo.php:262 +msgid "Cover Photos" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:199 +#: Zotlabs/Module/Admin/Profile_photo.php:145 +#: Zotlabs/Module/Cover_photo.php:199 Zotlabs/Module/Profile_photo.php:144 +msgid "Image resize failed." +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:208 +#: Zotlabs/Module/Admin/Profile_photo.php:191 +#: Zotlabs/Module/Cover_photo.php:211 Zotlabs/Module/Profile_photo.php:227 +#: include/photos.php:200 +msgid "Unable to process image" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:317 +#: Zotlabs/Module/Admin/Cover_photo.php:333 +#: Zotlabs/Module/Admin/Profile_photo.php:354 +#: Zotlabs/Module/Admin/Profile_photo.php:397 +#: Zotlabs/Module/Cover_photo.php:364 Zotlabs/Module/Cover_photo.php:380 +#: Zotlabs/Module/Profile_photo.php:386 Zotlabs/Module/Profile_photo.php:437 +msgid "Photo not available." +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:369 Zotlabs/Module/Cover_photo.php:415 +msgid "Your cover photo may be visible to anybody on the internet" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:371 +#: Zotlabs/Module/Admin/Profile_photo.php:465 +#: Zotlabs/Module/Cover_photo.php:417 Zotlabs/Module/Profile_photo.php:504 +msgid "Upload File:" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:372 +#: Zotlabs/Module/Admin/Profile_photo.php:466 +#: Zotlabs/Module/Cover_photo.php:418 Zotlabs/Module/Profile_photo.php:505 +msgid "Select a profile:" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:373 Zotlabs/Module/Cover_photo.php:419 +msgid "Change Cover Photo" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:374 +#: Zotlabs/Module/Admin/Profile_photo.php:468 +#: Zotlabs/Module/Cover_photo.php:420 Zotlabs/Module/Embedphotos.php:225 +#: Zotlabs/Module/Profile_photo.php:507 Zotlabs/Module/Photos.php:746 +#: Zotlabs/Storage/Browser.php:422 Zotlabs/Widget/Album.php:107 +#: Zotlabs/Widget/Cdav.php:154 Zotlabs/Widget/Cdav.php:188 +#: Zotlabs/Widget/Portfolio.php:122 +msgid "Upload" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:376 +#: Zotlabs/Module/Admin/Cover_photo.php:377 +#: Zotlabs/Module/Admin/Profile_photo.php:472 +#: Zotlabs/Module/Admin/Profile_photo.php:473 +#: Zotlabs/Module/Cover_photo.php:422 Zotlabs/Module/Cover_photo.php:423 +#: Zotlabs/Module/Profile_photo.php:511 Zotlabs/Module/Profile_photo.php:512 +msgid "Use a photo from your albums" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:379 +#: Zotlabs/Module/Admin/Profile_photo.php:475 +#: Zotlabs/Module/Cover_photo.php:425 Zotlabs/Module/Profile_photo.php:514 +#: include/conversation.php:1428 include/conversation.php:1492 +#: include/conversation.php:1494 include/conversation.php:1496 +msgid "OK" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:380 +#: Zotlabs/Module/Admin/Profile_photo.php:476 +#: Zotlabs/Module/Cover_photo.php:426 Zotlabs/Module/Profile_photo.php:515 +#: include/conversation.php:1292 +msgid "Choose images to embed" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:381 +#: Zotlabs/Module/Admin/Profile_photo.php:477 +#: Zotlabs/Module/Cover_photo.php:427 Zotlabs/Module/Profile_photo.php:516 +#: include/conversation.php:1293 +msgid "Choose an album" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:382 +#: Zotlabs/Module/Admin/Profile_photo.php:478 +#: Zotlabs/Module/Cover_photo.php:428 Zotlabs/Module/Profile_photo.php:517 +msgid "Choose a different album" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:383 +#: Zotlabs/Module/Admin/Profile_photo.php:479 +#: Zotlabs/Module/Cover_photo.php:429 Zotlabs/Module/Profile_photo.php:518 +#: include/conversation.php:1295 +msgid "Error getting album list" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:384 +#: Zotlabs/Module/Admin/Profile_photo.php:480 +#: Zotlabs/Module/Cover_photo.php:430 Zotlabs/Module/Profile_photo.php:519 +#: include/conversation.php:1296 +msgid "Error getting photo link" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:385 +#: Zotlabs/Module/Admin/Profile_photo.php:481 +#: Zotlabs/Module/Cover_photo.php:431 Zotlabs/Module/Profile_photo.php:520 +#: include/conversation.php:1297 +msgid "Error getting album" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:387 +#: Zotlabs/Module/Admin/Profile_photo.php:483 +#: Zotlabs/Module/Cover_photo.php:433 Zotlabs/Module/Profile_photo.php:522 +msgid "Select previously uploaded photo" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:403 +#: Zotlabs/Module/Admin/Profile_photo.php:498 +#: Zotlabs/Module/Cover_photo.php:449 Zotlabs/Module/Profile_photo.php:537 +msgid "Crop Image" +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:404 +#: Zotlabs/Module/Admin/Profile_photo.php:499 +#: Zotlabs/Module/Cover_photo.php:450 Zotlabs/Module/Profile_photo.php:538 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "" + +#: Zotlabs/Module/Admin/Cover_photo.php:406 +#: Zotlabs/Module/Admin/Profile_photo.php:501 +#: Zotlabs/Module/Cover_photo.php:452 Zotlabs/Module/Profile_photo.php:540 +msgid "Done Editing" +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:20 Zotlabs/Module/Admin/Dbsync.php:55 +msgid "Update has been marked successful" +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:32 +#, php-format +msgid "Verification of update %s failed. Check system logs." +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:34 Zotlabs/Module/Admin/Dbsync.php:69 +#, php-format +msgid "Update %s was successfully applied." +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:37 +#, php-format +msgid "Verifying update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:40 +#, php-format +msgid "Update %s does not contain a verification function." +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:43 Zotlabs/Module/Admin/Dbsync.php:75 +#, php-format +msgid "Update function %s could not be found." +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:67 +#, php-format +msgid "Executing update procedure %s failed. Check system logs." +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:72 +#, php-format +msgid "" +"Update %s did not return a status. It cannot be determined if it was " +"successful." +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:95 +msgid "Failed Updates" +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:97 +msgid "Mark success (if update was manually applied)" +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:98 +msgid "Attempt to verify this update if a verification procedure exists" +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:99 +msgid "Attempt to execute this update step automatically" +msgstr "" + +#: Zotlabs/Module/Admin/Dbsync.php:103 +msgid "No failed updates." +msgstr "" + #: Zotlabs/Module/Admin/Logs.php:28 msgid "Log settings updated." msgstr "" -#: Zotlabs/Module/Admin/Logs.php:82 Zotlabs/Module/Admin/Channels.php:152 -#: Zotlabs/Module/Admin/Accounts.php:166 Zotlabs/Module/Admin/Addons.php:339 -#: Zotlabs/Module/Admin/Addons.php:437 Zotlabs/Module/Admin/Themes.php:122 -#: Zotlabs/Module/Admin/Themes.php:156 Zotlabs/Module/Admin/Site.php:299 -#: Zotlabs/Module/Admin/Security.php:134 Zotlabs/Module/Admin.php:175 -msgid "Administration" -msgstr "" - -#: Zotlabs/Module/Admin/Logs.php:83 Zotlabs/Widget/Admin.php:50 -#: Zotlabs/Widget/Admin.php:60 +#: Zotlabs/Module/Admin/Logs.php:83 Zotlabs/Widget/Admin.php:54 +#: Zotlabs/Widget/Admin.php:64 msgid "Logs" msgstr "" @@ -1902,1520 +3283,150 @@ msgstr "" msgid "Log level" msgstr "" -#: Zotlabs/Module/Admin/Queue.php:33 -msgid "Queue Statistics" -msgstr "" - -#: Zotlabs/Module/Admin/Queue.php:34 -msgid "Total Entries" -msgstr "" - -#: Zotlabs/Module/Admin/Queue.php:35 -msgid "Priority" -msgstr "" - -#: Zotlabs/Module/Admin/Queue.php:36 -msgid "Destination URL" -msgstr "" - -#: Zotlabs/Module/Admin/Queue.php:37 -msgid "Mark hub permanently offline" -msgstr "" - -#: Zotlabs/Module/Admin/Queue.php:38 -msgid "Empty queue for this hub" -msgstr "" - -#: Zotlabs/Module/Admin/Queue.php:39 -msgid "Last known contact" -msgstr "" - -#: Zotlabs/Module/Admin/Account_edit.php:29 -#, php-format -msgid "Password changed for account %d." -msgstr "" - -#: Zotlabs/Module/Admin/Account_edit.php:44 -msgid "Account settings updated." -msgstr "" - -#: Zotlabs/Module/Admin/Account_edit.php:59 -msgid "Account not found." -msgstr "" - -#: Zotlabs/Module/Admin/Account_edit.php:66 -msgid "Account Edit" -msgstr "" - -#: Zotlabs/Module/Admin/Account_edit.php:67 -msgid "New Password" -msgstr "" - -#: Zotlabs/Module/Admin/Account_edit.php:68 -msgid "New Password again" -msgstr "" - -#: Zotlabs/Module/Admin/Account_edit.php:69 -msgid "Account language (for emails)" -msgstr "" - -#: Zotlabs/Module/Admin/Account_edit.php:70 -msgid "Service class" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:35 -#, php-format -msgid "%s channel censored/uncensored" -msgid_plural "%s channels censored/uncensored" -msgstr[0] "" -msgstr[1] "" - -#: Zotlabs/Module/Admin/Channels.php:44 -#, php-format -msgid "%s channel code allowed/disallowed" -msgid_plural "%s channels code allowed/disallowed" -msgstr[0] "" -msgstr[1] "" - -#: Zotlabs/Module/Admin/Channels.php:50 -#, php-format -msgid "%s channel deleted" -msgid_plural "%s channels deleted" -msgstr[0] "" -msgstr[1] "" - -#: Zotlabs/Module/Admin/Channels.php:69 -msgid "Channel not found" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:79 -#, php-format -msgid "Channel '%s' deleted" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:91 -#, php-format -msgid "Channel '%s' censored" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:91 -#, php-format -msgid "Channel '%s' uncensored" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:102 -#, php-format -msgid "Channel '%s' code allowed" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:102 -#, php-format -msgid "Channel '%s' code disallowed" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:153 Zotlabs/Module/Admin.php:137 -#: Zotlabs/Module/Manage.php:183 Zotlabs/Widget/Admin.php:26 include/nav.php:99 -msgid "Channels" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:155 Zotlabs/Module/Admin/Accounts.php:169 -msgid "select all" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:157 Zotlabs/Module/Connedit.php:587 -#: Zotlabs/Module/Directory.php:394 -msgid "Censor" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:158 Zotlabs/Module/Connedit.php:587 -#: Zotlabs/Module/Directory.php:394 -msgid "Uncensor" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:159 -msgid "Allow Code" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:160 -msgid "Disallow Code" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:161 include/nav.php:398 -#: include/conversation.php:1918 -msgid "Channel" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:165 -msgid "UID" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:166 Zotlabs/Module/Cdav.php:1349 -#: Zotlabs/Module/Connedit.php:852 Zotlabs/Module/Connections.php:234 -#: Zotlabs/Module/Chat.php:249 Zotlabs/Module/Lists.php:241 -#: Zotlabs/Module/Settings/Oauth.php:90 Zotlabs/Module/Settings/Oauth.php:116 -#: Zotlabs/Module/Settings/Oauth2.php:107 -#: Zotlabs/Module/Settings/Oauth2.php:136 Zotlabs/Module/Sharedwithme.php:109 -#: Zotlabs/Storage/Browser.php:310 Zotlabs/Widget/Activity_filter.php:293 -msgid "Name" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:167 Zotlabs/Module/Cdav.php:1356 -#: Zotlabs/Module/Connedit.php:859 Zotlabs/Module/Locs.php:123 -#: Zotlabs/Module/Profiles.php:499 Zotlabs/Module/Profiles.php:798 -msgid "Address" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:169 -msgid "" -"Selected channels will be deleted!\\n\\nEverything that was posted in these " -"channels on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: Zotlabs/Module/Admin/Channels.php:170 -msgid "" -"The channel {0} will be deleted!\\n\\nEverything that was posted in this " -"channel on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:63 -#: Zotlabs/Module/Admin/Profile_photo.php:66 Zotlabs/Module/Cover_photo.php:63 -#: Zotlabs/Module/Profile_photo.php:63 -msgid "Image uploaded but image cropping failed." -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:174 -#: Zotlabs/Module/Admin/Cover_photo.php:261 Zotlabs/Module/Cover_photo.php:174 -#: Zotlabs/Module/Cover_photo.php:265 -msgid "Cover Photos" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:198 -#: Zotlabs/Module/Admin/Profile_photo.php:143 -#: Zotlabs/Module/Cover_photo.php:198 Zotlabs/Module/Profile_photo.php:142 -msgid "Image resize failed." -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:208 -#: Zotlabs/Module/Admin/Profile_photo.php:188 -#: Zotlabs/Module/Cover_photo.php:212 Zotlabs/Module/Profile_photo.php:225 -#: include/photos.php:198 -msgid "Unable to process image" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:316 -#: Zotlabs/Module/Admin/Cover_photo.php:332 -#: Zotlabs/Module/Admin/Profile_photo.php:352 -#: Zotlabs/Module/Admin/Profile_photo.php:392 -#: Zotlabs/Module/Cover_photo.php:368 Zotlabs/Module/Cover_photo.php:384 -#: Zotlabs/Module/Profile_photo.php:385 Zotlabs/Module/Profile_photo.php:433 -msgid "Photo not available." -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:369 Zotlabs/Module/Cover_photo.php:420 -msgid "Your cover photo may be visible to anybody on the internet" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:371 -#: Zotlabs/Module/Admin/Profile_photo.php:462 -#: Zotlabs/Module/Cover_photo.php:422 Zotlabs/Module/Profile_photo.php:502 -msgid "Upload File:" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:372 -#: Zotlabs/Module/Admin/Profile_photo.php:463 -#: Zotlabs/Module/Cover_photo.php:423 Zotlabs/Module/Profile_photo.php:503 -msgid "Select a profile:" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:373 Zotlabs/Module/Cover_photo.php:424 -msgid "Change Cover Photo" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:374 -#: Zotlabs/Module/Admin/Profile_photo.php:465 -#: Zotlabs/Module/Cover_photo.php:425 Zotlabs/Module/Embedphotos.php:227 -#: Zotlabs/Module/Profile_photo.php:505 Zotlabs/Module/Photos.php:738 -#: Zotlabs/Storage/Browser.php:419 Zotlabs/Widget/Portfolio.php:110 -#: Zotlabs/Widget/Cdav.php:146 Zotlabs/Widget/Cdav.php:182 -#: Zotlabs/Widget/Album.php:101 -msgid "Upload" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:376 -#: Zotlabs/Module/Admin/Cover_photo.php:377 -#: Zotlabs/Module/Admin/Profile_photo.php:469 -#: Zotlabs/Module/Admin/Profile_photo.php:470 -#: Zotlabs/Module/Cover_photo.php:427 Zotlabs/Module/Cover_photo.php:428 -#: Zotlabs/Module/Profile_photo.php:509 Zotlabs/Module/Profile_photo.php:510 -msgid "Use a photo from your albums" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:378 -#: Zotlabs/Module/Admin/Profile_photo.php:471 -#: Zotlabs/Module/Admin/Addons.php:424 Zotlabs/Module/Cdav.php:1055 -#: Zotlabs/Module/Cdav.php:1367 Zotlabs/Module/Connedit.php:870 -#: Zotlabs/Module/Cover_photo.php:429 Zotlabs/Module/Editlayout.php:144 -#: Zotlabs/Module/Editwebpage.php:173 Zotlabs/Module/Filer.php:53 -#: Zotlabs/Module/Fbrowser.php:63 Zotlabs/Module/Fbrowser.php:85 -#: Zotlabs/Module/Card_edit.php:133 Zotlabs/Module/Editblock.php:145 -#: Zotlabs/Module/Editpost.php:142 Zotlabs/Module/Profiles.php:809 -#: Zotlabs/Module/Profile_photo.php:511 Zotlabs/Module/Settings/Oauth.php:89 -#: Zotlabs/Module/Settings/Oauth.php:115 Zotlabs/Module/Settings/Oauth2.php:106 -#: Zotlabs/Module/Settings/Oauth2.php:135 Zotlabs/Module/Tagrm.php:15 -#: Zotlabs/Module/Tagrm.php:138 include/conversation.php:1402 -#: include/conversation.php:1468 include/conversation.php:1470 -#: include/conversation.php:1472 -msgid "Cancel" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:379 -#: Zotlabs/Module/Admin/Profile_photo.php:472 -#: Zotlabs/Module/Cover_photo.php:430 Zotlabs/Module/Profile_photo.php:512 -#: include/conversation.php:1403 include/conversation.php:1467 -#: include/conversation.php:1469 include/conversation.php:1471 -msgid "OK" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:380 -#: Zotlabs/Module/Admin/Profile_photo.php:473 -#: Zotlabs/Module/Cover_photo.php:431 Zotlabs/Module/Profile_photo.php:513 -#: include/conversation.php:1272 -msgid "Choose images to embed" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:381 -#: Zotlabs/Module/Admin/Profile_photo.php:474 -#: Zotlabs/Module/Cover_photo.php:432 Zotlabs/Module/Profile_photo.php:514 -#: include/conversation.php:1273 -msgid "Choose an album" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:382 -#: Zotlabs/Module/Admin/Profile_photo.php:475 -#: Zotlabs/Module/Cover_photo.php:433 Zotlabs/Module/Profile_photo.php:515 -msgid "Choose a different album" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:383 -#: Zotlabs/Module/Admin/Profile_photo.php:476 -#: Zotlabs/Module/Cover_photo.php:434 Zotlabs/Module/Profile_photo.php:516 -#: include/conversation.php:1275 -msgid "Error getting album list" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:384 -#: Zotlabs/Module/Admin/Profile_photo.php:477 -#: Zotlabs/Module/Cover_photo.php:435 Zotlabs/Module/Profile_photo.php:517 -#: include/conversation.php:1276 -msgid "Error getting photo link" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:385 -#: Zotlabs/Module/Admin/Profile_photo.php:478 -#: Zotlabs/Module/Cover_photo.php:436 Zotlabs/Module/Profile_photo.php:518 -#: include/conversation.php:1277 -msgid "Error getting album" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:387 -#: Zotlabs/Module/Admin/Profile_photo.php:480 -#: Zotlabs/Module/Cover_photo.php:438 Zotlabs/Module/Profile_photo.php:520 -msgid "Select previously uploaded photo" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:404 -#: Zotlabs/Module/Admin/Profile_photo.php:497 -#: Zotlabs/Module/Cover_photo.php:455 Zotlabs/Module/Profile_photo.php:537 -msgid "Crop Image" -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:405 -#: Zotlabs/Module/Admin/Profile_photo.php:498 -#: Zotlabs/Module/Cover_photo.php:456 Zotlabs/Module/Profile_photo.php:538 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "" - -#: Zotlabs/Module/Admin/Cover_photo.php:407 -#: Zotlabs/Module/Admin/Profile_photo.php:500 -#: Zotlabs/Module/Cover_photo.php:458 Zotlabs/Module/Profile_photo.php:540 -msgid "Done Editing" -msgstr "" - -#: Zotlabs/Module/Admin/Profile_photo.php:119 -#: Zotlabs/Module/Admin/Profile_photo.php:252 -#: Zotlabs/Module/Profile_photo.php:116 Zotlabs/Module/Profile_photo.php:289 -#: include/photo_factory.php:550 +#: Zotlabs/Module/Admin/Profile_photo.php:121 +#: Zotlabs/Module/Admin/Profile_photo.php:251 +#: Zotlabs/Module/Profile_photo.php:118 Zotlabs/Module/Profile_photo.php:287 +#: include/photo_factory.php:539 msgid "Profile Photos" msgstr "" -#: Zotlabs/Module/Admin/Profile_photo.php:184 -#: Zotlabs/Module/Profile_photo.php:218 +#: Zotlabs/Module/Admin/Profile_photo.php:189 +#: Zotlabs/Module/Profile_photo.php:222 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "" #: Zotlabs/Module/Admin/Profile_photo.php:266 -#: Zotlabs/Module/Profile_photo.php:303 +#: Zotlabs/Module/Profile_photo.php:302 msgid "Image upload failed." msgstr "" #: Zotlabs/Module/Admin/Profile_photo.php:285 -#: Zotlabs/Module/Profile_photo.php:322 +#: Zotlabs/Module/Profile_photo.php:321 msgid "Unable to process image." msgstr "" -#: Zotlabs/Module/Admin/Profile_photo.php:460 -#: Zotlabs/Module/Profile_photo.php:500 +#: Zotlabs/Module/Admin/Profile_photo.php:463 +#: Zotlabs/Module/Profile_photo.php:502 msgid "" "Your default profile photo is visible to anybody on the internet. Profile " "photos for alternate profiles will inherit the permissions of the profile" msgstr "" -#: Zotlabs/Module/Admin/Profile_photo.php:460 +#: Zotlabs/Module/Admin/Profile_photo.php:463 msgid "" "Your site photo is visible to anybody on the internet and may be distributed " "to other websites." msgstr "" -#: Zotlabs/Module/Admin/Profile_photo.php:464 +#: Zotlabs/Module/Admin/Profile_photo.php:467 msgid "Use Photo for Site Logo" msgstr "" -#: Zotlabs/Module/Admin/Profile_photo.php:464 +#: Zotlabs/Module/Admin/Profile_photo.php:467 msgid "Change Site Logo" msgstr "" -#: Zotlabs/Module/Admin/Profile_photo.php:465 -#: Zotlabs/Module/Profile_photo.php:505 +#: Zotlabs/Module/Admin/Profile_photo.php:468 +#: Zotlabs/Module/Profile_photo.php:507 msgid "Use" msgstr "" -#: Zotlabs/Module/Admin/Accounts.php:37 -#, php-format -msgid "%s account blocked/unblocked" -msgid_plural "%s accounts blocked/unblocked" -msgstr[0] "" -msgstr[1] "" - -#: Zotlabs/Module/Admin/Accounts.php:45 -#, php-format -msgid "%s account deleted" -msgid_plural "%s accounts deleted" -msgstr[0] "" -msgstr[1] "" - -#: Zotlabs/Module/Admin/Accounts.php:83 -msgid "Account not found" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:94 include/channel.php:2181 -#, php-format -msgid "Account '%s' deleted" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:102 -#, php-format -msgid "Account '%s' blocked" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:110 -#, php-format -msgid "Account '%s' unblocked" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:167 Zotlabs/Module/Admin/Accounts.php:180 -#: Zotlabs/Module/Admin.php:119 Zotlabs/Widget/Admin.php:25 -msgid "Accounts" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:170 -msgid "Registrations waiting for confirm" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:171 -msgid "Request date" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:171 Zotlabs/Module/Admin/Accounts.php:183 -#: Zotlabs/Module/Cdav.php:1353 Zotlabs/Module/Connedit.php:856 -#: Zotlabs/Module/Profiles.php:795 include/network.php:1600 -msgid "Email" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:172 -msgid "No registrations." -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:173 Zotlabs/Module/Connections.php:340 -#: include/conversation.php:655 -msgid "Approve" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:174 Zotlabs/Module/Authorize.php:40 -msgid "Deny" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:176 Zotlabs/Module/Connedit.php:571 -#: Zotlabs/Widget/Sblock.php:19 -msgid "Block" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:177 Zotlabs/Module/Connedit.php:571 -msgid "Unblock" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:182 -msgid "ID" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:184 -msgid "All Channels" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:185 -msgid "Register date" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:186 -msgid "Last login" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:187 -msgid "Expires" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:188 -msgid "Service Class" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:190 -msgid "" -"Selected accounts will be deleted!\\n\\nEverything these accounts had posted " -"on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: Zotlabs/Module/Admin/Accounts.php:191 -msgid "" -"The account {0} will be deleted!\\n\\nEverything this account has posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:257 Zotlabs/Module/Admin/Themes.php:72 -#: Zotlabs/Module/Admin.php:85 Zotlabs/Module/Display.php:59 -#: Zotlabs/Module/Display.php:514 Zotlabs/Module/Filestorage.php:34 -#: Zotlabs/Module/Thing.php:101 Zotlabs/Module/Viewsrc.php:27 -#: Zotlabs/Module/Inspect.php:33 -#: extend/addon/a/flashcards/Mod_Flashcards.php:284 -#: extend/addon/a/flashcards/Mod_Flashcards.php:285 include/items.php:3763 -msgid "Item not found." -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:287 -#, php-format -msgid "Plugin %s disabled." -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:292 -#, php-format -msgid "Plugin %s enabled." -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:308 Zotlabs/Module/Admin/Themes.php:95 -msgid "Disable" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:311 Zotlabs/Module/Admin/Themes.php:97 -msgid "Enable" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:340 Zotlabs/Module/Admin/Addons.php:438 -#: Zotlabs/Widget/Admin.php:29 -msgid "Addons" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:341 Zotlabs/Module/Admin/Themes.php:124 -msgid "Toggle" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:349 Zotlabs/Module/Admin/Themes.php:134 -msgid "Author: " -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:350 Zotlabs/Module/Admin/Themes.php:135 -msgid "Maintainer: " -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:351 -msgid "Minimum project version: " -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:352 -msgid "Maximum project version: " -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:353 -msgid "Minimum PHP version: " -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:354 -msgid "Compatible Server Roles: " -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:355 -msgid "Requires: " -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:356 Zotlabs/Module/Admin/Addons.php:443 -msgid "Disabled - version incompatibility" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:412 -msgid "Enter the public git repository URL of the addon repo." -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:413 -msgid "Addon repo git URL" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:414 -msgid "Custom repo name" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:414 -msgid "(optional)" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:415 -msgid "Download Addon Repo" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:422 -msgid "Install new repo" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:446 -msgid "Manage Repos" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:447 -msgid "Installed Addon Repositories" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:448 -msgid "Install a New Addon Repository" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:455 -msgid "Switch branch" -msgstr "" - -#: Zotlabs/Module/Admin/Addons.php:456 Zotlabs/Module/Photos.php:1055 -#: Zotlabs/Module/Tagrm.php:137 Zotlabs/Module/Superblock.php:227 -#: Zotlabs/Module/Superblock.php:244 -msgid "Remove" -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:19 Zotlabs/Module/Admin/Dbsync.php:59 -msgid "Update has been marked successful" -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:32 -#, php-format -msgid "Verification of update %s failed. Check system logs." -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:35 Zotlabs/Module/Admin/Dbsync.php:74 -#, php-format -msgid "Update %s was successfully applied." -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:39 -#, php-format -msgid "Verifying update %s did not return a status. Unknown if it succeeded." -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:42 -#, php-format -msgid "Update %s does not contain a verification function." -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:46 Zotlabs/Module/Admin/Dbsync.php:81 -#, php-format -msgid "Update function %s could not be found." -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:71 -#, php-format -msgid "Executing update procedure %s failed. Check system logs." -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:78 -#, php-format -msgid "" -"Update %s did not return a status. It cannot be determined if it was " -"successful." -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:99 -msgid "Failed Updates" -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:101 -msgid "Mark success (if update was manually applied)" -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:102 -msgid "Attempt to verify this update if a verification procedure exists" -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:103 -msgid "Attempt to execute this update step automatically" -msgstr "" - -#: Zotlabs/Module/Admin/Dbsync.php:108 -msgid "No failed updates." -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:89 -msgid "New Profile Field" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:90 Zotlabs/Module/Admin/Profs.php:110 -msgid "Field nickname" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:90 Zotlabs/Module/Admin/Profs.php:110 -msgid "System name of field" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:91 Zotlabs/Module/Admin/Profs.php:111 -msgid "Input type" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:92 Zotlabs/Module/Admin/Profs.php:112 -msgid "Field Name" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:92 Zotlabs/Module/Admin/Profs.php:112 -msgid "Label on profile pages" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:93 Zotlabs/Module/Admin/Profs.php:113 -msgid "Help text" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:93 Zotlabs/Module/Admin/Profs.php:113 -msgid "Additional info (optional)" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:103 -msgid "Field definition not found" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:109 -msgid "Edit Profile Field" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:168 -msgid "Profile Fields" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:169 -msgid "Basic Profile Fields" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:170 -msgid "Advanced Profile Fields" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:170 -msgid "(In addition to basic fields)" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:172 -msgid "All available fields" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:173 -msgid "Custom Fields" -msgstr "" - -#: Zotlabs/Module/Admin/Profs.php:177 -msgid "Create Custom Field" -msgstr "" - -#: Zotlabs/Module/Admin/Themes.php:26 -msgid "Theme settings updated." -msgstr "" - -#: Zotlabs/Module/Admin/Themes.php:61 -msgid "No themes found." -msgstr "" - -#: Zotlabs/Module/Admin/Themes.php:116 -msgid "Screenshot" -msgstr "" - -#: Zotlabs/Module/Admin/Themes.php:123 Zotlabs/Module/Admin/Themes.php:157 -#: Zotlabs/Widget/Admin.php:30 -msgid "Themes" -msgstr "" - -#: Zotlabs/Module/Admin/Themes.php:162 -msgid "[Experimental]" -msgstr "" - -#: Zotlabs/Module/Admin/Themes.php:163 -msgid "[Unsupported]" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:187 -msgid "Site settings updated." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:214 include/text.php:3391 -#: view/theme/redbasic/php/config.php:15 -msgid "Default" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:225 Zotlabs/Module/Settings/Display.php:133 -#, php-format -msgid "%s - (Incompatible)" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:232 -msgid "mobile" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:234 -msgid "experimental" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:236 -msgid "unsupported" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:277 -msgid "Yes - with approval" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:283 -msgid "My site is not a public server" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:284 -msgid "My site provides free public access" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:285 -msgid "My site provides paid public access" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:286 -msgid "My site provides free public access and premium paid plans" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:292 -msgid "Default permission role for new accounts" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:292 -msgid "" -"This role will be used for the first channel created after registration." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:300 Zotlabs/Widget/Admin.php:22 -msgid "Site" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:302 -msgid "Site Configuration" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:303 Zotlabs/Module/Register.php:288 -msgid "Registration" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:304 -msgid "File upload" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:305 -msgid "Policies" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:306 Zotlabs/Widget/Findpeople.php:23 -msgid "Advanced" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:308 -msgid "Site name" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:309 -msgid "Administrator Information" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:309 -msgid "" -"Contact information for site administrators. Displayed on siteinfo page. " -"BBCode may be used here." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:310 Zotlabs/Module/Siteinfo.php:33 -msgid "Site Information" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:310 -msgid "" -"Publicly visible description of this site. Displayed on siteinfo page. " -"BBCode may be used here." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:311 -msgid "System language" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:312 -msgid "System theme" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:312 -msgid "" -"Default system theme - may be over-ridden by user profiles - change theme settings" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:315 -msgid "ActivityPub protocol" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:315 -msgid "Provides access to software supporting the ActivityPub protocol." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:316 -msgid "Maximum image size" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:316 -msgid "" -"Maximum size in bytes of uploaded images. Default is 0, which means no " -"limits." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:317 -msgid "Cache all public images" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:317 -msgid "If disabled, proxy non-SSL images, but do not store locally" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:318 -msgid "Does this site allow new member registration?" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:319 -msgid "Invitation only" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:319 -msgid "" -"Only allow new member registrations with an invitation code. New member " -"registration must be allowed for this to work." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:321 -msgid "Minimum age" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:321 -msgid "Minimum age (in years) for who may register on this site." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:322 -msgid "Which best describes the types of account offered by this hub?" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:322 -msgid "" -"If a public server policy is selected, this information may be displayed on " -"the public server site list." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:323 -msgid "Register text" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:323 -msgid "Will be displayed prominently on the registration page." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:325 -msgid "Site homepage to show visitors (default: login box)" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:325 -msgid "" -"example: 'public' to show public stream, 'page/sys/home' to show a system " -"webpage called 'home' or 'include:home.html' to include a file." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:326 -msgid "Preserve site homepage URL" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:326 -msgid "" -"Present the site homepage in a frame at the original location instead of " -"redirecting" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:327 -msgid "Accounts abandoned after x days" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:327 -msgid "" -"Will not waste system resources polling external sites for abandonded " -"accounts. Enter 0 for no time limit." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:328 Zotlabs/Module/Admin/Security.php:139 -msgid "Block directory from visitors" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:328 Zotlabs/Module/Admin/Security.php:139 -msgid "Only allow authenticated access to directory." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:329 -msgid "Verify Email Addresses" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:329 -msgid "" -"Check to verify email addresses used in account registration (recommended)." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:330 -msgid "Force publish in directory" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:330 -msgid "" -"Check to force all profiles on this site to be listed in the site directory." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:332 -msgid "Public stream" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:332 -msgid "Provide a Public stream on your site. This content is unmoderated." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:333 -msgid "the Public stream is disabled" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:334 -msgid "the Public stream contains public conversations from this site only" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:335 -msgid "" -"the Public stream contains public conversations from anywhere on the internet" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:338 -msgid "Allow anybody on the internet to access the Public stream" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:338 -msgid "" -"Default is to only allow viewing by site members. Warning: this content is " -"unmoderated." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:339 -msgid "Show numbers of likes and dislikes in conversations" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:339 -msgid "" -"If disabled, the presence of likes and dislikes will be shown, but without " -"totals." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:340 -msgid "Permit animated profile photos" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:340 -msgid "Changing this may take several days to work through the system" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:341 -msgid "Only import Public stream posts with this text" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:341 Zotlabs/Module/Admin/Site.php:342 -msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:342 -msgid "Do not import Public stream posts with this text" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:343 -msgid "Maximum number of imported friends of friends" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:343 -msgid "" -"Warning: higher numbers will improve the quality of friend suggestions and " -"directory results but can exponentially increase resource usage" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:344 -msgid "Login on Homepage" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:344 -msgid "" -"Present a login box to visitors on the home page if no other content has " -"been configured." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:345 -msgid "Enable context help" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:345 -msgid "" -"Display contextual help for the current page when the help button is pressed." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:346 -msgid "Reply-to email address for system generated email." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:347 -msgid "Sender (From) email address for system generated email." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:348 -msgid "Display name of email sender for system generated email." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:349 -msgid "Directory Server URL" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:349 -msgid "Default directory server" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:350 -msgid "Proxy user" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:351 -msgid "Proxy URL" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:352 -msgid "Network fetch timeout" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:352 Zotlabs/Module/Admin/Site.php:353 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:353 -msgid "Network post timeout" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:354 -msgid "Delivery interval" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:354 -msgid "" -"Delay background delivery processes by this many seconds to reduce system " -"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " -"for large dedicated servers." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:355 -msgid "Deliveries per process" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:355 -msgid "" -"Number of deliveries to attempt in a single operating system process. Adjust " -"if necessary to tune system performance. Recommend: 1-5." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:356 -msgid "Queue Threshold" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:356 -msgid "" -"Always defer immediate delivery if queue contains more than this number of " -"entries." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:357 -msgid "Poll interval" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:357 -msgid "" -"Delay background polling processes by this many seconds to reduce system " -"load. If 0, use delivery interval." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:358 -msgid "Path to ImageMagick convert program" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:358 -msgid "" -"If set, use this program to generate photo thumbnails for huge images ( > " -"4000 pixels in either dimension), otherwise memory exhaustion may occur. " -"Example: /usr/bin/convert" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:359 -msgid "Maximum Load Average" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:359 -msgid "" -"Maximum system load before delivery and poll processes are deferred - " -"default 50." -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:360 -msgid "Expiration period in days for imported streams and cached images" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:360 -msgid "0 for no expiration of imported content" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:361 -msgid "" -"Do not expire any posts which have comments less than this many days ago" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:362 -msgid "" -"Public servers: Optional landing (marketing) webpage for new registrants" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:362 -#, php-format -msgid "Create this page first. Default is %s/register" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:363 -msgid "Page to display after creating a new channel" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:363 -msgid "Default: profiles" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:364 -msgid "Site location" -msgstr "" - -#: Zotlabs/Module/Admin/Site.php:364 -msgid "Region or country - shared with other sites" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:125 -msgid "" -"By default, unfiltered HTML is allowed in embedded media. This is inherently " -"insecure." -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:128 -msgid "" -"The recommended setting is to only allow unfiltered HTML from the following " -"sites:" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:129 -msgid "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/" -"
https://vimeo.com/
https://soundcloud.com/
" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:130 -msgid "" -"All other embedded content will be filtered, unless " -"embedded content from that site is explicitly blocked." -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:135 Zotlabs/Widget/Admin.php:27 -msgid "Security" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:137 -msgid "Block public" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:137 -msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently authenticated." -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:138 -msgid "Block public search" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:138 -msgid "" -"Prevent access to search content unless you are currently authenticated." -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:140 -msgid "Hide local directory" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:140 -msgid "Only use the global directory" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:141 -msgid "Provide a cloud root directory" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:141 -msgid "" -"The cloud root directory lists all channel names which provide public files. " -"Otherwise only the names of connections are shown." -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:142 -msgid "Show total disk space available to cloud uploads" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:143 -msgid "Allow SVG thumbnails in file browser" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:143 -msgid "WARNING: SVG images may contain malicious code." -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:145 -msgid "Allow embedded (inline) PDF files" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:146 -msgid "Permit anonymous comments" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:146 -msgid "" -"Moderation will be performed by channels that select this comment option." -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:147 -msgid "Set \"Transport Security\" HTTP header" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:148 -msgid "Set \"Content Security Policy\" HTTP header" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:149 -msgid "Allowed email domains" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:149 -msgid "" -"Comma separated list of domains which are allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:150 -msgid "Not allowed email domains" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:150 -msgid "" -"Comma separated list of domains which are not allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains, unless allowed domains have been defined." -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:151 -msgid "Allow communications only from these sites" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:151 Zotlabs/Module/Admin/Security.php:156 -msgid "" -"One site per line. Leave empty to allow communication from anywhere by " -"default" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:152 -msgid "Block communications from these sites" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:153 -msgid "Allow communications only from these channels" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:153 Zotlabs/Module/Admin/Security.php:158 -msgid "" -"One channel (hash) per line. Leave empty to allow communication from any " -"channel by default" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:154 -msgid "Block communications from these channels" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:156 -msgid "Allow public stream communications only from these sites" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:157 -msgid "Block public stream communications from these sites" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:158 -msgid "Allow public stream communications only from these channels" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:159 -msgid "Block public stream communications from these channels" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:162 -msgid "Only allow embeds from secure (SSL) websites and links." -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:163 -msgid "Allow unfiltered embedded HTML content only from these domains" -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:163 -msgid "One site per line. By default embedded content is filtered." -msgstr "" - -#: Zotlabs/Module/Admin/Security.php:164 -msgid "Block embedded HTML from these domains" -msgstr "" - -#: Zotlabs/Module/Drafts.php:20 +#: Zotlabs/Module/Drafts.php:23 msgid "" "This app allows you to save posts you are writing and finish them later " "prior to sharing/publishing." msgstr "" -#: Zotlabs/Module/Api.php:82 Zotlabs/Module/Api.php:103 +#: Zotlabs/Module/Api.php:84 Zotlabs/Module/Api.php:106 msgid "Authorize application connection" msgstr "" -#: Zotlabs/Module/Api.php:83 +#: Zotlabs/Module/Api.php:85 msgid "Return to your app and insert this Security Code:" msgstr "" -#: Zotlabs/Module/Api.php:93 +#: Zotlabs/Module/Api.php:95 msgid "Please login to continue." msgstr "" -#: Zotlabs/Module/Api.php:105 +#: Zotlabs/Module/Api.php:108 msgid "" "Do you want to authorize this application to access your posts and contacts, " "and/or create new posts for you?" msgstr "" -#: Zotlabs/Module/Apporder.php:45 +#: Zotlabs/Module/Apporder.php:46 msgid "Change Order of Pinned Navbar Apps" msgstr "" -#: Zotlabs/Module/Apporder.php:45 +#: Zotlabs/Module/Apporder.php:46 msgid "Change Order of App Tray Apps" msgstr "" -#: Zotlabs/Module/Apporder.php:46 +#: Zotlabs/Module/Apporder.php:47 msgid "" "Use arrows to move the corresponding app left (top) or right (bottom) in the " "navbar" msgstr "" -#: Zotlabs/Module/Apporder.php:47 +#: Zotlabs/Module/Apporder.php:48 msgid "Use arrows to move the corresponding app up or down in the app tray" msgstr "" -#: Zotlabs/Module/Follow.php:133 +#: Zotlabs/Module/Follow.php:135 msgid "Connection added." msgstr "" -#: Zotlabs/Module/Apps.php:50 Zotlabs/Widget/Appstore.php:14 -#: include/nav.php:318 +#: Zotlabs/Module/Apps.php:59 Zotlabs/Widget/Appstore.php:15 +#: include/nav.php:315 msgid "Available Apps" msgstr "" -#: Zotlabs/Module/Apps.php:50 Zotlabs/Widget/Appstore.php:13 -#: include/nav.php:317 +#: Zotlabs/Module/Apps.php:59 Zotlabs/Widget/Appstore.php:14 +#: include/nav.php:314 msgid "Installed Apps" msgstr "" -#: Zotlabs/Module/Apps.php:53 +#: Zotlabs/Module/Apps.php:62 msgid "Manage apps" msgstr "" -#: Zotlabs/Module/Apps.php:54 +#: Zotlabs/Module/Apps.php:63 msgid "Create Custom App" msgstr "" -#: Zotlabs/Module/Common.php:18 +#: Zotlabs/Module/Common.php:21 msgid "No channel." msgstr "" -#: Zotlabs/Module/Common.php:49 +#: Zotlabs/Module/Common.php:55 msgid "No connections in common." msgstr "" -#: Zotlabs/Module/Common.php:69 +#: Zotlabs/Module/Common.php:75 msgid "View Common Connections" msgstr "" -#: Zotlabs/Module/Attach.php:13 +#: Zotlabs/Module/Attach.php:18 msgid "Item not available." msgstr "" -#: Zotlabs/Module/Authorize.php:24 +#: Zotlabs/Module/Authorize.php:23 msgid "Unknown App" msgstr "" -#: Zotlabs/Module/Authorize.php:36 +#: Zotlabs/Module/Authorize.php:35 msgid "Authorize" msgstr "" -#: Zotlabs/Module/Authorize.php:37 +#: Zotlabs/Module/Authorize.php:36 #, php-format msgid "Do you authorize the app %s to access your channel data?" msgstr "" -#: Zotlabs/Module/Authorize.php:39 +#: Zotlabs/Module/Authorize.php:38 msgid "Allow" msgstr "" @@ -3423,50 +3434,50 @@ msgstr "" msgid "Permissions denied." msgstr "" -#: Zotlabs/Module/Cal.php:270 Zotlabs/Module/Events.php:643 +#: Zotlabs/Module/Cal.php:283 Zotlabs/Module/Events.php:672 msgid "l, F j" msgstr "" -#: Zotlabs/Module/Cal.php:320 Zotlabs/Module/Events.php:699 -#: include/text.php:2071 +#: Zotlabs/Module/Cal.php:331 Zotlabs/Module/Events.php:727 +#: include/text.php:2167 msgid "Link to Source" msgstr "" -#: Zotlabs/Module/Cal.php:343 Zotlabs/Module/Events.php:727 +#: Zotlabs/Module/Cal.php:352 Zotlabs/Module/Events.php:753 msgid "Edit Event" msgstr "" -#: Zotlabs/Module/Cal.php:343 Zotlabs/Module/Events.php:727 +#: Zotlabs/Module/Cal.php:352 Zotlabs/Module/Events.php:753 msgid "Create Event" msgstr "" -#: Zotlabs/Module/Cal.php:344 Zotlabs/Module/Cal.php:351 -#: Zotlabs/Module/Cdav.php:1032 Zotlabs/Module/Events.php:728 -#: Zotlabs/Module/Events.php:737 Zotlabs/Module/Photos.php:1004 +#: Zotlabs/Module/Cal.php:353 Zotlabs/Module/Cal.php:360 +#: Zotlabs/Module/Cdav.php:1037 Zotlabs/Module/Events.php:754 +#: Zotlabs/Module/Events.php:763 Zotlabs/Module/Photos.php:1015 msgid "Previous" msgstr "" -#: Zotlabs/Module/Cal.php:345 Zotlabs/Module/Cal.php:352 -#: Zotlabs/Module/Cdav.php:1033 Zotlabs/Module/Events.php:729 -#: Zotlabs/Module/Events.php:738 Zotlabs/Module/Setup.php:284 -#: Zotlabs/Module/Photos.php:1013 +#: Zotlabs/Module/Cal.php:354 Zotlabs/Module/Cal.php:361 +#: Zotlabs/Module/Cdav.php:1038 Zotlabs/Module/Events.php:755 +#: Zotlabs/Module/Events.php:764 Zotlabs/Module/Setup.php:286 +#: Zotlabs/Module/Photos.php:1025 msgid "Next" msgstr "" -#: Zotlabs/Module/Cal.php:349 include/text.php:2716 +#: Zotlabs/Module/Cal.php:358 include/text.php:2875 msgid "Import" msgstr "" -#: Zotlabs/Module/Cal.php:353 Zotlabs/Module/Cdav.php:1034 -#: Zotlabs/Module/Events.php:739 +#: Zotlabs/Module/Cal.php:362 Zotlabs/Module/Cdav.php:1039 +#: Zotlabs/Module/Events.php:765 msgid "Today" msgstr "" -#: Zotlabs/Module/Expire.php:23 +#: Zotlabs/Module/Expire.php:25 msgid "Expiration settings updated." msgstr "" -#: Zotlabs/Module/Expire.php:33 +#: Zotlabs/Module/Expire.php:35 msgid "" "This app allows you to set an optional expiration date/time for your own " "posts, after which they will be deleted. This must be at least fifteen " @@ -3474,860 +3485,861 @@ msgid "" "your posts after a set number of days" msgstr "" -#: Zotlabs/Module/Expire.php:42 +#: Zotlabs/Module/Expire.php:44 msgid "Expire and delete all my posts after this many days" msgstr "" -#: Zotlabs/Module/Expire.php:42 +#: Zotlabs/Module/Expire.php:44 msgid "" "Leave at 0 if you wish to manually control expiration of specific posts." msgstr "" -#: Zotlabs/Module/Expire.php:46 +#: Zotlabs/Module/Expire.php:48 msgid "Automatic Expiration Settings" msgstr "" -#: Zotlabs/Module/Admin.php:120 +#: Zotlabs/Module/Admin.php:124 msgid "Blocked accounts" msgstr "" -#: Zotlabs/Module/Admin.php:121 +#: Zotlabs/Module/Admin.php:125 msgid "Expired accounts" msgstr "" -#: Zotlabs/Module/Admin.php:122 +#: Zotlabs/Module/Admin.php:126 msgid "Expiring accounts" msgstr "" -#: Zotlabs/Module/Admin.php:138 Zotlabs/Module/Locs.php:124 +#: Zotlabs/Module/Admin.php:143 Zotlabs/Module/Locs.php:134 msgid "Primary" msgstr "" -#: Zotlabs/Module/Admin.php:139 +#: Zotlabs/Module/Admin.php:144 msgid "Clones" msgstr "" -#: Zotlabs/Module/Admin.php:145 +#: Zotlabs/Module/Admin.php:150 msgid "Message queues" msgstr "" -#: Zotlabs/Module/Admin.php:170 +#: Zotlabs/Module/Admin.php:174 msgid "Your software should be updated" msgstr "" -#: Zotlabs/Module/Admin.php:176 include/conversation.php:1479 +#: Zotlabs/Module/Admin.php:180 include/conversation.php:1504 msgid "Summary" msgstr "" -#: Zotlabs/Module/Admin.php:179 +#: Zotlabs/Module/Admin.php:183 msgid "Registered accounts" msgstr "" -#: Zotlabs/Module/Admin.php:180 +#: Zotlabs/Module/Admin.php:184 msgid "Pending registrations" msgstr "" -#: Zotlabs/Module/Admin.php:181 +#: Zotlabs/Module/Admin.php:185 msgid "Registered channels" msgstr "" -#: Zotlabs/Module/Admin.php:182 +#: Zotlabs/Module/Admin.php:186 msgid "Active addons" msgstr "" -#: Zotlabs/Module/Admin.php:183 Zotlabs/Module/Sites.php:100 +#: Zotlabs/Module/Admin.php:187 Zotlabs/Module/Sites.php:103 msgid "Version" msgstr "" -#: Zotlabs/Module/Admin.php:184 +#: Zotlabs/Module/Admin.php:188 msgid "Repository version (release)" msgstr "" -#: Zotlabs/Module/Admin.php:185 +#: Zotlabs/Module/Admin.php:189 msgid "Repository version (dev)" msgstr "" -#: Zotlabs/Module/Block.php:30 Zotlabs/Module/Page.php:43 +#: Zotlabs/Module/Block.php:36 Zotlabs/Module/Page.php:46 msgid "Invalid item." msgstr "" -#: Zotlabs/Module/Block.php:78 Zotlabs/Module/Display.php:151 -#: Zotlabs/Module/Display.php:168 Zotlabs/Module/Display.php:185 -#: Zotlabs/Module/Display.php:191 Zotlabs/Module/Page.php:140 -#: Zotlabs/Web/Router.php:169 +#: Zotlabs/Module/Block.php:86 Zotlabs/Module/Display.php:158 +#: Zotlabs/Module/Display.php:176 Zotlabs/Module/Display.php:194 +#: Zotlabs/Module/Display.php:200 Zotlabs/Module/Page.php:148 +#: Zotlabs/Web/Router.php:166 msgid "Page not found." msgstr "" -#: Zotlabs/Module/Cards.php:48 +#: Zotlabs/Module/Cards.php:52 msgid "Create personal planning cards" msgstr "" -#: Zotlabs/Module/Cards.php:109 +#: Zotlabs/Module/Cards.php:110 msgid "Add Card" msgstr "" -#: Zotlabs/Module/Cards.php:110 Zotlabs/Module/Blocks.php:163 -#: Zotlabs/Module/Cdav.php:1056 Zotlabs/Module/Cdav.php:1364 -#: Zotlabs/Module/Connedit.php:867 Zotlabs/Module/Layouts.php:191 -#: Zotlabs/Module/Menu.php:184 Zotlabs/Module/New_channel.php:196 -#: Zotlabs/Module/Webpages.php:255 Zotlabs/Module/Profiles.php:806 -#: Zotlabs/Storage/Browser.php:299 Zotlabs/Storage/Browser.php:417 -#: Zotlabs/Widget/Cdav.php:140 Zotlabs/Widget/Cdav.php:178 +#: Zotlabs/Module/Cards.php:111 Zotlabs/Module/Blocks.php:172 +#: Zotlabs/Module/Cdav.php:1061 Zotlabs/Module/Cdav.php:1365 +#: Zotlabs/Module/Connedit.php:878 Zotlabs/Module/Layouts.php:199 +#: Zotlabs/Module/Menu.php:187 Zotlabs/Module/New_channel.php:203 +#: Zotlabs/Module/Webpages.php:264 Zotlabs/Module/Profiles.php:847 +#: Zotlabs/Storage/Browser.php:302 Zotlabs/Storage/Browser.php:420 +#: Zotlabs/Widget/Cdav.php:148 Zotlabs/Widget/Cdav.php:184 msgid "Create" msgstr "" -#: Zotlabs/Module/Blocks.php:101 Zotlabs/Module/Blocks.php:159 -#: Zotlabs/Module/Editblock.php:117 +#: Zotlabs/Module/Blocks.php:106 Zotlabs/Module/Blocks.php:168 +#: Zotlabs/Module/Editblock.php:126 msgid "Block Name" msgstr "" -#: Zotlabs/Module/Blocks.php:158 include/text.php:2692 +#: Zotlabs/Module/Blocks.php:167 include/text.php:2850 msgid "Blocks" msgstr "" -#: Zotlabs/Module/Blocks.php:160 +#: Zotlabs/Module/Blocks.php:169 msgid "Block Title" msgstr "" -#: Zotlabs/Module/Blocks.php:161 Zotlabs/Module/Connections.php:248 -#: Zotlabs/Module/Layouts.php:197 Zotlabs/Module/Menu.php:180 -#: Zotlabs/Module/Webpages.php:267 +#: Zotlabs/Module/Blocks.php:170 Zotlabs/Module/Connections.php:250 +#: Zotlabs/Module/Layouts.php:205 Zotlabs/Module/Menu.php:183 +#: Zotlabs/Module/Webpages.php:276 msgid "Created" msgstr "" -#: Zotlabs/Module/Blocks.php:162 Zotlabs/Module/Layouts.php:198 -#: Zotlabs/Module/Menu.php:181 Zotlabs/Module/Webpages.php:268 +#: Zotlabs/Module/Blocks.php:171 Zotlabs/Module/Layouts.php:206 +#: Zotlabs/Module/Menu.php:184 Zotlabs/Module/Webpages.php:277 msgid "Edited" msgstr "" -#: Zotlabs/Module/Blocks.php:165 Zotlabs/Module/Layouts.php:200 -#: Zotlabs/Module/Webpages.php:257 Zotlabs/Module/Photos.php:1158 -#: Zotlabs/Widget/Cdav.php:136 include/conversation.php:1376 +#: Zotlabs/Module/Blocks.php:174 Zotlabs/Module/Layouts.php:208 +#: Zotlabs/Module/Webpages.php:266 Zotlabs/Module/Photos.php:1170 +#: Zotlabs/Widget/Cdav.php:144 include/conversation.php:1401 msgid "Share" msgstr "" -#: Zotlabs/Module/Blocks.php:170 Zotlabs/Module/Events.php:733 -#: Zotlabs/Module/Layouts.php:204 Zotlabs/Module/Webpages.php:262 +#: Zotlabs/Module/Blocks.php:179 Zotlabs/Module/Events.php:759 +#: Zotlabs/Module/Layouts.php:212 Zotlabs/Module/Webpages.php:271 msgid "View" msgstr "" -#: Zotlabs/Module/Cdav.php:786 Zotlabs/Module/Events.php:33 +#: Zotlabs/Module/Cdav.php:793 Zotlabs/Module/Events.php:39 msgid "Calendar entries imported." msgstr "" -#: Zotlabs/Module/Cdav.php:789 Zotlabs/Module/Events.php:35 +#: Zotlabs/Module/Cdav.php:795 Zotlabs/Module/Events.php:41 msgid "No calendar entries found." msgstr "" -#: Zotlabs/Module/Cdav.php:852 +#: Zotlabs/Module/Cdav.php:857 msgid "INVALID EVENT DISMISSED!" msgstr "" -#: Zotlabs/Module/Cdav.php:853 +#: Zotlabs/Module/Cdav.php:858 msgid "Summary: " msgstr "" -#: Zotlabs/Module/Cdav.php:854 +#: Zotlabs/Module/Cdav.php:859 msgid "Date: " msgstr "" -#: Zotlabs/Module/Cdav.php:855 Zotlabs/Module/Cdav.php:862 +#: Zotlabs/Module/Cdav.php:860 Zotlabs/Module/Cdav.php:866 msgid "Reason: " msgstr "" -#: Zotlabs/Module/Cdav.php:860 +#: Zotlabs/Module/Cdav.php:864 msgid "INVALID CARD DISMISSED!" msgstr "" -#: Zotlabs/Module/Cdav.php:861 +#: Zotlabs/Module/Cdav.php:865 msgid "Name: " msgstr "" -#: Zotlabs/Module/Cdav.php:882 +#: Zotlabs/Module/Cdav.php:886 msgid "CardDAV App" msgstr "" -#: Zotlabs/Module/Cdav.php:882 extend/addon/a/fuzzloc/Mod_Fuzzloc.php:37 +#: Zotlabs/Module/Cdav.php:886 extend/addon/a/fuzzloc/Mod_Fuzzloc.php:37 #: extend/addon/a/gallery/Mod_Gallery.php:59 msgid "Not Installed" msgstr "" -#: Zotlabs/Module/Cdav.php:883 +#: Zotlabs/Module/Cdav.php:887 msgid "CalDAV capable addressbook" msgstr "" -#: Zotlabs/Module/Cdav.php:1009 Zotlabs/Module/Events.php:491 +#: Zotlabs/Module/Cdav.php:1014 Zotlabs/Module/Events.php:508 msgid "Event title" msgstr "" -#: Zotlabs/Module/Cdav.php:1010 Zotlabs/Module/Events.php:497 +#: Zotlabs/Module/Cdav.php:1015 Zotlabs/Module/Events.php:514 msgid "Start date and time" msgstr "" -#: Zotlabs/Module/Cdav.php:1011 +#: Zotlabs/Module/Cdav.php:1016 msgid "End date and time" msgstr "" -#: Zotlabs/Module/Cdav.php:1012 Zotlabs/Module/Appman.php:134 -#: Zotlabs/Module/Events.php:504 +#: Zotlabs/Module/Cdav.php:1017 Zotlabs/Module/Appman.php:140 +#: Zotlabs/Module/Events.php:521 msgid "Description" msgstr "" -#: Zotlabs/Module/Cdav.php:1013 Zotlabs/Module/Events.php:506 -#: Zotlabs/Module/Sites.php:91 Zotlabs/Module/Locs.php:122 -#: Zotlabs/Module/Profiles.php:506 Zotlabs/Module/Profiles.php:738 -#: include/js_strings.php:26 +#: Zotlabs/Module/Cdav.php:1018 Zotlabs/Module/Events.php:523 +#: Zotlabs/Module/Sites.php:94 Zotlabs/Module/Locs.php:132 +#: Zotlabs/Module/Profiles.php:536 Zotlabs/Module/Profiles.php:779 +#: include/js_strings.php:29 msgid "Location" msgstr "" -#: Zotlabs/Module/Cdav.php:1035 Zotlabs/Module/Events.php:734 +#: Zotlabs/Module/Cdav.php:1040 Zotlabs/Module/Events.php:760 msgid "Month" msgstr "" -#: Zotlabs/Module/Cdav.php:1036 Zotlabs/Module/Events.php:735 +#: Zotlabs/Module/Cdav.php:1041 Zotlabs/Module/Events.php:761 msgid "Week" msgstr "" -#: Zotlabs/Module/Cdav.php:1037 Zotlabs/Module/Events.php:736 +#: Zotlabs/Module/Cdav.php:1042 Zotlabs/Module/Events.php:762 msgid "Day" msgstr "" -#: Zotlabs/Module/Cdav.php:1038 +#: Zotlabs/Module/Cdav.php:1043 msgid "List month" msgstr "" -#: Zotlabs/Module/Cdav.php:1039 +#: Zotlabs/Module/Cdav.php:1044 msgid "List week" msgstr "" -#: Zotlabs/Module/Cdav.php:1040 +#: Zotlabs/Module/Cdav.php:1045 msgid "List day" msgstr "" -#: Zotlabs/Module/Cdav.php:1048 +#: Zotlabs/Module/Cdav.php:1053 msgid "More" msgstr "" -#: Zotlabs/Module/Cdav.php:1049 +#: Zotlabs/Module/Cdav.php:1054 msgid "Less" msgstr "" -#: Zotlabs/Module/Cdav.php:1051 +#: Zotlabs/Module/Cdav.php:1056 msgid "Select calendar" msgstr "" -#: Zotlabs/Module/Cdav.php:1052 Zotlabs/Widget/Cdav.php:143 +#: Zotlabs/Module/Cdav.php:1057 Zotlabs/Widget/Cdav.php:151 msgid "Channel Calendars" msgstr "" -#: Zotlabs/Module/Cdav.php:1052 Zotlabs/Widget/Cdav.php:129 -#: Zotlabs/Widget/Cdav.php:143 +#: Zotlabs/Module/Cdav.php:1057 Zotlabs/Widget/Cdav.php:137 +#: Zotlabs/Widget/Cdav.php:151 msgid "CalDAV Calendars" msgstr "" -#: Zotlabs/Module/Cdav.php:1054 +#: Zotlabs/Module/Cdav.php:1059 msgid "Delete all" msgstr "" -#: Zotlabs/Module/Cdav.php:1057 +#: Zotlabs/Module/Cdav.php:1062 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" -#: Zotlabs/Module/Cdav.php:1350 Zotlabs/Module/Connedit.php:853 +#: Zotlabs/Module/Cdav.php:1351 Zotlabs/Module/Connedit.php:864 msgid "Organisation" msgstr "" -#: Zotlabs/Module/Cdav.php:1351 Zotlabs/Module/Connedit.php:854 +#: Zotlabs/Module/Cdav.php:1352 Zotlabs/Module/Connedit.php:865 msgid "Title" msgstr "" -#: Zotlabs/Module/Cdav.php:1352 Zotlabs/Module/Connedit.php:855 -#: Zotlabs/Module/Profiles.php:794 +#: Zotlabs/Module/Cdav.php:1353 Zotlabs/Module/Connedit.php:866 +#: Zotlabs/Module/Profiles.php:835 msgid "Phone" msgstr "" -#: Zotlabs/Module/Cdav.php:1354 Zotlabs/Module/Connedit.php:857 -#: Zotlabs/Module/Profiles.php:796 +#: Zotlabs/Module/Cdav.php:1355 Zotlabs/Module/Connedit.php:868 +#: Zotlabs/Module/Profiles.php:837 msgid "Instant messenger" msgstr "" -#: Zotlabs/Module/Cdav.php:1355 Zotlabs/Module/Connedit.php:858 -#: Zotlabs/Module/Profiles.php:797 +#: Zotlabs/Module/Cdav.php:1356 Zotlabs/Module/Connedit.php:869 +#: Zotlabs/Module/Profiles.php:838 msgid "Website" msgstr "" -#: Zotlabs/Module/Cdav.php:1357 Zotlabs/Module/Connedit.php:860 -#: Zotlabs/Module/Profiles.php:799 +#: Zotlabs/Module/Cdav.php:1358 Zotlabs/Module/Connedit.php:871 +#: Zotlabs/Module/Profiles.php:840 msgid "Note" msgstr "" -#: Zotlabs/Module/Cdav.php:1358 Zotlabs/Module/Connedit.php:861 -#: Zotlabs/Module/Profiles.php:800 include/connections.php:790 -#: include/event.php:1377 +#: Zotlabs/Module/Cdav.php:1359 Zotlabs/Module/Connedit.php:872 +#: Zotlabs/Module/Profiles.php:841 include/event.php:1514 +#: include/connections.php:825 msgid "Mobile" msgstr "" -#: Zotlabs/Module/Cdav.php:1359 Zotlabs/Module/Connedit.php:862 -#: Zotlabs/Module/Profiles.php:801 include/connections.php:791 -#: include/event.php:1378 +#: Zotlabs/Module/Cdav.php:1360 Zotlabs/Module/Connedit.php:873 +#: Zotlabs/Module/Profiles.php:842 include/event.php:1515 +#: include/connections.php:826 msgid "Home" msgstr "" -#: Zotlabs/Module/Cdav.php:1360 Zotlabs/Module/Connedit.php:863 -#: Zotlabs/Module/Profiles.php:802 include/connections.php:794 -#: include/event.php:1381 +#: Zotlabs/Module/Cdav.php:1361 Zotlabs/Module/Connedit.php:874 +#: Zotlabs/Module/Profiles.php:843 include/event.php:1518 +#: include/connections.php:829 msgid "Work" msgstr "" -#: Zotlabs/Module/Cdav.php:1361 Zotlabs/Module/Connedit.php:864 -#: Zotlabs/Module/Profiles.php:803 Zotlabs/Module/Profiles.php:942 -#: Zotlabs/Module/Profiles.php:959 Zotlabs/Module/Profiles.php:1027 -#: Zotlabs/Module/Profiles.php:1063 include/connections.php:797 -#: include/connections.php:804 include/event.php:1384 include/event.php:1391 +#: Zotlabs/Module/Cdav.php:1362 Zotlabs/Module/Connedit.php:875 +#: Zotlabs/Module/Profiles.php:844 Zotlabs/Module/Profiles.php:985 +#: Zotlabs/Module/Profiles.php:1003 Zotlabs/Module/Profiles.php:1073 +#: Zotlabs/Module/Profiles.php:1110 include/event.php:1521 +#: include/event.php:1527 include/connections.php:832 +#: include/connections.php:838 msgid "Other" msgstr "" -#: Zotlabs/Module/Cdav.php:1362 Zotlabs/Module/Connedit.php:865 -#: Zotlabs/Module/Profiles.php:804 +#: Zotlabs/Module/Cdav.php:1363 Zotlabs/Module/Connedit.php:876 +#: Zotlabs/Module/Profiles.php:845 msgid "Add Contact" msgstr "" -#: Zotlabs/Module/Cdav.php:1363 Zotlabs/Module/Connedit.php:866 -#: Zotlabs/Module/Profiles.php:805 +#: Zotlabs/Module/Cdav.php:1364 Zotlabs/Module/Connedit.php:877 +#: Zotlabs/Module/Profiles.php:846 msgid "Add Field" msgstr "" -#: Zotlabs/Module/Cdav.php:1368 Zotlabs/Module/Connedit.php:871 +#: Zotlabs/Module/Cdav.php:1369 Zotlabs/Module/Connedit.php:882 msgid "P.O. Box" msgstr "" -#: Zotlabs/Module/Cdav.php:1369 Zotlabs/Module/Connedit.php:872 +#: Zotlabs/Module/Cdav.php:1370 Zotlabs/Module/Connedit.php:883 msgid "Additional" msgstr "" -#: Zotlabs/Module/Cdav.php:1370 Zotlabs/Module/Connedit.php:873 +#: Zotlabs/Module/Cdav.php:1371 Zotlabs/Module/Connedit.php:884 msgid "Street" msgstr "" -#: Zotlabs/Module/Cdav.php:1371 Zotlabs/Module/Connedit.php:874 +#: Zotlabs/Module/Cdav.php:1372 Zotlabs/Module/Connedit.php:885 msgid "Locality" msgstr "" -#: Zotlabs/Module/Cdav.php:1372 Zotlabs/Module/Connedit.php:875 +#: Zotlabs/Module/Cdav.php:1373 Zotlabs/Module/Connedit.php:886 msgid "Region" msgstr "" -#: Zotlabs/Module/Cdav.php:1373 Zotlabs/Module/Connedit.php:876 +#: Zotlabs/Module/Cdav.php:1374 Zotlabs/Module/Connedit.php:887 msgid "ZIP Code" msgstr "" -#: Zotlabs/Module/Cdav.php:1374 Zotlabs/Module/Connedit.php:877 -#: Zotlabs/Module/Profiles.php:762 +#: Zotlabs/Module/Cdav.php:1375 Zotlabs/Module/Connedit.php:888 +#: Zotlabs/Module/Profiles.php:803 msgid "Country" msgstr "" -#: Zotlabs/Module/Cdav.php:1423 +#: Zotlabs/Module/Cdav.php:1426 msgid "Default Calendar" msgstr "" -#: Zotlabs/Module/Cdav.php:1434 +#: Zotlabs/Module/Cdav.php:1437 msgid "Default Addressbook" msgstr "" -#: Zotlabs/Module/Changeaddr.php:52 +#: Zotlabs/Module/Changeaddr.php:57 msgid "" "Channel name changes are not allowed within 48 hours of changing the account " "password." msgstr "" -#: Zotlabs/Module/Changeaddr.php:63 include/channel.php:282 -#: include/channel.php:715 +#: Zotlabs/Module/Changeaddr.php:69 include/channel.php:298 +#: include/channel.php:749 msgid "Reserved nickname. Please choose another." msgstr "" -#: Zotlabs/Module/Changeaddr.php:68 include/channel.php:287 -#: include/channel.php:720 +#: Zotlabs/Module/Changeaddr.php:74 include/channel.php:303 +#: include/channel.php:754 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -#: Zotlabs/Module/Changeaddr.php:82 +#: Zotlabs/Module/Changeaddr.php:88 msgid "Feature has been disabled" msgstr "" -#: Zotlabs/Module/Changeaddr.php:101 +#: Zotlabs/Module/Changeaddr.php:107 msgid "Change channel nickname/address" msgstr "" -#: Zotlabs/Module/Changeaddr.php:102 Zotlabs/Module/Removeme.php:68 -#: Zotlabs/Module/Removeaccount.php:68 +#: Zotlabs/Module/Changeaddr.php:108 Zotlabs/Module/Removeme.php:72 +#: Zotlabs/Module/Removeaccount.php:72 msgid "WARNING: " msgstr "" -#: Zotlabs/Module/Changeaddr.php:102 +#: Zotlabs/Module/Changeaddr.php:108 msgid "Any/all connections on other networks will be lost!" msgstr "" -#: Zotlabs/Module/Changeaddr.php:103 Zotlabs/Module/Removeme.php:69 -#: Zotlabs/Module/Removeaccount.php:69 +#: Zotlabs/Module/Changeaddr.php:109 Zotlabs/Module/Removeme.php:73 +#: Zotlabs/Module/Removeaccount.php:73 msgid "Please enter your password for verification:" msgstr "" -#: Zotlabs/Module/Changeaddr.php:104 +#: Zotlabs/Module/Changeaddr.php:110 msgid "New channel address" msgstr "" -#: Zotlabs/Module/Changeaddr.php:105 +#: Zotlabs/Module/Changeaddr.php:111 msgid "Rename Channel" msgstr "" -#: Zotlabs/Module/Ping.php:412 +#: Zotlabs/Module/Ping.php:432 msgid "added your channel" msgstr "" -#: Zotlabs/Module/Ping.php:436 +#: Zotlabs/Module/Ping.php:457 msgid "requires approval" msgstr "" -#: Zotlabs/Module/Ping.php:445 +#: Zotlabs/Module/Ping.php:466 msgid "g A l F d" msgstr "" -#: Zotlabs/Module/Ping.php:463 +#: Zotlabs/Module/Ping.php:484 msgid "[today]" msgstr "" -#: Zotlabs/Module/Ping.php:473 +#: Zotlabs/Module/Ping.php:494 msgid "posted an event" msgstr "" -#: Zotlabs/Module/Ping.php:506 +#: Zotlabs/Module/Ping.php:528 msgid "shared a file with you" msgstr "" -#: Zotlabs/Module/Ping.php:534 +#: Zotlabs/Module/Ping.php:556 msgid "reported content" msgstr "" -#: Zotlabs/Module/Ping.php:730 +#: Zotlabs/Module/Ping.php:770 msgid "Private group" msgstr "" -#: Zotlabs/Module/Ping.php:730 +#: Zotlabs/Module/Ping.php:770 msgid "Public group" msgstr "" -#: Zotlabs/Module/Help.php:21 +#: Zotlabs/Module/Help.php:24 msgid "Documentation Search" msgstr "" -#: Zotlabs/Module/Help.php:92 +#: Zotlabs/Module/Help.php:95 msgid "Unknown language" msgstr "" -#: Zotlabs/Module/Help.php:112 +#: Zotlabs/Module/Help.php:114 msgid "$Projectname Documentation" msgstr "" -#: Zotlabs/Module/Help.php:113 +#: Zotlabs/Module/Help.php:115 msgid "Contents" msgstr "" -#: Zotlabs/Module/Chatsvc.php:131 +#: Zotlabs/Module/Chatsvc.php:146 msgid "Away" msgstr "" -#: Zotlabs/Module/Chatsvc.php:136 +#: Zotlabs/Module/Chatsvc.php:151 msgid "Online" msgstr "" -#: Zotlabs/Module/Connedit.php:83 Zotlabs/Module/Defperms.php:68 +#: Zotlabs/Module/Connedit.php:88 Zotlabs/Module/Defperms.php:74 msgid "Could not access contact record." msgstr "" -#: Zotlabs/Module/Connedit.php:114 +#: Zotlabs/Module/Connedit.php:120 msgid "Could not locate selected profile." msgstr "" -#: Zotlabs/Module/Connedit.php:197 +#: Zotlabs/Module/Connedit.php:203 msgid "Connection updated." msgstr "" -#: Zotlabs/Module/Connedit.php:200 +#: Zotlabs/Module/Connedit.php:205 msgid "Failed to update connection record." msgstr "" -#: Zotlabs/Module/Connedit.php:244 +#: Zotlabs/Module/Connedit.php:250 msgid "is now connected to" msgstr "" -#: Zotlabs/Module/Connedit.php:369 +#: Zotlabs/Module/Connedit.php:377 msgid "Could not access address book record." msgstr "" -#: Zotlabs/Module/Connedit.php:414 +#: Zotlabs/Module/Connedit.php:423 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: Zotlabs/Module/Connedit.php:443 +#: Zotlabs/Module/Connedit.php:450 msgid "Added by Connedit" msgstr "" -#: Zotlabs/Module/Connedit.php:481 +#: Zotlabs/Module/Connedit.php:488 msgid "Unable to set address book parameters." msgstr "" -#: Zotlabs/Module/Connedit.php:498 +#: Zotlabs/Module/Connedit.php:505 msgid "Connection has been removed." msgstr "" -#: Zotlabs/Module/Connedit.php:546 +#: Zotlabs/Module/Connedit.php:551 #, php-format msgid "View %s's profile" msgstr "" -#: Zotlabs/Module/Connedit.php:550 +#: Zotlabs/Module/Connedit.php:555 msgid "Refresh Permissions" msgstr "" -#: Zotlabs/Module/Connedit.php:553 +#: Zotlabs/Module/Connedit.php:558 msgid "Fetch updated permissions" msgstr "" -#: Zotlabs/Module/Connedit.php:557 +#: Zotlabs/Module/Connedit.php:562 msgid "Refresh Photo" msgstr "" -#: Zotlabs/Module/Connedit.php:560 +#: Zotlabs/Module/Connedit.php:565 msgid "Fetch updated photo" msgstr "" -#: Zotlabs/Module/Connedit.php:564 include/conversation.php:965 +#: Zotlabs/Module/Connedit.php:569 include/conversation.php:965 msgid "Recent Activity" msgstr "" -#: Zotlabs/Module/Connedit.php:567 +#: Zotlabs/Module/Connedit.php:572 msgid "View recent posts and comments" msgstr "" -#: Zotlabs/Module/Connedit.php:574 +#: Zotlabs/Module/Connedit.php:579 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: Zotlabs/Module/Connedit.php:575 +#: Zotlabs/Module/Connedit.php:580 msgid "This connection is blocked" msgstr "" -#: Zotlabs/Module/Connedit.php:579 +#: Zotlabs/Module/Connedit.php:584 msgid "Unignore" msgstr "" -#: Zotlabs/Module/Connedit.php:579 Zotlabs/Module/Connections.php:342 +#: Zotlabs/Module/Connedit.php:584 Zotlabs/Module/Connections.php:343 msgid "Ignore" msgstr "" -#: Zotlabs/Module/Connedit.php:582 +#: Zotlabs/Module/Connedit.php:587 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: Zotlabs/Module/Connedit.php:583 +#: Zotlabs/Module/Connedit.php:588 msgid "This connection is ignored" msgstr "" -#: Zotlabs/Module/Connedit.php:590 +#: Zotlabs/Module/Connedit.php:595 msgid "Censor (or Uncensor) images from this connection" msgstr "" -#: Zotlabs/Module/Connedit.php:591 +#: Zotlabs/Module/Connedit.php:596 msgid "This connection is censored" msgstr "" -#: Zotlabs/Module/Connedit.php:595 +#: Zotlabs/Module/Connedit.php:600 msgid "Unarchive" msgstr "" -#: Zotlabs/Module/Connedit.php:595 +#: Zotlabs/Module/Connedit.php:600 msgid "Archive" msgstr "" -#: Zotlabs/Module/Connedit.php:598 +#: Zotlabs/Module/Connedit.php:603 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: Zotlabs/Module/Connedit.php:599 +#: Zotlabs/Module/Connedit.php:604 msgid "This connection is archived" msgstr "" -#: Zotlabs/Module/Connedit.php:603 +#: Zotlabs/Module/Connedit.php:608 msgid "Unhide" msgstr "" -#: Zotlabs/Module/Connedit.php:603 +#: Zotlabs/Module/Connedit.php:608 msgid "Hide" msgstr "" -#: Zotlabs/Module/Connedit.php:606 +#: Zotlabs/Module/Connedit.php:611 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: Zotlabs/Module/Connedit.php:607 +#: Zotlabs/Module/Connedit.php:612 msgid "This connection is hidden" msgstr "" -#: Zotlabs/Module/Connedit.php:614 +#: Zotlabs/Module/Connedit.php:619 msgid "Delete this connection" msgstr "" -#: Zotlabs/Module/Connedit.php:622 +#: Zotlabs/Module/Connedit.php:627 msgid "Fetch Vcard" msgstr "" -#: Zotlabs/Module/Connedit.php:625 +#: Zotlabs/Module/Connedit.php:630 msgid "Fetch electronic calling card for this connection" msgstr "" -#: Zotlabs/Module/Connedit.php:632 Zotlabs/Module/Filestorage.php:226 -#: Zotlabs/Module/Thing.php:338 Zotlabs/Module/Thing.php:391 -#: Zotlabs/Module/Chat.php:233 Zotlabs/Module/Photos.php:728 -#: Zotlabs/Module/Photos.php:1108 +#: Zotlabs/Module/Connedit.php:637 Zotlabs/Module/Filestorage.php:230 +#: Zotlabs/Module/Thing.php:355 Zotlabs/Module/Thing.php:410 +#: Zotlabs/Module/Chat.php:240 Zotlabs/Module/Photos.php:736 +#: Zotlabs/Module/Photos.php:1121 #: extend/addon/a/flashcards/Mod_Flashcards.php:254 #: extend/addon/a/faces/Mod_Faces.php:172 include/acl_selectors.php:152 msgid "Permissions" msgstr "" -#: Zotlabs/Module/Connedit.php:635 +#: Zotlabs/Module/Connedit.php:640 msgid "Open Individual Permissions section by default" msgstr "" -#: Zotlabs/Module/Connedit.php:661 +#: Zotlabs/Module/Connedit.php:666 msgid "Open Friend Zoom section by default" msgstr "" -#: Zotlabs/Module/Connedit.php:665 Zotlabs/Module/Affinity.php:58 -#: Zotlabs/Widget/Affinity.php:24 +#: Zotlabs/Module/Connedit.php:670 Zotlabs/Module/Affinity.php:61 +#: Zotlabs/Widget/Affinity.php:26 msgid "Me" msgstr "" -#: Zotlabs/Module/Connedit.php:666 Zotlabs/Module/Affinity.php:59 -#: Zotlabs/Widget/Affinity.php:25 +#: Zotlabs/Module/Connedit.php:671 Zotlabs/Module/Affinity.php:62 +#: Zotlabs/Widget/Affinity.php:27 msgid "Family" msgstr "" -#: Zotlabs/Module/Connedit.php:667 Zotlabs/Module/Profiles.php:1046 -#: Zotlabs/Module/Affinity.php:60 Zotlabs/Module/Settings/Channel.php:75 -#: Zotlabs/Module/Settings/Channel.php:79 -#: Zotlabs/Module/Settings/Channel.php:80 -#: Zotlabs/Module/Settings/Channel.php:83 -#: Zotlabs/Module/Settings/Channel.php:94 Zotlabs/Widget/Affinity.php:26 -#: Zotlabs/Import/Friendica.php:242 Zotlabs/Import/Friendica.php:243 -#: Zotlabs/Import/Friendica.php:250 include/channel.php:505 -#: include/channel.php:507 +#: Zotlabs/Module/Connedit.php:672 Zotlabs/Module/Profiles.php:1092 +#: Zotlabs/Module/Affinity.php:63 Zotlabs/Module/Settings/Channel.php:78 +#: Zotlabs/Module/Settings/Channel.php:81 +#: Zotlabs/Module/Settings/Channel.php:82 +#: Zotlabs/Module/Settings/Channel.php:86 +#: Zotlabs/Module/Settings/Channel.php:97 Zotlabs/Widget/Affinity.php:28 +#: Zotlabs/Import/Friendica.php:244 Zotlabs/Import/Friendica.php:245 +#: Zotlabs/Import/Friendica.php:253 include/channel.php:529 +#: include/channel.php:531 msgid "Friends" msgstr "" -#: Zotlabs/Module/Connedit.php:668 Zotlabs/Module/Affinity.php:61 -#: Zotlabs/Widget/Affinity.php:27 +#: Zotlabs/Module/Connedit.php:673 Zotlabs/Module/Affinity.php:64 +#: Zotlabs/Widget/Affinity.php:29 msgid "Peers" msgstr "" -#: Zotlabs/Module/Connedit.php:670 Zotlabs/Module/Connections.php:85 -#: Zotlabs/Module/Connections.php:108 Zotlabs/Module/Affinity.php:63 -#: Zotlabs/Widget/Affinity.php:29 +#: Zotlabs/Module/Connedit.php:675 Zotlabs/Module/Connections.php:88 +#: Zotlabs/Module/Connections.php:111 Zotlabs/Module/Affinity.php:66 +#: Zotlabs/Widget/Affinity.php:31 msgid "All" msgstr "" -#: Zotlabs/Module/Connedit.php:687 +#: Zotlabs/Module/Connedit.php:692 msgid "Filter" msgstr "" -#: Zotlabs/Module/Connedit.php:690 +#: Zotlabs/Module/Connedit.php:695 msgid "Open Custom Filter section by default" msgstr "" -#: Zotlabs/Module/Connedit.php:727 +#: Zotlabs/Module/Connedit.php:732 msgid "Approve this connection" msgstr "" -#: Zotlabs/Module/Connedit.php:727 +#: Zotlabs/Module/Connedit.php:732 msgid "Accept connection to allow communication" msgstr "" -#: Zotlabs/Module/Connedit.php:732 +#: Zotlabs/Module/Connedit.php:737 msgid "Set Friend Zoom" msgstr "" -#: Zotlabs/Module/Connedit.php:735 +#: Zotlabs/Module/Connedit.php:741 msgid "Set Profile" msgstr "" -#: Zotlabs/Module/Connedit.php:738 +#: Zotlabs/Module/Connedit.php:745 msgid "Set Friend Zoom & Profile" msgstr "" -#: Zotlabs/Module/Connedit.php:782 +#: Zotlabs/Module/Connedit.php:793 msgid "This connection is unreachable from this location." msgstr "" -#: Zotlabs/Module/Connedit.php:783 +#: Zotlabs/Module/Connedit.php:794 msgid "This connection may be unreachable from other channel locations." msgstr "" -#: Zotlabs/Module/Connedit.php:785 +#: Zotlabs/Module/Connedit.php:796 msgid "Location independence is not supported by their network." msgstr "" -#: Zotlabs/Module/Connedit.php:791 +#: Zotlabs/Module/Connedit.php:801 msgid "" "This connection is unreachable from this location. Location independence is " "not supported by their network." msgstr "" -#: Zotlabs/Module/Connedit.php:794 Zotlabs/Module/Defperms.php:240 +#: Zotlabs/Module/Connedit.php:805 Zotlabs/Module/Defperms.php:247 msgid "Connection Default Permissions" msgstr "" -#: Zotlabs/Module/Connedit.php:794 include/items.php:4409 +#: Zotlabs/Module/Connedit.php:805 include/items.php:4561 #, php-format msgid "Connection: %s" msgstr "" -#: Zotlabs/Module/Connedit.php:795 Zotlabs/Module/Defperms.php:241 +#: Zotlabs/Module/Connedit.php:806 Zotlabs/Module/Defperms.php:248 msgid "Apply these permissions automatically" msgstr "" -#: Zotlabs/Module/Connedit.php:795 +#: Zotlabs/Module/Connedit.php:806 msgid "Connection requests will be approved without your interaction" msgstr "" -#: Zotlabs/Module/Connedit.php:796 Zotlabs/Module/Defperms.php:242 +#: Zotlabs/Module/Connedit.php:807 Zotlabs/Module/Defperms.php:249 msgid "Permission role" msgstr "" -#: Zotlabs/Module/Connedit.php:796 Zotlabs/Module/Defperms.php:242 -#: Zotlabs/Module/New_channel.php:164 Zotlabs/Module/New_channel.php:171 -#: Zotlabs/Widget/Notifications.php:148 include/nav.php:304 +#: Zotlabs/Module/Connedit.php:807 Zotlabs/Module/Defperms.php:249 +#: Zotlabs/Module/New_channel.php:171 Zotlabs/Module/New_channel.php:178 +#: Zotlabs/Widget/Notifications.php:151 include/nav.php:301 msgid "Loading" msgstr "" -#: Zotlabs/Module/Connedit.php:797 Zotlabs/Module/Defperms.php:243 +#: Zotlabs/Module/Connedit.php:808 Zotlabs/Module/Defperms.php:250 msgid "Add permission role" msgstr "" -#: Zotlabs/Module/Connedit.php:801 +#: Zotlabs/Module/Connedit.php:812 msgid "Ignore shares and repeats this connection posts" msgstr "" -#: Zotlabs/Module/Connedit.php:801 +#: Zotlabs/Module/Connedit.php:812 msgid "Note: This is not recommended for Groups." msgstr "" -#: Zotlabs/Module/Connedit.php:805 +#: Zotlabs/Module/Connedit.php:816 msgid "This connection's primary address is" msgstr "" -#: Zotlabs/Module/Connedit.php:806 +#: Zotlabs/Module/Connedit.php:817 msgid "Available locations:" msgstr "" -#: Zotlabs/Module/Connedit.php:811 Zotlabs/Module/Defperms.php:247 +#: Zotlabs/Module/Connedit.php:822 Zotlabs/Module/Defperms.php:254 msgid "" "The permissions indicated on this page will be applied to all new " "connections." msgstr "" -#: Zotlabs/Module/Connedit.php:812 +#: Zotlabs/Module/Connedit.php:823 msgid "Connection Tools" msgstr "" -#: Zotlabs/Module/Connedit.php:814 +#: Zotlabs/Module/Connedit.php:825 msgid "Slide to adjust your degree of friendship" msgstr "" -#: Zotlabs/Module/Connedit.php:815 include/js_strings.php:21 +#: Zotlabs/Module/Connedit.php:826 include/js_strings.php:24 msgid "Rating" msgstr "" -#: Zotlabs/Module/Connedit.php:816 +#: Zotlabs/Module/Connedit.php:827 msgid "Slide to adjust your rating" msgstr "" -#: Zotlabs/Module/Connedit.php:817 Zotlabs/Module/Connedit.php:823 +#: Zotlabs/Module/Connedit.php:828 Zotlabs/Module/Connedit.php:834 msgid "Optionally explain your rating" msgstr "" -#: Zotlabs/Module/Connedit.php:819 +#: Zotlabs/Module/Connedit.php:830 msgid "Custom Filter" msgstr "" -#: Zotlabs/Module/Connedit.php:820 Zotlabs/Module/Content_filter.php:51 +#: Zotlabs/Module/Connedit.php:831 Zotlabs/Module/Content_filter.php:51 msgid "Only import posts with this text" msgstr "" -#: Zotlabs/Module/Connedit.php:820 Zotlabs/Module/Connedit.php:821 +#: Zotlabs/Module/Connedit.php:831 Zotlabs/Module/Connedit.php:832 msgid "" "words one per line or #tags, $categories, /patterns/, or lang=xx, leave " "blank to import all posts" msgstr "" -#: Zotlabs/Module/Connedit.php:821 Zotlabs/Module/Content_filter.php:59 +#: Zotlabs/Module/Connedit.php:832 Zotlabs/Module/Content_filter.php:59 msgid "Do not import posts with this text" msgstr "" -#: Zotlabs/Module/Connedit.php:822 extend/addon/a/zotpost/Mod_zotpost.php:69 +#: Zotlabs/Module/Connedit.php:833 extend/addon/a/zotpost/Mod_zotpost.php:69 msgid "Nickname" msgstr "" -#: Zotlabs/Module/Connedit.php:822 +#: Zotlabs/Module/Connedit.php:833 msgid "optional - allows you to search by a name that you have chosen" msgstr "" -#: Zotlabs/Module/Connedit.php:824 +#: Zotlabs/Module/Connedit.php:835 msgid "This information is public!" msgstr "" -#: Zotlabs/Module/Connedit.php:829 +#: Zotlabs/Module/Connedit.php:840 msgid "Connection Pending Approval" msgstr "" -#: Zotlabs/Module/Connedit.php:832 Zotlabs/Module/Defperms.php:250 -#: Zotlabs/Module/Settings/Permcats.php:111 -#: Zotlabs/Module/Settings/Tokens.php:291 +#: Zotlabs/Module/Connedit.php:843 Zotlabs/Module/Defperms.php:257 +#: Zotlabs/Module/Settings/Permcats.php:122 +#: Zotlabs/Module/Settings/Tokens.php:309 msgid "inherited" msgstr "" -#: Zotlabs/Module/Connedit.php:834 +#: Zotlabs/Module/Connedit.php:845 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: Zotlabs/Module/Connedit.php:836 Zotlabs/Module/Settings/Tokens.php:288 +#: Zotlabs/Module/Connedit.php:847 Zotlabs/Module/Settings/Tokens.php:306 msgid "Their Settings" msgstr "" -#: Zotlabs/Module/Connedit.php:837 Zotlabs/Module/Defperms.php:252 -#: Zotlabs/Module/Settings/Permcats.php:109 -#: Zotlabs/Module/Settings/Tokens.php:289 +#: Zotlabs/Module/Connedit.php:848 Zotlabs/Module/Defperms.php:259 +#: Zotlabs/Module/Settings/Permcats.php:120 +#: Zotlabs/Module/Settings/Tokens.php:307 msgid "My Settings" msgstr "" -#: Zotlabs/Module/Connedit.php:839 Zotlabs/Module/Defperms.php:255 -#: Zotlabs/Module/Settings/Permcats.php:114 -#: Zotlabs/Module/Settings/Tokens.php:294 +#: Zotlabs/Module/Connedit.php:850 Zotlabs/Module/Defperms.php:262 +#: Zotlabs/Module/Settings/Permcats.php:125 +#: Zotlabs/Module/Settings/Tokens.php:312 msgid "Individual Permissions" msgstr "" -#: Zotlabs/Module/Connedit.php:840 Zotlabs/Module/Settings/Permcats.php:115 -#: Zotlabs/Module/Settings/Tokens.php:295 +#: Zotlabs/Module/Connedit.php:851 Zotlabs/Module/Settings/Permcats.php:126 +#: Zotlabs/Module/Settings/Tokens.php:313 msgid "" "Some permissions may be inherited from your channel's privacy settings, which have higher priority than " "individual settings. You can not change those settings here." msgstr "" -#: Zotlabs/Module/Connedit.php:841 +#: Zotlabs/Module/Connedit.php:852 msgid "" "Some permissions may be inherited from your channel's privacy settings, which have higher priority than " @@ -4335,91 +4347,91 @@ msgid "" "any impact unless the inherited setting changes." msgstr "" -#: Zotlabs/Module/Connedit.php:842 +#: Zotlabs/Module/Connedit.php:853 msgid "Last update:" msgstr "" -#: Zotlabs/Module/Connedit.php:850 +#: Zotlabs/Module/Connedit.php:861 msgid "Details" msgstr "" -#: Zotlabs/Module/Connections.php:65 Zotlabs/Module/Connections.php:154 +#: Zotlabs/Module/Connections.php:68 Zotlabs/Module/Connections.php:155 #: Zotlabs/Module/Connections.php:298 msgid "Blocked" msgstr "" -#: Zotlabs/Module/Connections.php:70 Zotlabs/Module/Connections.php:161 +#: Zotlabs/Module/Connections.php:73 Zotlabs/Module/Connections.php:162 #: Zotlabs/Module/Connections.php:297 msgid "Ignored" msgstr "" -#: Zotlabs/Module/Connections.php:75 Zotlabs/Module/Connections.php:175 +#: Zotlabs/Module/Connections.php:78 Zotlabs/Module/Connections.php:176 #: Zotlabs/Module/Connections.php:296 msgid "Hidden" msgstr "" -#: Zotlabs/Module/Connections.php:80 Zotlabs/Module/Connections.php:168 +#: Zotlabs/Module/Connections.php:83 Zotlabs/Module/Connections.php:169 msgid "Archived/Unreachable" msgstr "" -#: Zotlabs/Module/Connections.php:90 Zotlabs/Module/Connections.php:103 -#: Zotlabs/Module/Menu.php:182 Zotlabs/Module/Notifications.php:55 +#: Zotlabs/Module/Connections.php:93 Zotlabs/Module/Connections.php:107 +#: Zotlabs/Module/Menu.php:185 Zotlabs/Module/Notifications.php:63 msgid "New" msgstr "" -#: Zotlabs/Module/Connections.php:140 +#: Zotlabs/Module/Connections.php:141 msgid "Active Connections" msgstr "" -#: Zotlabs/Module/Connections.php:143 +#: Zotlabs/Module/Connections.php:144 msgid "Show active connections" msgstr "" -#: Zotlabs/Module/Connections.php:147 Zotlabs/Widget/Notifications.php:70 +#: Zotlabs/Module/Connections.php:148 Zotlabs/Widget/Notifications.php:73 msgid "New Connections" msgstr "" -#: Zotlabs/Module/Connections.php:150 +#: Zotlabs/Module/Connections.php:151 msgid "Show pending (new) connections" msgstr "" -#: Zotlabs/Module/Connections.php:157 +#: Zotlabs/Module/Connections.php:158 msgid "Only show blocked connections" msgstr "" -#: Zotlabs/Module/Connections.php:164 +#: Zotlabs/Module/Connections.php:165 msgid "Only show ignored connections" msgstr "" -#: Zotlabs/Module/Connections.php:171 +#: Zotlabs/Module/Connections.php:172 msgid "Only show archived/unreachable connections" msgstr "" -#: Zotlabs/Module/Connections.php:178 +#: Zotlabs/Module/Connections.php:179 msgid "Only show hidden connections" msgstr "" -#: Zotlabs/Module/Connections.php:182 Zotlabs/Module/Profperm.php:144 +#: Zotlabs/Module/Connections.php:183 Zotlabs/Module/Profperm.php:158 msgid "All Connections" msgstr "" -#: Zotlabs/Module/Connections.php:185 +#: Zotlabs/Module/Connections.php:186 msgid "Show all connections" msgstr "" -#: Zotlabs/Module/Connections.php:237 +#: Zotlabs/Module/Connections.php:239 msgid "Order by name" msgstr "" -#: Zotlabs/Module/Connections.php:241 +#: Zotlabs/Module/Connections.php:243 msgid "Recent" msgstr "" -#: Zotlabs/Module/Connections.php:244 +#: Zotlabs/Module/Connections.php:246 msgid "Order by recent" msgstr "" -#: Zotlabs/Module/Connections.php:251 +#: Zotlabs/Module/Connections.php:253 msgid "Order by date" msgstr "" @@ -4435,366 +4447,370 @@ msgstr "" msgid "Not connected at this location" msgstr "" -#: Zotlabs/Module/Connections.php:316 +#: Zotlabs/Module/Connections.php:317 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: Zotlabs/Module/Connections.php:317 +#: Zotlabs/Module/Connections.php:318 msgid "Edit connection" msgstr "" -#: Zotlabs/Module/Connections.php:319 +#: Zotlabs/Module/Connections.php:320 msgid "Delete connection" msgstr "" -#: Zotlabs/Module/Connections.php:328 +#: Zotlabs/Module/Connections.php:329 msgid "Channel address" msgstr "" -#: Zotlabs/Module/Connections.php:330 +#: Zotlabs/Module/Connections.php:331 msgid "Network" msgstr "" -#: Zotlabs/Module/Connections.php:333 +#: Zotlabs/Module/Connections.php:334 msgid "Call" msgstr "" -#: Zotlabs/Module/Connections.php:335 +#: Zotlabs/Module/Connections.php:336 msgid "Status" msgstr "" -#: Zotlabs/Module/Connections.php:337 +#: Zotlabs/Module/Connections.php:338 msgid "Connected" msgstr "" -#: Zotlabs/Module/Connections.php:339 +#: Zotlabs/Module/Connections.php:340 msgid "Approve connection" msgstr "" -#: Zotlabs/Module/Connections.php:341 +#: Zotlabs/Module/Connections.php:342 msgid "Ignore connection" msgstr "" -#: Zotlabs/Module/Connections.php:343 +#: Zotlabs/Module/Connections.php:344 msgid "Recent activity" msgstr "" -#: Zotlabs/Module/Connections.php:372 +#: Zotlabs/Module/Connections.php:371 msgid "Filter by" msgstr "" -#: Zotlabs/Module/Connections.php:373 +#: Zotlabs/Module/Connections.php:372 msgid "Sort by" msgstr "" -#: Zotlabs/Module/Connections.php:377 +#: Zotlabs/Module/Connections.php:376 msgid "Search your connections" msgstr "" -#: Zotlabs/Module/Connections.php:378 +#: Zotlabs/Module/Connections.php:377 msgid "Connections search" msgstr "" -#: Zotlabs/Module/Connections.php:379 Zotlabs/Module/Directory.php:483 -#: Zotlabs/Module/Directory.php:488 Zotlabs/Widget/Findpeople.php:30 +#: Zotlabs/Module/Connections.php:378 Zotlabs/Module/Directory.php:477 +#: Zotlabs/Module/Directory.php:482 Zotlabs/Widget/Findpeople.php:33 msgid "Find" msgstr "" -#: Zotlabs/Module/Item.php:554 Zotlabs/Module/Pin.php:42 +#: Zotlabs/Module/Item.php:570 Zotlabs/Module/Pin.php:49 msgid "Unable to locate original post." msgstr "" -#: Zotlabs/Module/Item.php:647 +#: Zotlabs/Module/Item.php:665 msgid "Comment may be moderated." msgstr "" -#: Zotlabs/Module/Item.php:875 +#: Zotlabs/Module/Item.php:901 msgid "Empty post discarded." msgstr "" -#: Zotlabs/Module/Item.php:1475 +#: Zotlabs/Module/Item.php:1501 msgid "Duplicate post suppressed." msgstr "" -#: Zotlabs/Module/Item.php:1512 +#: Zotlabs/Module/Item.php:1548 msgid "" "Draft saved. Use Drafts app to continue " "editing." msgstr "" -#: Zotlabs/Module/Item.php:1555 +#: Zotlabs/Module/Item.php:1592 msgid "Your comment has been posted." msgstr "" -#: Zotlabs/Module/Item.php:1626 +#: Zotlabs/Module/Item.php:1661 msgid "System error. Post not saved." msgstr "" -#: Zotlabs/Module/Item.php:1666 +#: Zotlabs/Module/Item.php:1703 msgid "Your post/comment is awaiting approval." msgstr "" -#: Zotlabs/Module/Item.php:1821 +#: Zotlabs/Module/Item.php:1738 Zotlabs/Module/Cloud.php:132 +msgid "Not found" +msgstr "" + +#: Zotlabs/Module/Item.php:1872 msgid "Unable to obtain post information from database." msgstr "" -#: Zotlabs/Module/Item.php:1829 +#: Zotlabs/Module/Item.php:1880 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: Zotlabs/Module/Item.php:1836 +#: Zotlabs/Module/Item.php:1886 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: Zotlabs/Module/Appman.php:40 Zotlabs/Module/Appman.php:57 +#: Zotlabs/Module/Appman.php:42 Zotlabs/Module/Appman.php:59 msgid "App installed." msgstr "" -#: Zotlabs/Module/Appman.php:50 +#: Zotlabs/Module/Appman.php:52 msgid "Malformed app." msgstr "" -#: Zotlabs/Module/Appman.php:123 +#: Zotlabs/Module/Appman.php:129 msgid "Embed code" msgstr "" -#: Zotlabs/Module/Appman.php:127 +#: Zotlabs/Module/Appman.php:133 msgid "Edit App" msgstr "" -#: Zotlabs/Module/Appman.php:127 +#: Zotlabs/Module/Appman.php:133 msgid "Create App" msgstr "" -#: Zotlabs/Module/Appman.php:132 +#: Zotlabs/Module/Appman.php:138 msgid "Name of app" msgstr "" -#: Zotlabs/Module/Appman.php:132 Zotlabs/Module/Appman.php:133 -#: Zotlabs/Module/Events.php:491 Zotlabs/Module/Events.php:496 -#: Zotlabs/Module/Profiles.php:750 Zotlabs/Module/Profiles.php:754 -#: include/datetime.php:213 +#: Zotlabs/Module/Appman.php:138 Zotlabs/Module/Appman.php:139 +#: Zotlabs/Module/Events.php:508 Zotlabs/Module/Events.php:513 +#: Zotlabs/Module/Profiles.php:791 Zotlabs/Module/Profiles.php:795 +#: include/datetime.php:249 msgid "Required" msgstr "" -#: Zotlabs/Module/Appman.php:133 +#: Zotlabs/Module/Appman.php:139 msgid "Location (URL) of app" msgstr "" -#: Zotlabs/Module/Appman.php:135 +#: Zotlabs/Module/Appman.php:141 msgid "Photo icon URL" msgstr "" -#: Zotlabs/Module/Appman.php:135 +#: Zotlabs/Module/Appman.php:141 msgid "80 x 80 pixels - optional" msgstr "" -#: Zotlabs/Module/Appman.php:136 +#: Zotlabs/Module/Appman.php:142 msgid "Categories (optional, comma separated list)" msgstr "" -#: Zotlabs/Module/Appman.php:137 +#: Zotlabs/Module/Appman.php:143 msgid "Version ID" msgstr "" -#: Zotlabs/Module/Appman.php:138 +#: Zotlabs/Module/Appman.php:144 msgid "Price of app" msgstr "" -#: Zotlabs/Module/Appman.php:139 +#: Zotlabs/Module/Appman.php:145 msgid "Location (URL) to purchase app" msgstr "" -#: Zotlabs/Module/Cover_photo.php:284 include/items.php:4766 +#: Zotlabs/Module/Cover_photo.php:281 include/items.php:4912 msgid "female" msgstr "" -#: Zotlabs/Module/Cover_photo.php:285 include/items.php:4767 +#: Zotlabs/Module/Cover_photo.php:282 include/items.php:4913 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: Zotlabs/Module/Cover_photo.php:287 include/items.php:4768 +#: Zotlabs/Module/Cover_photo.php:283 include/items.php:4914 msgid "male" msgstr "" -#: Zotlabs/Module/Cover_photo.php:288 include/items.php:4769 +#: Zotlabs/Module/Cover_photo.php:284 include/items.php:4915 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: Zotlabs/Module/Cover_photo.php:291 include/items.php:4771 +#: Zotlabs/Module/Cover_photo.php:286 include/items.php:4917 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: Zotlabs/Module/Cover_photo.php:294 include/channel.php:1734 +#: Zotlabs/Module/Cover_photo.php:289 include/channel.php:1841 msgid "cover photo" msgstr "" -#: Zotlabs/Module/Defperms.php:101 Zotlabs/Module/Settings/Channel.php:328 +#: Zotlabs/Module/Defperms.php:106 Zotlabs/Module/Settings/Channel.php:357 #: extend/addon/a/logrot/logrot.php:55 #: extend/addon/a/openstreetmap/openstreetmap.php:222 #: extend/addon/a/faces/faces.php:208 msgid "Settings updated." msgstr "" -#: Zotlabs/Module/Defperms.php:241 Zotlabs/Module/Settings/Channel.php:547 +#: Zotlabs/Module/Defperms.php:248 Zotlabs/Module/Settings/Channel.php:583 msgid "" "If enabled, connection requests will be approved without your interaction" msgstr "" -#: Zotlabs/Module/Defperms.php:248 +#: Zotlabs/Module/Defperms.php:255 msgid "Automatic approval settings" msgstr "" -#: Zotlabs/Module/Defperms.php:256 +#: Zotlabs/Module/Defperms.php:263 msgid "" "Some individual permissions may have been preset or locked based on your " "channel type and privacy settings." msgstr "" -#: Zotlabs/Module/Directory.php:93 Zotlabs/Module/Directory.php:100 -#: Zotlabs/Module/Display.php:43 Zotlabs/Module/Search.php:37 -#: Zotlabs/Module/Photos.php:570 Zotlabs/Module/Viewconnections.php:27 +#: Zotlabs/Module/Directory.php:96 Zotlabs/Module/Directory.php:103 +#: Zotlabs/Module/Display.php:47 Zotlabs/Module/Search.php:41 +#: Zotlabs/Module/Photos.php:579 Zotlabs/Module/Viewconnections.php:30 msgid "Public access denied." msgstr "" -#: Zotlabs/Module/Directory.php:158 +#: Zotlabs/Module/Directory.php:159 msgid "No default suggestions were found." msgstr "" -#: Zotlabs/Module/Directory.php:329 +#: Zotlabs/Module/Directory.php:326 msgid "Gender: " msgstr "" -#: Zotlabs/Module/Directory.php:330 +#: Zotlabs/Module/Directory.php:327 msgid "Status: " msgstr "" -#: Zotlabs/Module/Directory.php:331 +#: Zotlabs/Module/Directory.php:328 msgid "Homepage: " msgstr "" -#: Zotlabs/Module/Directory.php:392 +#: Zotlabs/Module/Directory.php:389 msgid "Description:" msgstr "" -#: Zotlabs/Module/Directory.php:403 Zotlabs/Module/Manage.php:77 -#: Zotlabs/Module/Manage.php:174 +#: Zotlabs/Module/Directory.php:400 Zotlabs/Module/Manage.php:78 +#: Zotlabs/Module/Manage.php:175 msgid "Group" msgstr "" -#: Zotlabs/Module/Directory.php:407 +#: Zotlabs/Module/Directory.php:404 msgid "Keywords: " msgstr "" -#: Zotlabs/Module/Directory.php:410 +#: Zotlabs/Module/Directory.php:407 msgid "Don't suggest" msgstr "" -#: Zotlabs/Module/Directory.php:412 +#: Zotlabs/Module/Directory.php:409 msgid "Suggestion ranking:" msgstr "" -#: Zotlabs/Module/Directory.php:478 +#: Zotlabs/Module/Directory.php:472 msgid "Local Directory" msgstr "" -#: Zotlabs/Module/Directory.php:484 +#: Zotlabs/Module/Directory.php:478 msgid "Finding:" msgstr "" -#: Zotlabs/Module/Directory.php:487 Zotlabs/Widget/Findpeople.php:31 +#: Zotlabs/Module/Directory.php:481 Zotlabs/Widget/Findpeople.php:34 msgid "Channel Suggestions" msgstr "" -#: Zotlabs/Module/Directory.php:489 +#: Zotlabs/Module/Directory.php:483 msgid "next page" msgstr "" -#: Zotlabs/Module/Directory.php:489 +#: Zotlabs/Module/Directory.php:483 msgid "previous page" msgstr "" -#: Zotlabs/Module/Directory.php:490 +#: Zotlabs/Module/Directory.php:484 msgid "Sort options" msgstr "" -#: Zotlabs/Module/Directory.php:491 +#: Zotlabs/Module/Directory.php:485 msgid "Alphabetic" msgstr "" -#: Zotlabs/Module/Directory.php:492 +#: Zotlabs/Module/Directory.php:486 msgid "Reverse Alphabetic" msgstr "" -#: Zotlabs/Module/Directory.php:493 +#: Zotlabs/Module/Directory.php:487 msgid "Newest to Oldest" msgstr "" -#: Zotlabs/Module/Directory.php:494 +#: Zotlabs/Module/Directory.php:488 msgid "Oldest to Newest" msgstr "" -#: Zotlabs/Module/Directory.php:521 +#: Zotlabs/Module/Directory.php:513 msgid "No entries (some entries may be hidden)." msgstr "" -#: Zotlabs/Module/Display.php:94 Zotlabs/Module/Channel.php:294 -#: Zotlabs/Module/Hq.php:141 Zotlabs/Module/Rpost.php:240 -#: Zotlabs/Module/Pubstream.php:85 Zotlabs/Module/Stream.php:246 +#: Zotlabs/Module/Display.php:98 Zotlabs/Module/Channel.php:287 +#: Zotlabs/Module/Hq.php:153 Zotlabs/Module/Rpost.php:236 +#: Zotlabs/Module/Pubstream.php:86 Zotlabs/Module/Stream.php:246 msgid "Reset form" msgstr "" -#: Zotlabs/Module/Display.php:382 +#: Zotlabs/Module/Display.php:390 #, php-format msgid "\"%1$s\", shared by %2$s with %3$s" msgstr "" -#: Zotlabs/Module/Display.php:383 +#: Zotlabs/Module/Display.php:391 #, php-format msgid "%1$s shared this post with %2$s" msgstr "" -#: Zotlabs/Module/Display.php:387 +#: Zotlabs/Module/Display.php:395 msgid "Not much to read, click to see the post." msgstr "" -#: Zotlabs/Module/Display.php:392 +#: Zotlabs/Module/Display.php:399 #, php-format msgid "%1$s shared a reaction to \"%2$s\"" msgstr "" -#: Zotlabs/Module/Display.php:393 +#: Zotlabs/Module/Display.php:400 #, php-format msgid "%s shared a reaction to this post/conversation" msgstr "" -#: Zotlabs/Module/Display.php:401 +#: Zotlabs/Module/Display.php:407 #, php-format msgid "%1$s commented \"%2$s\"" msgstr "" -#: Zotlabs/Module/Display.php:402 +#: Zotlabs/Module/Display.php:408 #, php-format msgid "%s shared a comment of this post/conversation" msgstr "" -#: Zotlabs/Module/Display.php:406 +#: Zotlabs/Module/Display.php:412 #, php-format msgid "%1$s wrote this: \"%2$s\"" msgstr "" -#: Zotlabs/Module/Display.php:435 Zotlabs/Module/Channel.php:573 +#: Zotlabs/Module/Display.php:437 Zotlabs/Module/Channel.php:556 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "" -#: Zotlabs/Module/Display.php:453 +#: Zotlabs/Module/Display.php:454 msgid "Article" msgstr "" @@ -4802,179 +4818,179 @@ msgstr "" msgid "Item has been removed." msgstr "" -#: Zotlabs/Module/Events.php:475 +#: Zotlabs/Module/Events.php:492 msgid "day(s)" msgstr "" -#: Zotlabs/Module/Events.php:476 +#: Zotlabs/Module/Events.php:493 msgid "week(s)" msgstr "" -#: Zotlabs/Module/Events.php:477 +#: Zotlabs/Module/Events.php:494 msgid "month(s)" msgstr "" -#: Zotlabs/Module/Events.php:478 +#: Zotlabs/Module/Events.php:495 msgid "year(s)" msgstr "" -#: Zotlabs/Module/Events.php:491 +#: Zotlabs/Module/Events.php:508 msgid "Edit event title" msgstr "" -#: Zotlabs/Module/Events.php:493 +#: Zotlabs/Module/Events.php:510 msgid "Categories (comma-separated list)" msgstr "" -#: Zotlabs/Module/Events.php:494 +#: Zotlabs/Module/Events.php:511 msgid "Edit Category" msgstr "" -#: Zotlabs/Module/Events.php:494 +#: Zotlabs/Module/Events.php:511 msgid "Category" msgstr "" -#: Zotlabs/Module/Events.php:497 +#: Zotlabs/Module/Events.php:514 msgid "Edit start date and time" msgstr "" -#: Zotlabs/Module/Events.php:498 Zotlabs/Module/Events.php:501 +#: Zotlabs/Module/Events.php:515 Zotlabs/Module/Events.php:518 msgid "Finish date and time are not known or not relevant" msgstr "" -#: Zotlabs/Module/Events.php:500 +#: Zotlabs/Module/Events.php:517 msgid "Edit finish date and time" msgstr "" -#: Zotlabs/Module/Events.php:500 +#: Zotlabs/Module/Events.php:517 msgid "Finish date and time" msgstr "" -#: Zotlabs/Module/Events.php:502 Zotlabs/Module/Events.php:503 +#: Zotlabs/Module/Events.php:519 Zotlabs/Module/Events.php:520 msgid "Adjust for viewer timezone" msgstr "" -#: Zotlabs/Module/Events.php:502 +#: Zotlabs/Module/Events.php:519 msgid "" "Important for events that happen in a particular place. Not practical for " "global holidays." msgstr "" -#: Zotlabs/Module/Events.php:504 +#: Zotlabs/Module/Events.php:521 msgid "Edit Description" msgstr "" -#: Zotlabs/Module/Events.php:506 +#: Zotlabs/Module/Events.php:523 msgid "Edit Location" msgstr "" -#: Zotlabs/Module/Events.php:510 include/conversation.php:1430 +#: Zotlabs/Module/Events.php:527 include/conversation.php:1455 msgid "Permission settings" msgstr "" -#: Zotlabs/Module/Events.php:520 +#: Zotlabs/Module/Events.php:537 msgid "Timezone:" msgstr "" -#: Zotlabs/Module/Events.php:525 +#: Zotlabs/Module/Events.php:542 msgid "Advanced Options" msgstr "" -#: Zotlabs/Module/Events.php:527 +#: Zotlabs/Module/Events.php:544 msgid "Event repeat" msgstr "" -#: Zotlabs/Module/Events.php:528 +#: Zotlabs/Module/Events.php:545 msgid "Repeat frequency" msgstr "" -#: Zotlabs/Module/Events.php:529 +#: Zotlabs/Module/Events.php:546 msgid "Repeat every" msgstr "" -#: Zotlabs/Module/Events.php:530 +#: Zotlabs/Module/Events.php:547 msgid "Number of total repeats" msgstr "" -#: Zotlabs/Module/Events.php:826 +#: Zotlabs/Module/Events.php:858 msgid "Event removed" msgstr "" -#: Zotlabs/Module/Editlayout.php:83 Zotlabs/Module/Editwebpage.php:84 -#: Zotlabs/Module/Card_edit.php:19 Zotlabs/Module/Card_edit.php:35 -#: Zotlabs/Module/Editblock.php:83 Zotlabs/Module/Editblock.php:99 -#: Zotlabs/Module/Editpost.php:27 Zotlabs/Module/Dreport.php:64 +#: Zotlabs/Module/Editlayout.php:88 Zotlabs/Module/Editwebpage.php:91 +#: Zotlabs/Module/Card_edit.php:25 Zotlabs/Module/Card_edit.php:43 +#: Zotlabs/Module/Editblock.php:89 Zotlabs/Module/Editblock.php:107 +#: Zotlabs/Module/Editpost.php:30 Zotlabs/Module/Dreport.php:67 msgid "Item not found" msgstr "" -#: Zotlabs/Module/Editlayout.php:132 Zotlabs/Module/Layouts.php:135 -#: Zotlabs/Module/Layouts.php:195 +#: Zotlabs/Module/Editlayout.php:140 Zotlabs/Module/Layouts.php:139 +#: Zotlabs/Module/Layouts.php:203 msgid "Layout Name" msgstr "" -#: Zotlabs/Module/Editlayout.php:133 Zotlabs/Module/Layouts.php:138 +#: Zotlabs/Module/Editlayout.php:141 Zotlabs/Module/Layouts.php:142 msgid "Layout Description (Optional)" msgstr "" -#: Zotlabs/Module/Editlayout.php:141 +#: Zotlabs/Module/Editlayout.php:149 msgid "Edit Layout" msgstr "" -#: Zotlabs/Module/Plike.php:124 include/conversation.php:133 +#: Zotlabs/Module/Plike.php:128 include/conversation.php:135 msgid "channel" msgstr "" -#: Zotlabs/Module/Plike.php:196 Zotlabs/Module/Like.php:220 -#: include/conversation.php:174 +#: Zotlabs/Module/Plike.php:202 Zotlabs/Module/Like.php:221 +#: include/conversation.php:178 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: Zotlabs/Module/Plike.php:198 Zotlabs/Module/Like.php:223 -#: include/conversation.php:177 +#: Zotlabs/Module/Plike.php:205 Zotlabs/Module/Like.php:224 +#: include/conversation.php:180 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: Zotlabs/Module/Notes.php:45 +#: Zotlabs/Module/Notes.php:52 msgid "This app allows you to create private notes for your personal use." msgstr "" -#: Zotlabs/Module/Notes.php:53 +#: Zotlabs/Module/Notes.php:60 msgid "This app is installed. The Notes tool can be found on your stream page." msgstr "" -#: Zotlabs/Module/Editwebpage.php:143 +#: Zotlabs/Module/Editwebpage.php:154 msgid "Page link" msgstr "" -#: Zotlabs/Module/Editwebpage.php:147 Zotlabs/Module/Chat.php:212 -#: Zotlabs/Module/Card_edit.php:103 Zotlabs/Module/Editblock.php:120 -#: include/conversation.php:1220 +#: Zotlabs/Module/Editwebpage.php:158 Zotlabs/Module/Chat.php:219 +#: Zotlabs/Module/Card_edit.php:110 Zotlabs/Module/Editblock.php:129 +#: include/conversation.php:1237 msgid "Insert web link" msgstr "" -#: Zotlabs/Module/Editwebpage.php:170 +#: Zotlabs/Module/Editwebpage.php:181 msgid "Edit Webpage" msgstr "" -#: Zotlabs/Module/Email_resend.php:12 Zotlabs/Module/Email_validation.php:24 +#: Zotlabs/Module/Email_resend.php:15 Zotlabs/Module/Email_validation.php:27 msgid "Token verification failed." msgstr "" -#: Zotlabs/Module/Email_resend.php:30 +#: Zotlabs/Module/Email_resend.php:33 msgid "Email verification resent" msgstr "" -#: Zotlabs/Module/Email_resend.php:33 +#: Zotlabs/Module/Email_resend.php:35 msgid "Unable to resend email verification message." msgstr "" -#: Zotlabs/Module/Email_validation.php:36 +#: Zotlabs/Module/Email_validation.php:40 msgid "Email Verification Required" msgstr "" -#: Zotlabs/Module/Email_validation.php:37 +#: Zotlabs/Module/Email_validation.php:41 #, php-format msgid "" "A verification token was sent to your email address [%s]. Enter that token " @@ -4982,70 +4998,70 @@ msgid "" "for delivery, and check your spam folder if you do not see the message." msgstr "" -#: Zotlabs/Module/Email_validation.php:38 +#: Zotlabs/Module/Email_validation.php:42 msgid "Resend Email" msgstr "" -#: Zotlabs/Module/Email_validation.php:41 +#: Zotlabs/Module/Email_validation.php:45 msgid "Validation token" msgstr "" -#: Zotlabs/Module/Embedphotos.php:105 include/bbcode.php:232 -#: include/bbcode.php:1041 include/bbcode.php:1924 include/bbcode.php:1926 -#: include/bbcode.php:1929 include/text.php:1735 include/text.php:1736 +#: Zotlabs/Module/Embedphotos.php:103 include/bbcode.php:258 +#: include/bbcode.php:1125 include/bbcode.php:2031 include/bbcode.php:2033 +#: include/bbcode.php:2036 include/text.php:1828 include/text.php:1829 msgid "Image/photo" msgstr "" -#: Zotlabs/Module/Embedphotos.php:210 Zotlabs/Module/Photos.php:842 -#: Zotlabs/Module/Photos.php:1394 Zotlabs/Widget/Portfolio.php:87 -#: Zotlabs/Widget/Album.php:82 +#: Zotlabs/Module/Embedphotos.php:208 Zotlabs/Module/Photos.php:848 +#: Zotlabs/Module/Photos.php:1405 Zotlabs/Widget/Album.php:88 +#: Zotlabs/Widget/Portfolio.php:99 msgid "View Photo" msgstr "" -#: Zotlabs/Module/Embedphotos.php:225 Zotlabs/Module/Photos.php:875 -#: Zotlabs/Widget/Portfolio.php:108 Zotlabs/Widget/Album.php:99 +#: Zotlabs/Module/Embedphotos.php:223 Zotlabs/Module/Photos.php:879 +#: Zotlabs/Widget/Album.php:105 Zotlabs/Widget/Portfolio.php:120 msgid "Edit Album" msgstr "" -#: Zotlabs/Module/Register.php:54 +#: Zotlabs/Module/Register.php:60 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" -#: Zotlabs/Module/Register.php:60 +#: Zotlabs/Module/Register.php:66 msgid "" "Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: Zotlabs/Module/Register.php:95 +#: Zotlabs/Module/Register.php:100 msgid "Passwords do not match." msgstr "" -#: Zotlabs/Module/Register.php:147 +#: Zotlabs/Module/Register.php:151 msgid "Registration successful. Continue to create your first channel..." msgstr "" -#: Zotlabs/Module/Register.php:150 +#: Zotlabs/Module/Register.php:153 msgid "" "Registration successful. Please check your email for validation instructions." msgstr "" -#: Zotlabs/Module/Register.php:157 +#: Zotlabs/Module/Register.php:159 msgid "Your registration is pending approval by the site owner." msgstr "" -#: Zotlabs/Module/Register.php:160 +#: Zotlabs/Module/Register.php:161 msgid "Your registration can not be processed." msgstr "" -#: Zotlabs/Module/Register.php:207 +#: Zotlabs/Module/Register.php:206 msgid "Registration on this website is disabled." msgstr "" -#: Zotlabs/Module/Register.php:217 +#: Zotlabs/Module/Register.php:215 msgid "Registration on this website is by approval only." msgstr "" -#: Zotlabs/Module/Register.php:225 +#: Zotlabs/Module/Register.php:223 msgid "Registration on this site is by invitation only." msgstr "" @@ -5055,7 +5071,7 @@ msgid "" "Please try again tomorrow." msgstr "" -#: Zotlabs/Module/Register.php:252 Zotlabs/Module/Siteinfo.php:37 +#: Zotlabs/Module/Register.php:252 Zotlabs/Module/Siteinfo.php:42 msgid "Terms of Service" msgstr "" @@ -5064,95 +5080,95 @@ msgstr "" msgid "I accept the %s for this website" msgstr "" -#: Zotlabs/Module/Register.php:265 +#: Zotlabs/Module/Register.php:264 #, php-format msgid "I am over %s years of age and accept the %s for this website" msgstr "" -#: Zotlabs/Module/Register.php:270 +#: Zotlabs/Module/Register.php:269 msgid "Your email address" msgstr "" -#: Zotlabs/Module/Register.php:271 +#: Zotlabs/Module/Register.php:270 msgid "Choose a password" msgstr "" -#: Zotlabs/Module/Register.php:272 +#: Zotlabs/Module/Register.php:271 msgid "Please re-enter your password" msgstr "" -#: Zotlabs/Module/Register.php:273 +#: Zotlabs/Module/Register.php:272 msgid "Please enter your invitation code" msgstr "" -#: Zotlabs/Module/Register.php:274 +#: Zotlabs/Module/Register.php:273 msgid "Your Name" msgstr "" -#: Zotlabs/Module/Register.php:274 +#: Zotlabs/Module/Register.php:273 msgid "Real names are preferred." msgstr "" -#: Zotlabs/Module/Register.php:276 Zotlabs/Module/New_channel.php:184 +#: Zotlabs/Module/Register.php:275 Zotlabs/Module/New_channel.php:191 msgid "Choose a short nickname" msgstr "" -#: Zotlabs/Module/Register.php:276 +#: Zotlabs/Module/Register.php:275 #, php-format msgid "" "Your nickname will be used to create an easy to remember channel address e." "g. nickname%s" msgstr "" -#: Zotlabs/Module/Register.php:277 Zotlabs/Module/New_channel.php:185 +#: Zotlabs/Module/Register.php:276 Zotlabs/Module/New_channel.php:192 msgid "Channel role and privacy" msgstr "" -#: Zotlabs/Module/Register.php:277 +#: Zotlabs/Module/Register.php:276 msgid "" "Select a channel permission role for your usage needs and privacy " "requirements." msgstr "" -#: Zotlabs/Module/Register.php:278 +#: Zotlabs/Module/Register.php:277 msgid "no" msgstr "" -#: Zotlabs/Module/Register.php:278 +#: Zotlabs/Module/Register.php:277 msgid "yes" msgstr "" -#: Zotlabs/Module/Register.php:291 +#: Zotlabs/Module/Register.php:290 msgid "" "Show affiliated sites - some of which may allow " "registration." msgstr "" -#: Zotlabs/Module/Register.php:304 Zotlabs/Module/Sites.php:51 boot.php:1698 -#: include/nav.php:166 +#: Zotlabs/Module/Register.php:303 Zotlabs/Module/Sites.php:55 boot.php:1706 +#: include/nav.php:164 msgid "Register" msgstr "" -#: Zotlabs/Module/Register.php:305 +#: Zotlabs/Module/Register.php:304 msgid "" "This site requires email verification. After completing this form, please " "check your email for further instructions." msgstr "" -#: Zotlabs/Module/Invite.php:34 +#: Zotlabs/Module/Invite.php:35 msgid "Total invitation limit exceeded." msgstr "" -#: Zotlabs/Module/Invite.php:58 +#: Zotlabs/Module/Invite.php:60 #, php-format msgid "%s : Not a valid email address." msgstr "" -#: Zotlabs/Module/Invite.php:72 +#: Zotlabs/Module/Invite.php:73 msgid "Please join us on $Projectname" msgstr "" -#: Zotlabs/Module/Invite.php:82 +#: Zotlabs/Module/Invite.php:83 msgid "Invitation limit exceeded. Please contact your site administrator." msgstr "" @@ -5161,7 +5177,7 @@ msgstr "" msgid "%s : Message delivery failed." msgstr "" -#: Zotlabs/Module/Invite.php:91 +#: Zotlabs/Module/Invite.php:90 #, php-format msgid "%d message sent." msgid_plural "%d messages sent." @@ -5176,710 +5192,710 @@ msgstr "" msgid "You have no more invitations available" msgstr "" -#: Zotlabs/Module/Invite.php:152 +#: Zotlabs/Module/Invite.php:155 msgid "Send invitations" msgstr "" -#: Zotlabs/Module/Invite.php:153 +#: Zotlabs/Module/Invite.php:156 msgid "Enter email addresses, one per line:" msgstr "" -#: Zotlabs/Module/Invite.php:154 +#: Zotlabs/Module/Invite.php:157 msgid "Your message:" msgstr "" -#: Zotlabs/Module/Invite.php:155 +#: Zotlabs/Module/Invite.php:158 msgid "Please join my community on $Projectname." msgstr "" -#: Zotlabs/Module/Invite.php:157 +#: Zotlabs/Module/Invite.php:160 msgid "You will need to supply this invitation code:" msgstr "" -#: Zotlabs/Module/Invite.php:158 +#: Zotlabs/Module/Invite.php:161 msgid "1. Register at any $Projectname location (they are all inter-connected)" msgstr "" -#: Zotlabs/Module/Invite.php:160 +#: Zotlabs/Module/Invite.php:163 msgid "2. Enter my $Projectname network address into the site searchbar." msgstr "" -#: Zotlabs/Module/Invite.php:161 +#: Zotlabs/Module/Invite.php:164 msgid "or visit" msgstr "" -#: Zotlabs/Module/Invite.php:163 +#: Zotlabs/Module/Invite.php:166 msgid "3. Click [Connect]" msgstr "" -#: Zotlabs/Module/Sites.php:13 +#: Zotlabs/Module/Sites.php:17 msgid "" "This page provides information about related projects and websites that are " "currently known to this system. These are a small fraction of the thousands " "of websites and dozens of projects and providers which make up the fediverse." msgstr "" -#: Zotlabs/Module/Sites.php:42 +#: Zotlabs/Module/Sites.php:45 msgid "free" msgstr "" -#: Zotlabs/Module/Sites.php:44 +#: Zotlabs/Module/Sites.php:47 msgid "subscription" msgstr "" -#: Zotlabs/Module/Sites.php:46 +#: Zotlabs/Module/Sites.php:49 msgid "tiered service plans" msgstr "" -#: Zotlabs/Module/Sites.php:53 +#: Zotlabs/Module/Sites.php:57 msgid "Register (requires approval)" msgstr "" -#: Zotlabs/Module/Sites.php:98 +#: Zotlabs/Module/Sites.php:101 msgid "Project" msgstr "" -#: Zotlabs/Module/Sites.php:106 +#: Zotlabs/Module/Sites.php:109 msgid "Access type" msgstr "" -#: Zotlabs/Module/Sites.php:112 +#: Zotlabs/Module/Sites.php:115 msgid "Affiliated Sites" msgstr "" -#: Zotlabs/Module/Filer.php:50 +#: Zotlabs/Module/Filer.php:59 msgid "Enter a folder name" msgstr "" -#: Zotlabs/Module/Filer.php:50 +#: Zotlabs/Module/Filer.php:59 msgid "or select an existing folder (doubleclick)" msgstr "" -#: Zotlabs/Module/Filestorage.php:94 +#: Zotlabs/Module/Filestorage.php:98 msgid "Channel unavailable." msgstr "" -#: Zotlabs/Module/Filestorage.php:139 +#: Zotlabs/Module/Filestorage.php:142 msgid "File not found." msgstr "" -#: Zotlabs/Module/Filestorage.php:221 +#: Zotlabs/Module/Filestorage.php:225 msgid "Edit file permissions" msgstr "" -#: Zotlabs/Module/Filestorage.php:233 +#: Zotlabs/Module/Filestorage.php:237 msgid "Change filename to" msgstr "" -#: Zotlabs/Module/Filestorage.php:233 +#: Zotlabs/Module/Filestorage.php:237 msgid "Leave blank to keep the existing filename" msgstr "" -#: Zotlabs/Module/Filestorage.php:234 +#: Zotlabs/Module/Filestorage.php:238 msgid "Move to directory" msgstr "" -#: Zotlabs/Module/Filestorage.php:235 +#: Zotlabs/Module/Filestorage.php:239 #: extend/addon/a/flashcards/Mod_Flashcards.php:261 #: extend/addon/a/faces/Mod_Faces.php:179 msgid "Set/edit permissions" msgstr "" -#: Zotlabs/Module/Filestorage.php:236 +#: Zotlabs/Module/Filestorage.php:240 msgid "Include all files and sub folders" msgstr "" -#: Zotlabs/Module/Filestorage.php:237 +#: Zotlabs/Module/Filestorage.php:241 msgid "Return to file list" msgstr "" -#: Zotlabs/Module/Filestorage.php:239 +#: Zotlabs/Module/Filestorage.php:243 msgid "Copy/paste this code to attach file to a post" msgstr "" -#: Zotlabs/Module/Filestorage.php:240 +#: Zotlabs/Module/Filestorage.php:244 msgid "Copy/paste this URL to link file from a web page" msgstr "" -#: Zotlabs/Module/Filestorage.php:242 +#: Zotlabs/Module/Filestorage.php:246 msgid "Share this file" msgstr "" -#: Zotlabs/Module/Filestorage.php:243 +#: Zotlabs/Module/Filestorage.php:247 msgid "Show URL to this file" msgstr "" -#: Zotlabs/Module/Filestorage.php:244 Zotlabs/Storage/Browser.php:432 +#: Zotlabs/Module/Filestorage.php:248 Zotlabs/Storage/Browser.php:435 msgid "Show in your contacts shared folder" msgstr "" -#: Zotlabs/Module/Dircensor.php:42 +#: Zotlabs/Module/Dircensor.php:45 msgid "Entry censored" msgstr "" -#: Zotlabs/Module/Dircensor.php:45 +#: Zotlabs/Module/Dircensor.php:47 msgid "Entry uncensored" msgstr "" -#: Zotlabs/Module/Impel.php:43 include/bbcode.php:377 +#: Zotlabs/Module/Impel.php:56 include/bbcode.php:416 msgid "webpage" msgstr "" -#: Zotlabs/Module/Impel.php:48 include/bbcode.php:383 +#: Zotlabs/Module/Impel.php:61 include/bbcode.php:422 msgid "block" msgstr "" -#: Zotlabs/Module/Impel.php:53 include/bbcode.php:380 +#: Zotlabs/Module/Impel.php:66 include/bbcode.php:419 msgid "layout" msgstr "" -#: Zotlabs/Module/Impel.php:60 include/bbcode.php:386 +#: Zotlabs/Module/Impel.php:73 include/bbcode.php:425 msgid "menu" msgstr "" -#: Zotlabs/Module/Impel.php:185 +#: Zotlabs/Module/Impel.php:206 #, php-format msgid "%s element installed" msgstr "" -#: Zotlabs/Module/Impel.php:188 +#: Zotlabs/Module/Impel.php:208 #, php-format msgid "%s element installation failed" msgstr "" -#: Zotlabs/Module/Thing.php:133 +#: Zotlabs/Module/Thing.php:139 msgid "Thing updated" msgstr "" -#: Zotlabs/Module/Thing.php:191 +#: Zotlabs/Module/Thing.php:200 msgid "Object store: failed" msgstr "" -#: Zotlabs/Module/Thing.php:195 +#: Zotlabs/Module/Thing.php:204 msgid "Thing added" msgstr "" -#: Zotlabs/Module/Thing.php:221 +#: Zotlabs/Module/Thing.php:232 #, php-format msgid "OBJ: %1$s %2$s %3$s" msgstr "" -#: Zotlabs/Module/Thing.php:284 +#: Zotlabs/Module/Thing.php:301 msgid "Show Thing" msgstr "" -#: Zotlabs/Module/Thing.php:291 +#: Zotlabs/Module/Thing.php:307 msgid "item not found." msgstr "" -#: Zotlabs/Module/Thing.php:324 +#: Zotlabs/Module/Thing.php:341 msgid "Edit Thing" msgstr "" -#: Zotlabs/Module/Thing.php:326 Zotlabs/Module/Thing.php:383 +#: Zotlabs/Module/Thing.php:343 Zotlabs/Module/Thing.php:402 msgid "Select a profile" msgstr "" -#: Zotlabs/Module/Thing.php:330 Zotlabs/Module/Thing.php:386 +#: Zotlabs/Module/Thing.php:347 Zotlabs/Module/Thing.php:405 msgid "Post an activity" msgstr "" -#: Zotlabs/Module/Thing.php:330 Zotlabs/Module/Thing.php:386 +#: Zotlabs/Module/Thing.php:347 Zotlabs/Module/Thing.php:405 msgid "Only sends to viewers of the applicable profile" msgstr "" -#: Zotlabs/Module/Thing.php:332 Zotlabs/Module/Thing.php:388 +#: Zotlabs/Module/Thing.php:349 Zotlabs/Module/Thing.php:407 msgid "Name of thing e.g. something" msgstr "" -#: Zotlabs/Module/Thing.php:334 Zotlabs/Module/Thing.php:389 +#: Zotlabs/Module/Thing.php:351 Zotlabs/Module/Thing.php:408 msgid "URL of thing (optional)" msgstr "" -#: Zotlabs/Module/Thing.php:336 Zotlabs/Module/Thing.php:390 +#: Zotlabs/Module/Thing.php:353 Zotlabs/Module/Thing.php:409 msgid "URL for photo of thing (optional)" msgstr "" -#: Zotlabs/Module/Thing.php:381 +#: Zotlabs/Module/Thing.php:400 msgid "Add Thing to your Profile" msgstr "" -#: Zotlabs/Module/Chat.php:26 Zotlabs/Module/Channel.php:57 +#: Zotlabs/Module/Chat.php:30 Zotlabs/Module/Channel.php:58 msgid "You must be logged in to see this page." msgstr "" -#: Zotlabs/Module/Chat.php:187 +#: Zotlabs/Module/Chat.php:194 msgid "Room not found" msgstr "" -#: Zotlabs/Module/Chat.php:204 +#: Zotlabs/Module/Chat.php:211 msgid "Leave Room" msgstr "" -#: Zotlabs/Module/Chat.php:205 +#: Zotlabs/Module/Chat.php:212 msgid "Delete Room" msgstr "" -#: Zotlabs/Module/Chat.php:206 +#: Zotlabs/Module/Chat.php:213 msgid "I am away right now" msgstr "" -#: Zotlabs/Module/Chat.php:207 +#: Zotlabs/Module/Chat.php:214 msgid "I am online" msgstr "" -#: Zotlabs/Module/Chat.php:210 include/conversation.php:1267 +#: Zotlabs/Module/Chat.php:217 include/conversation.php:1287 msgid "Please enter a link URL:" msgstr "" -#: Zotlabs/Module/Chat.php:230 +#: Zotlabs/Module/Chat.php:237 msgid "New Chatroom" msgstr "" -#: Zotlabs/Module/Chat.php:231 +#: Zotlabs/Module/Chat.php:238 msgid "Chatroom name" msgstr "" -#: Zotlabs/Module/Chat.php:232 +#: Zotlabs/Module/Chat.php:239 msgid "Expiration of chats (minutes)" msgstr "" -#: Zotlabs/Module/Chat.php:248 +#: Zotlabs/Module/Chat.php:255 #, php-format msgid "%1$s's Chatrooms" msgstr "" -#: Zotlabs/Module/Chat.php:253 +#: Zotlabs/Module/Chat.php:260 msgid "No chatrooms available" msgstr "" -#: Zotlabs/Module/Chat.php:254 Zotlabs/Module/Manage.php:154 -#: Zotlabs/Module/Profiles.php:839 +#: Zotlabs/Module/Chat.php:261 Zotlabs/Module/Manage.php:154 +#: Zotlabs/Module/Profiles.php:879 msgid "Create New" msgstr "" -#: Zotlabs/Module/Chat.php:257 +#: Zotlabs/Module/Chat.php:264 msgid "Expiration" msgstr "" -#: Zotlabs/Module/Chat.php:258 +#: Zotlabs/Module/Chat.php:265 msgid "min" msgstr "" -#: Zotlabs/Module/Moderate.php:32 +#: Zotlabs/Module/Moderate.php:35 msgid "No entries." msgstr "" -#: Zotlabs/Module/Moderate.php:74 +#: Zotlabs/Module/Moderate.php:80 msgid "Comment approved" msgstr "" -#: Zotlabs/Module/Moderate.php:78 +#: Zotlabs/Module/Moderate.php:83 msgid "Comment deleted" msgstr "" -#: Zotlabs/Module/Setup.php:190 +#: Zotlabs/Module/Setup.php:192 msgid "$Projectname Server - Setup" msgstr "" -#: Zotlabs/Module/Setup.php:194 +#: Zotlabs/Module/Setup.php:196 msgid "Could not connect to database." msgstr "" -#: Zotlabs/Module/Setup.php:198 +#: Zotlabs/Module/Setup.php:200 msgid "" "Could not connect to specified site URL. Possible SSL certificate or DNS " "issue." msgstr "" -#: Zotlabs/Module/Setup.php:206 +#: Zotlabs/Module/Setup.php:208 msgid "Could not create table." msgstr "" -#: Zotlabs/Module/Setup.php:209 +#: Zotlabs/Module/Setup.php:211 msgid "Installation succeeded!" msgstr "" -#: Zotlabs/Module/Setup.php:211 +#: Zotlabs/Module/Setup.php:213 msgid "Your site database has been installed." msgstr "" -#: Zotlabs/Module/Setup.php:215 +#: Zotlabs/Module/Setup.php:217 msgid "Database install failed!" msgstr "" -#: Zotlabs/Module/Setup.php:217 +#: Zotlabs/Module/Setup.php:219 msgid "" "You may need to import the file \"install/schema_xxx.sql\" manually using a " "database client." msgstr "" -#: Zotlabs/Module/Setup.php:218 Zotlabs/Module/Setup.php:283 +#: Zotlabs/Module/Setup.php:220 Zotlabs/Module/Setup.php:285 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: Zotlabs/Module/Setup.php:280 +#: Zotlabs/Module/Setup.php:282 msgid "System check" msgstr "" -#: Zotlabs/Module/Setup.php:285 +#: Zotlabs/Module/Setup.php:287 msgid "Check again" msgstr "" -#: Zotlabs/Module/Setup.php:310 +#: Zotlabs/Module/Setup.php:313 msgid "Database connection" msgstr "" -#: Zotlabs/Module/Setup.php:311 +#: Zotlabs/Module/Setup.php:314 msgid "" "In order to install this software we need to know how to connect to your " "database." msgstr "" -#: Zotlabs/Module/Setup.php:312 +#: Zotlabs/Module/Setup.php:315 msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "" -#: Zotlabs/Module/Setup.php:313 +#: Zotlabs/Module/Setup.php:316 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "" -#: Zotlabs/Module/Setup.php:317 +#: Zotlabs/Module/Setup.php:320 msgid "Database Server Name" msgstr "" -#: Zotlabs/Module/Setup.php:317 +#: Zotlabs/Module/Setup.php:320 msgid "Default is 127.0.0.1" msgstr "" -#: Zotlabs/Module/Setup.php:318 +#: Zotlabs/Module/Setup.php:321 msgid "Database Port" msgstr "" -#: Zotlabs/Module/Setup.php:318 +#: Zotlabs/Module/Setup.php:321 msgid "Communication port number - use 0 for default" msgstr "" -#: Zotlabs/Module/Setup.php:319 +#: Zotlabs/Module/Setup.php:322 msgid "Database Login Name" msgstr "" -#: Zotlabs/Module/Setup.php:320 +#: Zotlabs/Module/Setup.php:323 msgid "Database Login Password" msgstr "" -#: Zotlabs/Module/Setup.php:321 +#: Zotlabs/Module/Setup.php:324 msgid "Database Name" msgstr "" -#: Zotlabs/Module/Setup.php:322 +#: Zotlabs/Module/Setup.php:325 msgid "Database Type" msgstr "" -#: Zotlabs/Module/Setup.php:324 Zotlabs/Module/Setup.php:365 +#: Zotlabs/Module/Setup.php:327 Zotlabs/Module/Setup.php:369 msgid "Site administrator email address" msgstr "" -#: Zotlabs/Module/Setup.php:324 Zotlabs/Module/Setup.php:365 +#: Zotlabs/Module/Setup.php:327 Zotlabs/Module/Setup.php:369 msgid "" "Required. Your account email address must match this in order to use the web " "admin panel." msgstr "" -#: Zotlabs/Module/Setup.php:325 Zotlabs/Module/Setup.php:367 +#: Zotlabs/Module/Setup.php:328 Zotlabs/Module/Setup.php:371 msgid "Website URL" msgstr "" -#: Zotlabs/Module/Setup.php:325 Zotlabs/Module/Setup.php:367 +#: Zotlabs/Module/Setup.php:328 Zotlabs/Module/Setup.php:371 msgid "Required. Please use SSL (https) URL if available." msgstr "" -#: Zotlabs/Module/Setup.php:326 Zotlabs/Module/Setup.php:369 +#: Zotlabs/Module/Setup.php:329 Zotlabs/Module/Setup.php:373 msgid "Please select a default timezone for your website" msgstr "" -#: Zotlabs/Module/Setup.php:353 +#: Zotlabs/Module/Setup.php:357 msgid "Site settings" msgstr "" -#: Zotlabs/Module/Setup.php:409 +#: Zotlabs/Module/Setup.php:415 msgid "PHP version 7.1 or greater is required." msgstr "" -#: Zotlabs/Module/Setup.php:410 +#: Zotlabs/Module/Setup.php:416 msgid "PHP version" msgstr "" -#: Zotlabs/Module/Setup.php:427 +#: Zotlabs/Module/Setup.php:431 msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: Zotlabs/Module/Setup.php:428 +#: Zotlabs/Module/Setup.php:432 msgid "" "If you do not have a command line version of PHP installed on server, you " "will not be able to run background tasks - including message delivery." msgstr "" -#: Zotlabs/Module/Setup.php:432 +#: Zotlabs/Module/Setup.php:436 msgid "PHP executable path" msgstr "" -#: Zotlabs/Module/Setup.php:432 +#: Zotlabs/Module/Setup.php:436 msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." msgstr "" -#: Zotlabs/Module/Setup.php:437 +#: Zotlabs/Module/Setup.php:441 msgid "Command line PHP" msgstr "" -#: Zotlabs/Module/Setup.php:448 +#: Zotlabs/Module/Setup.php:451 msgid "" "Unable to check command line PHP, as shell_exec() is disabled. This is " "required." msgstr "" -#: Zotlabs/Module/Setup.php:452 +#: Zotlabs/Module/Setup.php:455 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "" -#: Zotlabs/Module/Setup.php:453 +#: Zotlabs/Module/Setup.php:456 msgid "This is required for message delivery to work." msgstr "" -#: Zotlabs/Module/Setup.php:456 +#: Zotlabs/Module/Setup.php:459 msgid "PHP register_argc_argv" msgstr "" -#: Zotlabs/Module/Setup.php:475 +#: Zotlabs/Module/Setup.php:479 msgid "" "This is not sufficient to upload larger images or files. You should be able " "to upload at least 2MB (2097152 bytes) at once." msgstr "" -#: Zotlabs/Module/Setup.php:478 +#: Zotlabs/Module/Setup.php:483 #, php-format msgid "" "Your max allowed total upload size is set to %s. Maximum size of one file to " "upload is set to %s. You are allowed to upload up to %d files at once." msgstr "" -#: Zotlabs/Module/Setup.php:485 +#: Zotlabs/Module/Setup.php:490 msgid "You can adjust these settings in the server php.ini file." msgstr "" -#: Zotlabs/Module/Setup.php:487 +#: Zotlabs/Module/Setup.php:492 msgid "PHP upload limits" msgstr "" -#: Zotlabs/Module/Setup.php:510 +#: Zotlabs/Module/Setup.php:515 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -#: Zotlabs/Module/Setup.php:511 +#: Zotlabs/Module/Setup.php:516 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -#: Zotlabs/Module/Setup.php:514 +#: Zotlabs/Module/Setup.php:519 msgid "Generate encryption keys" msgstr "" -#: Zotlabs/Module/Setup.php:532 +#: Zotlabs/Module/Setup.php:538 msgid "libCurl PHP module" msgstr "" -#: Zotlabs/Module/Setup.php:533 +#: Zotlabs/Module/Setup.php:539 msgid "GD graphics PHP module" msgstr "" -#: Zotlabs/Module/Setup.php:534 +#: Zotlabs/Module/Setup.php:540 msgid "OpenSSL PHP module" msgstr "" -#: Zotlabs/Module/Setup.php:535 +#: Zotlabs/Module/Setup.php:541 msgid "PDO database PHP module" msgstr "" -#: Zotlabs/Module/Setup.php:536 +#: Zotlabs/Module/Setup.php:542 msgid "mb_string PHP module" msgstr "" -#: Zotlabs/Module/Setup.php:537 +#: Zotlabs/Module/Setup.php:543 msgid "xml PHP module" msgstr "" -#: Zotlabs/Module/Setup.php:538 +#: Zotlabs/Module/Setup.php:544 msgid "zip PHP module" msgstr "" -#: Zotlabs/Module/Setup.php:542 Zotlabs/Module/Setup.php:545 +#: Zotlabs/Module/Setup.php:548 Zotlabs/Module/Setup.php:550 msgid "Apache mod_rewrite module" msgstr "" -#: Zotlabs/Module/Setup.php:542 +#: Zotlabs/Module/Setup.php:548 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: Zotlabs/Module/Setup.php:549 Zotlabs/Module/Setup.php:552 +#: Zotlabs/Module/Setup.php:554 Zotlabs/Module/Setup.php:556 msgid "exec" msgstr "" -#: Zotlabs/Module/Setup.php:549 +#: Zotlabs/Module/Setup.php:554 msgid "" "Error: exec is required but is either not installed or has been disabled in " "php.ini" msgstr "" -#: Zotlabs/Module/Setup.php:555 Zotlabs/Module/Setup.php:558 +#: Zotlabs/Module/Setup.php:559 Zotlabs/Module/Setup.php:561 msgid "shell_exec" msgstr "" -#: Zotlabs/Module/Setup.php:555 +#: Zotlabs/Module/Setup.php:559 msgid "" "Error: shell_exec is required but is either not installed or has been " "disabled in php.ini" msgstr "" -#: Zotlabs/Module/Setup.php:563 +#: Zotlabs/Module/Setup.php:566 msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: Zotlabs/Module/Setup.php:567 +#: Zotlabs/Module/Setup.php:570 msgid "" "Error: GD PHP module with JPEG support or ImageMagick graphics library " "required but not installed." msgstr "" -#: Zotlabs/Module/Setup.php:571 +#: Zotlabs/Module/Setup.php:574 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: Zotlabs/Module/Setup.php:577 +#: Zotlabs/Module/Setup.php:580 msgid "" "Error: PDO database PHP module missing a driver for either mysql or pgsql." msgstr "" -#: Zotlabs/Module/Setup.php:582 +#: Zotlabs/Module/Setup.php:585 msgid "Error: PDO database PHP module required but not installed." msgstr "" -#: Zotlabs/Module/Setup.php:586 +#: Zotlabs/Module/Setup.php:589 msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: Zotlabs/Module/Setup.php:590 +#: Zotlabs/Module/Setup.php:593 msgid "Error: xml PHP module required for DAV but not installed." msgstr "" -#: Zotlabs/Module/Setup.php:594 +#: Zotlabs/Module/Setup.php:597 msgid "Error: zip PHP module required but not installed." msgstr "" -#: Zotlabs/Module/Setup.php:613 Zotlabs/Module/Setup.php:622 +#: Zotlabs/Module/Setup.php:619 Zotlabs/Module/Setup.php:628 msgid ".htconfig.php is writable" msgstr "" -#: Zotlabs/Module/Setup.php:618 +#: Zotlabs/Module/Setup.php:624 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\" " "in the top folder of your web server and it is unable to do so." msgstr "" -#: Zotlabs/Module/Setup.php:619 +#: Zotlabs/Module/Setup.php:625 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "" -#: Zotlabs/Module/Setup.php:620 +#: Zotlabs/Module/Setup.php:626 msgid "Please see install/INSTALL.txt for additional information." msgstr "" -#: Zotlabs/Module/Setup.php:638 +#: Zotlabs/Module/Setup.php:645 msgid "" "This software uses the Smarty3 template engine to render its web views. " "Smarty3 compiles templates to PHP to speed up rendering." msgstr "" -#: Zotlabs/Module/Setup.php:639 +#: Zotlabs/Module/Setup.php:646 #, php-format msgid "" "In order to store these compiled templates, the web server needs to have " "write access to the directory %s under the top level web folder." msgstr "" -#: Zotlabs/Module/Setup.php:640 Zotlabs/Module/Setup.php:660 +#: Zotlabs/Module/Setup.php:647 Zotlabs/Module/Setup.php:668 msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has " "write access to this folder." msgstr "" -#: Zotlabs/Module/Setup.php:643 +#: Zotlabs/Module/Setup.php:650 #, php-format msgid "%s is writable" msgstr "" -#: Zotlabs/Module/Setup.php:659 +#: Zotlabs/Module/Setup.php:667 msgid "" "This software uses the store directory to save uploaded files. The web " "server needs to have write access to the store directory under the top level " "web folder" msgstr "" -#: Zotlabs/Module/Setup.php:663 +#: Zotlabs/Module/Setup.php:671 msgid "store is writable" msgstr "" -#: Zotlabs/Module/Setup.php:695 +#: Zotlabs/Module/Setup.php:703 msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access " "to this site." msgstr "" -#: Zotlabs/Module/Setup.php:696 +#: Zotlabs/Module/Setup.php:704 msgid "" "If you have https access to your website or allow connections to TCP port " "443 (the https: port), you MUST use a browser-valid certificate. You MUST " "NOT use self-signed certificates!" msgstr "" -#: Zotlabs/Module/Setup.php:697 +#: Zotlabs/Module/Setup.php:705 msgid "" "This restriction is incorporated because public posts from you may for " "example contain references to images on your own hub." msgstr "" -#: Zotlabs/Module/Setup.php:698 +#: Zotlabs/Module/Setup.php:706 msgid "" "If your certificate is not recognized, members of other sites (who may " "themselves have valid certificates) will get a warning message on their own " "site complaining about security issues." msgstr "" -#: Zotlabs/Module/Setup.php:699 +#: Zotlabs/Module/Setup.php:707 msgid "" "This can cause usability issues elsewhere (not just on your own site) so we " "must insist on this requirement." msgstr "" -#: Zotlabs/Module/Setup.php:700 +#: Zotlabs/Module/Setup.php:708 msgid "" "Providers are available that issue free certificates which are browser-valid." msgstr "" -#: Zotlabs/Module/Setup.php:702 +#: Zotlabs/Module/Setup.php:710 msgid "" "If you are confident that the certificate is valid and signed by a trusted " "authority, check to see if you have failed to install an intermediate cert. " @@ -5887,51 +5903,51 @@ msgid "" "server communications." msgstr "" -#: Zotlabs/Module/Setup.php:704 +#: Zotlabs/Module/Setup.php:712 msgid "SSL certificate validation" msgstr "" -#: Zotlabs/Module/Setup.php:710 +#: Zotlabs/Module/Setup.php:718 msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." "Test: " msgstr "" -#: Zotlabs/Module/Setup.php:713 +#: Zotlabs/Module/Setup.php:721 msgid "Url rewrite is working" msgstr "" -#: Zotlabs/Module/Setup.php:728 +#: Zotlabs/Module/Setup.php:736 msgid "" "The database configuration file \".htconfig.php\" could not be written. " "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "" -#: Zotlabs/Module/Setup.php:753 extend/addon/a/faces/faces.php:219 +#: Zotlabs/Module/Setup.php:762 extend/addon/a/faces/faces.php:219 msgid "Errors encountered creating database tables." msgstr "" -#: Zotlabs/Module/Setup.php:796 +#: Zotlabs/Module/Setup.php:807 msgid "registration page" msgstr "" -#: Zotlabs/Module/Setup.php:799 +#: Zotlabs/Module/Setup.php:810 msgid "What next?
" msgstr "" -#: Zotlabs/Module/Setup.php:801 +#: Zotlabs/Module/Setup.php:812 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: Zotlabs/Module/Setup.php:803 +#: Zotlabs/Module/Setup.php:814 msgid "" "Please see the file \"install/INSTALL.txt\" for more information and " "instructions." msgstr "" -#: Zotlabs/Module/Setup.php:805 +#: Zotlabs/Module/Setup.php:816 #, php-format msgid "" "Go to your new hub %s and register as new member. Please use the same email " @@ -5939,184 +5955,177 @@ msgid "" "new account to enter the site admin panel." msgstr "" -#: Zotlabs/Module/Hcard.php:40 Zotlabs/Module/Profile.php:52 +#: Zotlabs/Module/Hcard.php:45 Zotlabs/Module/Profile.php:55 msgid "Posts and comments" msgstr "" -#: Zotlabs/Module/Hcard.php:47 Zotlabs/Module/Channel.php:84 -#: Zotlabs/Module/Profile.php:59 +#: Zotlabs/Module/Hcard.php:52 Zotlabs/Module/Channel.php:85 +#: Zotlabs/Module/Profile.php:62 msgid "Only posts" msgstr "" -#: Zotlabs/Module/Lists.php:105 +#: Zotlabs/Module/Lists.php:107 msgid "Access list created." msgstr "" -#: Zotlabs/Module/Lists.php:108 +#: Zotlabs/Module/Lists.php:109 msgid "Could not create access list." msgstr "" -#: Zotlabs/Module/Lists.php:127 Zotlabs/Module/Lists.php:311 -#: include/items.php:4375 +#: Zotlabs/Module/Lists.php:129 Zotlabs/Module/Lists.php:276 +#: include/items.php:4529 msgid "Access list not found." msgstr "" -#: Zotlabs/Module/Lists.php:144 +#: Zotlabs/Module/Lists.php:146 msgid "Access list updated." msgstr "" -#: Zotlabs/Module/Lists.php:173 Zotlabs/Module/Lists.php:201 -#: Zotlabs/Module/Import_items.php:123 Zotlabs/Module/Cloud.php:127 -#: Zotlabs/Module/Like.php:109 Zotlabs/Module/Share.php:70 -#: Zotlabs/Module/Dreport.php:13 Zotlabs/Module/Dreport.php:82 -#: Zotlabs/Module/Profperm.php:32 Zotlabs/Module/Subthread.php:92 -#: Zotlabs/Web/WebServer.php:70 include/items.php:476 +#: Zotlabs/Module/Lists.php:169 Zotlabs/Module/Lists.php:215 +#: Zotlabs/Module/Lists.php:244 Zotlabs/Module/Lists.php:287 +#: Zotlabs/Module/Import_items.php:133 Zotlabs/Module/Cloud.php:134 +#: Zotlabs/Module/Like.php:109 Zotlabs/Module/Share.php:81 +#: Zotlabs/Module/Dreport.php:16 Zotlabs/Module/Dreport.php:86 +#: Zotlabs/Module/Profperm.php:35 Zotlabs/Module/Subthread.php:97 +#: Zotlabs/Web/WebServer.php:69 include/items.php:490 msgid "Permission denied" msgstr "" -#: Zotlabs/Module/Lists.php:185 Zotlabs/Module/Lists.php:362 -msgid "List members" -msgstr "" - -#: Zotlabs/Module/Lists.php:191 -msgid "List not found" -msgstr "" - -#: Zotlabs/Module/Lists.php:229 Zotlabs/Module/Lists.php:240 +#: Zotlabs/Module/Lists.php:190 Zotlabs/Module/Lists.php:201 msgid "Access Lists" msgstr "" -#: Zotlabs/Module/Lists.php:230 +#: Zotlabs/Module/Lists.php:191 msgid "Create access list" msgstr "" -#: Zotlabs/Module/Lists.php:234 +#: Zotlabs/Module/Lists.php:195 msgid "Access list name" msgstr "" -#: Zotlabs/Module/Lists.php:235 Zotlabs/Module/Lists.php:350 +#: Zotlabs/Module/Lists.php:196 Zotlabs/Module/Lists.php:339 msgid "Members are visible to other channels" msgstr "" -#: Zotlabs/Module/Lists.php:242 +#: Zotlabs/Module/Lists.php:203 msgid "Members" msgstr "" -#: Zotlabs/Module/Lists.php:264 +#: Zotlabs/Module/Lists.php:232 msgid "Access list removed." msgstr "" -#: Zotlabs/Module/Lists.php:266 +#: Zotlabs/Module/Lists.php:234 msgid "Unable to remove access list." msgstr "" -#: Zotlabs/Module/Lists.php:345 +#: Zotlabs/Module/Lists.php:299 Zotlabs/Module/Lists.php:351 +msgid "List members" +msgstr "" + +#: Zotlabs/Module/Lists.php:334 #, php-format msgid "Access List: %s" msgstr "" -#: Zotlabs/Module/Lists.php:347 +#: Zotlabs/Module/Lists.php:336 msgid "Access list name: " msgstr "" -#: Zotlabs/Module/Lists.php:352 +#: Zotlabs/Module/Lists.php:341 msgid "Delete access list" msgstr "" -#: Zotlabs/Module/Lists.php:364 +#: Zotlabs/Module/Lists.php:353 msgid "Not in this list" msgstr "" -#: Zotlabs/Module/Lists.php:396 +#: Zotlabs/Module/Lists.php:386 msgid "Select a channel to toggle membership" msgstr "" -#: Zotlabs/Module/Layouts.php:190 include/text.php:2694 +#: Zotlabs/Module/Layouts.php:198 include/text.php:2852 msgid "Layouts" msgstr "" -#: Zotlabs/Module/Layouts.php:196 +#: Zotlabs/Module/Layouts.php:204 msgid "Layout Description" msgstr "" -#: Zotlabs/Module/Layouts.php:201 +#: Zotlabs/Module/Layouts.php:209 msgid "Download PDL file" msgstr "" -#: Zotlabs/Module/Channel.php:180 +#: Zotlabs/Module/Channel.php:176 #, php-format msgid "This is the home page of %s." msgstr "" -#: Zotlabs/Module/Channel.php:237 +#: Zotlabs/Module/Channel.php:233 msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: Zotlabs/Module/Channel.php:254 Zotlabs/Module/Stream.php:215 +#: Zotlabs/Module/Channel.php:249 Zotlabs/Module/Stream.php:215 msgid "Search Results For:" msgstr "" -#: Zotlabs/Module/Channel.php:621 +#: Zotlabs/Module/Channel.php:604 #, php-format msgid "This post was published on the home page of %s." msgstr "" -#: Zotlabs/Module/Card_edit.php:119 Zotlabs/Module/Editblock.php:133 -#: Zotlabs/Module/Photos.php:724 Zotlabs/Module/Photos.php:1105 -#: include/conversation.php:1426 +#: Zotlabs/Module/Card_edit.php:126 Zotlabs/Module/Editblock.php:142 +#: Zotlabs/Module/Photos.php:732 Zotlabs/Module/Photos.php:1118 +#: include/conversation.php:1451 msgid "Title (optional)" msgstr "" -#: Zotlabs/Module/Card_edit.php:130 +#: Zotlabs/Module/Card_edit.php:137 msgid "Edit Card" msgstr "" -#: Zotlabs/Module/Import_items.php:48 Zotlabs/Module/Import.php:75 +#: Zotlabs/Module/Import_items.php:54 Zotlabs/Module/Import.php:73 msgid "Nothing to import." msgstr "" -#: Zotlabs/Module/Import_items.php:72 Zotlabs/Module/Import.php:91 -#: Zotlabs/Module/Import.php:107 +#: Zotlabs/Module/Import_items.php:79 Zotlabs/Module/Import.php:88 +#: Zotlabs/Module/Import.php:103 msgid "Unable to download data from old server" msgstr "" -#: Zotlabs/Module/Import_items.php:77 Zotlabs/Module/Import.php:114 +#: Zotlabs/Module/Import_items.php:85 Zotlabs/Module/Import.php:110 msgid "Imported file is empty." msgstr "" -#: Zotlabs/Module/Import_items.php:101 +#: Zotlabs/Module/Import_items.php:110 msgid "Data export format is not compatible with this software" msgstr "" -#: Zotlabs/Module/Import_items.php:111 +#: Zotlabs/Module/Import_items.php:120 msgid "Import completed" msgstr "" -#: Zotlabs/Module/Import_items.php:128 +#: Zotlabs/Module/Import_items.php:138 msgid "Import Items" msgstr "" -#: Zotlabs/Module/Import_items.php:129 +#: Zotlabs/Module/Import_items.php:139 msgid "Use this form to import existing posts and content from an export file." msgstr "" -#: Zotlabs/Module/Import_items.php:130 Zotlabs/Module/Import.php:693 +#: Zotlabs/Module/Import_items.php:140 Zotlabs/Module/Import.php:687 msgid "File to Upload" msgstr "" -#: Zotlabs/Module/Cloud.php:124 -msgid "Not found" -msgstr "" - -#: Zotlabs/Module/Cloud.php:130 +#: Zotlabs/Module/Cloud.php:136 msgid "Please refresh page" msgstr "" -#: Zotlabs/Module/Cloud.php:137 +#: Zotlabs/Module/Cloud.php:142 msgid "Unknown error" msgstr "" -#: Zotlabs/Module/Manage.php:147 Zotlabs/Module/New_channel.php:157 +#: Zotlabs/Module/Manage.php:148 Zotlabs/Module/New_channel.php:165 #, php-format msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" @@ -6125,653 +6134,653 @@ msgstr "" msgid "Create a new channel" msgstr "" -#: Zotlabs/Module/Manage.php:184 +#: Zotlabs/Module/Manage.php:183 msgid "Current Channel" msgstr "" -#: Zotlabs/Module/Manage.php:186 +#: Zotlabs/Module/Manage.php:185 msgid "Switch to one of your channels by selecting it." msgstr "" -#: Zotlabs/Module/Manage.php:187 +#: Zotlabs/Module/Manage.php:186 msgid "Default Login Channel" msgstr "" -#: Zotlabs/Module/Manage.php:188 +#: Zotlabs/Module/Manage.php:187 msgid "Make Default" msgstr "" -#: Zotlabs/Module/Manage.php:189 Zotlabs/Module/Manage.php:190 +#: Zotlabs/Module/Manage.php:188 Zotlabs/Module/Manage.php:189 msgid "Add to menu" msgstr "" -#: Zotlabs/Module/Manage.php:193 +#: Zotlabs/Module/Manage.php:192 #, php-format msgid "%d new messages" msgstr "" -#: Zotlabs/Module/Manage.php:194 +#: Zotlabs/Module/Manage.php:193 #, php-format msgid "%d new introductions" msgstr "" -#: Zotlabs/Module/Manage.php:196 +#: Zotlabs/Module/Manage.php:195 msgid "Delegated Channel" msgstr "" -#: Zotlabs/Module/Lang.php:18 +#: Zotlabs/Module/Lang.php:21 msgid "Change UI language" msgstr "" -#: Zotlabs/Module/Mitem.php:35 Zotlabs/Module/Menu.php:211 +#: Zotlabs/Module/Mitem.php:41 Zotlabs/Module/Menu.php:213 msgid "Menu not found." msgstr "" -#: Zotlabs/Module/Mitem.php:67 +#: Zotlabs/Module/Mitem.php:75 msgid "Unable to create element." msgstr "" -#: Zotlabs/Module/Mitem.php:91 +#: Zotlabs/Module/Mitem.php:100 msgid "Unable to update menu element." msgstr "" -#: Zotlabs/Module/Mitem.php:107 +#: Zotlabs/Module/Mitem.php:114 msgid "Unable to add menu element." msgstr "" -#: Zotlabs/Module/Mitem.php:138 Zotlabs/Module/Menu.php:234 -#: Zotlabs/Module/Xchan.php:41 +#: Zotlabs/Module/Mitem.php:145 Zotlabs/Module/Menu.php:234 +#: Zotlabs/Module/Xchan.php:46 msgid "Not found." msgstr "" -#: Zotlabs/Module/Mitem.php:171 Zotlabs/Module/Mitem.php:250 +#: Zotlabs/Module/Mitem.php:179 Zotlabs/Module/Mitem.php:258 msgid "Menu Item Permissions" msgstr "" -#: Zotlabs/Module/Mitem.php:172 Zotlabs/Module/Mitem.php:251 -#: Zotlabs/Module/Settings/Channel.php:625 +#: Zotlabs/Module/Mitem.php:180 Zotlabs/Module/Mitem.php:259 +#: Zotlabs/Module/Settings/Channel.php:658 msgid "(click to open/close)" msgstr "" -#: Zotlabs/Module/Mitem.php:178 Zotlabs/Module/Mitem.php:195 +#: Zotlabs/Module/Mitem.php:186 Zotlabs/Module/Mitem.php:203 msgid "Link Name" msgstr "" -#: Zotlabs/Module/Mitem.php:179 Zotlabs/Module/Mitem.php:259 +#: Zotlabs/Module/Mitem.php:187 Zotlabs/Module/Mitem.php:267 msgid "Link or Submenu Target" msgstr "" -#: Zotlabs/Module/Mitem.php:179 +#: Zotlabs/Module/Mitem.php:187 msgid "Enter URL of the link or select a menu name to create a submenu" msgstr "" -#: Zotlabs/Module/Mitem.php:180 Zotlabs/Module/Mitem.php:260 +#: Zotlabs/Module/Mitem.php:188 Zotlabs/Module/Mitem.php:268 msgid "Use magic-auth if available" msgstr "" -#: Zotlabs/Module/Mitem.php:181 Zotlabs/Module/Mitem.php:261 +#: Zotlabs/Module/Mitem.php:189 Zotlabs/Module/Mitem.php:269 msgid "Open link in new window" msgstr "" -#: Zotlabs/Module/Mitem.php:182 Zotlabs/Module/Mitem.php:262 +#: Zotlabs/Module/Mitem.php:190 Zotlabs/Module/Mitem.php:270 msgid "Order in list" msgstr "" -#: Zotlabs/Module/Mitem.php:182 Zotlabs/Module/Mitem.php:262 +#: Zotlabs/Module/Mitem.php:190 Zotlabs/Module/Mitem.php:270 msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: Zotlabs/Module/Mitem.php:183 +#: Zotlabs/Module/Mitem.php:191 msgid "Submit and finish" msgstr "" -#: Zotlabs/Module/Mitem.php:184 +#: Zotlabs/Module/Mitem.php:192 msgid "Submit and continue" msgstr "" -#: Zotlabs/Module/Mitem.php:193 +#: Zotlabs/Module/Mitem.php:201 msgid "Menu:" msgstr "" -#: Zotlabs/Module/Mitem.php:196 +#: Zotlabs/Module/Mitem.php:204 msgid "Link Target" msgstr "" -#: Zotlabs/Module/Mitem.php:199 +#: Zotlabs/Module/Mitem.php:207 msgid "Edit menu" msgstr "" -#: Zotlabs/Module/Mitem.php:202 +#: Zotlabs/Module/Mitem.php:210 msgid "Edit element" msgstr "" -#: Zotlabs/Module/Mitem.php:203 +#: Zotlabs/Module/Mitem.php:211 msgid "Drop element" msgstr "" -#: Zotlabs/Module/Mitem.php:204 +#: Zotlabs/Module/Mitem.php:212 msgid "New element" msgstr "" -#: Zotlabs/Module/Mitem.php:205 +#: Zotlabs/Module/Mitem.php:213 msgid "Edit this menu container" msgstr "" -#: Zotlabs/Module/Mitem.php:206 +#: Zotlabs/Module/Mitem.php:214 msgid "Add menu element" msgstr "" -#: Zotlabs/Module/Mitem.php:207 +#: Zotlabs/Module/Mitem.php:215 msgid "Delete this menu item" msgstr "" -#: Zotlabs/Module/Mitem.php:208 +#: Zotlabs/Module/Mitem.php:216 msgid "Edit this menu item" msgstr "" -#: Zotlabs/Module/Mitem.php:226 +#: Zotlabs/Module/Mitem.php:233 msgid "Menu item not found." msgstr "" -#: Zotlabs/Module/Mitem.php:239 +#: Zotlabs/Module/Mitem.php:246 msgid "Menu item deleted." msgstr "" -#: Zotlabs/Module/Mitem.php:241 +#: Zotlabs/Module/Mitem.php:248 msgid "Menu item could not be deleted." msgstr "" -#: Zotlabs/Module/Mitem.php:248 +#: Zotlabs/Module/Mitem.php:256 msgid "Edit Menu Element" msgstr "" -#: Zotlabs/Module/Mitem.php:258 +#: Zotlabs/Module/Mitem.php:266 msgid "Link text" msgstr "" -#: Zotlabs/Module/Finger.php:20 +#: Zotlabs/Module/Finger.php:22 msgid "Webfinger Diagnostic" msgstr "" -#: Zotlabs/Module/Finger.php:21 +#: Zotlabs/Module/Finger.php:23 msgid "Lookup address or URL" msgstr "" -#: Zotlabs/Module/Editblock.php:142 +#: Zotlabs/Module/Editblock.php:151 msgid "Edit Block" msgstr "" -#: Zotlabs/Module/Like.php:172 Zotlabs/Module/Subthread.php:119 -#: Zotlabs/Module/Tagger.php:76 include/text.php:2245 -#: include/conversation.php:127 +#: Zotlabs/Module/Like.php:172 Zotlabs/Module/Subthread.php:124 +#: Zotlabs/Module/Tagger.php:84 include/conversation.php:129 +#: include/text.php:2369 msgid "photo" msgstr "" -#: Zotlabs/Module/Like.php:172 Zotlabs/Module/Subthread.php:119 +#: Zotlabs/Module/Like.php:172 Zotlabs/Module/Subthread.php:124 msgid "status" msgstr "" -#: Zotlabs/Module/Like.php:215 +#: Zotlabs/Module/Like.php:217 msgid "Undo a previous action" msgstr "" -#: Zotlabs/Module/Like.php:226 +#: Zotlabs/Module/Like.php:227 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: Zotlabs/Module/Like.php:229 +#: Zotlabs/Module/Like.php:230 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: Zotlabs/Module/Like.php:232 +#: Zotlabs/Module/Like.php:233 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: Zotlabs/Module/Share.php:119 +#: Zotlabs/Module/Share.php:134 msgid "Post repeated" msgstr "" -#: Zotlabs/Module/Lostpass.php:19 +#: Zotlabs/Module/Lostpass.php:25 msgid "No valid account found." msgstr "" -#: Zotlabs/Module/Lostpass.php:33 +#: Zotlabs/Module/Lostpass.php:40 msgid "Password reset request issued. Check your email." msgstr "" -#: Zotlabs/Module/Lostpass.php:39 Zotlabs/Module/Lostpass.php:108 +#: Zotlabs/Module/Lostpass.php:47 Zotlabs/Module/Lostpass.php:119 #, php-format msgid "Site Member (%s)" msgstr "" -#: Zotlabs/Module/Lostpass.php:44 Zotlabs/Module/Lostpass.php:49 +#: Zotlabs/Module/Lostpass.php:52 Zotlabs/Module/Lostpass.php:57 #, php-format msgid "Password reset requested at %s" msgstr "" -#: Zotlabs/Module/Lostpass.php:68 +#: Zotlabs/Module/Lostpass.php:78 msgid "" "Request could not be verified. (You may have previously submitted it.) " "Password reset failed." msgstr "" -#: Zotlabs/Module/Lostpass.php:91 boot.php:1727 +#: Zotlabs/Module/Lostpass.php:102 boot.php:1735 msgid "Password Reset" msgstr "" -#: Zotlabs/Module/Lostpass.php:92 +#: Zotlabs/Module/Lostpass.php:103 msgid "Your password has been reset as requested." msgstr "" -#: Zotlabs/Module/Lostpass.php:93 +#: Zotlabs/Module/Lostpass.php:104 msgid "Your new password is" msgstr "" -#: Zotlabs/Module/Lostpass.php:94 +#: Zotlabs/Module/Lostpass.php:105 msgid "Save or copy your new password - and then" msgstr "" -#: Zotlabs/Module/Lostpass.php:95 +#: Zotlabs/Module/Lostpass.php:106 msgid "click here to login" msgstr "" -#: Zotlabs/Module/Lostpass.php:96 +#: Zotlabs/Module/Lostpass.php:107 msgid "" "Your password may be changed from the Settings page after " "successful login." msgstr "" -#: Zotlabs/Module/Lostpass.php:117 +#: Zotlabs/Module/Lostpass.php:127 #, php-format msgid "Your password has changed at %s" msgstr "" -#: Zotlabs/Module/Lostpass.php:130 +#: Zotlabs/Module/Lostpass.php:138 msgid "Forgot your Password?" msgstr "" -#: Zotlabs/Module/Lostpass.php:131 +#: Zotlabs/Module/Lostpass.php:139 msgid "" "Enter your email address and submit to have your password reset. Then check " "your email for further instructions." msgstr "" -#: Zotlabs/Module/Lostpass.php:132 Zotlabs/Module/Settings/Channel.php:600 +#: Zotlabs/Module/Lostpass.php:140 Zotlabs/Module/Settings/Channel.php:633 msgid "Email Address" msgstr "" -#: Zotlabs/Module/Menu.php:70 +#: Zotlabs/Module/Menu.php:76 msgid "Unable to update menu." msgstr "" -#: Zotlabs/Module/Menu.php:81 +#: Zotlabs/Module/Menu.php:86 msgid "Unable to create menu." msgstr "" -#: Zotlabs/Module/Menu.php:163 Zotlabs/Module/Menu.php:176 +#: Zotlabs/Module/Menu.php:166 Zotlabs/Module/Menu.php:179 msgid "Menu Name" msgstr "" -#: Zotlabs/Module/Menu.php:163 +#: Zotlabs/Module/Menu.php:166 msgid "Unique name (not visible on webpage) - required" msgstr "" -#: Zotlabs/Module/Menu.php:164 Zotlabs/Module/Menu.php:177 +#: Zotlabs/Module/Menu.php:167 Zotlabs/Module/Menu.php:180 msgid "Menu Title" msgstr "" -#: Zotlabs/Module/Menu.php:164 +#: Zotlabs/Module/Menu.php:167 msgid "Visible on webpage - leave empty for no title" msgstr "" -#: Zotlabs/Module/Menu.php:165 +#: Zotlabs/Module/Menu.php:168 msgid "Allow Bookmarks" msgstr "" -#: Zotlabs/Module/Menu.php:165 Zotlabs/Module/Menu.php:224 +#: Zotlabs/Module/Menu.php:168 Zotlabs/Module/Menu.php:226 msgid "Menu may be used to store saved bookmarks" msgstr "" -#: Zotlabs/Module/Menu.php:166 Zotlabs/Module/Menu.php:227 +#: Zotlabs/Module/Menu.php:169 Zotlabs/Module/Menu.php:229 msgid "Submit and proceed" msgstr "" -#: Zotlabs/Module/Menu.php:173 include/text.php:2693 +#: Zotlabs/Module/Menu.php:176 include/text.php:2851 msgid "Menus" msgstr "" -#: Zotlabs/Module/Menu.php:179 Zotlabs/Module/Locs.php:125 +#: Zotlabs/Module/Menu.php:182 Zotlabs/Module/Locs.php:135 msgid "Drop" msgstr "" -#: Zotlabs/Module/Menu.php:183 +#: Zotlabs/Module/Menu.php:186 msgid "Bookmarks allowed" msgstr "" -#: Zotlabs/Module/Menu.php:185 +#: Zotlabs/Module/Menu.php:188 msgid "Delete this menu" msgstr "" -#: Zotlabs/Module/Menu.php:186 Zotlabs/Module/Menu.php:221 +#: Zotlabs/Module/Menu.php:189 Zotlabs/Module/Menu.php:223 msgid "Edit menu contents" msgstr "" -#: Zotlabs/Module/Menu.php:187 +#: Zotlabs/Module/Menu.php:190 msgid "Edit this menu" msgstr "" -#: Zotlabs/Module/Menu.php:203 +#: Zotlabs/Module/Menu.php:204 msgid "Menu could not be deleted." msgstr "" -#: Zotlabs/Module/Menu.php:216 +#: Zotlabs/Module/Menu.php:218 msgid "Edit Menu" msgstr "" -#: Zotlabs/Module/Menu.php:220 +#: Zotlabs/Module/Menu.php:222 msgid "Add or remove entries to this menu" msgstr "" -#: Zotlabs/Module/Menu.php:222 +#: Zotlabs/Module/Menu.php:224 msgid "Menu name" msgstr "" -#: Zotlabs/Module/Menu.php:222 +#: Zotlabs/Module/Menu.php:224 msgid "Must be unique, only seen by you" msgstr "" -#: Zotlabs/Module/Menu.php:223 +#: Zotlabs/Module/Menu.php:225 msgid "Menu title" msgstr "" -#: Zotlabs/Module/Menu.php:223 +#: Zotlabs/Module/Menu.php:225 msgid "Menu title as seen by others" msgstr "" -#: Zotlabs/Module/Menu.php:224 +#: Zotlabs/Module/Menu.php:226 msgid "Allow bookmarks" msgstr "" -#: Zotlabs/Module/Pconfig.php:35 Zotlabs/Module/Pconfig.php:72 +#: Zotlabs/Module/Pconfig.php:37 Zotlabs/Module/Pconfig.php:73 msgid "This setting requires special processing and editing has been blocked." msgstr "" -#: Zotlabs/Module/Pconfig.php:61 +#: Zotlabs/Module/Pconfig.php:63 msgid "Configuration Editor" msgstr "" -#: Zotlabs/Module/Pconfig.php:62 +#: Zotlabs/Module/Pconfig.php:64 msgid "" "Warning: Changing some settings could render your channel inoperable. Please " "leave this page unless you are comfortable with and knowledgeable about how " "to correctly use this feature." msgstr "" -#: Zotlabs/Module/Editpost.php:40 +#: Zotlabs/Module/Editpost.php:44 msgid "Item is not editable" msgstr "" -#: Zotlabs/Module/Editpost.php:142 Zotlabs/Module/Rpost.php:246 +#: Zotlabs/Module/Editpost.php:147 Zotlabs/Module/Rpost.php:242 msgid "Edit post" msgstr "" -#: Zotlabs/Module/Search.php:342 +#: Zotlabs/Module/Search.php:336 #, php-format msgid "Items tagged with: %s" msgstr "" -#: Zotlabs/Module/Search.php:344 +#: Zotlabs/Module/Search.php:338 #, php-format msgid "Search results for: %s" msgstr "" -#: Zotlabs/Module/Hq.php:147 +#: Zotlabs/Module/Hq.php:160 msgid "Welcome to $Projectname!" msgstr "" -#: Zotlabs/Module/Hq.php:147 +#: Zotlabs/Module/Hq.php:160 msgid "You have got no unseen posts..." msgstr "" -#: Zotlabs/Module/Locs.php:28 Zotlabs/Module/Locs.php:65 +#: Zotlabs/Module/Locs.php:31 Zotlabs/Module/Locs.php:72 msgid "Location not found." msgstr "" -#: Zotlabs/Module/Locs.php:73 +#: Zotlabs/Module/Locs.php:81 msgid "Location lookup failed." msgstr "" -#: Zotlabs/Module/Locs.php:77 +#: Zotlabs/Module/Locs.php:85 msgid "" "Please select another location to become primary before removing the primary " "location." msgstr "" -#: Zotlabs/Module/Locs.php:106 +#: Zotlabs/Module/Locs.php:115 msgid "Pushing location info" msgstr "" -#: Zotlabs/Module/Locs.php:116 +#: Zotlabs/Module/Locs.php:126 msgid "No locations found." msgstr "" -#: Zotlabs/Module/Locs.php:121 +#: Zotlabs/Module/Locs.php:131 msgid "Manage Channel Locations" msgstr "" -#: Zotlabs/Module/Locs.php:127 +#: Zotlabs/Module/Locs.php:137 msgid "Publish these settings" msgstr "" -#: Zotlabs/Module/Locs.php:128 +#: Zotlabs/Module/Locs.php:138 msgid "Please wait several minutes between consecutive operations." msgstr "" -#: Zotlabs/Module/Locs.php:129 +#: Zotlabs/Module/Locs.php:139 msgid "" "When possible, drop a location by logging into that website/hub and removing " "your channel." msgstr "" -#: Zotlabs/Module/Locs.php:130 +#: Zotlabs/Module/Locs.php:140 msgid "Use this form to drop the location if the hub is no longer operating." msgstr "" -#: Zotlabs/Module/Viewsrc.php:45 +#: Zotlabs/Module/Viewsrc.php:48 msgid "item" msgstr "" -#: Zotlabs/Module/Viewsrc.php:55 +#: Zotlabs/Module/Viewsrc.php:58 msgid "inspect" msgstr "" -#: Zotlabs/Module/New_channel.php:166 +#: Zotlabs/Module/New_channel.php:173 msgid "Your real name is recommended." msgstr "" -#: Zotlabs/Module/New_channel.php:167 +#: Zotlabs/Module/New_channel.php:174 msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" msgstr "" -#: Zotlabs/Module/New_channel.php:172 +#: Zotlabs/Module/New_channel.php:179 msgid "" "This will be used to create a unique network address (like an email address)." msgstr "" -#: Zotlabs/Module/New_channel.php:174 +#: Zotlabs/Module/New_channel.php:181 msgid "Allowed characters are a-z 0-9, - and _" msgstr "" -#: Zotlabs/Module/New_channel.php:182 +#: Zotlabs/Module/New_channel.php:189 msgid "Channel name" msgstr "" -#: Zotlabs/Module/New_channel.php:185 +#: Zotlabs/Module/New_channel.php:192 msgid "" "Select a channel permission role compatible with your usage needs and " "privacy requirements." msgstr "" -#: Zotlabs/Module/New_channel.php:188 +#: Zotlabs/Module/New_channel.php:195 msgid "Create a Channel" msgstr "" -#: Zotlabs/Module/New_channel.php:189 +#: Zotlabs/Module/New_channel.php:196 msgid "" "A channel is a unique network identity. It can represent a person (social " "network profile), a forum (group), a business or celebrity page, a newsfeed, " "and many other things." msgstr "" -#: Zotlabs/Module/New_channel.php:190 +#: Zotlabs/Module/New_channel.php:197 msgid "" "or import an existing channel from another location." msgstr "" -#: Zotlabs/Module/New_channel.php:195 +#: Zotlabs/Module/New_channel.php:202 msgid "Validate" msgstr "" -#: Zotlabs/Module/Connect.php:54 Zotlabs/Module/Connect.php:102 +#: Zotlabs/Module/Connect.php:56 Zotlabs/Module/Connect.php:106 msgid "Continue" msgstr "" -#: Zotlabs/Module/Connect.php:83 +#: Zotlabs/Module/Connect.php:87 msgid "Premium Channel Setup" msgstr "" -#: Zotlabs/Module/Connect.php:85 +#: Zotlabs/Module/Connect.php:89 msgid "Enable premium channel connection restrictions" msgstr "" -#: Zotlabs/Module/Connect.php:86 +#: Zotlabs/Module/Connect.php:90 msgid "" "Please enter your restrictions or conditions, such as paypal receipt, usage " "guidelines, etc." msgstr "" -#: Zotlabs/Module/Connect.php:88 Zotlabs/Module/Connect.php:108 +#: Zotlabs/Module/Connect.php:92 Zotlabs/Module/Connect.php:112 msgid "" "This channel may require additional steps or acknowledgement of the " "following conditions prior to connecting:" msgstr "" -#: Zotlabs/Module/Connect.php:89 +#: Zotlabs/Module/Connect.php:93 msgid "" "Potential connections will then see the following text before proceeding:" msgstr "" -#: Zotlabs/Module/Connect.php:90 Zotlabs/Module/Connect.php:111 +#: Zotlabs/Module/Connect.php:94 Zotlabs/Module/Connect.php:115 msgid "" "By continuing, I certify that I have complied with any instructions provided " "on this page." msgstr "" -#: Zotlabs/Module/Connect.php:99 +#: Zotlabs/Module/Connect.php:102 msgid "(No specific instructions have been provided by the channel owner.)" msgstr "" -#: Zotlabs/Module/Connect.php:107 +#: Zotlabs/Module/Connect.php:111 msgid "Restricted or Premium Channel" msgstr "" -#: Zotlabs/Module/Notifications.php:60 Zotlabs/Module/Notify.php:70 +#: Zotlabs/Module/Notifications.php:67 Zotlabs/Module/Notify.php:73 msgid "No more system notifications." msgstr "" -#: Zotlabs/Module/Notifications.php:64 Zotlabs/Module/Notify.php:74 +#: Zotlabs/Module/Notifications.php:71 Zotlabs/Module/Notify.php:77 msgid "System Notifications" msgstr "" -#: Zotlabs/Module/Notify.php:38 +#: Zotlabs/Module/Notify.php:42 #, php-format msgid "A notification with that id was not found for channel '%s'" msgstr "" -#: Zotlabs/Module/Acl.php:277 +#: Zotlabs/Module/Acl.php:261 msgid "network" msgstr "" -#: Zotlabs/Module/Mood.php:75 include/conversation.php:291 +#: Zotlabs/Module/Mood.php:80 include/conversation.php:296 #, php-format msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: Zotlabs/Module/Mood.php:134 Zotlabs/Module/Mood.php:154 +#: Zotlabs/Module/Mood.php:141 Zotlabs/Module/Mood.php:163 msgid "Set your current mood and tell your friends" msgstr "" -#: Zotlabs/Module/Vote.php:39 +#: Zotlabs/Module/Vote.php:41 msgid "Poll not found." msgstr "" -#: Zotlabs/Module/Vote.php:70 +#: Zotlabs/Module/Vote.php:72 msgid "Invalid response." msgstr "" -#: Zotlabs/Module/Vote.php:129 +#: Zotlabs/Module/Vote.php:131 msgid "Response submitted. Updates may not appear instantly." msgstr "" -#: Zotlabs/Module/Webpages.php:50 +#: Zotlabs/Module/Webpages.php:54 msgid "Provide managed web pages on your channel" msgstr "" -#: Zotlabs/Module/Webpages.php:70 +#: Zotlabs/Module/Webpages.php:74 msgid "Import Webpage Elements" msgstr "" -#: Zotlabs/Module/Webpages.php:71 +#: Zotlabs/Module/Webpages.php:75 msgid "Import selected" msgstr "" -#: Zotlabs/Module/Webpages.php:94 +#: Zotlabs/Module/Webpages.php:98 msgid "Export Webpage Elements" msgstr "" -#: Zotlabs/Module/Webpages.php:95 +#: Zotlabs/Module/Webpages.php:99 msgid "Export selected" msgstr "" -#: Zotlabs/Module/Webpages.php:264 +#: Zotlabs/Module/Webpages.php:273 msgid "Actions" msgstr "" -#: Zotlabs/Module/Webpages.php:265 +#: Zotlabs/Module/Webpages.php:274 msgid "Page Link" msgstr "" -#: Zotlabs/Module/Webpages.php:266 +#: Zotlabs/Module/Webpages.php:275 msgid "Page Title" msgstr "" -#: Zotlabs/Module/Webpages.php:296 +#: Zotlabs/Module/Webpages.php:305 msgid "Invalid file type." msgstr "" -#: Zotlabs/Module/Webpages.php:308 +#: Zotlabs/Module/Webpages.php:317 msgid "Error opening zip file" msgstr "" -#: Zotlabs/Module/Webpages.php:319 +#: Zotlabs/Module/Webpages.php:327 msgid "Invalid folder path." msgstr "" -#: Zotlabs/Module/Webpages.php:346 +#: Zotlabs/Module/Webpages.php:353 msgid "No webpage elements detected." msgstr "" -#: Zotlabs/Module/Webpages.php:421 Zotlabs/Import/Friendica.php:356 +#: Zotlabs/Module/Webpages.php:427 Zotlabs/Import/Friendica.php:360 msgid "Import complete." msgstr "" -#: Zotlabs/Module/Page.php:177 +#: Zotlabs/Module/Page.php:187 msgid "" "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " @@ -6781,737 +6790,737 @@ msgid "" "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "" -#: Zotlabs/Module/Removeme.php:45 +#: Zotlabs/Module/Removeme.php:48 msgid "" "Channel removals are not allowed within 48 hours of changing the account " "password." msgstr "" -#: Zotlabs/Module/Removeme.php:67 +#: Zotlabs/Module/Removeme.php:71 msgid "Remove This Channel" msgstr "" -#: Zotlabs/Module/Removeme.php:68 +#: Zotlabs/Module/Removeme.php:72 msgid "This channel will be completely removed from this server. " msgstr "" -#: Zotlabs/Module/Removeme.php:68 Zotlabs/Module/Removeaccount.php:68 +#: Zotlabs/Module/Removeme.php:72 Zotlabs/Module/Removeaccount.php:72 msgid "This action is permanent and can not be undone!" msgstr "" -#: Zotlabs/Module/Removeme.php:70 Zotlabs/Module/Settings/Channel.php:711 +#: Zotlabs/Module/Removeme.php:74 Zotlabs/Module/Settings/Channel.php:744 msgid "Remove Channel" msgstr "" -#: Zotlabs/Module/Pdledit.php:21 +#: Zotlabs/Module/Pdledit.php:27 msgid "Layout updated." msgstr "" -#: Zotlabs/Module/Pdledit.php:42 Zotlabs/Module/Pdledit.php:97 +#: Zotlabs/Module/Pdledit.php:49 Zotlabs/Module/Pdledit.php:106 msgid "Edit System Page Description" msgstr "" -#: Zotlabs/Module/Pdledit.php:63 Zotlabs/Module/Pdledit.php:71 +#: Zotlabs/Module/Pdledit.php:71 Zotlabs/Module/Pdledit.php:79 msgid "(modified)" msgstr "" -#: Zotlabs/Module/Pdledit.php:92 +#: Zotlabs/Module/Pdledit.php:101 msgid "Layout not found." msgstr "" -#: Zotlabs/Module/Pdledit.php:98 +#: Zotlabs/Module/Pdledit.php:107 msgid "Module Name:" msgstr "" -#: Zotlabs/Module/Pdledit.php:99 +#: Zotlabs/Module/Pdledit.php:108 msgid "Layout Help" msgstr "" -#: Zotlabs/Module/Pdledit.php:100 +#: Zotlabs/Module/Pdledit.php:109 msgid "Edit another layout" msgstr "" -#: Zotlabs/Module/Pdledit.php:101 +#: Zotlabs/Module/Pdledit.php:110 msgid "System layout" msgstr "" -#: Zotlabs/Module/Dreport.php:33 +#: Zotlabs/Module/Dreport.php:35 msgid "Invalid message" msgstr "" -#: Zotlabs/Module/Dreport.php:59 +#: Zotlabs/Module/Dreport.php:63 msgid "Delivery Log" msgstr "" -#: Zotlabs/Module/Dreport.php:92 +#: Zotlabs/Module/Dreport.php:97 msgid "no results" msgstr "" -#: Zotlabs/Module/Dreport.php:105 +#: Zotlabs/Module/Dreport.php:109 msgid "channel sync processed" msgstr "" -#: Zotlabs/Module/Dreport.php:109 +#: Zotlabs/Module/Dreport.php:113 msgid "queued" msgstr "" -#: Zotlabs/Module/Dreport.php:113 +#: Zotlabs/Module/Dreport.php:117 msgid "site dead" msgstr "" -#: Zotlabs/Module/Dreport.php:117 +#: Zotlabs/Module/Dreport.php:121 msgid "site might be dead - deferred" msgstr "" -#: Zotlabs/Module/Dreport.php:121 +#: Zotlabs/Module/Dreport.php:125 msgid "posted" msgstr "" -#: Zotlabs/Module/Dreport.php:125 +#: Zotlabs/Module/Dreport.php:129 msgid "accepted for delivery" msgstr "" -#: Zotlabs/Module/Dreport.php:129 +#: Zotlabs/Module/Dreport.php:133 msgid "updated" msgstr "" -#: Zotlabs/Module/Dreport.php:132 +#: Zotlabs/Module/Dreport.php:136 msgid "update ignored" msgstr "" -#: Zotlabs/Module/Dreport.php:135 +#: Zotlabs/Module/Dreport.php:139 msgid "permission denied" msgstr "" -#: Zotlabs/Module/Dreport.php:139 +#: Zotlabs/Module/Dreport.php:143 msgid "recipient not found" msgstr "" -#: Zotlabs/Module/Dreport.php:142 +#: Zotlabs/Module/Dreport.php:146 msgid "mail recalled" msgstr "" -#: Zotlabs/Module/Dreport.php:145 +#: Zotlabs/Module/Dreport.php:149 msgid "duplicate mail received" msgstr "" -#: Zotlabs/Module/Dreport.php:148 +#: Zotlabs/Module/Dreport.php:152 msgid "mail delivered" msgstr "" -#: Zotlabs/Module/Dreport.php:152 +#: Zotlabs/Module/Dreport.php:156 msgid "delivery rejected" msgstr "" -#: Zotlabs/Module/Dreport.php:171 +#: Zotlabs/Module/Dreport.php:175 #, php-format msgid "Delivery report for %1$s" msgstr "" -#: Zotlabs/Module/Dreport.php:174 +#: Zotlabs/Module/Dreport.php:178 msgid "Options" msgstr "" -#: Zotlabs/Module/Dreport.php:175 +#: Zotlabs/Module/Dreport.php:179 msgid "Redeliver" msgstr "" -#: Zotlabs/Module/Profiles.php:28 Zotlabs/Module/Profiles.php:182 -#: Zotlabs/Module/Profiles.php:236 Zotlabs/Module/Profiles.php:663 +#: Zotlabs/Module/Profiles.php:32 Zotlabs/Module/Profiles.php:198 +#: Zotlabs/Module/Profiles.php:254 Zotlabs/Module/Profiles.php:701 msgid "Profile not found." msgstr "" -#: Zotlabs/Module/Profiles.php:47 +#: Zotlabs/Module/Profiles.php:53 msgid "Profile deleted." msgstr "" -#: Zotlabs/Module/Profiles.php:71 Zotlabs/Module/Profiles.php:108 +#: Zotlabs/Module/Profiles.php:76 Zotlabs/Module/Profiles.php:118 msgid "Profile-" msgstr "" -#: Zotlabs/Module/Profiles.php:93 Zotlabs/Module/Profiles.php:130 +#: Zotlabs/Module/Profiles.php:101 Zotlabs/Module/Profiles.php:142 msgid "New profile created." msgstr "" -#: Zotlabs/Module/Profiles.php:114 +#: Zotlabs/Module/Profiles.php:125 msgid "Profile unavailable to clone." msgstr "" -#: Zotlabs/Module/Profiles.php:149 +#: Zotlabs/Module/Profiles.php:162 msgid "Profile unavailable to export." msgstr "" -#: Zotlabs/Module/Profiles.php:247 +#: Zotlabs/Module/Profiles.php:265 msgid "Profile Name is required." msgstr "" -#: Zotlabs/Module/Profiles.php:456 +#: Zotlabs/Module/Profiles.php:484 msgid "Marital Status" msgstr "" -#: Zotlabs/Module/Profiles.php:460 +#: Zotlabs/Module/Profiles.php:488 msgid "Romantic Partner" msgstr "" -#: Zotlabs/Module/Profiles.php:464 Zotlabs/Module/Profiles.php:780 +#: Zotlabs/Module/Profiles.php:492 Zotlabs/Module/Profiles.php:821 msgid "Likes" msgstr "" -#: Zotlabs/Module/Profiles.php:468 Zotlabs/Module/Profiles.php:781 +#: Zotlabs/Module/Profiles.php:496 Zotlabs/Module/Profiles.php:822 msgid "Dislikes" msgstr "" -#: Zotlabs/Module/Profiles.php:472 Zotlabs/Module/Profiles.php:788 +#: Zotlabs/Module/Profiles.php:500 Zotlabs/Module/Profiles.php:829 msgid "Work/Employment" msgstr "" -#: Zotlabs/Module/Profiles.php:475 +#: Zotlabs/Module/Profiles.php:503 msgid "Religion" msgstr "" -#: Zotlabs/Module/Profiles.php:479 +#: Zotlabs/Module/Profiles.php:507 msgid "Political Views" msgstr "" -#: Zotlabs/Module/Profiles.php:483 +#: Zotlabs/Module/Profiles.php:511 msgid "Gender" msgstr "" -#: Zotlabs/Module/Profiles.php:487 +#: Zotlabs/Module/Profiles.php:515 msgid "Sexual Preference" msgstr "" -#: Zotlabs/Module/Profiles.php:491 +#: Zotlabs/Module/Profiles.php:519 msgid "Homepage" msgstr "" -#: Zotlabs/Module/Profiles.php:495 +#: Zotlabs/Module/Profiles.php:523 msgid "Interests" msgstr "" -#: Zotlabs/Module/Profiles.php:593 +#: Zotlabs/Module/Profiles.php:623 msgid "Profile updated." msgstr "" -#: Zotlabs/Module/Profiles.php:682 +#: Zotlabs/Module/Profiles.php:721 msgid "Hide your connections list from viewers of this profile" msgstr "" -#: Zotlabs/Module/Profiles.php:726 +#: Zotlabs/Module/Profiles.php:767 msgid "Edit Profile Details" msgstr "" -#: Zotlabs/Module/Profiles.php:728 +#: Zotlabs/Module/Profiles.php:769 msgid "View this profile" msgstr "" -#: Zotlabs/Module/Profiles.php:730 +#: Zotlabs/Module/Profiles.php:771 msgid "Profile Tools" msgstr "" -#: Zotlabs/Module/Profiles.php:731 +#: Zotlabs/Module/Profiles.php:772 msgid "Change cover photo" msgstr "" -#: Zotlabs/Module/Profiles.php:733 +#: Zotlabs/Module/Profiles.php:774 msgid "Create a new profile using these settings" msgstr "" -#: Zotlabs/Module/Profiles.php:734 +#: Zotlabs/Module/Profiles.php:775 msgid "Clone this profile" msgstr "" -#: Zotlabs/Module/Profiles.php:735 +#: Zotlabs/Module/Profiles.php:776 msgid "Delete this profile" msgstr "" -#: Zotlabs/Module/Profiles.php:736 +#: Zotlabs/Module/Profiles.php:777 msgid "Add profile things" msgstr "" -#: Zotlabs/Module/Profiles.php:737 +#: Zotlabs/Module/Profiles.php:778 msgid "Personal" msgstr "" -#: Zotlabs/Module/Profiles.php:739 +#: Zotlabs/Module/Profiles.php:780 msgid "Relationship" msgstr "" -#: Zotlabs/Module/Profiles.php:740 Zotlabs/Module/Settings/Channel.php:706 -#: Zotlabs/Widget/Newmember.php:49 include/datetime.php:58 +#: Zotlabs/Module/Profiles.php:781 Zotlabs/Module/Settings/Channel.php:739 +#: Zotlabs/Widget/Newmember.php:52 include/datetime.php:72 msgid "Miscellaneous" msgstr "" -#: Zotlabs/Module/Profiles.php:742 +#: Zotlabs/Module/Profiles.php:783 msgid "Import profile from file" msgstr "" -#: Zotlabs/Module/Profiles.php:743 +#: Zotlabs/Module/Profiles.php:784 msgid "Export profile to file" msgstr "" -#: Zotlabs/Module/Profiles.php:744 +#: Zotlabs/Module/Profiles.php:785 msgid "Your gender" msgstr "" -#: Zotlabs/Module/Profiles.php:745 +#: Zotlabs/Module/Profiles.php:786 msgid "Marital status" msgstr "" -#: Zotlabs/Module/Profiles.php:746 +#: Zotlabs/Module/Profiles.php:787 msgid "Sexual preference" msgstr "" -#: Zotlabs/Module/Profiles.php:747 +#: Zotlabs/Module/Profiles.php:788 msgid "Pronouns" msgstr "" -#: Zotlabs/Module/Profiles.php:750 +#: Zotlabs/Module/Profiles.php:791 msgid "Profile name" msgstr "" -#: Zotlabs/Module/Profiles.php:754 +#: Zotlabs/Module/Profiles.php:795 msgid "Your full name" msgstr "" -#: Zotlabs/Module/Profiles.php:755 +#: Zotlabs/Module/Profiles.php:796 msgid "Title/Description" msgstr "" -#: Zotlabs/Module/Profiles.php:758 +#: Zotlabs/Module/Profiles.php:799 msgid "Street address" msgstr "" -#: Zotlabs/Module/Profiles.php:759 +#: Zotlabs/Module/Profiles.php:800 msgid "Locality/City" msgstr "" -#: Zotlabs/Module/Profiles.php:760 +#: Zotlabs/Module/Profiles.php:801 msgid "Region/State" msgstr "" -#: Zotlabs/Module/Profiles.php:761 +#: Zotlabs/Module/Profiles.php:802 msgid "Postal/Zip code" msgstr "" -#: Zotlabs/Module/Profiles.php:768 +#: Zotlabs/Module/Profiles.php:809 msgid "Who (if applicable)" msgstr "" -#: Zotlabs/Module/Profiles.php:768 +#: Zotlabs/Module/Profiles.php:809 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: Zotlabs/Module/Profiles.php:769 +#: Zotlabs/Module/Profiles.php:810 msgid "Since (date)" msgstr "" -#: Zotlabs/Module/Profiles.php:774 +#: Zotlabs/Module/Profiles.php:815 msgid "Tell us about yourself" msgstr "" -#: Zotlabs/Module/Profiles.php:775 +#: Zotlabs/Module/Profiles.php:816 msgid "Homepage URL" msgstr "" -#: Zotlabs/Module/Profiles.php:776 +#: Zotlabs/Module/Profiles.php:817 msgid "Hometown" msgstr "" -#: Zotlabs/Module/Profiles.php:777 +#: Zotlabs/Module/Profiles.php:818 msgid "Political views" msgstr "" -#: Zotlabs/Module/Profiles.php:778 +#: Zotlabs/Module/Profiles.php:819 msgid "Religious views" msgstr "" -#: Zotlabs/Module/Profiles.php:779 +#: Zotlabs/Module/Profiles.php:820 msgid "Keywords used in directory listings" msgstr "" -#: Zotlabs/Module/Profiles.php:779 +#: Zotlabs/Module/Profiles.php:820 msgid "Example: fishing photography software" msgstr "" -#: Zotlabs/Module/Profiles.php:782 +#: Zotlabs/Module/Profiles.php:823 msgid "Musical interests" msgstr "" -#: Zotlabs/Module/Profiles.php:783 +#: Zotlabs/Module/Profiles.php:824 msgid "Books, literature" msgstr "" -#: Zotlabs/Module/Profiles.php:784 +#: Zotlabs/Module/Profiles.php:825 msgid "Television" msgstr "" -#: Zotlabs/Module/Profiles.php:785 +#: Zotlabs/Module/Profiles.php:826 msgid "Film/Dance/Culture/Entertainment" msgstr "" -#: Zotlabs/Module/Profiles.php:786 +#: Zotlabs/Module/Profiles.php:827 msgid "Hobbies/Interests" msgstr "" -#: Zotlabs/Module/Profiles.php:787 +#: Zotlabs/Module/Profiles.php:828 msgid "Love/Romance" msgstr "" -#: Zotlabs/Module/Profiles.php:789 +#: Zotlabs/Module/Profiles.php:830 msgid "School/Education" msgstr "" -#: Zotlabs/Module/Profiles.php:790 +#: Zotlabs/Module/Profiles.php:831 msgid "Contact information and social networks" msgstr "" -#: Zotlabs/Module/Profiles.php:791 +#: Zotlabs/Module/Profiles.php:832 msgid "My other channels" msgstr "" -#: Zotlabs/Module/Profiles.php:793 +#: Zotlabs/Module/Profiles.php:834 msgid "Communications" msgstr "" -#: Zotlabs/Module/Profiles.php:890 +#: Zotlabs/Module/Profiles.php:932 msgid " and " msgstr "" -#: Zotlabs/Module/Profiles.php:892 +#: Zotlabs/Module/Profiles.php:934 msgid ", " msgstr "" -#: Zotlabs/Module/Profiles.php:898 +#: Zotlabs/Module/Profiles.php:941 msgid "public profile" msgstr "" -#: Zotlabs/Module/Profiles.php:907 +#: Zotlabs/Module/Profiles.php:951 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: Zotlabs/Module/Profiles.php:908 +#: Zotlabs/Module/Profiles.php:952 #, php-format msgid "Visit %1$s's %2$s" msgstr "" -#: Zotlabs/Module/Profiles.php:911 +#: Zotlabs/Module/Profiles.php:954 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: Zotlabs/Module/Profiles.php:942 +#: Zotlabs/Module/Profiles.php:985 msgid "Currently Male" msgstr "" -#: Zotlabs/Module/Profiles.php:942 +#: Zotlabs/Module/Profiles.php:985 msgid "Currently Female" msgstr "" -#: Zotlabs/Module/Profiles.php:942 +#: Zotlabs/Module/Profiles.php:985 msgid "Mostly Male" msgstr "" -#: Zotlabs/Module/Profiles.php:942 +#: Zotlabs/Module/Profiles.php:985 msgid "Mostly Female" msgstr "" -#: Zotlabs/Module/Profiles.php:942 +#: Zotlabs/Module/Profiles.php:985 msgid "Transgender" msgstr "" -#: Zotlabs/Module/Profiles.php:942 +#: Zotlabs/Module/Profiles.php:985 msgid "Intersex" msgstr "" -#: Zotlabs/Module/Profiles.php:942 +#: Zotlabs/Module/Profiles.php:985 msgid "Transsexual" msgstr "" -#: Zotlabs/Module/Profiles.php:942 +#: Zotlabs/Module/Profiles.php:985 msgid "Hermaphrodite" msgstr "" -#: Zotlabs/Module/Profiles.php:942 +#: Zotlabs/Module/Profiles.php:985 msgid "Undecided" msgstr "" -#: Zotlabs/Module/Profiles.php:976 +#: Zotlabs/Module/Profiles.php:1021 msgid "He/Him" msgstr "" -#: Zotlabs/Module/Profiles.php:976 +#: Zotlabs/Module/Profiles.php:1021 msgid "She/Her" msgstr "" -#: Zotlabs/Module/Profiles.php:976 +#: Zotlabs/Module/Profiles.php:1021 msgid "They/Them" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 Zotlabs/Module/Profiles.php:1027 +#: Zotlabs/Module/Profiles.php:1053 Zotlabs/Module/Profiles.php:1073 msgid "Males" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 Zotlabs/Module/Profiles.php:1027 +#: Zotlabs/Module/Profiles.php:1053 Zotlabs/Module/Profiles.php:1073 msgid "Females" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 +#: Zotlabs/Module/Profiles.php:1053 msgid "Gay" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 +#: Zotlabs/Module/Profiles.php:1053 msgid "Lesbian" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 +#: Zotlabs/Module/Profiles.php:1053 msgid "No Preference" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 +#: Zotlabs/Module/Profiles.php:1053 msgid "Bisexual" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 +#: Zotlabs/Module/Profiles.php:1053 msgid "Autosexual" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 +#: Zotlabs/Module/Profiles.php:1053 msgid "Abstinent" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 +#: Zotlabs/Module/Profiles.php:1053 msgid "Virgin" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 +#: Zotlabs/Module/Profiles.php:1053 msgid "Deviant" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 +#: Zotlabs/Module/Profiles.php:1053 msgid "Fetish" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 +#: Zotlabs/Module/Profiles.php:1053 msgid "Oodles" msgstr "" -#: Zotlabs/Module/Profiles.php:1008 +#: Zotlabs/Module/Profiles.php:1053 msgid "Nonsexual" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 Zotlabs/Module/Profiles.php:1063 +#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110 msgid "Single" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Lonely" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Available" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Unavailable" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Has crush" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Infatuated" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 Zotlabs/Module/Profiles.php:1063 +#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110 msgid "Dating" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Unfaithful" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Sex Addict" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Friends/Benefits" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Casual" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Engaged" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 Zotlabs/Module/Profiles.php:1063 +#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110 msgid "Married" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Imaginarily married" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Partners" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 Zotlabs/Module/Profiles.php:1063 +#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110 msgid "Cohabiting" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Common law" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Happy" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Not looking" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Swinger" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Betrayed" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 Zotlabs/Module/Profiles.php:1063 +#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110 msgid "Separated" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Unstable" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 Zotlabs/Module/Profiles.php:1063 +#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110 msgid "Divorced" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Imaginarily divorced" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 Zotlabs/Module/Profiles.php:1063 +#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110 msgid "Widowed" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Uncertain" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 Zotlabs/Module/Profiles.php:1063 +#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110 msgid "It's complicated" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Don't care" msgstr "" -#: Zotlabs/Module/Profiles.php:1046 +#: Zotlabs/Module/Profiles.php:1092 msgid "Ask me" msgstr "" -#: Zotlabs/Module/Stream.php:136 Zotlabs/Widget/Activity_filter.php:147 -#: include/network.php:1603 +#: Zotlabs/Module/Stream.php:139 Zotlabs/Widget/Activity_filter.php:149 +#: include/network.php:1693 msgid "Nomad" msgstr "" -#: Zotlabs/Module/Stream.php:140 Zotlabs/Widget/Activity_filter.php:150 -#: include/network.php:1599 +#: Zotlabs/Module/Stream.php:143 Zotlabs/Widget/Activity_filter.php:152 +#: include/network.php:1689 msgid "ActivityPub" msgstr "" -#: Zotlabs/Module/Stream.php:155 +#: Zotlabs/Module/Stream.php:158 msgid "Access list not found" msgstr "" -#: Zotlabs/Module/Stream.php:201 +#: Zotlabs/Module/Stream.php:202 msgid "No such channel" msgstr "" -#: Zotlabs/Module/Stream.php:290 +#: Zotlabs/Module/Stream.php:288 msgid "Access list is empty" msgstr "" -#: Zotlabs/Module/Stream.php:304 include/items.php:4399 +#: Zotlabs/Module/Stream.php:302 include/items.php:4552 #, php-format msgid "Access list: %s" msgstr "" -#: Zotlabs/Module/Stream.php:352 extend/addon/a/zotpost/Mod_zotpost.php:29 +#: Zotlabs/Module/Stream.php:345 extend/addon/a/zotpost/Mod_zotpost.php:29 msgid "Invalid channel." msgstr "" -#: Zotlabs/Module/Profile_photo.php:500 +#: Zotlabs/Module/Profile_photo.php:502 msgid "" "Your profile photo is visible to anybody on the internet and may be " "distributed to other websites." msgstr "" -#: Zotlabs/Module/Profile_photo.php:504 +#: Zotlabs/Module/Profile_photo.php:506 msgid "Use Photo for Profile" msgstr "" -#: Zotlabs/Module/Profile_photo.php:504 +#: Zotlabs/Module/Profile_photo.php:506 msgid "Change Profile Photo" msgstr "" -#: Zotlabs/Module/Poke.php:100 +#: Zotlabs/Module/Poke.php:104 #, php-format msgid "You %1$s %2$s" msgstr "" -#: Zotlabs/Module/Poke.php:116 +#: Zotlabs/Module/Poke.php:120 msgid "Poke App (Not Installed)" msgstr "" -#: Zotlabs/Module/Poke.php:117 +#: Zotlabs/Module/Poke.php:121 msgid "Poke or do something else to somebody" msgstr "" -#: Zotlabs/Module/Poke.php:136 +#: Zotlabs/Module/Poke.php:140 msgid "Poke, prod or do other things to somebody" msgstr "" -#: Zotlabs/Module/Poke.php:141 +#: Zotlabs/Module/Poke.php:145 msgid "Recipient" msgstr "" -#: Zotlabs/Module/Poke.php:142 +#: Zotlabs/Module/Poke.php:146 msgid "Choose your default action" msgstr "" -#: Zotlabs/Module/Profperm.php:38 Zotlabs/Module/Profperm.php:67 +#: Zotlabs/Module/Profperm.php:41 Zotlabs/Module/Profperm.php:75 msgid "Invalid profile identifier." msgstr "" -#: Zotlabs/Module/Profperm.php:115 +#: Zotlabs/Module/Profperm.php:129 msgid "Profile Visibility Editor" msgstr "" -#: Zotlabs/Module/Profperm.php:119 +#: Zotlabs/Module/Profperm.php:133 msgid "Click on a contact to add or remove." msgstr "" -#: Zotlabs/Module/Profperm.php:128 +#: Zotlabs/Module/Profperm.php:142 msgid "Visible To" msgstr "" -#: Zotlabs/Module/Affinity.php:26 +#: Zotlabs/Module/Affinity.php:31 msgid "Friend Zoom settings updated." msgstr "" -#: Zotlabs/Module/Affinity.php:37 +#: Zotlabs/Module/Affinity.php:41 msgid "" "This app (when installed) presents a slider control in your connection " "editor and also on your stream page. The slider represents your degree of " @@ -7519,911 +7528,911 @@ msgid "" "conversations from only your closest friends or everybody in your stream." msgstr "" -#: Zotlabs/Module/Affinity.php:45 +#: Zotlabs/Module/Affinity.php:49 msgid "" "The number below represents the default maximum slider position for your " "stream page as a percentage." msgstr "" -#: Zotlabs/Module/Affinity.php:71 +#: Zotlabs/Module/Affinity.php:74 msgid "Default friend zoom in/out" msgstr "" -#: Zotlabs/Module/Affinity.php:72 Zotlabs/Widget/Affinity.php:38 +#: Zotlabs/Module/Affinity.php:75 Zotlabs/Widget/Affinity.php:40 msgid "Refresh" msgstr "" -#: Zotlabs/Module/Affinity.php:83 +#: Zotlabs/Module/Affinity.php:86 msgid "Friend Zoom Settings" msgstr "" -#: Zotlabs/Module/Zot_probe.php:15 +#: Zotlabs/Module/Zot_probe.php:18 msgid "Zot6 Probe Diagnostic" msgstr "" -#: Zotlabs/Module/Zot_probe.php:16 Zotlabs/Module/Ap_probe.php:19 +#: Zotlabs/Module/Zot_probe.php:19 Zotlabs/Module/Ap_probe.php:21 msgid "Object URL" msgstr "" -#: Zotlabs/Module/Zot_probe.php:17 Zotlabs/Module/Ap_probe.php:20 +#: Zotlabs/Module/Zot_probe.php:20 Zotlabs/Module/Ap_probe.php:22 msgid "Authenticated fetch" msgstr "" -#: Zotlabs/Module/Home.php:159 +#: Zotlabs/Module/Home.php:161 #, php-format msgid "Welcome to %s" msgstr "" -#: Zotlabs/Module/Oexchange.php:25 +#: Zotlabs/Module/Oexchange.php:28 msgid "Unable to find your site." msgstr "" -#: Zotlabs/Module/Oexchange.php:39 +#: Zotlabs/Module/Oexchange.php:42 msgid "Post successful." msgstr "" -#: Zotlabs/Module/Regmod.php:15 +#: Zotlabs/Module/Regmod.php:19 msgid "Please login." msgstr "" -#: Zotlabs/Module/Removeaccount.php:46 +#: Zotlabs/Module/Removeaccount.php:49 msgid "" "Account removals are not allowed within 48 hours of changing the account " "password." msgstr "" -#: Zotlabs/Module/Removeaccount.php:67 +#: Zotlabs/Module/Removeaccount.php:71 msgid "Remove This Account" msgstr "" -#: Zotlabs/Module/Removeaccount.php:68 +#: Zotlabs/Module/Removeaccount.php:72 msgid "" "This account and all its channels will be completely removed from this " "server. " msgstr "" -#: Zotlabs/Module/Removeaccount.php:70 Zotlabs/Module/Settings/Account.php:106 +#: Zotlabs/Module/Removeaccount.php:74 Zotlabs/Module/Settings/Account.php:116 msgid "Remove Account" msgstr "" -#: Zotlabs/Module/Rmagic.php:39 +#: Zotlabs/Module/Rmagic.php:44 msgid "Authentication failed." msgstr "" -#: Zotlabs/Module/Rmagic.php:80 boot.php:1719 include/channel.php:2018 +#: Zotlabs/Module/Rmagic.php:84 boot.php:1727 include/channel.php:2142 msgid "Remote Authentication" msgstr "" -#: Zotlabs/Module/Rmagic.php:81 include/channel.php:2019 +#: Zotlabs/Module/Rmagic.php:85 include/channel.php:2143 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: Zotlabs/Module/Rmagic.php:84 include/channel.php:2020 +#: Zotlabs/Module/Rmagic.php:88 include/channel.php:2144 msgid "Authenticate" msgstr "" -#: Zotlabs/Module/Ap_probe.php:18 +#: Zotlabs/Module/Ap_probe.php:20 msgid "ActivityPub Probe Diagnostic" msgstr "" -#: Zotlabs/Module/Tasks.php:102 +#: Zotlabs/Module/Tasks.php:106 msgid "This app provides a simple personal and task list." msgstr "" -#: Zotlabs/Module/Service_limits.php:23 +#: Zotlabs/Module/Service_limits.php:28 msgid "No service class restrictions found." msgstr "" -#: Zotlabs/Module/Settings/Featured.php:25 +#: Zotlabs/Module/Settings/Account.php:23 +msgid "Not valid email." +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:27 +msgid "Protected email address. Cannot change to that email." +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:37 +msgid "System failure storing new email. Please try again." +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:55 +msgid "Password verification failed." +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:62 +msgid "Passwords do not match. Password unchanged." +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:66 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:81 +msgid "Password changed." +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:83 +msgid "Password update failed. Please try again." +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:110 +msgid "Account Settings" +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:111 +msgid "Current Password" +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:112 +msgid "Enter New Password" +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:113 +msgid "Confirm New Password" +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:113 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:115 +msgid "Email Address:" +msgstr "" + +#: Zotlabs/Module/Settings/Account.php:117 +msgid "Remove this account including all its channels" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:156 +#, php-format +msgid "%s - (Experimental)" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:199 +msgid "Display Settings" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:200 +msgid "Theme Settings" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:201 +msgid "Custom Theme Settings" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:202 +msgid "Content Settings" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:208 +msgid "Display Theme:" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:209 +msgid "Select scheme" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:211 +msgid "Preload images before rendering the page" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:211 +msgid "" +"The subjective page load time will be longer but the page will be ready when " +"displayed" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:212 +msgid "Enable user zoom on mobile devices" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:213 +msgid "Update notifications every xx seconds" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:213 +msgid "Minimum of 15 seconds, no maximum" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:214 +msgid "Maximum number of conversations to load at any time:" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:214 +msgid "Maximum of 100 items" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:215 +msgid "Show emoticons (smilies) as images" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:216 +msgid "Provide channel menu in navigation bar" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:216 +msgid "Default: channel menu located in app menu" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:217 +msgid "System Page Layout Editor - (advanced)" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:220 +msgid "Channel page max height of content (in pixels)" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:220 +#: Zotlabs/Module/Settings/Display.php:221 +msgid "click to expand content exceeding this height" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:221 +msgid "Stream page max height of content (in pixels)" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:222 +msgid "Indent threaded comments this many pixels from the parent" +msgstr "" + +#: Zotlabs/Module/Settings/Display.php:222 +msgid "0-20" +msgstr "" + +#: Zotlabs/Module/Settings/Featured.php:28 msgid "Affinity Slider settings updated." msgstr "" -#: Zotlabs/Module/Settings/Featured.php:40 +#: Zotlabs/Module/Settings/Featured.php:43 msgid "No feature settings configured" msgstr "" -#: Zotlabs/Module/Settings/Featured.php:47 +#: Zotlabs/Module/Settings/Featured.php:50 msgid "Default maximum affinity level" msgstr "" -#: Zotlabs/Module/Settings/Featured.php:47 +#: Zotlabs/Module/Settings/Featured.php:50 msgid "0-99 default 99" msgstr "" -#: Zotlabs/Module/Settings/Featured.php:52 +#: Zotlabs/Module/Settings/Featured.php:55 msgid "Default minimum affinity level" msgstr "" -#: Zotlabs/Module/Settings/Featured.php:52 +#: Zotlabs/Module/Settings/Featured.php:55 msgid "0-99 - default 0" msgstr "" -#: Zotlabs/Module/Settings/Featured.php:56 +#: Zotlabs/Module/Settings/Featured.php:59 msgid "Affinity Slider Settings" msgstr "" -#: Zotlabs/Module/Settings/Featured.php:69 +#: Zotlabs/Module/Settings/Featured.php:72 msgid "Addon Settings" msgstr "" -#: Zotlabs/Module/Settings/Featured.php:70 +#: Zotlabs/Module/Settings/Featured.php:73 msgid "Please save/submit changes to any panel before opening another." msgstr "" -#: Zotlabs/Module/Settings/Network.php:30 -#: Zotlabs/Module/Settings/Features.php:47 +#: Zotlabs/Module/Settings/Features.php:51 +#: Zotlabs/Module/Settings/Network.php:33 msgid "Off" msgstr "" -#: Zotlabs/Module/Settings/Network.php:30 -#: Zotlabs/Module/Settings/Features.php:47 +#: Zotlabs/Module/Settings/Features.php:51 +#: Zotlabs/Module/Settings/Network.php:33 msgid "On" msgstr "" -#: Zotlabs/Module/Settings/Network.php:38 +#: Zotlabs/Module/Settings/Features.php:59 +msgid "Additional Features" +msgstr "" + +#: Zotlabs/Module/Settings/Network.php:41 msgid "Activity Settings" msgstr "" -#: Zotlabs/Module/Settings/Network.php:52 include/features.php:375 +#: Zotlabs/Module/Settings/Network.php:56 include/features.php:383 msgid "Search by Date" msgstr "" -#: Zotlabs/Module/Settings/Network.php:53 include/features.php:376 +#: Zotlabs/Module/Settings/Network.php:57 include/features.php:384 msgid "Ability to select posts by date ranges" msgstr "" -#: Zotlabs/Module/Settings/Network.php:60 Zotlabs/Widget/Savedsearch.php:83 -#: include/features.php:385 +#: Zotlabs/Module/Settings/Network.php:64 Zotlabs/Widget/Savedsearch.php:94 +#: include/features.php:393 msgid "Saved Searches" msgstr "" -#: Zotlabs/Module/Settings/Network.php:61 include/features.php:386 +#: Zotlabs/Module/Settings/Network.php:65 include/features.php:394 msgid "Save search terms for re-use" msgstr "" -#: Zotlabs/Module/Settings/Network.php:68 include/features.php:394 +#: Zotlabs/Module/Settings/Network.php:72 include/features.php:402 msgid "Alternate Stream Order" msgstr "" -#: Zotlabs/Module/Settings/Network.php:69 include/features.php:395 +#: Zotlabs/Module/Settings/Network.php:73 include/features.php:403 msgid "" "Ability to order the stream by last post date, last comment date or " "unthreaded activities" msgstr "" -#: Zotlabs/Module/Settings/Network.php:76 include/features.php:403 +#: Zotlabs/Module/Settings/Network.php:80 include/features.php:411 msgid "Contact Filter" msgstr "" -#: Zotlabs/Module/Settings/Network.php:77 include/features.php:404 +#: Zotlabs/Module/Settings/Network.php:81 include/features.php:412 msgid "Ability to display only posts of a selected contact" msgstr "" -#: Zotlabs/Module/Settings/Network.php:84 include/features.php:412 +#: Zotlabs/Module/Settings/Network.php:88 include/features.php:420 msgid "Forum Filter" msgstr "" -#: Zotlabs/Module/Settings/Network.php:85 include/features.php:413 +#: Zotlabs/Module/Settings/Network.php:89 include/features.php:421 msgid "Ability to display only posts of a specific forum" msgstr "" -#: Zotlabs/Module/Settings/Network.php:92 include/features.php:421 +#: Zotlabs/Module/Settings/Network.php:96 include/features.php:429 msgid "Personal Posts Filter" msgstr "" -#: Zotlabs/Module/Settings/Network.php:93 include/features.php:422 +#: Zotlabs/Module/Settings/Network.php:97 include/features.php:430 msgid "Ability to display only posts that you've interacted on" msgstr "" -#: Zotlabs/Module/Settings/Network.php:100 include/features.php:430 +#: Zotlabs/Module/Settings/Network.php:104 include/features.php:438 msgid "Affinity Tool" msgstr "" -#: Zotlabs/Module/Settings/Network.php:101 include/features.php:431 +#: Zotlabs/Module/Settings/Network.php:105 include/features.php:439 msgid "Filter stream activity by depth of relationships" msgstr "" -#: Zotlabs/Module/Settings/Network.php:109 include/features.php:440 +#: Zotlabs/Module/Settings/Network.php:113 include/features.php:448 msgid "Show friend and connection suggestions" msgstr "" -#: Zotlabs/Module/Settings/Network.php:116 include/features.php:448 +#: Zotlabs/Module/Settings/Network.php:120 include/features.php:456 msgid "Connection Filtering" msgstr "" -#: Zotlabs/Module/Settings/Network.php:117 include/features.php:449 +#: Zotlabs/Module/Settings/Network.php:121 include/features.php:457 msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:35 +#: Zotlabs/Module/Settings/Oauth.php:37 msgid "Name is required" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:39 +#: Zotlabs/Module/Settings/Oauth.php:41 msgid "Key and Secret are required" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:87 Zotlabs/Module/Settings/Oauth.php:113 -#: Zotlabs/Module/Settings/Oauth.php:149 Zotlabs/Module/Settings/Oauth2.php:133 -#: Zotlabs/Module/Settings/Oauth2.php:195 +#: Zotlabs/Module/Settings/Oauth.php:94 Zotlabs/Module/Settings/Oauth.php:122 +#: Zotlabs/Module/Settings/Oauth.php:162 Zotlabs/Module/Settings/Oauth2.php:142 +#: Zotlabs/Module/Settings/Oauth2.php:210 msgid "Add application" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:90 Zotlabs/Module/Settings/Oauth2.php:107 -#: Zotlabs/Module/Settings/Oauth2.php:136 +#: Zotlabs/Module/Settings/Oauth.php:97 Zotlabs/Module/Settings/Oauth2.php:115 +#: Zotlabs/Module/Settings/Oauth2.php:145 msgid "Name of application" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:91 Zotlabs/Module/Settings/Oauth.php:117 +#: Zotlabs/Module/Settings/Oauth.php:98 Zotlabs/Module/Settings/Oauth.php:126 msgid "Consumer Key" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:91 Zotlabs/Module/Settings/Oauth.php:92 -#: Zotlabs/Module/Settings/Oauth2.php:108 -#: Zotlabs/Module/Settings/Oauth2.php:109 -#: Zotlabs/Module/Settings/Oauth2.php:137 -#: Zotlabs/Module/Settings/Oauth2.php:138 +#: Zotlabs/Module/Settings/Oauth.php:98 Zotlabs/Module/Settings/Oauth.php:99 +#: Zotlabs/Module/Settings/Oauth2.php:116 +#: Zotlabs/Module/Settings/Oauth2.php:117 +#: Zotlabs/Module/Settings/Oauth2.php:146 +#: Zotlabs/Module/Settings/Oauth2.php:147 msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:92 Zotlabs/Module/Settings/Oauth.php:118 -#: Zotlabs/Module/Settings/Oauth2.php:109 -#: Zotlabs/Module/Settings/Oauth2.php:138 +#: Zotlabs/Module/Settings/Oauth.php:99 Zotlabs/Module/Settings/Oauth.php:127 +#: Zotlabs/Module/Settings/Oauth2.php:117 +#: Zotlabs/Module/Settings/Oauth2.php:147 msgid "Consumer Secret" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:93 Zotlabs/Module/Settings/Oauth.php:119 -#: Zotlabs/Module/Settings/Oauth2.php:110 -#: Zotlabs/Module/Settings/Oauth2.php:139 +#: Zotlabs/Module/Settings/Oauth.php:100 Zotlabs/Module/Settings/Oauth.php:128 +#: Zotlabs/Module/Settings/Oauth2.php:118 +#: Zotlabs/Module/Settings/Oauth2.php:148 msgid "Redirect" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:93 Zotlabs/Module/Settings/Oauth2.php:110 -#: Zotlabs/Module/Settings/Oauth2.php:139 +#: Zotlabs/Module/Settings/Oauth.php:100 Zotlabs/Module/Settings/Oauth2.php:118 +#: Zotlabs/Module/Settings/Oauth2.php:148 msgid "" "Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:94 Zotlabs/Module/Settings/Oauth.php:120 +#: Zotlabs/Module/Settings/Oauth.php:101 Zotlabs/Module/Settings/Oauth.php:129 msgid "Icon url" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:94 Zotlabs/Module/Sources.php:121 -#: Zotlabs/Module/Sources.php:156 +#: Zotlabs/Module/Settings/Oauth.php:101 Zotlabs/Module/Sources.php:128 +#: Zotlabs/Module/Sources.php:164 msgid "Optional" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:105 +#: Zotlabs/Module/Settings/Oauth.php:114 msgid "Application not found." msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:148 +#: Zotlabs/Module/Settings/Oauth.php:161 msgid "Connected Apps" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:152 Zotlabs/Module/Settings/Oauth2.php:198 +#: Zotlabs/Module/Settings/Oauth.php:165 Zotlabs/Module/Settings/Oauth2.php:213 msgid "Client key starts with" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:153 Zotlabs/Module/Settings/Oauth2.php:199 +#: Zotlabs/Module/Settings/Oauth.php:166 Zotlabs/Module/Settings/Oauth2.php:214 msgid "No name" msgstr "" -#: Zotlabs/Module/Settings/Oauth.php:154 Zotlabs/Module/Settings/Oauth2.php:200 +#: Zotlabs/Module/Settings/Oauth.php:167 Zotlabs/Module/Settings/Oauth2.php:215 msgid "Remove authorization" msgstr "" -#: Zotlabs/Module/Settings/Permcats.php:24 +#: Zotlabs/Module/Settings/Oauth2.php:51 +msgid "ID and Secret are required" +msgstr "" + +#: Zotlabs/Module/Settings/Oauth2.php:112 +msgid "Add OAuth2 application" +msgstr "" + +#: Zotlabs/Module/Settings/Oauth2.php:116 +#: Zotlabs/Module/Settings/Oauth2.php:146 +msgid "Consumer ID" +msgstr "" + +#: Zotlabs/Module/Settings/Oauth2.php:119 +#: Zotlabs/Module/Settings/Oauth2.php:149 +msgid "Grant Types" +msgstr "" + +#: Zotlabs/Module/Settings/Oauth2.php:119 +#: Zotlabs/Module/Settings/Oauth2.php:120 +#: Zotlabs/Module/Settings/Oauth2.php:149 +#: Zotlabs/Module/Settings/Oauth2.php:150 +msgid "leave blank unless your application specifically requires this" +msgstr "" + +#: Zotlabs/Module/Settings/Oauth2.php:120 +#: Zotlabs/Module/Settings/Oauth2.php:150 +msgid "Authorization scope" +msgstr "" + +#: Zotlabs/Module/Settings/Oauth2.php:133 +msgid "OAuth2 Application not found." +msgstr "" + +#: Zotlabs/Module/Settings/Oauth2.php:209 +msgid "Connected OAuth2 Apps" +msgstr "" + +#: Zotlabs/Module/Settings/Permcats.php:30 msgid "Permission Name is required." msgstr "" -#: Zotlabs/Module/Settings/Permcats.php:43 +#: Zotlabs/Module/Settings/Permcats.php:49 msgid "Permission category saved." msgstr "" -#: Zotlabs/Module/Settings/Permcats.php:67 +#: Zotlabs/Module/Settings/Permcats.php:76 msgid "" "Use this form to create permission rules for various classes of people or " "connections." msgstr "" -#: Zotlabs/Module/Settings/Permcats.php:108 +#: Zotlabs/Module/Settings/Permcats.php:119 msgid "Permission Name" msgstr "" -#: Zotlabs/Module/Settings/Oauth2.php:48 -msgid "ID and Secret are required" -msgstr "" - -#: Zotlabs/Module/Settings/Oauth2.php:104 -msgid "Add OAuth2 application" -msgstr "" - -#: Zotlabs/Module/Settings/Oauth2.php:108 -#: Zotlabs/Module/Settings/Oauth2.php:137 -msgid "Consumer ID" -msgstr "" - -#: Zotlabs/Module/Settings/Oauth2.php:111 -#: Zotlabs/Module/Settings/Oauth2.php:140 -msgid "Grant Types" -msgstr "" - -#: Zotlabs/Module/Settings/Oauth2.php:111 -#: Zotlabs/Module/Settings/Oauth2.php:112 -#: Zotlabs/Module/Settings/Oauth2.php:140 -#: Zotlabs/Module/Settings/Oauth2.php:141 -msgid "leave blank unless your application specifically requires this" -msgstr "" - -#: Zotlabs/Module/Settings/Oauth2.php:112 -#: Zotlabs/Module/Settings/Oauth2.php:141 -msgid "Authorization scope" -msgstr "" - -#: Zotlabs/Module/Settings/Oauth2.php:124 -msgid "OAuth2 Application not found." -msgstr "" - -#: Zotlabs/Module/Settings/Oauth2.php:194 -msgid "Connected OAuth2 Apps" -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:19 -msgid "Not valid email." -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:22 -msgid "Protected email address. Cannot change to that email." -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:31 -msgid "System failure storing new email. Please try again." -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:48 -msgid "Password verification failed." -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:55 -msgid "Passwords do not match. Password unchanged." -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:59 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:73 -msgid "Password changed." -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:75 -msgid "Password update failed. Please try again." -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:100 -msgid "Account Settings" -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:101 -msgid "Current Password" -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:102 -msgid "Enter New Password" -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:103 -msgid "Confirm New Password" -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:103 -msgid "Leave password fields blank unless changing" -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:105 -msgid "Email Address:" -msgstr "" - -#: Zotlabs/Module/Settings/Account.php:107 -msgid "Remove this account including all its channels" -msgstr "" - -#: Zotlabs/Module/Settings/Features.php:55 -msgid "Additional Features" -msgstr "" - -#: Zotlabs/Module/Settings/Tokens.php:40 +#: Zotlabs/Module/Settings/Tokens.php:45 #, php-format msgid "This channel is limited to %d tokens" msgstr "" -#: Zotlabs/Module/Settings/Tokens.php:46 +#: Zotlabs/Module/Settings/Tokens.php:51 msgid "Name and Password are required." msgstr "" -#: Zotlabs/Module/Settings/Tokens.php:177 +#: Zotlabs/Module/Settings/Tokens.php:187 msgid "Token saved." msgstr "" -#: Zotlabs/Module/Settings/Tokens.php:242 +#: Zotlabs/Module/Settings/Tokens.php:258 msgid "" "Use this form to create temporary access identifiers to share things with " "non-members. These identities may be used in Access Control Lists and " "visitors may login using these credentials to access private content." msgstr "" -#: Zotlabs/Module/Settings/Tokens.php:244 +#: Zotlabs/Module/Settings/Tokens.php:260 msgid "" "You may also provide dropbox style access links to friends and " "associates by adding the Login Password to any specific site URL as shown. " "Examples:" msgstr "" -#: Zotlabs/Module/Settings/Tokens.php:277 +#: Zotlabs/Module/Settings/Tokens.php:295 msgid "Guest Access Tokens" msgstr "" -#: Zotlabs/Module/Settings/Tokens.php:285 +#: Zotlabs/Module/Settings/Tokens.php:303 msgid "Login Name" msgstr "" -#: Zotlabs/Module/Settings/Tokens.php:286 +#: Zotlabs/Module/Settings/Tokens.php:304 msgid "Login Password" msgstr "" -#: Zotlabs/Module/Settings/Tokens.php:287 +#: Zotlabs/Module/Settings/Tokens.php:305 msgid "Expires (yyyy-mm-dd)" msgstr "" -#: Zotlabs/Module/Settings/Display.php:142 -#, php-format -msgid "%s - (Experimental)" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:185 -msgid "Display Settings" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:186 -msgid "Theme Settings" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:187 -msgid "Custom Theme Settings" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:188 -msgid "Content Settings" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:194 -msgid "Display Theme:" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:195 -msgid "Select scheme" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:197 -msgid "Preload images before rendering the page" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:197 -msgid "" -"The subjective page load time will be longer but the page will be ready when " -"displayed" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:198 -msgid "Enable user zoom on mobile devices" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:199 -msgid "Update notifications every xx seconds" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:199 -msgid "Minimum of 15 seconds, no maximum" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:200 -msgid "Maximum number of conversations to load at any time:" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:200 -msgid "Maximum of 100 items" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:201 -msgid "Show emoticons (smilies) as images" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:202 -msgid "Provide channel menu in navigation bar" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:202 -msgid "Default: channel menu located in app menu" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:203 -msgid "System Page Layout Editor - (advanced)" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:206 -msgid "Channel page max height of content (in pixels)" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:206 -#: Zotlabs/Module/Settings/Display.php:207 -msgid "click to expand content exceeding this height" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:207 -msgid "Stream page max height of content (in pixels)" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:208 -msgid "Indent threaded comments this many pixels from the parent" -msgstr "" - -#: Zotlabs/Module/Settings/Display.php:208 -msgid "0-20" -msgstr "" - -#: Zotlabs/Module/Settings/Channel.php:397 include/conversation.php:1331 +#: Zotlabs/Module/Settings/Channel.php:433 include/conversation.php:1355 msgid "Restricted - from connections only" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:398 include/conversation.php:1332 +#: Zotlabs/Module/Settings/Channel.php:434 include/conversation.php:1356 msgid "Semi-public - from anybody that can be identified" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:399 include/conversation.php:1333 +#: Zotlabs/Module/Settings/Channel.php:435 include/conversation.php:1357 msgid "Public - from anybody on the internet" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:479 +#: Zotlabs/Module/Settings/Channel.php:513 msgid "Publish your profile in the network directory" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:484 +#: Zotlabs/Module/Settings/Channel.php:518 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:488 -#: Zotlabs/Module/Settings/Channel.php:502 +#: Zotlabs/Module/Settings/Channel.php:522 +#: Zotlabs/Module/Settings/Channel.php:536 msgid "or" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:494 +#: Zotlabs/Module/Settings/Channel.php:528 msgid "Your channel address is" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:496 +#: Zotlabs/Module/Settings/Channel.php:530 msgid "" "Friends using compatible applications can use this address to connect with " "you." msgstr "" -#: Zotlabs/Module/Settings/Channel.php:498 +#: Zotlabs/Module/Settings/Channel.php:532 msgid "Your files/photos are accessible as a network drive at" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:500 +#: Zotlabs/Module/Settings/Channel.php:534 msgid "(Windows)" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:501 +#: Zotlabs/Module/Settings/Channel.php:535 msgid "(other platforms)" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:547 +#: Zotlabs/Module/Settings/Channel.php:583 msgid "Automatic membership approval" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:553 +#: Zotlabs/Module/Settings/Channel.php:588 msgid "Friend-of-friend conversations" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:553 +#: Zotlabs/Module/Settings/Channel.php:588 msgid "" "Import public third-party conversations in which your connections " "participate." msgstr "" -#: Zotlabs/Module/Settings/Channel.php:557 +#: Zotlabs/Module/Settings/Channel.php:592 msgid "Enable ActivityPub protocol" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:557 +#: Zotlabs/Module/Settings/Channel.php:592 msgid "ActivityPub is an emerging internet standard for social communications" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:592 +#: Zotlabs/Module/Settings/Channel.php:625 msgid "Channel Settings" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:598 +#: Zotlabs/Module/Settings/Channel.php:631 msgid "Basic Settings" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:599 +#: Zotlabs/Module/Settings/Channel.php:632 msgid "Full name" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:601 +#: Zotlabs/Module/Settings/Channel.php:634 msgid "Your timezone" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:601 +#: Zotlabs/Module/Settings/Channel.php:634 msgid "This is important for showing the correct time on shared events" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:602 +#: Zotlabs/Module/Settings/Channel.php:635 msgid "Default post location" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:602 +#: Zotlabs/Module/Settings/Channel.php:635 msgid "Optional geographical location to display on your posts" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:603 +#: Zotlabs/Module/Settings/Channel.php:636 msgid "Obtain post location from your web browser or device" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:605 +#: Zotlabs/Module/Settings/Channel.php:638 msgid "Adult content" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:605 +#: Zotlabs/Module/Settings/Channel.php:638 msgid "" "Enable to indicate if this channel frequently or regularly publishes adult " "content. (Please also tag any adult material and/or nudity with #NSFW)" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:607 +#: Zotlabs/Module/Settings/Channel.php:640 msgid "Security and Privacy" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:609 +#: Zotlabs/Module/Settings/Channel.php:642 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:611 +#: Zotlabs/Module/Settings/Channel.php:644 msgid "Hide my online presence" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:611 +#: Zotlabs/Module/Settings/Channel.php:644 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:612 +#: Zotlabs/Module/Settings/Channel.php:645 msgid "Allow others to view your friends and connections" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:616 +#: Zotlabs/Module/Settings/Channel.php:649 msgid "Forbid indexing of your channel content by search engines" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:617 +#: Zotlabs/Module/Settings/Channel.php:650 msgid "Disable acceptance of comments on my posts after this many days" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:617 +#: Zotlabs/Module/Settings/Channel.php:650 msgid "Leave unset or enter 0 to allow comments indefinitely" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:618 +#: Zotlabs/Module/Settings/Channel.php:651 msgid "Allow others to tag your posts" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:618 +#: Zotlabs/Module/Settings/Channel.php:651 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:620 +#: Zotlabs/Module/Settings/Channel.php:653 msgid "Channel Permission Limits" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:622 +#: Zotlabs/Module/Settings/Channel.php:655 msgid "Expire conversations you have not participated in after this many days" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:622 +#: Zotlabs/Module/Settings/Channel.php:655 msgid "0 or blank to use the website limit." msgstr "" -#: Zotlabs/Module/Settings/Channel.php:622 +#: Zotlabs/Module/Settings/Channel.php:655 #, php-format msgid "This website expires after %d days." msgstr "" -#: Zotlabs/Module/Settings/Channel.php:622 +#: Zotlabs/Module/Settings/Channel.php:655 msgid "This website does not provide an expiration policy." msgstr "" -#: Zotlabs/Module/Settings/Channel.php:622 +#: Zotlabs/Module/Settings/Channel.php:655 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: Zotlabs/Module/Settings/Channel.php:623 +#: Zotlabs/Module/Settings/Channel.php:656 msgid "Maximum Friend Requests/Day:" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:623 +#: Zotlabs/Module/Settings/Channel.php:656 msgid "May reduce spam activity" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:624 +#: Zotlabs/Module/Settings/Channel.php:657 msgid "Default Access List" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:626 +#: Zotlabs/Module/Settings/Channel.php:659 msgid "Use my default audience setting for the type of object published" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:627 +#: Zotlabs/Module/Settings/Channel.php:660 msgid "Profile to assign new connections" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:638 +#: Zotlabs/Module/Settings/Channel.php:671 msgid "Channel type and privacy" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:639 +#: Zotlabs/Module/Settings/Channel.php:672 msgid "Default Permissions Group" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:645 +#: Zotlabs/Module/Settings/Channel.php:678 msgid "Maximum direct messages per day from unknown people:" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:645 +#: Zotlabs/Module/Settings/Channel.php:678 msgid "" "Useful to reduce spamming if you allow direct messages from unknown people" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:654 +#: Zotlabs/Module/Settings/Channel.php:687 msgid "By default post a status message when:" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:655 +#: Zotlabs/Module/Settings/Channel.php:688 msgid "accepting a friend request" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:656 +#: Zotlabs/Module/Settings/Channel.php:689 msgid "joining a forum/community" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:657 +#: Zotlabs/Module/Settings/Channel.php:690 msgid "making an interesting profile change" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:658 +#: Zotlabs/Module/Settings/Channel.php:691 msgid "Send a notification email when:" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:659 +#: Zotlabs/Module/Settings/Channel.php:692 msgid "You receive a connection request" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:661 +#: Zotlabs/Module/Settings/Channel.php:694 msgid "Someone writes on your profile wall" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:662 +#: Zotlabs/Module/Settings/Channel.php:695 msgid "Someone writes a followup comment" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:663 +#: Zotlabs/Module/Settings/Channel.php:696 msgid "Someone shares a followed conversation" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:664 +#: Zotlabs/Module/Settings/Channel.php:697 msgid "You receive a direct (private) message" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:666 +#: Zotlabs/Module/Settings/Channel.php:699 msgid "You are tagged in a post" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:669 +#: Zotlabs/Module/Settings/Channel.php:702 msgid "Someone likes your post/comment" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:672 +#: Zotlabs/Module/Settings/Channel.php:705 msgid "Show visual notifications including:" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:674 +#: Zotlabs/Module/Settings/Channel.php:707 msgid "Unseen stream activity" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:675 +#: Zotlabs/Module/Settings/Channel.php:708 msgid "Unseen channel activity" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:676 +#: Zotlabs/Module/Settings/Channel.php:709 msgid "Unseen direct messages" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:676 -#: Zotlabs/Module/Settings/Channel.php:681 -#: Zotlabs/Module/Settings/Channel.php:682 -#: Zotlabs/Module/Settings/Channel.php:683 +#: Zotlabs/Module/Settings/Channel.php:709 +#: Zotlabs/Module/Settings/Channel.php:714 +#: Zotlabs/Module/Settings/Channel.php:715 +#: Zotlabs/Module/Settings/Channel.php:716 msgid "Recommended" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:677 +#: Zotlabs/Module/Settings/Channel.php:710 msgid "Upcoming events" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:678 +#: Zotlabs/Module/Settings/Channel.php:711 msgid "Events today" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:679 +#: Zotlabs/Module/Settings/Channel.php:712 msgid "Upcoming birthdays" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:679 +#: Zotlabs/Module/Settings/Channel.php:712 msgid "Not available in all themes" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:680 +#: Zotlabs/Module/Settings/Channel.php:713 msgid "System (personal) notifications" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:681 +#: Zotlabs/Module/Settings/Channel.php:714 msgid "System info messages" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:682 +#: Zotlabs/Module/Settings/Channel.php:715 msgid "System critical alerts" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:683 +#: Zotlabs/Module/Settings/Channel.php:716 msgid "New connections" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:684 +#: Zotlabs/Module/Settings/Channel.php:717 msgid "System Registrations" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:686 +#: Zotlabs/Module/Settings/Channel.php:719 msgid "Unseen public stream activity" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:687 +#: Zotlabs/Module/Settings/Channel.php:720 msgid "Unseen likes and dislikes" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:688 +#: Zotlabs/Module/Settings/Channel.php:721 msgid "Unseen forum posts" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:689 +#: Zotlabs/Module/Settings/Channel.php:722 msgid "Reported content" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:690 +#: Zotlabs/Module/Settings/Channel.php:723 msgid "" "Desktop notifications are unavailable because the required browser " "permission has not been granted" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:691 +#: Zotlabs/Module/Settings/Channel.php:724 msgid "Grant permission" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:692 +#: Zotlabs/Module/Settings/Channel.php:725 msgid "Email notifications sent from (hostname)" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:692 +#: Zotlabs/Module/Settings/Channel.php:725 #, php-format msgid "" "If your channel is mirrored to multiple locations, set this to your " @@ -8431,237 +8440,237 @@ msgid "" "Example: %s" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:693 +#: Zotlabs/Module/Settings/Channel.php:726 msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:694 -msgid "Accept messages from strangers which mention me" +#: Zotlabs/Module/Settings/Channel.php:727 +msgid "Accept messages from strangers which mention you" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:694 +#: Zotlabs/Module/Settings/Channel.php:727 msgid "This setting bypasses normal permissions" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:695 +#: Zotlabs/Module/Settings/Channel.php:728 msgid "" "Accept messages from strangers which include any of the following hashtags" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:695 +#: Zotlabs/Module/Settings/Channel.php:728 msgid "comma separated, do not include the #" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:696 +#: Zotlabs/Module/Settings/Channel.php:729 msgid "Notify me of events this many days in advance" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:696 +#: Zotlabs/Module/Settings/Channel.php:729 msgid "Must be greater than 0" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:701 +#: Zotlabs/Module/Settings/Channel.php:734 msgid "Date and time" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:702 +#: Zotlabs/Module/Settings/Channel.php:735 msgid "" "This section is reserved for use by optional addons and apps to provide " "additional settings." msgstr "" -#: Zotlabs/Module/Settings/Channel.php:703 +#: Zotlabs/Module/Settings/Channel.php:736 msgid "Advanced Account/Page Type Settings" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:704 +#: Zotlabs/Module/Settings/Channel.php:737 msgid "Change the behaviour of this account for special situations" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:707 +#: Zotlabs/Module/Settings/Channel.php:740 msgid "Default photo upload folder name" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:707 -#: Zotlabs/Module/Settings/Channel.php:708 +#: Zotlabs/Module/Settings/Channel.php:740 +#: Zotlabs/Module/Settings/Channel.php:741 msgid "%Y - current year, %m - current month" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:708 +#: Zotlabs/Module/Settings/Channel.php:741 msgid "Default file upload folder name" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:710 +#: Zotlabs/Module/Settings/Channel.php:743 msgid "Personal menu to display in your channel pages" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:712 +#: Zotlabs/Module/Settings/Channel.php:745 msgid "Remove this channel." msgstr "" -#: Zotlabs/Module/Settings/Channel.php:713 +#: Zotlabs/Module/Settings/Channel.php:746 msgid "Mentions should display" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:713 +#: Zotlabs/Module/Settings/Channel.php:746 msgid "" "Changes to this setting are applied to new posts/comments only. It is not " "retroactive." msgstr "" -#: Zotlabs/Module/Settings/Channel.php:715 +#: Zotlabs/Module/Settings/Channel.php:748 msgid "the channel display name [example: @Barbara Jenkins]" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:716 +#: Zotlabs/Module/Settings/Channel.php:749 msgid "the channel nickname [example: @barbara1976]" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:717 +#: Zotlabs/Module/Settings/Channel.php:750 msgid "combined [example: @Barbara Jenkins (barbara1976)]" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:718 +#: Zotlabs/Module/Settings/Channel.php:751 msgid "no preference, use the system default" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:721 +#: Zotlabs/Module/Settings/Channel.php:754 msgid "Calendar week begins on" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:721 +#: Zotlabs/Module/Settings/Channel.php:754 msgid "This varies by country/culture" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:722 include/text.php:1352 -#: include/js_strings.php:90 +#: Zotlabs/Module/Settings/Channel.php:755 include/text.php:1427 +#: include/js_strings.php:93 msgid "Sunday" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:723 include/text.php:1352 -#: include/js_strings.php:91 +#: Zotlabs/Module/Settings/Channel.php:756 include/text.php:1427 +#: include/js_strings.php:94 msgid "Monday" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:724 include/text.php:1352 -#: include/js_strings.php:92 +#: Zotlabs/Module/Settings/Channel.php:757 include/text.php:1427 +#: include/js_strings.php:95 msgid "Tuesday" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:725 include/text.php:1352 -#: include/js_strings.php:93 +#: Zotlabs/Module/Settings/Channel.php:758 include/text.php:1427 +#: include/js_strings.php:96 msgid "Wednesday" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:726 include/text.php:1352 -#: include/js_strings.php:94 +#: Zotlabs/Module/Settings/Channel.php:759 include/text.php:1427 +#: include/js_strings.php:97 msgid "Thursday" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:727 include/text.php:1352 -#: include/js_strings.php:95 +#: Zotlabs/Module/Settings/Channel.php:760 include/text.php:1427 +#: include/js_strings.php:98 msgid "Friday" msgstr "" -#: Zotlabs/Module/Settings/Channel.php:728 include/text.php:1352 -#: include/js_strings.php:96 +#: Zotlabs/Module/Settings/Channel.php:761 include/text.php:1427 +#: include/js_strings.php:99 msgid "Saturday" msgstr "" -#: Zotlabs/Module/Subthread.php:133 +#: Zotlabs/Module/Subthread.php:139 #, php-format msgid "%1$s is following %2$s's %3$s" msgstr "" -#: Zotlabs/Module/Subthread.php:136 +#: Zotlabs/Module/Subthread.php:142 #, php-format msgid "%1$s stopped following %2$s's %3$s" msgstr "" -#: Zotlabs/Module/Sharedwithme.php:108 +#: Zotlabs/Module/Sharedwithme.php:106 msgid "Files: shared with me" msgstr "" -#: Zotlabs/Module/Sharedwithme.php:110 +#: Zotlabs/Module/Sharedwithme.php:108 msgid "NEW" msgstr "" -#: Zotlabs/Module/Sharedwithme.php:111 Zotlabs/Storage/Browser.php:312 -#: include/text.php:1449 +#: Zotlabs/Module/Sharedwithme.php:109 Zotlabs/Storage/Browser.php:315 +#: include/text.php:1534 msgid "Size" msgstr "" -#: Zotlabs/Module/Sharedwithme.php:112 Zotlabs/Storage/Browser.php:313 +#: Zotlabs/Module/Sharedwithme.php:110 Zotlabs/Storage/Browser.php:316 msgid "Last Modified" msgstr "" -#: Zotlabs/Module/Sharedwithme.php:113 +#: Zotlabs/Module/Sharedwithme.php:111 msgid "Remove all files" msgstr "" -#: Zotlabs/Module/Sharedwithme.php:114 +#: Zotlabs/Module/Sharedwithme.php:112 msgid "Remove this file" msgstr "" -#: Zotlabs/Module/Siteinfo.php:29 +#: Zotlabs/Module/Siteinfo.php:34 msgid "About this site" msgstr "" -#: Zotlabs/Module/Siteinfo.php:31 +#: Zotlabs/Module/Siteinfo.php:36 msgid "Site Name" msgstr "" -#: Zotlabs/Module/Siteinfo.php:35 +#: Zotlabs/Module/Siteinfo.php:40 msgid "Administrator" msgstr "" -#: Zotlabs/Module/Siteinfo.php:38 +#: Zotlabs/Module/Siteinfo.php:43 msgid "Software and Project information" msgstr "" -#: Zotlabs/Module/Siteinfo.php:39 +#: Zotlabs/Module/Siteinfo.php:44 msgid "This site is powered by $Projectname" msgstr "" -#: Zotlabs/Module/Siteinfo.php:40 +#: Zotlabs/Module/Siteinfo.php:45 msgid "" "Federated and decentralised networking and identity services provided by " "Nomad" msgstr "" -#: Zotlabs/Module/Siteinfo.php:44 +#: Zotlabs/Module/Siteinfo.php:49 msgid "Protocols:" msgstr "" -#: Zotlabs/Module/Siteinfo.php:46 +#: Zotlabs/Module/Siteinfo.php:51 #, php-format msgid "Version %s" msgstr "" -#: Zotlabs/Module/Siteinfo.php:47 +#: Zotlabs/Module/Siteinfo.php:52 msgid "Project homepage" msgstr "" -#: Zotlabs/Module/Siteinfo.php:48 +#: Zotlabs/Module/Siteinfo.php:53 msgid "Developer homepage" msgstr "" -#: Zotlabs/Module/Uexport.php:61 Zotlabs/Module/Uexport.php:62 +#: Zotlabs/Module/Uexport.php:64 Zotlabs/Module/Uexport.php:65 msgid "Export Channel" msgstr "" -#: Zotlabs/Module/Uexport.php:63 +#: Zotlabs/Module/Uexport.php:66 msgid "" "Export your basic channel information to a file. This acts as a backup of " "your connections, permissions, profile and basic data, which can be used to " "import your data to a new server hub, but does not contain your content." msgstr "" -#: Zotlabs/Module/Uexport.php:64 +#: Zotlabs/Module/Uexport.php:67 msgid "Export Content" msgstr "" -#: Zotlabs/Module/Uexport.php:65 +#: Zotlabs/Module/Uexport.php:68 msgid "" "Export your channel information and recent content to a JSON backup that can " "be restored or imported to another server hub. This backs up all of your " @@ -8670,11 +8679,11 @@ msgid "" "this download to begin." msgstr "" -#: Zotlabs/Module/Uexport.php:67 +#: Zotlabs/Module/Uexport.php:70 msgid "Export your posts from a given year." msgstr "" -#: Zotlabs/Module/Uexport.php:69 +#: Zotlabs/Module/Uexport.php:72 msgid "" "You may also export your posts and conversations for a particular year or " "month. Adjust the date in your browser location bar to select other dates. " @@ -8682,21 +8691,21 @@ msgid "" "please try again selecting a more limited date range." msgstr "" -#: Zotlabs/Module/Uexport.php:70 +#: Zotlabs/Module/Uexport.php:73 #, php-format msgid "" "To select all posts for a given year, such as this year, visit %2$s" msgstr "" -#: Zotlabs/Module/Uexport.php:71 +#: Zotlabs/Module/Uexport.php:74 #, php-format msgid "" "To select all posts for a given month, such as January of this year, visit " "%2$s" msgstr "" -#: Zotlabs/Module/Uexport.php:72 +#: Zotlabs/Module/Uexport.php:75 #, php-format msgid "" "These content files may be imported or restored by visiting " @@ -8704,352 +8713,352 @@ msgid "" "or restore these in date order (oldest first)." msgstr "" -#: Zotlabs/Module/Sources.php:45 +#: Zotlabs/Module/Sources.php:49 msgid "Failed to create source. No channel selected." msgstr "" -#: Zotlabs/Module/Sources.php:61 +#: Zotlabs/Module/Sources.php:66 msgid "Source created." msgstr "" -#: Zotlabs/Module/Sources.php:74 +#: Zotlabs/Module/Sources.php:79 msgid "Source updated." msgstr "" -#: Zotlabs/Module/Sources.php:99 +#: Zotlabs/Module/Sources.php:106 msgid "*" msgstr "" -#: Zotlabs/Module/Sources.php:106 +#: Zotlabs/Module/Sources.php:113 msgid "Manage remote sources of content for your channel." msgstr "" -#: Zotlabs/Module/Sources.php:107 Zotlabs/Module/Sources.php:117 +#: Zotlabs/Module/Sources.php:114 Zotlabs/Module/Sources.php:124 msgid "New Source" msgstr "" -#: Zotlabs/Module/Sources.php:118 Zotlabs/Module/Sources.php:152 +#: Zotlabs/Module/Sources.php:125 Zotlabs/Module/Sources.php:160 msgid "" "Import all or selected content from the following channel into this channel " "and distribute it according to your channel settings." msgstr "" -#: Zotlabs/Module/Sources.php:119 Zotlabs/Module/Sources.php:153 +#: Zotlabs/Module/Sources.php:126 Zotlabs/Module/Sources.php:161 msgid "Only import content with these words (one per line)" msgstr "" -#: Zotlabs/Module/Sources.php:119 Zotlabs/Module/Sources.php:153 +#: Zotlabs/Module/Sources.php:126 Zotlabs/Module/Sources.php:161 msgid "Leave blank to import all public content" msgstr "" -#: Zotlabs/Module/Sources.php:120 Zotlabs/Module/Sources.php:159 +#: Zotlabs/Module/Sources.php:127 Zotlabs/Module/Sources.php:167 msgid "Channel Name" msgstr "" -#: Zotlabs/Module/Sources.php:121 Zotlabs/Module/Sources.php:156 +#: Zotlabs/Module/Sources.php:128 Zotlabs/Module/Sources.php:164 msgid "" "Add the following categories to posts imported from this source (comma " "separated)" msgstr "" -#: Zotlabs/Module/Sources.php:122 Zotlabs/Module/Sources.php:157 +#: Zotlabs/Module/Sources.php:129 Zotlabs/Module/Sources.php:165 msgid "Resend posts with this channel as author" msgstr "" -#: Zotlabs/Module/Sources.php:122 Zotlabs/Module/Sources.php:157 +#: Zotlabs/Module/Sources.php:129 Zotlabs/Module/Sources.php:165 msgid "Copyrights may apply" msgstr "" -#: Zotlabs/Module/Sources.php:142 Zotlabs/Module/Sources.php:172 +#: Zotlabs/Module/Sources.php:150 Zotlabs/Module/Sources.php:180 msgid "Source not found." msgstr "" -#: Zotlabs/Module/Sources.php:149 +#: Zotlabs/Module/Sources.php:157 msgid "Edit Source" msgstr "" -#: Zotlabs/Module/Sources.php:150 +#: Zotlabs/Module/Sources.php:158 msgid "Delete Source" msgstr "" -#: Zotlabs/Module/Sources.php:180 +#: Zotlabs/Module/Sources.php:189 msgid "Source removed" msgstr "" -#: Zotlabs/Module/Sources.php:182 +#: Zotlabs/Module/Sources.php:191 msgid "Unable to remove source." msgstr "" -#: Zotlabs/Module/Photos.php:80 Zotlabs/Module/Photos.php:98 +#: Zotlabs/Module/Photos.php:81 Zotlabs/Module/Photos.php:99 msgid "Album not found." msgstr "" -#: Zotlabs/Module/Photos.php:89 +#: Zotlabs/Module/Photos.php:90 msgid "Delete Album" msgstr "" -#: Zotlabs/Module/Photos.php:163 Zotlabs/Module/Photos.php:1120 +#: Zotlabs/Module/Photos.php:164 Zotlabs/Module/Photos.php:1133 msgid "Delete Photo" msgstr "" -#: Zotlabs/Module/Photos.php:356 +#: Zotlabs/Module/Photos.php:365 msgid "linked item not found." msgstr "" -#: Zotlabs/Module/Photos.php:549 +#: Zotlabs/Module/Photos.php:559 #, php-format msgid "%s: Unsupported photo type. Saved as file." msgstr "" -#: Zotlabs/Module/Photos.php:578 +#: Zotlabs/Module/Photos.php:587 msgid "No photos selected" msgstr "" -#: Zotlabs/Module/Photos.php:628 +#: Zotlabs/Module/Photos.php:637 msgid "Access to this item is restricted." msgstr "" -#: Zotlabs/Module/Photos.php:671 +#: Zotlabs/Module/Photos.php:680 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: Zotlabs/Module/Photos.php:674 +#: Zotlabs/Module/Photos.php:682 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: Zotlabs/Module/Photos.php:716 +#: Zotlabs/Module/Photos.php:724 msgid "Upload Photos" msgstr "" -#: Zotlabs/Module/Photos.php:720 +#: Zotlabs/Module/Photos.php:728 msgid "Enter an album name" msgstr "" -#: Zotlabs/Module/Photos.php:721 +#: Zotlabs/Module/Photos.php:729 msgid "or select an existing album (doubleclick)" msgstr "" -#: Zotlabs/Module/Photos.php:722 +#: Zotlabs/Module/Photos.php:730 msgid "Create a status post for this upload" msgstr "" -#: Zotlabs/Module/Photos.php:722 +#: Zotlabs/Module/Photos.php:730 msgid "" "If multiple files are selected, the message will be repeated for each photo" msgstr "" -#: Zotlabs/Module/Photos.php:723 Zotlabs/Module/Photos.php:1104 +#: Zotlabs/Module/Photos.php:731 Zotlabs/Module/Photos.php:1117 msgid "Please briefly describe this photo for vision-impaired viewers" msgstr "" -#: Zotlabs/Module/Photos.php:725 Zotlabs/Module/Photos.php:1106 +#: Zotlabs/Module/Photos.php:733 Zotlabs/Module/Photos.php:1119 msgid "Your message (optional)" msgstr "" -#: Zotlabs/Module/Photos.php:814 +#: Zotlabs/Module/Photos.php:820 msgid "Date descending" msgstr "" -#: Zotlabs/Module/Photos.php:815 +#: Zotlabs/Module/Photos.php:821 msgid "Date ascending" msgstr "" -#: Zotlabs/Module/Photos.php:816 +#: Zotlabs/Module/Photos.php:822 msgid "Name ascending" msgstr "" -#: Zotlabs/Module/Photos.php:873 Zotlabs/Module/Photos.php:1422 +#: Zotlabs/Module/Photos.php:877 Zotlabs/Module/Photos.php:1430 msgid "View files" msgstr "" -#: Zotlabs/Module/Photos.php:877 Zotlabs/Module/Photos.php:1425 +#: Zotlabs/Module/Photos.php:881 Zotlabs/Module/Photos.php:1433 msgid "Add Photos" msgstr "" -#: Zotlabs/Module/Photos.php:879 +#: Zotlabs/Module/Photos.php:883 msgid "Sort" msgstr "" -#: Zotlabs/Module/Photos.php:923 +#: Zotlabs/Module/Photos.php:928 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: Zotlabs/Module/Photos.php:925 +#: Zotlabs/Module/Photos.php:930 msgid "Photo not available" msgstr "" -#: Zotlabs/Module/Photos.php:985 +#: Zotlabs/Module/Photos.php:994 msgid "Use as profile photo" msgstr "" -#: Zotlabs/Module/Photos.php:986 +#: Zotlabs/Module/Photos.php:995 msgid "Use as cover photo" msgstr "" -#: Zotlabs/Module/Photos.php:993 +#: Zotlabs/Module/Photos.php:1002 msgid "Private Photo" msgstr "" -#: Zotlabs/Module/Photos.php:1008 +#: Zotlabs/Module/Photos.php:1020 msgid "View Full Size" msgstr "" -#: Zotlabs/Module/Photos.php:1095 +#: Zotlabs/Module/Photos.php:1108 msgid "Edit photo" msgstr "" -#: Zotlabs/Module/Photos.php:1099 +#: Zotlabs/Module/Photos.php:1112 msgid "Move photo to album" msgstr "" -#: Zotlabs/Module/Photos.php:1100 +#: Zotlabs/Module/Photos.php:1113 msgid "Enter a new album name" msgstr "" -#: Zotlabs/Module/Photos.php:1101 +#: Zotlabs/Module/Photos.php:1114 msgid "or select an existing one (doubleclick)" msgstr "" -#: Zotlabs/Module/Photos.php:1106 +#: Zotlabs/Module/Photos.php:1119 msgid "" "This will only appear in the optional status post attached to this photo" msgstr "" -#: Zotlabs/Module/Photos.php:1107 +#: Zotlabs/Module/Photos.php:1120 msgid "Add a Tag" msgstr "" -#: Zotlabs/Module/Photos.php:1115 +#: Zotlabs/Module/Photos.php:1128 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: Zotlabs/Module/Photos.php:1118 +#: Zotlabs/Module/Photos.php:1131 msgid "Flag as adult in album view" msgstr "" -#: Zotlabs/Module/Photos.php:1194 include/conversation.php:530 +#: Zotlabs/Module/Photos.php:1206 include/conversation.php:521 msgctxt "title" msgid "Likes" msgstr "" -#: Zotlabs/Module/Photos.php:1195 include/conversation.php:531 +#: Zotlabs/Module/Photos.php:1207 include/conversation.php:522 msgctxt "title" msgid "Dislikes" msgstr "" -#: Zotlabs/Module/Photos.php:1196 include/conversation.php:532 +#: Zotlabs/Module/Photos.php:1208 include/conversation.php:523 msgctxt "title" msgid "Attending" msgstr "" -#: Zotlabs/Module/Photos.php:1197 include/conversation.php:533 +#: Zotlabs/Module/Photos.php:1209 include/conversation.php:524 msgctxt "title" msgid "Not attending" msgstr "" -#: Zotlabs/Module/Photos.php:1198 include/conversation.php:534 +#: Zotlabs/Module/Photos.php:1210 include/conversation.php:525 msgctxt "title" msgid "Might attend" msgstr "" -#: Zotlabs/Module/Photos.php:1311 +#: Zotlabs/Module/Photos.php:1320 msgid "Photo Tools" msgstr "" -#: Zotlabs/Module/Photos.php:1321 +#: Zotlabs/Module/Photos.php:1330 msgid "In This Photo:" msgstr "" -#: Zotlabs/Module/Photos.php:1326 +#: Zotlabs/Module/Photos.php:1335 msgid "Map" msgstr "" -#: Zotlabs/Module/Photos.php:1406 Zotlabs/Module/Photos.php:1420 -#: Zotlabs/Module/Photos.php:1421 include/photos.php:746 +#: Zotlabs/Module/Photos.php:1417 Zotlabs/Module/Photos.php:1428 +#: Zotlabs/Module/Photos.php:1429 include/photos.php:756 msgid "Recent Photos" msgstr "" -#: Zotlabs/Module/Tagger.php:55 +#: Zotlabs/Module/Tagger.php:62 msgid "Post not found." msgstr "" -#: Zotlabs/Module/Tagger.php:86 include/text.php:2253 -#: include/conversation.php:160 +#: Zotlabs/Module/Tagger.php:94 include/conversation.php:163 +#: include/text.php:2377 msgid "comment" msgstr "" -#: Zotlabs/Module/Tagger.php:126 +#: Zotlabs/Module/Tagger.php:135 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: Zotlabs/Module/Tagrm.php:48 Zotlabs/Module/Tagrm.php:98 +#: Zotlabs/Module/Tagrm.php:59 Zotlabs/Module/Tagrm.php:111 msgid "Tag removed" msgstr "" -#: Zotlabs/Module/Tagrm.php:123 +#: Zotlabs/Module/Tagrm.php:137 msgid "Remove Item Tag" msgstr "" -#: Zotlabs/Module/Tagrm.php:125 +#: Zotlabs/Module/Tagrm.php:139 msgid "Select a tag to remove: " msgstr "" -#: Zotlabs/Module/Import.php:165 Zotlabs/Import/Friendica.php:60 +#: Zotlabs/Module/Import.php:160 Zotlabs/Import/Friendica.php:64 #, php-format msgid "Your service plan only allows %d channels." msgstr "" -#: Zotlabs/Module/Import.php:195 +#: Zotlabs/Module/Import.php:188 msgid "No channel. Import failed." msgstr "" -#: Zotlabs/Module/Import.php:640 +#: Zotlabs/Module/Import.php:633 msgid "Files and Posts imported." msgstr "" -#: Zotlabs/Module/Import.php:656 +#: Zotlabs/Module/Import.php:648 msgid "Import completed." msgstr "" -#: Zotlabs/Module/Import.php:686 +#: Zotlabs/Module/Import.php:680 msgid "You must be logged in to use this feature." msgstr "" -#: Zotlabs/Module/Import.php:691 +#: Zotlabs/Module/Import.php:685 msgid "Import Channel" msgstr "" -#: Zotlabs/Module/Import.php:692 +#: Zotlabs/Module/Import.php:686 msgid "" "Use this form to import an existing channel from a different server. You may " "retrieve the channel identity from the old server via the network or provide " "an export file." msgstr "" -#: Zotlabs/Module/Import.php:694 +#: Zotlabs/Module/Import.php:688 msgid "Or provide the old server details" msgstr "" -#: Zotlabs/Module/Import.php:695 +#: Zotlabs/Module/Import.php:689 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: Zotlabs/Module/Import.php:696 +#: Zotlabs/Module/Import.php:690 msgid "Your old login email address" msgstr "" -#: Zotlabs/Module/Import.php:697 +#: Zotlabs/Module/Import.php:691 msgid "Your old login password" msgstr "" -#: Zotlabs/Module/Import.php:698 +#: Zotlabs/Module/Import.php:692 msgid "Import a few months of posts if possible (limited by available memory)" msgstr "" -#: Zotlabs/Module/Import.php:700 +#: Zotlabs/Module/Import.php:694 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be " @@ -9057,179 +9066,36 @@ msgid "" "location for files, photos, and media." msgstr "" -#: Zotlabs/Module/Import.php:702 +#: Zotlabs/Module/Import.php:696 msgid "Make this hub my primary location" msgstr "" -#: Zotlabs/Module/Import.php:703 +#: Zotlabs/Module/Import.php:697 msgid "Move this channel (disable all previous locations)" msgstr "" -#: Zotlabs/Module/Import.php:704 +#: Zotlabs/Module/Import.php:698 msgid "Use this channel nickname instead of the one provided" msgstr "" -#: Zotlabs/Module/Import.php:704 +#: Zotlabs/Module/Import.php:698 msgid "" "Leave blank to keep your existing channel nickname. You will be randomly " "assigned a similar nickname if either name is already allocated on this site." msgstr "" -#: Zotlabs/Module/Import.php:706 +#: Zotlabs/Module/Import.php:700 msgid "" "This process may take several minutes to complete and considerably longer if " "importing a large amount of posts and files. Please submit the form only " "once and leave this page open until finished." msgstr "" -#: Zotlabs/Module/Profile.php:112 +#: Zotlabs/Module/Profile.php:115 msgid "vcard" msgstr "" -#: Zotlabs/Module/Xchan.php:10 -msgid "Xchan Lookup" -msgstr "" - -#: Zotlabs/Module/Xchan.php:13 -msgid "Lookup xchan beginning with (or webbie): " -msgstr "" - -#: Zotlabs/Module/Comment_control.php:13 -msgid "" -"This app allows you to select the comment audience and set a length of time " -"that comments on a particular post will be accepted." -msgstr "" - -#: Zotlabs/Module/Comment_control.php:21 -msgid "" -"This app is installed. A button to control comments may be found below the " -"post editor." -msgstr "" - -#: Zotlabs/Module/Categories.php:29 -msgid "This app allows you to add categories to posts and events." -msgstr "" - -#: Zotlabs/Module/Zotfinger.php:23 -msgid "Zotfinger Diagnostic" -msgstr "" - -#: Zotlabs/Module/Zotfinger.php:24 -msgid "Lookup URL" -msgstr "" - -#: Zotlabs/Module/Photomap.php:12 -msgid "" -"This app provides a displayable map when viewing detail of photos that " -"contain location information." -msgstr "" - -#: Zotlabs/Module/Photomap.php:20 -msgid "This app is currently installed." -msgstr "" - -#: Zotlabs/Module/Viewconnections.php:62 -msgid "No connections." -msgstr "" - -#: Zotlabs/Module/Viewconnections.php:80 -#, php-format -msgid "Visit %1$s's profile [%2$s]" -msgstr "" - -#: Zotlabs/Module/Viewconnections.php:109 -msgid "View Connections" -msgstr "" - -#: Zotlabs/Module/Suggestions.php:39 -msgid "" -"This app (when installed) displays a small number of friend suggestions on " -"selected pages or you can run the app to display a full list of channel " -"suggestions." -msgstr "" - -#: Zotlabs/Module/Vlists.php:14 -msgid "" -"This app creates dynamic access lists corresponding to [1] all connections, " -"[2] all ActivityPub protocol connections, and [3] all Nomad or Zot/6 " -"protocol connections. These additional selections will be found within the " -"Permissions setting tool." -msgstr "" - -#: Zotlabs/Module/Vlists.php:21 -msgid "This app is installed. " -msgstr "" - -#: Zotlabs/Module/Clients.php:14 -msgid "" -"This app allows you to authorize mobile apps using OAuth and OpenID to " -"access your channel." -msgstr "" - -#: Zotlabs/Module/Superblock.php:34 -msgid "Blocking this site is not permitted." -msgstr "" - -#: Zotlabs/Module/Superblock.php:91 -msgid "Added by Superblock" -msgstr "" - -#: Zotlabs/Module/Superblock.php:191 -msgid "superblock settings updated" -msgstr "" - -#: Zotlabs/Module/Superblock.php:223 -msgid "Blocked channels" -msgstr "" - -#: Zotlabs/Module/Superblock.php:225 -msgid "No channels currently blocked" -msgstr "" - -#: Zotlabs/Module/Superblock.php:240 -msgid "Blocked servers" -msgstr "" - -#: Zotlabs/Module/Superblock.php:242 -msgid "No servers currently blocked" -msgstr "" - -#: Zotlabs/Module/Superblock.php:248 Zotlabs/Widget/Settings_menu.php:58 -msgid "Manage Blocks" -msgstr "" - -#: Zotlabs/Module/Fedi_id.php:23 -msgid "You are already connected with this channel." -msgstr "" - -#: Zotlabs/Module/Fedi_id.php:34 -msgid "Unknown or unreachable identifier" -msgstr "" - -#: Zotlabs/Module/Fedi_id.php:43 -msgid "Home instance" -msgstr "" - -#: Zotlabs/Module/Fedi_id.php:44 -msgid "Enter your channel address or fediverse ID (e.g. channel@example.com)" -msgstr "" - -#: Zotlabs/Module/Fedi_id.php:44 -msgid "" -"If you do not have a fediverse ID, please use your browser 'back' button to " -"return to the previous page" -msgstr "" - -#: Zotlabs/Module/Tagadelic.php:29 -msgid "This app displays a hashtag cloud on your channel homepage." -msgstr "" - -#: Zotlabs/Module/Tagadelic.php:37 -msgid "" -"This app is installed. It displays a hashtag cloud on your channel homepage." -msgstr "" - -#: Zotlabs/Module/Content_filter.php:25 +#: Zotlabs/Module/Content_filter.php:26 msgid "Content Filter settings updated." msgstr "" @@ -9257,7 +9123,40 @@ msgstr "" msgid "Content Filter Settings" msgstr "" -#: Zotlabs/Module/Future.php:13 +#: Zotlabs/Module/Secrets.php:15 +msgid "" +"This app allows you to protect messages with a secret passphrase. This only " +"works across selected platforms." +msgstr "" + +#: Zotlabs/Module/Secrets.php:23 +msgid "" +"This app is installed. A button to encrypt content may be found in the post " +"editor." +msgstr "" + +#: Zotlabs/Module/Xchan.php:13 +msgid "Xchan Lookup" +msgstr "" + +#: Zotlabs/Module/Xchan.php:16 +msgid "Lookup xchan beginning with (or webbie): " +msgstr "" + +#: Zotlabs/Module/Suggestions.php:44 +msgid "" +"This app (when installed) displays a small number of friend suggestions on " +"selected pages or you can run the app to display a full list of channel " +"suggestions." +msgstr "" + +#: Zotlabs/Module/Clients.php:16 +msgid "" +"This app allows you to authorize mobile apps using OAuth and OpenID to " +"access your channel." +msgstr "" + +#: Zotlabs/Module/Future.php:15 msgid "" "This app allows you to set an optional publish date/time for posts, which " "may be in the future. This must be at least ten minutes into the future to " @@ -9266,524 +9165,240 @@ msgid "" "editor to set the date/time." msgstr "" -#: Zotlabs/Module/Secrets.php:13 -msgid "" -"This app allows you to protect messages with a secret passphrase. This only " -"works across selected platforms." +#: Zotlabs/Module/Superblock.php:36 +msgid "Blocking this site is not permitted." msgstr "" -#: Zotlabs/Module/Secrets.php:21 -msgid "" -"This app is installed. A button to encrypt content may be found in the post " -"editor." +#: Zotlabs/Module/Superblock.php:93 +msgid "Added by Superblock" msgstr "" -#: Zotlabs/Module/Markup.php:14 +#: Zotlabs/Module/Superblock.php:199 +msgid "superblock settings updated" +msgstr "" + +#: Zotlabs/Module/Superblock.php:230 +msgid "Blocked channels" +msgstr "" + +#: Zotlabs/Module/Superblock.php:232 +msgid "No channels currently blocked" +msgstr "" + +#: Zotlabs/Module/Superblock.php:247 +msgid "Blocked servers" +msgstr "" + +#: Zotlabs/Module/Superblock.php:249 +msgid "No servers currently blocked" +msgstr "" + +#: Zotlabs/Module/Superblock.php:255 Zotlabs/Widget/Settings_menu.php:64 +msgid "Manage Blocks" +msgstr "" + +#: Zotlabs/Module/Viewconnections.php:66 +msgid "No connections." +msgstr "" + +#: Zotlabs/Module/Viewconnections.php:83 +#, php-format +msgid "Visit %1$s's profile [%2$s]" +msgstr "" + +#: Zotlabs/Module/Viewconnections.php:110 +msgid "View Connections" +msgstr "" + +#: Zotlabs/Module/Vlists.php:16 +msgid "" +"This app creates dynamic access lists corresponding to [1] all connections, " +"[2] all ActivityPub protocol connections, and [3] all Nomad or Zot/6 " +"protocol connections. These additional selections will be found within the " +"Permissions setting tool." +msgstr "" + +#: Zotlabs/Module/Vlists.php:23 +msgid "This app is installed. " +msgstr "" + +#: Zotlabs/Module/Categories.php:31 +msgid "This app allows you to add categories to posts and events." +msgstr "" + +#: Zotlabs/Module/Comment_control.php:15 +msgid "" +"This app allows you to select the comment audience and set a length of time " +"that comments on a particular post will be accepted." +msgstr "" + +#: Zotlabs/Module/Comment_control.php:23 +msgid "" +"This app is installed. A button to control comments may be found below the " +"post editor." +msgstr "" + +#: Zotlabs/Module/Tagadelic.php:31 +msgid "This app displays a hashtag cloud on your channel homepage." +msgstr "" + +#: Zotlabs/Module/Tagadelic.php:39 +msgid "" +"This app is installed. It displays a hashtag cloud on your channel homepage." +msgstr "" + +#: Zotlabs/Module/Zotfinger.php:26 +msgid "Zotfinger Diagnostic" +msgstr "" + +#: Zotlabs/Module/Zotfinger.php:27 +msgid "Lookup URL" +msgstr "" + +#: Zotlabs/Module/Markup.php:16 msgid "" "This app adds editor buttons for bold, italic, underline, quote, and " "possibly other common richtext constructs." msgstr "" -#: Zotlabs/Storage/Browser.php:117 Zotlabs/Storage/Browser.php:314 +#: Zotlabs/Module/Fedi_id.php:25 +msgid "You are already connected with this channel." +msgstr "" + +#: Zotlabs/Module/Fedi_id.php:37 +msgid "Unknown or unreachable identifier" +msgstr "" + +#: Zotlabs/Module/Fedi_id.php:48 +msgid "Home instance" +msgstr "" + +#: Zotlabs/Module/Fedi_id.php:49 +msgid "Enter your channel address or fediverse ID (e.g. channel@example.com)" +msgstr "" + +#: Zotlabs/Module/Fedi_id.php:49 +msgid "" +"If you do not have a fediverse ID, please use your browser 'back' button to " +"return to the previous page" +msgstr "" + +#: Zotlabs/Module/Photomap.php:15 +msgid "" +"This app provides a displayable map when viewing detail of photos that " +"contain location information." +msgstr "" + +#: Zotlabs/Module/Photomap.php:23 +msgid "This app is currently installed." +msgstr "" + +#: Zotlabs/Storage/Browser.php:120 Zotlabs/Storage/Browser.php:317 msgid "parent" msgstr "" -#: Zotlabs/Storage/Browser.php:148 +#: Zotlabs/Storage/Browser.php:151 msgid "Principal" msgstr "" -#: Zotlabs/Storage/Browser.php:151 +#: Zotlabs/Storage/Browser.php:154 msgid "Addressbook" msgstr "" -#: Zotlabs/Storage/Browser.php:157 +#: Zotlabs/Storage/Browser.php:160 msgid "Schedule Inbox" msgstr "" -#: Zotlabs/Storage/Browser.php:160 +#: Zotlabs/Storage/Browser.php:163 msgid "Schedule Outbox" msgstr "" -#: Zotlabs/Storage/Browser.php:296 +#: Zotlabs/Storage/Browser.php:299 msgid "Total" msgstr "" -#: Zotlabs/Storage/Browser.php:298 +#: Zotlabs/Storage/Browser.php:301 msgid "Shared" msgstr "" -#: Zotlabs/Storage/Browser.php:300 +#: Zotlabs/Storage/Browser.php:303 msgid "Add Files" msgstr "" -#: Zotlabs/Storage/Browser.php:307 +#: Zotlabs/Storage/Browser.php:310 msgid "View photos" msgstr "" -#: Zotlabs/Storage/Browser.php:311 +#: Zotlabs/Storage/Browser.php:314 msgid "Type" msgstr "" -#: Zotlabs/Storage/Browser.php:389 +#: Zotlabs/Storage/Browser.php:392 #, php-format msgid "You are using %1$s of your available file storage." msgstr "" -#: Zotlabs/Storage/Browser.php:393 +#: Zotlabs/Storage/Browser.php:396 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "" -#: Zotlabs/Storage/Browser.php:404 +#: Zotlabs/Storage/Browser.php:407 msgid "WARNING:" msgstr "" -#: Zotlabs/Storage/Browser.php:416 +#: Zotlabs/Storage/Browser.php:419 msgid "Create new folder" msgstr "" -#: Zotlabs/Storage/Browser.php:418 +#: Zotlabs/Storage/Browser.php:421 msgid "Upload file" msgstr "" -#: Zotlabs/Storage/Browser.php:431 +#: Zotlabs/Storage/Browser.php:434 msgid "Drop files here to immediately upload" msgstr "" -#: Zotlabs/Update/_1239.php:23 +#: Zotlabs/Update/_1239.php:25 msgid "Added by superblock" msgstr "" -#: Zotlabs/Widget/Categories.php:78 Zotlabs/Widget/Categories.php:122 -#: Zotlabs/Widget/Categories.php:169 Zotlabs/Widget/Appcategories.php:46 -#: Zotlabs/Widget/Filer.php:31 -msgid "Everything" +#: Zotlabs/Widget/Rating.php:58 +msgid "Rating Tools" msgstr "" -#: Zotlabs/Widget/Photo_rand.php:58 Zotlabs/Widget/Photo.php:48 -msgid "photo/image" +#: Zotlabs/Widget/Rating.php:62 Zotlabs/Widget/Rating.php:64 +msgid "Rate Me" msgstr "" -#: Zotlabs/Widget/Archive.php:43 -msgid "Archives" +#: Zotlabs/Widget/Rating.php:68 +msgid "View Ratings" msgstr "" -#: Zotlabs/Widget/Bookmarkedchats.php:24 -msgid "Bookmarked Chatrooms" -msgstr "" - -#: Zotlabs/Widget/Chatroom_list.php:20 -msgid "Overview" -msgstr "" - -#: Zotlabs/Widget/Chatroom_members.php:11 -msgid "Chat Members" -msgstr "" - -#: Zotlabs/Widget/Cover_photo.php:85 -msgid "Click to show more" -msgstr "" - -#: Zotlabs/Widget/Findpeople.php:18 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: Zotlabs/Widget/Findpeople.php:26 -msgid "Find Channels" -msgstr "" - -#: Zotlabs/Widget/Findpeople.php:27 -msgid "Enter name or interest" -msgstr "" - -#: Zotlabs/Widget/Findpeople.php:28 -msgid "Connect/Follow" -msgstr "" - -#: Zotlabs/Widget/Findpeople.php:29 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "" - -#: Zotlabs/Widget/Findpeople.php:34 -msgid "Affiliated sites" -msgstr "" - -#: Zotlabs/Widget/Findpeople.php:37 -msgid "Advanced example: name=fred and country=iceland" -msgstr "" - -#: Zotlabs/Widget/Eventstools.php:13 -msgid "Events Tools" -msgstr "" - -#: Zotlabs/Widget/Eventstools.php:14 -msgid "Export Calendar" -msgstr "" - -#: Zotlabs/Widget/Eventstools.php:15 -msgid "Import Calendar" -msgstr "" - -#: Zotlabs/Widget/Follow.php:26 +#: Zotlabs/Widget/Follow.php:29 #, php-format msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: Zotlabs/Widget/Follow.php:33 +#: Zotlabs/Widget/Follow.php:35 msgid "Add New Connection" msgstr "" -#: Zotlabs/Widget/Follow.php:34 +#: Zotlabs/Widget/Follow.php:36 msgid "Enter channel address" msgstr "" -#: Zotlabs/Widget/Follow.php:35 Zotlabs/Widget/Sblock.php:18 +#: Zotlabs/Widget/Follow.php:37 Zotlabs/Widget/Sblock.php:20 msgid "Examples: bob@example.com, https://example.com/barbara" msgstr "" -#: Zotlabs/Widget/Settings_menu.php:38 -msgid "Account settings" -msgstr "" - -#: Zotlabs/Widget/Settings_menu.php:44 -msgid "Channel settings" -msgstr "" - -#: Zotlabs/Widget/Settings_menu.php:52 -msgid "Display settings" -msgstr "" - -#: Zotlabs/Widget/Settings_menu.php:66 -msgid "Manage locations" -msgstr "" - -#: Zotlabs/Widget/Settings_menu.php:73 -msgid "Export channel" -msgstr "" - -#: Zotlabs/Widget/Settings_menu.php:88 -msgid "Client apps" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:34 -msgid "Direct Messages" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:38 -msgid "Show direct (private) messages" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:48 -msgid "Personal Posts" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:52 -msgid "Show posts that mention or involve me" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:61 -msgid "Saved Posts" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:65 -msgid "Show posts that I have saved" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:79 -msgid "Show drafts that I have saved" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:89 -msgid "Videos" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:93 -msgid "Show posts that include videos" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:107 -msgid "Show posts that include events" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:111 -msgid "Polls" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:115 -msgid "Show posts that include polls" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:136 -#: Zotlabs/Widget/Activity_filter.php:166 -#, php-format -msgid "Show posts related to the %s access list" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:176 -msgid "Show my access lists" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:194 -msgid "Show posts to this group" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:196 -msgid "New post" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:203 Zotlabs/Widget/Notifications.php:105 -#: Zotlabs/Widget/Notifications.php:106 Zotlabs/Widget/Groups.php:108 -msgid "Groups" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:207 -msgid "Show groups" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:229 -#, php-format -msgid "Show posts that I have filed to %s" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:235 Zotlabs/Widget/Filer.php:28 -#: include/features.php:492 -msgid "Saved Folders" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:239 -msgid "Show filed post categories" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:259 -#, php-format -msgid "Show posts with hashtag %s" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:265 -msgid "Followed Hashtags" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:269 -msgid "Show followed hashtags" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:307 -msgid "Remove active filter" -msgstr "" - -#: Zotlabs/Widget/Activity_filter.php:323 -msgid "Stream Filters" -msgstr "" - -#: Zotlabs/Widget/Hq_controls.php:14 -msgid "HQ Control Panel" -msgstr "" - -#: Zotlabs/Widget/Hq_controls.php:17 -msgid "Create a new post" -msgstr "" - -#: Zotlabs/Widget/Mailmenu.php:13 -msgid "Private Mail Menu" -msgstr "" - -#: Zotlabs/Widget/Mailmenu.php:15 -msgid "Combined View" -msgstr "" - -#: Zotlabs/Widget/Mailmenu.php:20 -msgid "Inbox" -msgstr "" - -#: Zotlabs/Widget/Mailmenu.php:25 -msgid "Outbox" -msgstr "" - -#: Zotlabs/Widget/Mailmenu.php:30 -msgid "New Message" -msgstr "" - -#: Zotlabs/Widget/Rating.php:51 -msgid "Rating Tools" -msgstr "" - -#: Zotlabs/Widget/Rating.php:55 Zotlabs/Widget/Rating.php:57 -msgid "Rate Me" -msgstr "" - -#: Zotlabs/Widget/Rating.php:60 -msgid "View Ratings" -msgstr "" - -#: Zotlabs/Widget/Savedsearch.php:75 -msgid "Remove term" -msgstr "" - -#: Zotlabs/Widget/Stream_order.php:96 -msgid "Commented Date" -msgstr "" - -#: Zotlabs/Widget/Stream_order.php:100 -msgid "Order by last commented date" -msgstr "" - -#: Zotlabs/Widget/Stream_order.php:103 -msgid "Posted Date" -msgstr "" - -#: Zotlabs/Widget/Stream_order.php:107 -msgid "Order by last posted date" -msgstr "" - -#: Zotlabs/Widget/Stream_order.php:110 -msgid "Date Unthreaded" -msgstr "" - -#: Zotlabs/Widget/Stream_order.php:114 -msgid "Order unthreaded by date" -msgstr "" - -#: Zotlabs/Widget/Suggestedchats.php:32 -msgid "Suggested Chatrooms" -msgstr "" - -#: Zotlabs/Widget/Tagcloud.php:22 include/taxonomy.php:322 -#: include/taxonomy.php:459 include/taxonomy.php:480 +#: Zotlabs/Widget/Tagcloud.php:25 include/taxonomy.php:364 +#: include/taxonomy.php:509 include/taxonomy.php:532 msgid "Tags" msgstr "" -#: Zotlabs/Widget/Common_friends.php:40 -msgid "Common Connections" -msgstr "" - -#: Zotlabs/Widget/Common_friends.php:45 -#, php-format -msgid "View all %d common connections" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:17 -msgid "New Stream Activity" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:18 -msgid "New Stream Activity Notifications" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:21 -msgid "View your stream activity" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:24 -msgid "Mark all notifications read" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:27 Zotlabs/Widget/Notifications.php:46 -#: Zotlabs/Widget/Notifications.php:138 -msgid "Show new posts only" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:28 Zotlabs/Widget/Notifications.php:47 -#: Zotlabs/Widget/Notifications.php:108 Zotlabs/Widget/Notifications.php:139 -msgid "Filter by name" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:36 -msgid "New Home Activity" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:37 -msgid "New Home Activity Notifications" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:40 -msgid "View your home activity" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:43 Zotlabs/Widget/Notifications.php:135 -msgid "Mark all notifications seen" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:55 -msgid "New Events" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:56 -msgid "New Events Notifications" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:59 -msgid "View events" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:62 -msgid "Mark all events seen" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:71 -msgid "New Connections Notifications" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:74 -msgid "View all connections" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:82 -msgid "New Files" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:83 -msgid "New Files Notifications" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:90 Zotlabs/Widget/Notifications.php:91 -msgid "Notices" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:94 -msgid "View all notices" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:97 -msgid "Mark all notices seen" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:118 -msgid "New Registrations" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:119 -msgid "New Registrations Notifications" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:129 -msgid "Public Stream Notifications" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:132 -msgid "View the public stream" -msgstr "" - -#: Zotlabs/Widget/Notifications.php:147 -msgid "Sorry, you have got no notifications at the moment" -msgstr "" - -#: Zotlabs/Widget/Affinity.php:37 -msgid "Friend zoom in/out" -msgstr "" - -#: Zotlabs/Widget/Suggestions.php:49 -msgid "Ignore/Hide" -msgstr "" - -#: Zotlabs/Widget/Suggestions.php:54 -msgid "Suggestions" -msgstr "" - -#: Zotlabs/Widget/Suggestions.php:55 -msgid "See more..." +#: Zotlabs/Widget/Photo.php:55 Zotlabs/Widget/Photo_rand.php:72 +msgid "photo/image" msgstr "" #: Zotlabs/Widget/Activity.php:58 @@ -9791,221 +9406,615 @@ msgctxt "widget" msgid "Activity" msgstr "" -#: Zotlabs/Widget/Site_projects.php:33 -msgid "Projects" -msgstr "" - -#: Zotlabs/Widget/Site_projects.php:35 -msgid "All projects" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:29 -msgid "Profile Creation" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:31 -msgid "Upload profile photo" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:32 -msgid "Upload cover photo" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:33 include/nav.php:121 -msgid "Edit your profile" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:36 -msgid "Find and Connect with others" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:38 -msgid "View the directory" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:39 -msgid "View friend suggestions" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:40 -msgid "Manage your connections" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:43 -msgid "Communicate" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:45 -msgid "View your channel homepage" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:46 -msgid "View your stream" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:59 -msgid "View public stream" -msgstr "" - -#: Zotlabs/Widget/Newmember.php:63 include/features.php:60 -msgid "New Member Links" -msgstr "" - -#: Zotlabs/Widget/Sblock.php:16 -msgid "Block channel or site" -msgstr "" - -#: Zotlabs/Widget/Sblock.php:17 -msgid "Enter channel address or URL" -msgstr "" - -#: Zotlabs/Widget/Appstore.php:11 -msgid "App Collections" -msgstr "" - -#: Zotlabs/Widget/Cdav.php:37 +#: Zotlabs/Widget/Cdav.php:43 msgid "Select Channel" msgstr "" -#: Zotlabs/Widget/Cdav.php:42 +#: Zotlabs/Widget/Cdav.php:48 msgid "Read-write" msgstr "" -#: Zotlabs/Widget/Cdav.php:43 +#: Zotlabs/Widget/Cdav.php:49 msgid "Read-only" msgstr "" -#: Zotlabs/Widget/Cdav.php:127 +#: Zotlabs/Widget/Cdav.php:135 msgid "Channel Calendar" msgstr "" -#: Zotlabs/Widget/Cdav.php:131 +#: Zotlabs/Widget/Cdav.php:139 msgid "Shared CalDAV Calendars" msgstr "" -#: Zotlabs/Widget/Cdav.php:135 +#: Zotlabs/Widget/Cdav.php:143 msgid "Share this calendar" msgstr "" -#: Zotlabs/Widget/Cdav.php:137 +#: Zotlabs/Widget/Cdav.php:145 msgid "Calendar name and color" msgstr "" -#: Zotlabs/Widget/Cdav.php:139 +#: Zotlabs/Widget/Cdav.php:147 msgid "Create new CalDAV calendar" msgstr "" -#: Zotlabs/Widget/Cdav.php:141 +#: Zotlabs/Widget/Cdav.php:149 msgid "Calendar Name" msgstr "" -#: Zotlabs/Widget/Cdav.php:142 +#: Zotlabs/Widget/Cdav.php:150 msgid "Calendar Tools" msgstr "" -#: Zotlabs/Widget/Cdav.php:144 +#: Zotlabs/Widget/Cdav.php:152 msgid "Import calendar" msgstr "" -#: Zotlabs/Widget/Cdav.php:145 +#: Zotlabs/Widget/Cdav.php:153 msgid "Select a calendar to import to" msgstr "" -#: Zotlabs/Widget/Cdav.php:172 +#: Zotlabs/Widget/Cdav.php:178 msgid "Addressbooks" msgstr "" -#: Zotlabs/Widget/Cdav.php:174 +#: Zotlabs/Widget/Cdav.php:180 msgid "Addressbook name" msgstr "" -#: Zotlabs/Widget/Cdav.php:176 +#: Zotlabs/Widget/Cdav.php:182 msgid "Create new addressbook" msgstr "" -#: Zotlabs/Widget/Cdav.php:177 +#: Zotlabs/Widget/Cdav.php:183 msgid "Addressbook Name" msgstr "" -#: Zotlabs/Widget/Cdav.php:179 +#: Zotlabs/Widget/Cdav.php:185 msgid "Addressbook Tools" msgstr "" -#: Zotlabs/Widget/Cdav.php:180 +#: Zotlabs/Widget/Cdav.php:186 msgid "Import addressbook" msgstr "" -#: Zotlabs/Widget/Cdav.php:181 +#: Zotlabs/Widget/Cdav.php:187 msgid "Select an addressbook to import to" msgstr "" -#: Zotlabs/Widget/Admin.php:25 Zotlabs/Widget/Admin.php:62 +#: Zotlabs/Widget/Savedsearch.php:86 +msgid "Remove term" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:36 +msgid "Direct Messages" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:40 +msgid "Show direct (private) messages" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:50 +msgid "Personal Posts" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:54 +msgid "Show posts that mention or involve me" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:63 +msgid "Saved Posts" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:67 +msgid "Show posts that I have saved" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:81 +msgid "Show drafts that I have saved" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:91 +msgid "Videos" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:95 +msgid "Show posts that include videos" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:109 +msgid "Show posts that include events" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:113 +msgid "Polls" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:117 +msgid "Show posts that include polls" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:138 +#: Zotlabs/Widget/Activity_filter.php:168 +#, php-format +msgid "Show posts related to the %s access list" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:178 +msgid "Show my access lists" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:196 +msgid "Show posts to this group" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:198 +msgid "New post" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:205 Zotlabs/Widget/Groups.php:114 +#: Zotlabs/Widget/Notifications.php:108 Zotlabs/Widget/Notifications.php:109 +msgid "Groups" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:209 +msgid "Show groups" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:232 +#, php-format +msgid "Show posts that I have filed to %s" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:238 Zotlabs/Widget/Filer.php:34 +#: include/features.php:500 +msgid "Saved Folders" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:242 +msgid "Show filed post categories" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:262 +#, php-format +msgid "Show posts with hashtag %s" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:268 +msgid "Followed Hashtags" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:272 +msgid "Show followed hashtags" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:308 +msgid "Remove active filter" +msgstr "" + +#: Zotlabs/Widget/Activity_filter.php:324 +msgid "Stream Filters" +msgstr "" + +#: Zotlabs/Widget/Appcategories.php:52 Zotlabs/Widget/Filer.php:37 +#: Zotlabs/Widget/Categories.php:88 Zotlabs/Widget/Categories.php:136 +#: Zotlabs/Widget/Categories.php:187 +msgid "Everything" +msgstr "" + +#: Zotlabs/Widget/Hq_controls.php:18 +msgid "HQ Control Panel" +msgstr "" + +#: Zotlabs/Widget/Hq_controls.php:21 +msgid "Create a new post" +msgstr "" + +#: Zotlabs/Widget/Mailmenu.php:16 +msgid "Private Mail Menu" +msgstr "" + +#: Zotlabs/Widget/Mailmenu.php:18 +msgid "Combined View" +msgstr "" + +#: Zotlabs/Widget/Mailmenu.php:23 +msgid "Inbox" +msgstr "" + +#: Zotlabs/Widget/Mailmenu.php:28 +msgid "Outbox" +msgstr "" + +#: Zotlabs/Widget/Mailmenu.php:33 +msgid "New Message" +msgstr "" + +#: Zotlabs/Widget/Sblock.php:18 +msgid "Block channel or site" +msgstr "" + +#: Zotlabs/Widget/Sblock.php:19 +msgid "Enter channel address or URL" +msgstr "" + +#: Zotlabs/Widget/Stream_order.php:104 +msgid "Commented Date" +msgstr "" + +#: Zotlabs/Widget/Stream_order.php:108 +msgid "Order by last commented date" +msgstr "" + +#: Zotlabs/Widget/Stream_order.php:111 +msgid "Posted Date" +msgstr "" + +#: Zotlabs/Widget/Stream_order.php:115 +msgid "Order by last posted date" +msgstr "" + +#: Zotlabs/Widget/Stream_order.php:118 +msgid "Date Unthreaded" +msgstr "" + +#: Zotlabs/Widget/Stream_order.php:122 +msgid "Order unthreaded by date" +msgstr "" + +#: Zotlabs/Widget/Suggestions.php:52 +msgid "Ignore/Hide" +msgstr "" + +#: Zotlabs/Widget/Suggestions.php:57 +msgid "Suggestions" +msgstr "" + +#: Zotlabs/Widget/Suggestions.php:58 +msgid "See more..." +msgstr "" + +#: Zotlabs/Widget/Admin.php:29 Zotlabs/Widget/Admin.php:66 msgid "Member registrations waiting for confirmation" msgstr "" -#: Zotlabs/Widget/Admin.php:31 +#: Zotlabs/Widget/Admin.php:35 msgid "Inspect queue" msgstr "" -#: Zotlabs/Widget/Admin.php:33 +#: Zotlabs/Widget/Admin.php:37 msgid "DB updates" msgstr "" -#: Zotlabs/Widget/Admin.php:57 include/nav.php:191 +#: Zotlabs/Widget/Admin.php:61 include/nav.php:190 msgid "Admin" msgstr "" -#: Zotlabs/Widget/Admin.php:58 +#: Zotlabs/Widget/Admin.php:62 msgid "Addon Features" msgstr "" -#: Zotlabs/Import/Friendica.php:192 include/channel.php:455 +#: Zotlabs/Widget/Appstore.php:12 +msgid "App Collections" +msgstr "" + +#: Zotlabs/Widget/Archive.php:49 +msgid "Archives" +msgstr "" + +#: Zotlabs/Widget/Bookmarkedchats.php:31 +msgid "Bookmarked Chatrooms" +msgstr "" + +#: Zotlabs/Widget/Chatroom_list.php:26 +msgid "Overview" +msgstr "" + +#: Zotlabs/Widget/Chatroom_members.php:13 +msgid "Chat Members" +msgstr "" + +#: Zotlabs/Widget/Common_friends.php:47 +msgid "Common Connections" +msgstr "" + +#: Zotlabs/Widget/Common_friends.php:52 +#, php-format +msgid "View all %d common connections" +msgstr "" + +#: Zotlabs/Widget/Cover_photo.php:95 +msgid "Click to show more" +msgstr "" + +#: Zotlabs/Widget/Eventstools.php:16 +msgid "Events Tools" +msgstr "" + +#: Zotlabs/Widget/Eventstools.php:17 +msgid "Export Calendar" +msgstr "" + +#: Zotlabs/Widget/Eventstools.php:18 +msgid "Import Calendar" +msgstr "" + +#: Zotlabs/Widget/Findpeople.php:21 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" + +#: Zotlabs/Widget/Findpeople.php:29 +msgid "Find Channels" +msgstr "" + +#: Zotlabs/Widget/Findpeople.php:30 +msgid "Enter name or interest" +msgstr "" + +#: Zotlabs/Widget/Findpeople.php:31 +msgid "Connect/Follow" +msgstr "" + +#: Zotlabs/Widget/Findpeople.php:32 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "" + +#: Zotlabs/Widget/Findpeople.php:37 +msgid "Affiliated sites" +msgstr "" + +#: Zotlabs/Widget/Findpeople.php:40 +msgid "Advanced example: name=fred and country=iceland" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:32 +msgid "Profile Creation" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:34 +msgid "Upload profile photo" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:35 +msgid "Upload cover photo" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:36 include/nav.php:122 +msgid "Edit your profile" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:39 +msgid "Find and Connect with others" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:41 +msgid "View the directory" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:42 +msgid "View friend suggestions" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:43 +msgid "Manage your connections" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:46 +msgid "Communicate" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:48 +msgid "View your channel homepage" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:49 +msgid "View your stream" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:62 +msgid "View public stream" +msgstr "" + +#: Zotlabs/Widget/Newmember.php:66 include/features.php:68 +msgid "New Member Links" +msgstr "" + +#: Zotlabs/Widget/Settings_menu.php:44 +msgid "Account settings" +msgstr "" + +#: Zotlabs/Widget/Settings_menu.php:50 +msgid "Channel settings" +msgstr "" + +#: Zotlabs/Widget/Settings_menu.php:58 +msgid "Display settings" +msgstr "" + +#: Zotlabs/Widget/Settings_menu.php:72 +msgid "Manage locations" +msgstr "" + +#: Zotlabs/Widget/Settings_menu.php:79 +msgid "Export channel" +msgstr "" + +#: Zotlabs/Widget/Settings_menu.php:94 +msgid "Client apps" +msgstr "" + +#: Zotlabs/Widget/Site_projects.php:32 +msgid "Projects" +msgstr "" + +#: Zotlabs/Widget/Site_projects.php:34 +msgid "All projects" +msgstr "" + +#: Zotlabs/Widget/Suggestedchats.php:38 +msgid "Suggested Chatrooms" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:20 +msgid "New Stream Activity" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:21 +msgid "New Stream Activity Notifications" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:24 +msgid "View your stream activity" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:27 +msgid "Mark all notifications read" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:30 Zotlabs/Widget/Notifications.php:49 +#: Zotlabs/Widget/Notifications.php:141 +msgid "Show new posts only" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:31 Zotlabs/Widget/Notifications.php:50 +#: Zotlabs/Widget/Notifications.php:111 Zotlabs/Widget/Notifications.php:142 +msgid "Filter by name" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:39 +msgid "New Home Activity" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:40 +msgid "New Home Activity Notifications" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:43 +msgid "View your home activity" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:46 Zotlabs/Widget/Notifications.php:138 +msgid "Mark all notifications seen" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:58 +msgid "New Events" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:59 +msgid "New Events Notifications" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:62 +msgid "View events" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:65 +msgid "Mark all events seen" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:74 +msgid "New Connections Notifications" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:77 +msgid "View all connections" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:85 +msgid "New Files" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:86 +msgid "New Files Notifications" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:93 Zotlabs/Widget/Notifications.php:94 +msgid "Notices" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:97 +msgid "View all notices" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:100 +msgid "Mark all notices seen" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:121 +msgid "New Registrations" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:122 +msgid "New Registrations Notifications" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:132 +msgid "Public Stream Notifications" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:135 +msgid "View the public stream" +msgstr "" + +#: Zotlabs/Widget/Notifications.php:150 +msgid "Sorry, you have got no notifications at the moment" +msgstr "" + +#: Zotlabs/Widget/Affinity.php:39 +msgid "Friend zoom in/out" +msgstr "" + +#: Zotlabs/Import/Friendica.php:195 include/channel.php:480 msgid "Default Profile" msgstr "" -#: boot.php:1697 +#: boot.php:1705 msgid "Create an account to access services and applications" msgstr "" -#: boot.php:1717 include/nav.php:113 include/nav.php:142 include/nav.php:161 +#: boot.php:1725 include/nav.php:114 include/nav.php:141 include/nav.php:159 msgid "Logout" msgstr "" -#: boot.php:1721 +#: boot.php:1729 msgid "Login/Email" msgstr "" -#: boot.php:1722 +#: boot.php:1730 msgid "Password" msgstr "" -#: boot.php:1723 +#: boot.php:1731 msgid "Remember me" msgstr "" -#: boot.php:1726 +#: boot.php:1734 msgid "Forgot your password?" msgstr "" -#: boot.php:2507 +#: boot.php:2541 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: boot.php:2512 +#: boot.php:2546 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: boot.php:2556 +#: boot.php:2590 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: boot.php:2561 +#: boot.php:2595 msgid "Cron/Scheduled tasks not running." msgstr "" -#: boot.php:2562 include/datetime.php:240 +#: boot.php:2596 include/datetime.php:277 msgid "never" msgstr "" @@ -10428,547 +10437,39 @@ msgstr "" msgid "Photo Gallery" msgstr "" -#: include/features.php:56 -msgid "General Features" -msgstr "" - -#: include/features.php:61 -msgid "Display new member quick links menu" -msgstr "" - -#: include/features.php:69 -msgid "Advanced Profiles" -msgstr "" - -#: include/features.php:70 -msgid "Additional profile sections and selections" -msgstr "" - -#: include/features.php:116 -msgid "Private Notes" -msgstr "" - -#: include/features.php:117 -msgid "Enables a tool to store notes and reminders (note: not encrypted)" -msgstr "" - -#: include/features.php:137 -msgid "Create interactive articles" -msgstr "" - -#: include/features.php:154 -msgid "Photo Location" -msgstr "" - -#: include/features.php:155 -msgid "If location data is available on uploaded photos, link this to a map." -msgstr "" - -#: include/features.php:183 -msgid "Event Timezone Selection" -msgstr "" - -#: include/features.php:184 -msgid "Allow event creation in timezones other than your own." -msgstr "" - -#: include/features.php:202 -msgid "Advanced Directory Search" -msgstr "" - -#: include/features.php:203 -msgid "Allows creation of complex directory search queries" -msgstr "" - -#: include/features.php:211 -msgid "Advanced Theme and Layout Settings" -msgstr "" - -#: include/features.php:212 -msgid "Allows fine tuning of themes and page layouts" -msgstr "" - -#: include/features.php:221 -msgid "Access Control and Permissions" -msgstr "" - -#: include/features.php:225 -msgid "Privacy Groups" -msgstr "" - -#: include/features.php:226 -msgid "Enable management and selection of privacy groups" -msgstr "" - -#: include/features.php:262 -msgid "OAuth2 Clients" -msgstr "" - -#: include/features.php:263 -msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps." -msgstr "" - -#: include/features.php:283 -msgid "Post Composition Features" -msgstr "" - -#: include/features.php:305 -msgid "Browser Encryption" -msgstr "" - -#: include/features.php:306 -msgid "" -"Provide optional browser-to-browser encryption of content with a shared " -"secret key" -msgstr "" - -#: include/features.php:350 -msgid "Suppress Duplicate Posts/Comments" -msgstr "" - -#: include/features.php:351 -msgid "" -"Prevent posts with identical content to be published with less than two " -"minutes in between submissions." -msgstr "" - -#: include/features.php:359 -msgid "Auto-save drafts of posts and comments" -msgstr "" - -#: include/features.php:360 -msgid "" -"Automatically saves post and comment drafts in local browser storage to help " -"prevent accidental loss of compositions" -msgstr "" - -#: include/features.php:371 -msgid "Network and Stream Filtering" -msgstr "" - -#: include/features.php:461 -msgid "Post/Comment Tools" -msgstr "" - -#: include/features.php:465 -msgid "Community Tagging" -msgstr "" - -#: include/features.php:466 -msgid "Ability to tag existing posts" -msgstr "" - -#: include/features.php:474 -msgid "Post Categories" -msgstr "" - -#: include/features.php:475 -msgid "Add categories to your posts" -msgstr "" - -#: include/features.php:483 -msgid "Emoji Reactions" -msgstr "" - -#: include/features.php:484 -msgid "Add emoji reaction ability to posts" -msgstr "" - -#: include/features.php:493 -msgid "Ability to file posts under folders" -msgstr "" - -#: include/features.php:501 -msgid "Dislike Posts" -msgstr "" - -#: include/features.php:502 -msgid "Ability to dislike posts/comments" -msgstr "" - -#: include/features.php:519 -msgid "Tag Cloud" -msgstr "" - -#: include/features.php:520 -msgid "Provide a personal tag cloud on your channel page" -msgstr "" - -#: include/bbcode.php:283 -msgid "Encrypted content" -msgstr "" - -#: include/bbcode.php:323 +#: include/dba/dba_driver.php:190 #, php-format -msgid "(Embedded app '%s' could not be displayed)." +msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: include/bbcode.php:363 -#, php-format -msgid "Install %1$s element %2$s" -msgstr "" - -#: include/bbcode.php:367 -#, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." -msgstr "" - -#: include/bbcode.php:624 -msgid "card" -msgstr "" - -#: include/bbcode.php:626 -msgid "article" -msgstr "" - -#: include/bbcode.php:709 include/bbcode.php:717 -msgid "Click to open/close" -msgstr "" - -#: include/bbcode.php:717 -msgid "spoiler" -msgstr "" - -#: include/bbcode.php:1310 include/bbcode.php:1580 -msgid "Different viewers will see this text differently" -msgstr "" - -#: include/bbcode.php:1906 -msgid "$1 wrote:" -msgstr "" - -#: include/auth.php:196 -msgid "Delegation session ended." -msgstr "" - -#: include/auth.php:200 -msgid "Logged out." -msgstr "" - -#: include/auth.php:296 -msgid "Email validation is incomplete. Please check your email." -msgstr "" - -#: include/auth.php:312 -msgid "Failed authentication" -msgstr "" - -#: include/auth.php:322 -msgid "Login failed." -msgstr "" - -#: include/security.php:619 +#: include/security.php:643 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: include/dba/dba_driver.php:179 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "" - -#: include/account.php:31 -msgid "Not a valid email address" -msgstr "" - -#: include/account.php:34 -msgid "Your email domain is not among those allowed on this site" -msgstr "" - -#: include/account.php:41 -msgid "Your email address is already registered at this site." -msgstr "" - -#: include/account.php:74 -msgid "An invitation is required." -msgstr "" - -#: include/account.php:78 -msgid "Invitation could not be verified." -msgstr "" - -#: include/account.php:157 -msgid "Please enter the required information." -msgstr "" - -#: include/account.php:221 -msgid "Failed to store account information." -msgstr "" - -#: include/account.php:310 -#, php-format -msgid "Registration confirmation for %s" -msgstr "" - -#: include/account.php:386 -#, php-format -msgid "Registration request at %s" -msgstr "" - -#: include/account.php:410 -msgid "your registration password" -msgstr "" - -#: include/account.php:416 include/account.php:480 -#, php-format -msgid "Registration details for %s" -msgstr "" - -#: include/account.php:492 -msgid "Account approved." -msgstr "" - -#: include/account.php:534 -#, php-format -msgid "Registration revoked for %s" -msgstr "" - -#: include/account.php:821 include/account.php:823 -msgid "Click here to upgrade." -msgstr "" - -#: include/account.php:829 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: include/account.php:834 -msgid "This action is not available under your subscription plan." -msgstr "" - -#: include/channel.php:47 -msgid "Unable to obtain identity information from database" -msgstr "" - -#: include/channel.php:80 -msgid "Empty name" -msgstr "" - -#: include/channel.php:83 -msgid "Name too long" -msgstr "" - -#: include/channel.php:256 -msgid "No account identifier" -msgstr "" - -#: include/channel.php:268 -msgid "Nickname is required." -msgstr "" - -#: include/channel.php:356 -msgid "Unable to retrieve created identity" -msgstr "" - -#: include/channel.php:647 include/channel.php:737 -msgid "Unable to retrieve modified identity" -msgstr "" - -#: include/taxonomy.php:322 -msgid "Popular Tags" -msgstr "" - -#: include/taxonomy.php:566 -msgid "Keywords" -msgstr "" - -#: include/taxonomy.php:587 -msgid "have" -msgstr "" - -#: include/taxonomy.php:587 -msgid "has" -msgstr "" - -#: include/taxonomy.php:588 -msgid "want" -msgstr "" - -#: include/taxonomy.php:588 -msgid "wants" -msgstr "" - -#: include/taxonomy.php:589 -msgid "like" -msgstr "" - -#: include/taxonomy.php:589 -msgid "likes" -msgstr "" - -#: include/taxonomy.php:590 -msgid "dislike" -msgstr "" - -#: include/taxonomy.php:590 -msgid "dislikes" -msgstr "" - -#: include/oembed.php:150 -msgid "View PDF" -msgstr "" - -#: include/oembed.php:357 -msgid " by " -msgstr "" - -#: include/oembed.php:358 -msgid " on " -msgstr "" - -#: include/oembed.php:387 -msgid "Embedded content" -msgstr "" - -#: include/oembed.php:396 -msgid "Embedding disabled" -msgstr "" - -#: include/datetime.php:142 -msgid "Birthday" -msgstr "" - -#: include/datetime.php:142 -msgid "Age: " -msgstr "" - -#: include/datetime.php:142 -msgid "YYYY-MM-DD or MM-DD" -msgstr "" - -#: include/datetime.php:244 -msgid "from now" -msgstr "" - -#: include/datetime.php:248 -msgid "ago" -msgstr "" - -#: include/datetime.php:253 -#, php-format -msgid "less than a second %s" -msgstr "" - -#: include/datetime.php:271 -#, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s %3$s" -msgstr "" - -#: include/datetime.php:282 -msgctxt "relative_date" -msgid "year" -msgid_plural "years" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:285 -msgctxt "relative_date" -msgid "month" -msgid_plural "months" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:288 -msgctxt "relative_date" -msgid "week" -msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:291 -msgctxt "relative_date" -msgid "day" -msgid_plural "days" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:294 -msgctxt "relative_date" -msgid "hour" -msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:297 -msgctxt "relative_date" -msgid "minute" -msgid_plural "minutes" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:300 -msgctxt "relative_date" -msgid "second" -msgid_plural "seconds" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:529 -#, php-format -msgid "%1$s's birthday" -msgstr "" - -#: include/datetime.php:530 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "" - -#: include/photos.php:153 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "" - -#: include/photos.php:164 -msgid "Image file is empty." -msgstr "" - -#: include/photos.php:347 -msgid "Photo storage failed." -msgstr "" - -#: include/photos.php:397 -msgid "a new photo" -msgstr "" - -#: include/photos.php:401 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" -msgstr "" - -#: include/photos.php:745 include/nav.php:424 include/conversation.php:1944 -msgid "Photo Albums" -msgstr "" - -#: include/photos.php:750 -msgid "Upload New Photos" -msgstr "" - -#: include/acl_selectors.php:93 +#: include/acl_selectors.php:94 msgid "(List)" msgstr "" -#: include/acl_selectors.php:99 +#: include/acl_selectors.php:100 msgid "My connections" msgstr "" -#: include/acl_selectors.php:99 include/acl_selectors.php:102 -#: include/acl_selectors.php:105 +#: include/acl_selectors.php:100 include/acl_selectors.php:103 +#: include/acl_selectors.php:106 msgid "(Virtual List)" msgstr "" -#: include/acl_selectors.php:102 +#: include/acl_selectors.php:103 msgid "My ActivityPub connections" msgstr "" -#: include/acl_selectors.php:105 +#: include/acl_selectors.php:106 msgid "My Nomad connections" msgstr "" -#: include/acl_selectors.php:116 +#: include/acl_selectors.php:115 msgid "(Group)" msgstr "" @@ -10998,759 +10499,108 @@ msgstr "" msgid "Don't show" msgstr "" -#: include/acl_selectors.php:179 +#: include/acl_selectors.php:180 msgid "" "Post permissions cannot be changed after a post is shared.
These " "permissions set who is allowed to view the post." msgstr "" -#: include/import.php:33 -msgid "Unable to import a removed channel." +#: include/bbcode.php:316 +msgid "Encrypted content" msgstr "" -#: include/import.php:60 +#: include/bbcode.php:359 +#, php-format +msgid "(Embedded app '%s' could not be displayed)." +msgstr "" + +#: include/bbcode.php:402 +#, php-format +msgid "Install %1$s element %2$s" +msgstr "" + +#: include/bbcode.php:405 +#, php-format msgid "" -"A channel with these settings was discovered and is not usable as it was " -"removed or reserved for system use. Import failed." +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." msgstr "" -#: include/import.php:69 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: include/bbcode.php:673 +msgid "card" msgstr "" -#: include/import.php:90 -msgid "Unable to create a unique channel address. Import failed." +#: include/bbcode.php:675 +msgid "article" msgstr "" -#: include/import.php:136 -msgid "Cloned channel not found. Import failed." +#: include/bbcode.php:771 include/bbcode.php:780 +msgid "Click to open/close" msgstr "" -#: include/attach.php:275 include/attach.php:396 -msgid "Item was not found." +#: include/bbcode.php:780 +msgid "spoiler" msgstr "" -#: include/attach.php:292 -msgid "Unknown error." +#: include/bbcode.php:1412 include/bbcode.php:1683 +msgid "Different viewers will see this text differently" msgstr "" -#: include/attach.php:585 -msgid "No source file." +#: include/bbcode.php:2010 +msgid "$1 wrote:" msgstr "" -#: include/attach.php:607 -msgid "Cannot locate file to replace" +#: include/taxonomy.php:364 +msgid "Popular Tags" msgstr "" -#: include/attach.php:626 -msgid "Cannot locate file to revise/update" +#: include/taxonomy.php:626 +msgid "Keywords" msgstr "" -#: include/attach.php:781 -#, php-format -msgid "File exceeds size limit of %d" +#: include/taxonomy.php:648 +msgid "have" msgstr "" -#: include/attach.php:802 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +#: include/taxonomy.php:648 +msgid "has" msgstr "" -#: include/attach.php:993 -msgid "File upload failed. Possible system limit or action terminated." +#: include/taxonomy.php:649 +msgid "want" msgstr "" -#: include/attach.php:1022 -msgid "Stored file could not be verified. Upload failed." +#: include/taxonomy.php:649 +msgid "wants" msgstr "" -#: include/attach.php:1097 include/attach.php:1114 -msgid "Path not available." +#: include/taxonomy.php:650 +msgid "like" msgstr "" -#: include/attach.php:1163 include/attach.php:1332 -msgid "Empty pathname" +#: include/taxonomy.php:650 +msgid "likes" msgstr "" -#: include/attach.php:1189 -msgid "duplicate filename or path" +#: include/taxonomy.php:651 +msgid "dislike" msgstr "" -#: include/attach.php:1214 -msgid "Path not found." +#: include/taxonomy.php:651 +msgid "dislikes" msgstr "" -#: include/attach.php:1285 -msgid "mkdir failed." -msgstr "" - -#: include/attach.php:1289 -msgid "database storage failed." -msgstr "" - -#: include/attach.php:1338 -msgid "Empty path" -msgstr "" - -#: include/nav.php:93 -msgid "Remote authentication" -msgstr "" - -#: include/nav.php:93 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: include/nav.php:99 -msgid "Manage your channels" -msgstr "" - -#: include/nav.php:102 -msgid "Manage your access lists" -msgstr "" - -#: include/nav.php:104 -msgid "Account/Channel Settings" -msgstr "" - -#: include/nav.php:106 -msgid "(is on)" -msgstr "" - -#: include/nav.php:106 -msgid "(is off)" -msgstr "" - -#: include/nav.php:106 -msgid "Content filtering" -msgstr "" - -#: include/nav.php:113 include/nav.php:142 -msgid "End this session" -msgstr "" - -#: include/nav.php:116 -msgid "Your profile page" -msgstr "" - -#: include/nav.php:119 -msgid "Manage/Edit profiles" -msgstr "" - -#: include/nav.php:128 include/nav.php:132 -msgid "Sign in" -msgstr "" - -#: include/nav.php:159 -msgid "Take me home" -msgstr "" - -#: include/nav.php:161 -msgid "Log me out of this site" -msgstr "" - -#: include/nav.php:166 -msgid "Create an account" -msgstr "" - -#: include/nav.php:178 -msgid "Help and documentation" -msgstr "" - -#: include/nav.php:185 -msgid "Search site @name, #tag, ?doc, content" -msgstr "" - -#: include/nav.php:191 -msgid "Site Setup and Configuration" -msgstr "" - -#: include/nav.php:299 -msgid "Powered by $Projectname" -msgstr "" - -#: include/nav.php:310 -msgid "@name, #tag, ?doc, content" -msgstr "" - -#: include/nav.php:311 -msgid "Please wait..." -msgstr "" - -#: include/nav.php:319 -msgid "Arrange Apps" -msgstr "" - -#: include/nav.php:320 -msgid "Toggle System Apps" -msgstr "" - -#: include/nav.php:401 include/conversation.php:1921 -msgid "Status Messages and Posts" -msgstr "" - -#: include/nav.php:411 include/conversation.php:1931 -msgid "About" -msgstr "" - -#: include/nav.php:414 include/conversation.php:1934 -msgid "Profile Details" -msgstr "" - -#: include/nav.php:432 include/conversation.php:1952 -msgid "Files and Storage" -msgstr "" - -#: include/nav.php:467 include/conversation.php:1989 -msgid "Bookmarks" -msgstr "" - -#: include/nav.php:470 include/conversation.php:1992 -msgid "Saved Bookmarks" -msgstr "" - -#: include/nav.php:481 include/conversation.php:2003 -msgid "View Cards" -msgstr "" - -#: include/nav.php:492 include/conversation.php:2014 -msgid "View Articles" -msgstr "" - -#: include/nav.php:504 include/conversation.php:2025 -msgid "View Webpages" -msgstr "" - -#: include/nav.php:513 include/conversation.php:2035 -msgid "Wikis" -msgstr "" - -#: include/text.php:506 -msgid "prev" -msgstr "" - -#: include/text.php:508 -msgid "first" -msgstr "" - -#: include/text.php:537 -msgid "last" -msgstr "" - -#: include/text.php:540 -msgid "next" -msgstr "" - -#: include/text.php:551 -msgid "older" -msgstr "" - -#: include/text.php:553 -msgid "newer" -msgstr "" - -#: include/text.php:1121 include/text.php:1125 -msgid "poke" -msgstr "" - -#: include/text.php:1121 include/text.php:1125 include/conversation.php:274 -msgid "poked" -msgstr "" - -#: include/text.php:1126 -msgid "ping" -msgstr "" - -#: include/text.php:1126 -msgid "pinged" -msgstr "" - -#: include/text.php:1127 -msgid "prod" -msgstr "" - -#: include/text.php:1127 -msgid "prodded" -msgstr "" - -#: include/text.php:1128 -msgid "slap" -msgstr "" - -#: include/text.php:1128 -msgid "slapped" -msgstr "" - -#: include/text.php:1129 -msgid "finger" -msgstr "" - -#: include/text.php:1129 -msgid "fingered" -msgstr "" - -#: include/text.php:1130 -msgid "rebuff" -msgstr "" - -#: include/text.php:1130 -msgid "rebuffed" -msgstr "" - -#: include/text.php:1153 -msgid "happy" -msgstr "" - -#: include/text.php:1154 -msgid "sad" -msgstr "" - -#: include/text.php:1155 -msgid "mellow" -msgstr "" - -#: include/text.php:1156 -msgid "tired" -msgstr "" - -#: include/text.php:1157 -msgid "perky" -msgstr "" - -#: include/text.php:1158 -msgid "angry" -msgstr "" - -#: include/text.php:1159 -msgid "stupefied" -msgstr "" - -#: include/text.php:1160 -msgid "puzzled" -msgstr "" - -#: include/text.php:1161 -msgid "interested" -msgstr "" - -#: include/text.php:1162 -msgid "bitter" -msgstr "" - -#: include/text.php:1163 -msgid "cheerful" -msgstr "" - -#: include/text.php:1164 -msgid "alive" -msgstr "" - -#: include/text.php:1165 -msgid "annoyed" -msgstr "" - -#: include/text.php:1166 -msgid "anxious" -msgstr "" - -#: include/text.php:1167 -msgid "cranky" -msgstr "" - -#: include/text.php:1168 -msgid "disturbed" -msgstr "" - -#: include/text.php:1169 -msgid "frustrated" -msgstr "" - -#: include/text.php:1170 -msgid "depressed" -msgstr "" - -#: include/text.php:1171 -msgid "motivated" -msgstr "" - -#: include/text.php:1172 -msgid "relaxed" -msgstr "" - -#: include/text.php:1173 -msgid "surprised" -msgstr "" - -#: include/text.php:1356 include/js_strings.php:66 -msgid "January" -msgstr "" - -#: include/text.php:1356 include/js_strings.php:67 -msgid "February" -msgstr "" - -#: include/text.php:1356 include/js_strings.php:68 -msgid "March" -msgstr "" - -#: include/text.php:1356 include/js_strings.php:69 -msgid "April" -msgstr "" - -#: include/text.php:1356 -msgid "May" -msgstr "" - -#: include/text.php:1356 include/js_strings.php:71 -msgid "June" -msgstr "" - -#: include/text.php:1356 include/js_strings.php:72 -msgid "July" -msgstr "" - -#: include/text.php:1356 include/js_strings.php:73 -msgid "August" -msgstr "" - -#: include/text.php:1356 include/js_strings.php:74 -msgid "September" -msgstr "" - -#: include/text.php:1356 include/js_strings.php:75 -msgid "October" -msgstr "" - -#: include/text.php:1356 include/js_strings.php:76 -msgid "November" -msgstr "" - -#: include/text.php:1356 include/js_strings.php:77 -msgid "December" -msgstr "" - -#: include/text.php:1446 -msgid "Unknown Attachment" -msgstr "" - -#: include/text.php:1449 -msgid "unknown" -msgstr "" - -#: include/text.php:1502 -msgid "remove category" -msgstr "" - -#: include/text.php:1634 -msgid "remove from file" -msgstr "" - -#: include/text.php:1784 -msgid "Added to your calendar" -msgstr "" - -#: include/text.php:1866 -msgid "Link" -msgstr "" - -#: include/text.php:1952 -msgid "Poll has ended." -msgstr "" - -#: include/text.php:1955 -#, php-format -msgid "Poll ends: %1$s (%2$s)" -msgstr "" - -#: include/text.php:1960 -msgid "vote" -msgstr "" - -#: include/text.php:1972 -msgid "Download binary/encrypted content" -msgstr "" - -#: include/text.php:2097 -msgid "Page layout" -msgstr "" - -#: include/text.php:2097 -msgid "You can create your own with the layouts tool" -msgstr "" - -#: include/text.php:2107 -msgid "BBcode" -msgstr "" - -#: include/text.php:2108 -msgid "HTML" -msgstr "" - -#: include/text.php:2109 -msgid "Markdown" -msgstr "" - -#: include/text.php:2110 -msgid "Text" -msgstr "" - -#: include/text.php:2111 -msgid "Comanche Layout" -msgstr "" - -#: include/text.php:2116 -msgid "PHP" -msgstr "" - -#: include/text.php:2125 -msgid "Page content type" -msgstr "" - -#: include/text.php:2258 -msgid "activity" -msgstr "" - -#: include/text.php:2362 -msgid "a-z, 0-9, -, and _ only" -msgstr "" - -#: include/text.php:2689 -msgid "Design Tools" -msgstr "" - -#: include/text.php:2695 -msgid "Pages" -msgstr "" - -#: include/text.php:2717 -msgid "Import website..." -msgstr "" - -#: include/text.php:2718 -msgid "Select folder to import" -msgstr "" - -#: include/text.php:2719 -msgid "Import from a zipped folder:" -msgstr "" - -#: include/text.php:2720 -msgid "Import from cloud files:" -msgstr "" - -#: include/text.php:2721 -msgid "/cloud/channel/path/to/folder" -msgstr "" - -#: include/text.php:2722 -msgid "Enter path to website files" -msgstr "" - -#: include/text.php:2723 -msgid "Select folder" -msgstr "" - -#: include/text.php:2724 -msgid "Export website..." -msgstr "" - -#: include/text.php:2725 -msgid "Export to a zip file" -msgstr "" - -#: include/text.php:2726 -msgid "website.zip" -msgstr "" - -#: include/text.php:2727 -msgid "Enter a name for the zip file." -msgstr "" - -#: include/text.php:2728 -msgid "Export to cloud files" -msgstr "" - -#: include/text.php:2729 -msgid "/path/to/export/folder" -msgstr "" - -#: include/text.php:2730 -msgid "Enter a path to a cloud files destination." -msgstr "" - -#: include/text.php:2731 -msgid "Specify folder" -msgstr "" - -#: include/items.php:1026 -msgid "(Unknown)" -msgstr "" - -#: include/items.php:1210 -msgid "Visible to anybody on the internet." -msgstr "" - -#: include/items.php:1212 -msgid "Visible to you only." -msgstr "" - -#: include/items.php:1214 -msgid "Visible to anybody in this network." -msgstr "" - -#: include/items.php:1216 -msgid "Visible to anybody authenticated." -msgstr "" - -#: include/items.php:1218 -#, php-format -msgid "Visible to anybody on %s." -msgstr "" - -#: include/items.php:1220 -msgid "Visible to all connections." -msgstr "" - -#: include/items.php:1222 -msgid "Visible to approved connections." -msgstr "" - -#: include/items.php:1224 -msgid "Visible to specific connections." -msgstr "" - -#: include/items.php:4392 -msgid "Privacy group is empty." -msgstr "" - -#: include/items.php:4773 -msgid "profile photo" -msgstr "" - -#: include/items.php:4977 -#, php-format -msgid "[Edited %s]" -msgstr "" - -#: include/items.php:4977 -msgctxt "edit_activity" -msgid "Post" -msgstr "" - -#: include/items.php:4977 -msgctxt "edit_activity" -msgid "Comment" -msgstr "" - -#: include/connections.php:158 -msgid "New window" -msgstr "" - -#: include/connections.php:159 -msgid "Open the selected location in a different window or browser tab" -msgstr "" - -#: include/connections.php:792 include/event.php:1379 -msgid "Home, Voice" -msgstr "" - -#: include/connections.php:793 include/event.php:1380 -msgid "Home, Fax" -msgstr "" - -#: include/connections.php:795 include/event.php:1382 -msgid "Work, Voice" -msgstr "" - -#: include/connections.php:796 include/event.php:1383 -msgid "Work, Fax" -msgstr "" - -#: include/connections.php:895 -msgid "No connections" -msgstr "" - -#: include/connections.php:927 -#, php-format -msgid "View all %s connections" -msgstr "" - -#: include/connections.php:960 -#, php-format -msgid "Network: %s" -msgstr "" - -#: include/api_auth.php:184 -msgid "This api method requires authentication" -msgstr "" - -#: include/network.php:473 -msgid "url: " -msgstr "" - -#: include/network.php:474 -msgid "error_code: " -msgstr "" - -#: include/network.php:475 -msgid "error_string: " -msgstr "" - -#: include/network.php:476 -msgid "content-type: " -msgstr "" - -#: include/network.php:1594 include/network.php:1595 -msgid "Friendica" -msgstr "" - -#: include/network.php:1596 -msgid "OStatus" -msgstr "" - -#: include/network.php:1597 -msgid "GNU-Social" -msgstr "" - -#: include/network.php:1598 -msgid "RSS/Atom" -msgstr "" - -#: include/network.php:1601 -msgid "Diaspora" -msgstr "" - -#: include/network.php:1602 -msgid "Facebook" -msgstr "" - -#: include/network.php:1604 -msgid "Zot" -msgstr "" - -#: include/network.php:1605 -msgid "LinkedIn" -msgstr "" - -#: include/network.php:1606 -msgid "XMPP/IM" -msgstr "" - -#: include/network.php:1607 -msgid "MySpace" -msgstr "" - -#: include/conversation.php:180 +#: include/conversation.php:182 #, php-format msgid "%1$s repeated %2$s's %3$s" msgstr "" -#: include/conversation.php:186 +#: include/conversation.php:188 #, php-format msgid "likes %1$s's %2$s" msgstr "" -#: include/conversation.php:189 +#: include/conversation.php:190 #, php-format msgid "doesn't like %1$s's %2$s" msgstr "" @@ -11760,58 +10610,62 @@ msgstr "" msgid "repeated %1$s's %2$s" msgstr "" -#: include/conversation.php:235 +#: include/conversation.php:234 #, php-format msgid "%1$s is now connected with %2$s" msgstr "" -#: include/conversation.php:270 +#: include/conversation.php:274 #, php-format msgid "%1$s poked %2$s" msgstr "" -#: include/conversation.php:612 +#: include/conversation.php:278 include/text.php:1182 include/text.php:1186 +msgid "poked" +msgstr "" + +#: include/conversation.php:604 msgid "Toggle Star Status" msgstr "" -#: include/conversation.php:659 +#: include/conversation.php:657 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: include/conversation.php:680 +#: include/conversation.php:679 msgid "Categories:" msgstr "" -#: include/conversation.php:681 +#: include/conversation.php:680 msgid "Filed under:" msgstr "" -#: include/conversation.php:710 +#: include/conversation.php:709 msgid "View Conversation" msgstr "" -#: include/conversation.php:807 +#: include/conversation.php:799 msgid "remove" msgstr "" -#: include/conversation.php:811 +#: include/conversation.php:803 msgid "Loading..." msgstr "" -#: include/conversation.php:812 +#: include/conversation.php:804 msgid "Delete Selected Items" msgstr "" -#: include/conversation.php:855 +#: include/conversation.php:850 msgid "View Source" msgstr "" -#: include/conversation.php:865 +#: include/conversation.php:860 msgid "Follow Thread" msgstr "" -#: include/conversation.php:874 +#: include/conversation.php:869 msgid "Unfollow Thread" msgstr "" @@ -11831,608 +10685,1763 @@ msgstr "" msgid "Block author" msgstr "" -#: include/conversation.php:1129 +#: include/conversation.php:1135 #, php-format msgid "%s likes this." msgstr "" -#: include/conversation.php:1129 +#: include/conversation.php:1135 #, php-format msgid "%s doesn't like this." msgstr "" -#: include/conversation.php:1133 +#: include/conversation.php:1139 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1135 +#: include/conversation.php:1141 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1141 +#: include/conversation.php:1148 msgid "and" msgstr "" -#: include/conversation.php:1144 +#: include/conversation.php:1152 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1145 +#: include/conversation.php:1154 #, php-format msgid "%s like this." msgstr "" -#: include/conversation.php:1145 +#: include/conversation.php:1154 #, php-format msgid "%s don't like this." msgstr "" -#: include/conversation.php:1205 +#: include/conversation.php:1220 msgid "Set your location" msgstr "" -#: include/conversation.php:1206 +#: include/conversation.php:1221 msgid "Clear browser location" msgstr "" -#: include/conversation.php:1224 +#: include/conversation.php:1242 msgid "Embed (existing) photo from your photo albums" msgstr "" -#: include/conversation.php:1268 +#: include/conversation.php:1288 msgid "Tag term:" msgstr "" -#: include/conversation.php:1269 +#: include/conversation.php:1289 msgid "Where are you right now?" msgstr "" -#: include/conversation.php:1274 +#: include/conversation.php:1294 msgid "Choose a different album..." msgstr "" -#: include/conversation.php:1279 include/js_strings.php:6 +#: include/conversation.php:1299 include/js_strings.php:9 msgid "Delete this item?" msgstr "" -#: include/conversation.php:1348 +#: include/conversation.php:1373 msgid "Accept delivery of comments and likes on this post from" msgstr "" -#: include/conversation.php:1385 +#: include/conversation.php:1410 msgid "Page link name" msgstr "" -#: include/conversation.php:1388 +#: include/conversation.php:1413 msgid "Post as" msgstr "" -#: include/conversation.php:1390 +#: include/conversation.php:1415 msgid "Text styles" msgstr "" -#: include/conversation.php:1398 +#: include/conversation.php:1423 msgid "Please enter a link location (URL)" msgstr "" -#: include/conversation.php:1399 +#: include/conversation.php:1424 msgid "Insert link only" msgstr "" -#: include/conversation.php:1399 +#: include/conversation.php:1424 msgid "Embed content if possible" msgstr "" -#: include/conversation.php:1401 +#: include/conversation.php:1426 msgid "Embed an image from your albums" msgstr "" -#: include/conversation.php:1405 +#: include/conversation.php:1430 msgid "Toggle poll" msgstr "" -#: include/conversation.php:1406 +#: include/conversation.php:1431 msgid "Option" msgstr "" -#: include/conversation.php:1407 +#: include/conversation.php:1432 msgid "Add option" msgstr "" -#: include/conversation.php:1408 +#: include/conversation.php:1433 msgid "Minutes" msgstr "" -#: include/conversation.php:1408 +#: include/conversation.php:1433 msgid "Hours" msgstr "" -#: include/conversation.php:1408 +#: include/conversation.php:1433 msgid "Days" msgstr "" -#: include/conversation.php:1409 +#: include/conversation.php:1434 msgid "Allow multiple answers" msgstr "" -#: include/conversation.php:1412 +#: include/conversation.php:1437 msgid "Disable comments" msgstr "" -#: include/conversation.php:1413 +#: include/conversation.php:1438 msgid "Toggle comments" msgstr "" -#: include/conversation.php:1414 +#: include/conversation.php:1439 msgid "Allow comments on this post" msgstr "" -#: include/conversation.php:1420 +#: include/conversation.php:1445 msgid "Optional: disable comments after (date)" msgstr "" -#: include/conversation.php:1429 +#: include/conversation.php:1454 msgid "Categories (optional, comma-separated list)" msgstr "" -#: include/conversation.php:1453 +#: include/conversation.php:1478 msgid "Other networks and post services" msgstr "" -#: include/conversation.php:1454 +#: include/conversation.php:1479 msgid "Collections" msgstr "" -#: include/conversation.php:1457 +#: include/conversation.php:1482 msgid "Set expiration date" msgstr "" -#: include/conversation.php:1462 +#: include/conversation.php:1487 msgid "Set publish date" msgstr "" -#: include/conversation.php:1480 +#: include/conversation.php:1505 msgid "Load remote media players" msgstr "" -#: include/conversation.php:1481 +#: include/conversation.php:1506 msgid "This may subject viewers of this post to behaviour tracking" msgstr "" -#: include/conversation.php:1483 +#: include/conversation.php:1508 msgid "Find shareable objects (Zot)" msgstr "" -#: include/conversation.php:1508 +#: include/conversation.php:1535 msgid "Post to Collections" msgstr "" -#: include/conversation.php:2011 +#: include/conversation.php:1981 include/nav.php:403 +msgid "Status Messages and Posts" +msgstr "" + +#: include/conversation.php:1991 include/nav.php:413 +msgid "About" +msgstr "" + +#: include/conversation.php:1994 include/nav.php:416 +msgid "Profile Details" +msgstr "" + +#: include/conversation.php:2004 include/photos.php:755 include/nav.php:426 +msgid "Photo Albums" +msgstr "" + +#: include/conversation.php:2012 include/nav.php:434 +msgid "Files and Storage" +msgstr "" + +#: include/conversation.php:2049 include/nav.php:469 +msgid "Bookmarks" +msgstr "" + +#: include/conversation.php:2052 include/nav.php:472 +msgid "Saved Bookmarks" +msgstr "" + +#: include/conversation.php:2063 include/nav.php:483 +msgid "View Cards" +msgstr "" + +#: include/conversation.php:2071 msgid "articles" msgstr "" -#: include/conversation.php:2104 +#: include/conversation.php:2074 include/nav.php:494 +msgid "View Articles" +msgstr "" + +#: include/conversation.php:2085 include/nav.php:506 +msgid "View Webpages" +msgstr "" + +#: include/conversation.php:2095 include/nav.php:515 +msgid "Wikis" +msgstr "" + +#: include/conversation.php:2165 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:2107 +#: include/conversation.php:2168 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:2110 +#: include/conversation.php:2171 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:2113 +#: include/conversation.php:2174 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:2116 +#: include/conversation.php:2177 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:2119 +#: include/conversation.php:2180 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" msgstr[0] "" msgstr[1] "" -#: include/zid.php:376 +#: include/account.php:34 +msgid "Not a valid email address" +msgstr "" + +#: include/account.php:36 +msgid "Your email domain is not among those allowed on this site" +msgstr "" + +#: include/account.php:43 +msgid "Your email address is already registered at this site." +msgstr "" + +#: include/account.php:78 +msgid "An invitation is required." +msgstr "" + +#: include/account.php:82 +msgid "Invitation could not be verified." +msgstr "" + +#: include/account.php:164 +msgid "Please enter the required information." +msgstr "" + +#: include/account.php:228 +msgid "Failed to store account information." +msgstr "" + +#: include/account.php:321 +#, php-format +msgid "Registration confirmation for %s" +msgstr "" + +#: include/account.php:398 +#, php-format +msgid "Registration request at %s" +msgstr "" + +#: include/account.php:422 +msgid "your registration password" +msgstr "" + +#: include/account.php:428 include/account.php:498 +#, php-format +msgid "Registration details for %s" +msgstr "" + +#: include/account.php:510 +msgid "Account approved." +msgstr "" + +#: include/account.php:557 +#, php-format +msgid "Registration revoked for %s" +msgstr "" + +#: include/account.php:862 include/account.php:864 +msgid "Click here to upgrade." +msgstr "" + +#: include/account.php:872 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "" + +#: include/account.php:878 +msgid "This action is not available under your subscription plan." +msgstr "" + +#: include/api_auth.php:184 +msgid "This api method requires authentication" +msgstr "" + +#: include/attach.php:282 include/attach.php:408 +msgid "Item was not found." +msgstr "" + +#: include/attach.php:300 +msgid "Unknown error." +msgstr "" + +#: include/attach.php:603 +msgid "No source file." +msgstr "" + +#: include/attach.php:627 +msgid "Cannot locate file to replace" +msgstr "" + +#: include/attach.php:648 +msgid "Cannot locate file to revise/update" +msgstr "" + +#: include/attach.php:807 +#, php-format +msgid "File exceeds size limit of %d" +msgstr "" + +#: include/attach.php:830 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "" + +#: include/attach.php:1037 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "" + +#: include/attach.php:1068 +msgid "Stored file could not be verified. Upload failed." +msgstr "" + +#: include/attach.php:1146 include/attach.php:1163 +msgid "Path not available." +msgstr "" + +#: include/attach.php:1213 include/attach.php:1384 +msgid "Empty pathname" +msgstr "" + +#: include/attach.php:1241 +msgid "duplicate filename or path" +msgstr "" + +#: include/attach.php:1266 +msgid "Path not found." +msgstr "" + +#: include/attach.php:1337 +msgid "mkdir failed." +msgstr "" + +#: include/attach.php:1340 +msgid "database storage failed." +msgstr "" + +#: include/attach.php:1390 +msgid "Empty path" +msgstr "" + +#: include/photos.php:154 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "" + +#: include/photos.php:165 +msgid "Image file is empty." +msgstr "" + +#: include/photos.php:359 +msgid "Photo storage failed." +msgstr "" + +#: include/photos.php:408 +msgid "a new photo" +msgstr "" + +#: include/photos.php:416 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" +msgstr "" + +#: include/photos.php:760 +msgid "Upload New Photos" +msgstr "" + +#: include/network.php:502 +msgid "url: " +msgstr "" + +#: include/network.php:503 +msgid "error_code: " +msgstr "" + +#: include/network.php:504 +msgid "error_string: " +msgstr "" + +#: include/network.php:505 +msgid "content-type: " +msgstr "" + +#: include/network.php:1684 include/network.php:1685 +msgid "Friendica" +msgstr "" + +#: include/network.php:1686 +msgid "OStatus" +msgstr "" + +#: include/network.php:1687 +msgid "GNU-Social" +msgstr "" + +#: include/network.php:1688 +msgid "RSS/Atom" +msgstr "" + +#: include/network.php:1691 +msgid "Diaspora" +msgstr "" + +#: include/network.php:1692 +msgid "Facebook" +msgstr "" + +#: include/network.php:1694 +msgid "Zot" +msgstr "" + +#: include/network.php:1695 +msgid "LinkedIn" +msgstr "" + +#: include/network.php:1696 +msgid "XMPP/IM" +msgstr "" + +#: include/network.php:1697 +msgid "MySpace" +msgstr "" + +#: include/auth.php:207 +msgid "Delegation session ended." +msgstr "" + +#: include/auth.php:210 +msgid "Logged out." +msgstr "" + +#: include/auth.php:305 +msgid "Email validation is incomplete. Please check your email." +msgstr "" + +#: include/auth.php:318 +msgid "Failed authentication" +msgstr "" + +#: include/auth.php:329 +msgid "Login failed." +msgstr "" + +#: include/datetime.php:165 +msgid "Birthday" +msgstr "" + +#: include/datetime.php:165 +msgid "Age: " +msgstr "" + +#: include/datetime.php:165 +msgid "YYYY-MM-DD or MM-DD" +msgstr "" + +#: include/datetime.php:281 +msgid "from now" +msgstr "" + +#: include/datetime.php:284 +msgid "ago" +msgstr "" + +#: include/datetime.php:289 +#, php-format +msgid "less than a second %s" +msgstr "" + +#: include/datetime.php:307 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s %3$s" +msgstr "" + +#: include/datetime.php:319 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:322 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:325 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:328 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:331 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:334 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:337 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:592 +#, php-format +msgid "%1$s's birthday" +msgstr "" + +#: include/datetime.php:593 +#, php-format +msgid "Happy Birthday %1$s" +msgstr "" + +#: include/event.php:34 include/event.php:121 +msgid "l F d, Y \\@ g:i A" +msgstr "" + +#: include/event.php:42 include/event.php:127 +msgid "Starts:" +msgstr "" + +#: include/event.php:60 include/event.php:131 +msgid "Finishes:" +msgstr "" + +#: include/event.php:1190 +msgid "This event has been added to your calendar." +msgstr "" + +#: include/event.php:1421 +msgid "Not specified" +msgstr "" + +#: include/event.php:1422 +msgid "Needs Action" +msgstr "" + +#: include/event.php:1423 +msgid "Completed" +msgstr "" + +#: include/event.php:1424 +msgid "In Process" +msgstr "" + +#: include/event.php:1425 +msgid "Cancelled" +msgstr "" + +#: include/event.php:1516 include/connections.php:827 +msgid "Home, Voice" +msgstr "" + +#: include/event.php:1517 include/connections.php:828 +msgid "Home, Fax" +msgstr "" + +#: include/event.php:1519 include/connections.php:830 +msgid "Work, Voice" +msgstr "" + +#: include/event.php:1520 include/connections.php:831 +msgid "Work, Fax" +msgstr "" + +#: include/features.php:64 +msgid "General Features" +msgstr "" + +#: include/features.php:69 +msgid "Display new member quick links menu" +msgstr "" + +#: include/features.php:77 +msgid "Advanced Profiles" +msgstr "" + +#: include/features.php:78 +msgid "Additional profile sections and selections" +msgstr "" + +#: include/features.php:124 +msgid "Private Notes" +msgstr "" + +#: include/features.php:125 +msgid "Enables a tool to store notes and reminders (note: not encrypted)" +msgstr "" + +#: include/features.php:145 +msgid "Create interactive articles" +msgstr "" + +#: include/features.php:162 +msgid "Photo Location" +msgstr "" + +#: include/features.php:163 +msgid "If location data is available on uploaded photos, link this to a map." +msgstr "" + +#: include/features.php:191 +msgid "Event Timezone Selection" +msgstr "" + +#: include/features.php:192 +msgid "Allow event creation in timezones other than your own." +msgstr "" + +#: include/features.php:210 +msgid "Advanced Directory Search" +msgstr "" + +#: include/features.php:211 +msgid "Allows creation of complex directory search queries" +msgstr "" + +#: include/features.php:219 +msgid "Advanced Theme and Layout Settings" +msgstr "" + +#: include/features.php:220 +msgid "Allows fine tuning of themes and page layouts" +msgstr "" + +#: include/features.php:229 +msgid "Access Control and Permissions" +msgstr "" + +#: include/features.php:233 +msgid "Privacy Groups" +msgstr "" + +#: include/features.php:234 +msgid "Enable management and selection of privacy groups" +msgstr "" + +#: include/features.php:270 +msgid "OAuth2 Clients" +msgstr "" + +#: include/features.php:271 +msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps." +msgstr "" + +#: include/features.php:291 +msgid "Post Composition Features" +msgstr "" + +#: include/features.php:313 +msgid "Browser Encryption" +msgstr "" + +#: include/features.php:314 +msgid "" +"Provide optional browser-to-browser encryption of content with a shared " +"secret key" +msgstr "" + +#: include/features.php:358 +msgid "Suppress Duplicate Posts/Comments" +msgstr "" + +#: include/features.php:359 +msgid "" +"Prevent posts with identical content to be published with less than two " +"minutes in between submissions." +msgstr "" + +#: include/features.php:367 +msgid "Auto-save drafts of posts and comments" +msgstr "" + +#: include/features.php:368 +msgid "" +"Automatically saves post and comment drafts in local browser storage to help " +"prevent accidental loss of compositions" +msgstr "" + +#: include/features.php:379 +msgid "Network and Stream Filtering" +msgstr "" + +#: include/features.php:469 +msgid "Post/Comment Tools" +msgstr "" + +#: include/features.php:473 +msgid "Community Tagging" +msgstr "" + +#: include/features.php:474 +msgid "Ability to tag existing posts" +msgstr "" + +#: include/features.php:482 +msgid "Post Categories" +msgstr "" + +#: include/features.php:483 +msgid "Add categories to your posts" +msgstr "" + +#: include/features.php:491 +msgid "Emoji Reactions" +msgstr "" + +#: include/features.php:492 +msgid "Add emoji reaction ability to posts" +msgstr "" + +#: include/features.php:501 +msgid "Ability to file posts under folders" +msgstr "" + +#: include/features.php:509 +msgid "Dislike Posts" +msgstr "" + +#: include/features.php:510 +msgid "Ability to dislike posts/comments" +msgstr "" + +#: include/features.php:527 +msgid "Tag Cloud" +msgstr "" + +#: include/features.php:528 +msgid "Provide a personal tag cloud on your channel page" +msgstr "" + +#: include/connections.php:172 +msgid "New window" +msgstr "" + +#: include/connections.php:173 +msgid "Open the selected location in a different window or browser tab" +msgstr "" + +#: include/connections.php:942 +msgid "No connections" +msgstr "" + +#: include/connections.php:973 +#, php-format +msgid "View all %s connections" +msgstr "" + +#: include/connections.php:1010 +#, php-format +msgid "Network: %s" +msgstr "" + +#: include/text.php:522 +msgid "prev" +msgstr "" + +#: include/text.php:525 +msgid "first" +msgstr "" + +#: include/text.php:556 +msgid "last" +msgstr "" + +#: include/text.php:559 +msgid "next" +msgstr "" + +#: include/text.php:572 +msgid "older" +msgstr "" + +#: include/text.php:575 +msgid "newer" +msgstr "" + +#: include/text.php:1182 include/text.php:1186 +msgid "poke" +msgstr "" + +#: include/text.php:1187 +msgid "ping" +msgstr "" + +#: include/text.php:1187 +msgid "pinged" +msgstr "" + +#: include/text.php:1188 +msgid "prod" +msgstr "" + +#: include/text.php:1188 +msgid "prodded" +msgstr "" + +#: include/text.php:1189 +msgid "slap" +msgstr "" + +#: include/text.php:1189 +msgid "slapped" +msgstr "" + +#: include/text.php:1190 +msgid "finger" +msgstr "" + +#: include/text.php:1190 +msgid "fingered" +msgstr "" + +#: include/text.php:1191 +msgid "rebuff" +msgstr "" + +#: include/text.php:1191 +msgid "rebuffed" +msgstr "" + +#: include/text.php:1215 +msgid "happy" +msgstr "" + +#: include/text.php:1216 +msgid "sad" +msgstr "" + +#: include/text.php:1217 +msgid "mellow" +msgstr "" + +#: include/text.php:1218 +msgid "tired" +msgstr "" + +#: include/text.php:1219 +msgid "perky" +msgstr "" + +#: include/text.php:1220 +msgid "angry" +msgstr "" + +#: include/text.php:1221 +msgid "stupefied" +msgstr "" + +#: include/text.php:1222 +msgid "puzzled" +msgstr "" + +#: include/text.php:1223 +msgid "interested" +msgstr "" + +#: include/text.php:1224 +msgid "bitter" +msgstr "" + +#: include/text.php:1225 +msgid "cheerful" +msgstr "" + +#: include/text.php:1226 +msgid "alive" +msgstr "" + +#: include/text.php:1227 +msgid "annoyed" +msgstr "" + +#: include/text.php:1228 +msgid "anxious" +msgstr "" + +#: include/text.php:1229 +msgid "cranky" +msgstr "" + +#: include/text.php:1230 +msgid "disturbed" +msgstr "" + +#: include/text.php:1231 +msgid "frustrated" +msgstr "" + +#: include/text.php:1232 +msgid "depressed" +msgstr "" + +#: include/text.php:1233 +msgid "motivated" +msgstr "" + +#: include/text.php:1234 +msgid "relaxed" +msgstr "" + +#: include/text.php:1235 +msgid "surprised" +msgstr "" + +#: include/text.php:1433 include/js_strings.php:69 +msgid "January" +msgstr "" + +#: include/text.php:1433 include/js_strings.php:70 +msgid "February" +msgstr "" + +#: include/text.php:1433 include/js_strings.php:71 +msgid "March" +msgstr "" + +#: include/text.php:1433 include/js_strings.php:72 +msgid "April" +msgstr "" + +#: include/text.php:1433 +msgid "May" +msgstr "" + +#: include/text.php:1433 include/js_strings.php:74 +msgid "June" +msgstr "" + +#: include/text.php:1433 include/js_strings.php:75 +msgid "July" +msgstr "" + +#: include/text.php:1433 include/js_strings.php:76 +msgid "August" +msgstr "" + +#: include/text.php:1433 include/js_strings.php:77 +msgid "September" +msgstr "" + +#: include/text.php:1433 include/js_strings.php:78 +msgid "October" +msgstr "" + +#: include/text.php:1433 include/js_strings.php:79 +msgid "November" +msgstr "" + +#: include/text.php:1433 include/js_strings.php:80 +msgid "December" +msgstr "" + +#: include/text.php:1531 +msgid "Unknown Attachment" +msgstr "" + +#: include/text.php:1534 +msgid "unknown" +msgstr "" + +#: include/text.php:1588 +msgid "remove category" +msgstr "" + +#: include/text.php:1727 +msgid "remove from file" +msgstr "" + +#: include/text.php:1873 +msgid "Added to your calendar" +msgstr "" + +#: include/text.php:1961 +msgid "Link" +msgstr "" + +#: include/text.php:2044 +msgid "Poll has ended." +msgstr "" + +#: include/text.php:2046 +#, php-format +msgid "Poll ends: %1$s (%2$s)" +msgstr "" + +#: include/text.php:2051 +msgid "vote" +msgstr "" + +#: include/text.php:2062 +msgid "Download binary/encrypted content" +msgstr "" + +#: include/text.php:2194 +msgid "Page layout" +msgstr "" + +#: include/text.php:2194 +msgid "You can create your own with the layouts tool" +msgstr "" + +#: include/text.php:2205 +msgid "BBcode" +msgstr "" + +#: include/text.php:2206 +msgid "HTML" +msgstr "" + +#: include/text.php:2207 +msgid "Markdown" +msgstr "" + +#: include/text.php:2208 +msgid "Text" +msgstr "" + +#: include/text.php:2209 +msgid "Comanche Layout" +msgstr "" + +#: include/text.php:2214 +msgid "PHP" +msgstr "" + +#: include/text.php:2223 +msgid "Page content type" +msgstr "" + +#: include/text.php:2383 +msgid "activity" +msgstr "" + +#: include/text.php:2497 +msgid "a-z, 0-9, -, and _ only" +msgstr "" + +#: include/text.php:2847 +msgid "Design Tools" +msgstr "" + +#: include/text.php:2853 +msgid "Pages" +msgstr "" + +#: include/text.php:2876 +msgid "Import website..." +msgstr "" + +#: include/text.php:2877 +msgid "Select folder to import" +msgstr "" + +#: include/text.php:2878 +msgid "Import from a zipped folder:" +msgstr "" + +#: include/text.php:2879 +msgid "Import from cloud files:" +msgstr "" + +#: include/text.php:2880 +msgid "/cloud/channel/path/to/folder" +msgstr "" + +#: include/text.php:2881 +msgid "Enter path to website files" +msgstr "" + +#: include/text.php:2882 +msgid "Select folder" +msgstr "" + +#: include/text.php:2883 +msgid "Export website..." +msgstr "" + +#: include/text.php:2884 +msgid "Export to a zip file" +msgstr "" + +#: include/text.php:2885 +msgid "website.zip" +msgstr "" + +#: include/text.php:2886 +msgid "Enter a name for the zip file." +msgstr "" + +#: include/text.php:2887 +msgid "Export to cloud files" +msgstr "" + +#: include/text.php:2888 +msgid "/path/to/export/folder" +msgstr "" + +#: include/text.php:2889 +msgid "Enter a path to a cloud files destination." +msgstr "" + +#: include/text.php:2890 +msgid "Specify folder" +msgstr "" + +#: include/items.php:1058 +msgid "(Unknown)" +msgstr "" + +#: include/items.php:1261 +msgid "Visible to anybody on the internet." +msgstr "" + +#: include/items.php:1264 +msgid "Visible to you only." +msgstr "" + +#: include/items.php:1267 +msgid "Visible to anybody in this network." +msgstr "" + +#: include/items.php:1270 +msgid "Visible to anybody authenticated." +msgstr "" + +#: include/items.php:1273 +#, php-format +msgid "Visible to anybody on %s." +msgstr "" + +#: include/items.php:1276 +msgid "Visible to all connections." +msgstr "" + +#: include/items.php:1279 +msgid "Visible to approved connections." +msgstr "" + +#: include/items.php:1282 +msgid "Visible to specific connections." +msgstr "" + +#: include/items.php:4545 +msgid "Privacy group is empty." +msgstr "" + +#: include/items.php:4920 +msgid "profile photo" +msgstr "" + +#: include/items.php:5135 +#, php-format +msgid "[Edited %s]" +msgstr "" + +#: include/items.php:5135 +msgctxt "edit_activity" +msgid "Post" +msgstr "" + +#: include/items.php:5135 +msgctxt "edit_activity" +msgid "Comment" +msgstr "" + +#: include/oembed.php:159 +msgid "View PDF" +msgstr "" + +#: include/oembed.php:375 +msgid " by " +msgstr "" + +#: include/oembed.php:378 +msgid " on " +msgstr "" + +#: include/oembed.php:409 +msgid "Embedded content" +msgstr "" + +#: include/oembed.php:418 +msgid "Embedding disabled" +msgstr "" + +#: include/zid.php:398 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" -#: include/js_strings.php:9 +#: include/channel.php:49 +msgid "Unable to obtain identity information from database" +msgstr "" + +#: include/channel.php:83 +msgid "Empty name" +msgstr "" + +#: include/channel.php:87 +msgid "Name too long" +msgstr "" + +#: include/channel.php:272 +msgid "No account identifier" +msgstr "" + +#: include/channel.php:284 +msgid "Nickname is required." +msgstr "" + +#: include/channel.php:375 +msgid "Unable to retrieve created identity" +msgstr "" + +#: include/channel.php:675 include/channel.php:773 +msgid "Unable to retrieve modified identity" +msgstr "" + +#: include/import.php:33 +msgid "Unable to import a removed channel." +msgstr "" + +#: include/import.php:63 +msgid "" +"A channel with these settings was discovered and is not usable as it was " +"removed or reserved for system use. Import failed." +msgstr "" + +#: include/import.php:72 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "" + +#: include/import.php:93 +msgid "Unable to create a unique channel address. Import failed." +msgstr "" + +#: include/import.php:140 +msgid "Cloned channel not found. Import failed." +msgstr "" + +#: include/nav.php:95 +msgid "Remote authentication" +msgstr "" + +#: include/nav.php:95 +msgid "Click to authenticate to your home hub" +msgstr "" + +#: include/nav.php:100 +msgid "Manage your channels" +msgstr "" + +#: include/nav.php:103 +msgid "Manage your access lists" +msgstr "" + +#: include/nav.php:105 +msgid "Account/Channel Settings" +msgstr "" + +#: include/nav.php:107 +msgid "(is on)" +msgstr "" + +#: include/nav.php:107 +msgid "(is off)" +msgstr "" + +#: include/nav.php:107 +msgid "Content filtering" +msgstr "" + +#: include/nav.php:114 include/nav.php:141 +msgid "End this session" +msgstr "" + +#: include/nav.php:117 +msgid "Your profile page" +msgstr "" + +#: include/nav.php:120 +msgid "Manage/Edit profiles" +msgstr "" + +#: include/nav.php:128 include/nav.php:131 +msgid "Sign in" +msgstr "" + +#: include/nav.php:157 +msgid "Take me home" +msgstr "" + +#: include/nav.php:159 +msgid "Log me out of this site" +msgstr "" + +#: include/nav.php:164 +msgid "Create an account" +msgstr "" + +#: include/nav.php:177 +msgid "Help and documentation" +msgstr "" + +#: include/nav.php:184 +msgid "Search site @name, #tag, ?doc, content" +msgstr "" + +#: include/nav.php:190 +msgid "Site Setup and Configuration" +msgstr "" + +#: include/nav.php:296 +msgid "Powered by $Projectname" +msgstr "" + +#: include/nav.php:307 +msgid "@name, #tag, ?doc, content" +msgstr "" + +#: include/nav.php:308 +msgid "Please wait..." +msgstr "" + +#: include/nav.php:316 +msgid "Arrange Apps" +msgstr "" + +#: include/nav.php:317 +msgid "Toggle System Apps" +msgstr "" + +#: include/js_strings.php:12 #, php-format msgid "%s show less" msgstr "" -#: include/js_strings.php:10 +#: include/js_strings.php:13 #, php-format msgid "%s expand" msgstr "" -#: include/js_strings.php:11 +#: include/js_strings.php:14 #, php-format msgid "%s collapse" msgstr "" -#: include/js_strings.php:12 +#: include/js_strings.php:15 msgid "Password too short" msgstr "" -#: include/js_strings.php:13 +#: include/js_strings.php:16 msgid "Passwords do not match" msgstr "" -#: include/js_strings.php:14 +#: include/js_strings.php:17 msgid "everybody" msgstr "" -#: include/js_strings.php:15 +#: include/js_strings.php:18 msgid "Secret Passphrase" msgstr "" -#: include/js_strings.php:16 +#: include/js_strings.php:19 msgid "Passphrase hint" msgstr "" -#: include/js_strings.php:17 +#: include/js_strings.php:20 msgid "Notice: Permissions have changed but have not yet been submitted." msgstr "" -#: include/js_strings.php:18 +#: include/js_strings.php:21 msgid "close all" msgstr "" -#: include/js_strings.php:19 +#: include/js_strings.php:22 msgid "Nothing new here" msgstr "" -#: include/js_strings.php:20 +#: include/js_strings.php:23 msgid "Rate This Channel (this is public)" msgstr "" -#: include/js_strings.php:22 +#: include/js_strings.php:25 msgid "Describe (optional)" msgstr "" -#: include/js_strings.php:24 +#: include/js_strings.php:27 msgid "Please enter a link URL" msgstr "" -#: include/js_strings.php:25 +#: include/js_strings.php:28 msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "" -#: include/js_strings.php:27 +#: include/js_strings.php:30 msgid "lovely" msgstr "" -#: include/js_strings.php:28 +#: include/js_strings.php:31 msgid "wonderful" msgstr "" -#: include/js_strings.php:29 +#: include/js_strings.php:32 msgid "fantastic" msgstr "" -#: include/js_strings.php:30 +#: include/js_strings.php:33 msgid "great" msgstr "" -#: include/js_strings.php:31 +#: include/js_strings.php:34 msgid "" "Your chosen nickname was either already taken or not valid. Please use our " "suggestion (" msgstr "" -#: include/js_strings.php:32 +#: include/js_strings.php:35 msgid ") or enter a new one." msgstr "" -#: include/js_strings.php:33 +#: include/js_strings.php:36 msgid "Thank you, this nickname is valid." msgstr "" -#: include/js_strings.php:34 +#: include/js_strings.php:37 msgid "A channel name is required." msgstr "" -#: include/js_strings.php:35 +#: include/js_strings.php:38 msgid "This is a " msgstr "" -#: include/js_strings.php:36 +#: include/js_strings.php:39 msgid " channel name" msgstr "" -#: include/js_strings.php:37 +#: include/js_strings.php:40 msgid "Pinned" msgstr "" -#: include/js_strings.php:40 +#: include/js_strings.php:43 msgid "Please accept terms to continue" msgstr "" -#: include/js_strings.php:46 +#: include/js_strings.php:49 msgid "timeago.prefixAgo" msgstr "" -#: include/js_strings.php:47 +#: include/js_strings.php:50 msgid "timeago.prefixFromNow" msgstr "" -#: include/js_strings.php:48 +#: include/js_strings.php:51 msgid "timeago.suffixAgo" msgstr "" -#: include/js_strings.php:49 +#: include/js_strings.php:52 msgid "timeago.suffixFromNow" msgstr "" -#: include/js_strings.php:52 +#: include/js_strings.php:55 msgid "less than a minute" msgstr "" -#: include/js_strings.php:53 +#: include/js_strings.php:56 msgid "about a minute" msgstr "" -#: include/js_strings.php:54 +#: include/js_strings.php:57 #, php-format msgid "%d minutes" msgstr "" -#: include/js_strings.php:55 +#: include/js_strings.php:58 msgid "about an hour" msgstr "" -#: include/js_strings.php:56 +#: include/js_strings.php:59 #, php-format msgid "about %d hours" msgstr "" -#: include/js_strings.php:57 +#: include/js_strings.php:60 msgid "a day" msgstr "" -#: include/js_strings.php:58 +#: include/js_strings.php:61 #, php-format msgid "%d days" msgstr "" -#: include/js_strings.php:59 +#: include/js_strings.php:62 msgid "about a month" msgstr "" -#: include/js_strings.php:60 +#: include/js_strings.php:63 #, php-format msgid "%d months" msgstr "" -#: include/js_strings.php:61 +#: include/js_strings.php:64 msgid "about a year" msgstr "" -#: include/js_strings.php:62 +#: include/js_strings.php:65 #, php-format msgid "%d years" msgstr "" -#: include/js_strings.php:63 +#: include/js_strings.php:66 msgid " " msgstr "" -#: include/js_strings.php:64 +#: include/js_strings.php:67 msgid "timeago.numbers" msgstr "" -#: include/js_strings.php:70 +#: include/js_strings.php:73 msgctxt "long" msgid "May" msgstr "" -#: include/js_strings.php:78 +#: include/js_strings.php:81 msgid "Jan" msgstr "" -#: include/js_strings.php:79 +#: include/js_strings.php:82 msgid "Feb" msgstr "" -#: include/js_strings.php:80 +#: include/js_strings.php:83 msgid "Mar" msgstr "" -#: include/js_strings.php:81 +#: include/js_strings.php:84 msgid "Apr" msgstr "" -#: include/js_strings.php:82 +#: include/js_strings.php:85 msgctxt "short" msgid "May" msgstr "" -#: include/js_strings.php:83 +#: include/js_strings.php:86 msgid "Jun" msgstr "" -#: include/js_strings.php:84 +#: include/js_strings.php:87 msgid "Jul" msgstr "" -#: include/js_strings.php:85 +#: include/js_strings.php:88 msgid "Aug" msgstr "" -#: include/js_strings.php:86 +#: include/js_strings.php:89 msgid "Sep" msgstr "" -#: include/js_strings.php:87 +#: include/js_strings.php:90 msgid "Oct" msgstr "" -#: include/js_strings.php:88 +#: include/js_strings.php:91 msgid "Nov" msgstr "" -#: include/js_strings.php:89 +#: include/js_strings.php:92 msgid "Dec" msgstr "" -#: include/js_strings.php:97 +#: include/js_strings.php:100 msgid "Sun" msgstr "" -#: include/js_strings.php:98 +#: include/js_strings.php:101 msgid "Mon" msgstr "" -#: include/js_strings.php:99 +#: include/js_strings.php:102 msgid "Tue" msgstr "" -#: include/js_strings.php:100 +#: include/js_strings.php:103 msgid "Wed" msgstr "" -#: include/js_strings.php:101 +#: include/js_strings.php:104 msgid "Thu" msgstr "" -#: include/js_strings.php:102 +#: include/js_strings.php:105 msgid "Fri" msgstr "" -#: include/js_strings.php:103 -msgid "Sat" -msgstr "" - -#: include/js_strings.php:104 -msgctxt "calendar" -msgid "today" -msgstr "" - -#: include/js_strings.php:105 -msgctxt "calendar" -msgid "month" -msgstr "" - #: include/js_strings.php:106 -msgctxt "calendar" -msgid "week" +msgid "Sat" msgstr "" #: include/js_strings.php:107 msgctxt "calendar" -msgid "day" +msgid "today" msgstr "" #: include/js_strings.php:108 msgctxt "calendar" -msgid "All day" +msgid "month" msgstr "" #: include/js_strings.php:109 +msgctxt "calendar" +msgid "week" +msgstr "" + +#: include/js_strings.php:110 +msgctxt "calendar" +msgid "day" +msgstr "" + +#: include/js_strings.php:111 +msgctxt "calendar" +msgid "All day" +msgstr "" + +#: include/js_strings.php:112 msgid "" "A social networking profile that is public by default and private if desired" msgstr "" -#: include/js_strings.php:110 +#: include/js_strings.php:113 msgid "" "A social networking profile where content is private to your [Friends] " "Access List by default but can be made public if desired" msgstr "" -#: include/js_strings.php:111 +#: include/js_strings.php:114 msgid "A public group where members are allowed to upload media by default" msgstr "" -#: include/js_strings.php:112 +#: include/js_strings.php:115 msgid "A private group with no upload permission" msgstr "" -#: include/js_strings.php:113 +#: include/js_strings.php:116 msgid "" "A public group where posts are moderated by the owner. The [moderated] " "permission may be removed from any group member once trust is established" msgstr "" -#: include/js_strings.php:114 +#: include/js_strings.php:117 msgid "" "A sub-channel of your main channel - often devoted to a specific language or " "topic. Replies are sent back to your main channel" msgstr "" -#: include/js_strings.php:115 +#: include/js_strings.php:118 msgid "" "A private sub-channel of your main channel - often devoted to a specific " "language or topic. Replies are sent back to your main channel" msgstr "" -#: include/event.php:33 include/event.php:102 -msgid "l F d, Y \\@ g:i A" -msgstr "" - -#: include/event.php:41 include/event.php:108 -msgid "Starts:" -msgstr "" - -#: include/event.php:51 include/event.php:112 -msgid "Finishes:" -msgstr "" - -#: include/event.php:1066 -msgid "This event has been added to your calendar." -msgstr "" - -#: include/event.php:1291 -msgid "Not specified" -msgstr "" - -#: include/event.php:1292 -msgid "Needs Action" -msgstr "" - -#: include/event.php:1293 -msgid "Completed" -msgstr "" - -#: include/event.php:1294 -msgid "In Process" -msgstr "" - -#: include/event.php:1295 -msgid "Cancelled" -msgstr "" - #: view/theme/redbasic/php/config.php:16 view/theme/redbasic/php/config.php:19 msgid "Focus (Hubzilla default)" msgstr "" diff --git a/util/pconfig b/util/pconfig index a30e69960..69192534f 100755 --- a/util/pconfig +++ b/util/pconfig @@ -82,7 +82,7 @@ if($argc == 3) { } if($argc == 2) { - $r = q("select * from pconfig where uid = " . intval($argv[1])); + $r = q('select * from pconfig where uid = ' . intval($argv[1])); if($r) { foreach($r as $rr) { echo "pconfig[{$rr['uid']}][{$rr['cat']}][{$rr['k']}] = " . printable_config($rr['v']) . "\n"; @@ -91,7 +91,7 @@ if($argc == 2) { } if($argc == 1) { - $r = q("select channel_id, channel_name from channel where channel_removed = 0"); + $r = q('select channel_id, channel_name from channel where channel_removed = 0'); if($r) { foreach($r as $rr) { echo sprintf('%4u %s', $rr['channel_id'], $rr['channel_name']) . PHP_EOL; diff --git a/util/php2po.php b/util/php2po.php index 46e7f9069..906e04704 100644 --- a/util/php2po.php +++ b/util/php2po.php @@ -1,85 +1,86 @@ \n\n"; - return; - } +if ($argc != 2) { + print 'Usage: ' . $argv[0] . "\n\n"; + return; +} $phpfile = $argv[1]; - $pofile = dirname($phpfile)."/messages.po"; + $pofile = dirname($phpfile) . '/messages.po'; - if (!file_exists($phpfile)){ - print "Unable to find '$phpfile'\n"; - return; - } +if (!file_exists($phpfile)) { + print "Unable to find '$phpfile'\n"; + return; +} include_once($phpfile); print "Out to '$pofile'\n"; - $out = ""; + $out = ''; $infile = file($pofile); - $k = ""; - $c = ""; - $ink = False; - foreach ($infile as $l) { - - $l = trim($l, " "); - if (!preg_match("/^msgstr\[[1-9]/",$l)) { - if ($k!="" && (substr($l,0,7)=="msgstr " || substr($l,0,8)=="msgstr[0")){ - $ink = False; - $k = stripcslashes($k); - $v = ""; - if (isset(App::$strings[$k])) { - $v = App::$strings[$k]; - } else { - $k = "__ctx:".$c."__ ".$k; - if (isset(App::$strings[$k])) { - $v = App::$strings[$k]; - $c = ""; - }; - } - if (!empty($v)) { - if (is_array($v)) { - $l = ""; - $n = 0; - foreach ($v as &$value) { - $l .= "msgstr[".$n."] \"".addcslashes($value,"\"\n")."\"\n"; - $n++; - } - } else { - $l = "msgstr \"".addcslashes($v,"\"\n")."\"\n"; - } - } - } - - if (substr($l,0,6)=="msgid_" || substr($l,0,7)=="msgstr[") $ink = False; - - if ($ink) { - preg_match('/^"(.*)"$/',$l,$m); - $k .= $m[1]; - } - - if (substr($l,0,6)=="msgid ") { - preg_match('/^msgid "(.*)"$/',$l,$m); - $k = $m[1]; - $ink = True; - } - - if (substr($l,0,8)=="msgctxt ") { - preg_match('/^msgctxt "(.*)"$/',$l,$m); - $c = $m[1]; - } - - $out .= $l; + $k = ''; + $c = ''; + $ink = false; +foreach ($infile as $l) { + $l = trim($l, ' '); + if (!preg_match('/^msgstr\[[1-9]/', $l)) { + if ($k != '' && (substr($l, 0, 7) == 'msgstr ' || substr($l, 0, 8) == 'msgstr[0')) { + $ink = false; + $k = stripcslashes($k); + $v = ''; + if (isset(App::$strings[$k])) { + $v = App::$strings[$k]; + } else { + $k = '__ctx:' . $c . '__ ' . $k; + if (isset(App::$strings[$k])) { + $v = App::$strings[$k]; + $c = ''; } + } + if (!empty($v)) { + if (is_array($v)) { + $l = ''; + $n = 0; + foreach ($v as &$value) { + $l .= 'msgstr[' . $n . "] \"" . addcslashes($value, "\"\n") . "\"\n"; + $n++; + } + } else { + $l = "msgstr \"" . addcslashes($v, "\"\n") . "\"\n"; + } + } } + + if (substr($l, 0, 6) == 'msgid_' || substr($l, 0, 7) == 'msgstr[') { + $ink = false; + } + + if ($ink) { + preg_match('/^"(.*)"$/', $l, $m); + $k .= $m[1]; + } + + if (substr($l, 0, 6) == 'msgid ') { + preg_match('/^msgid "(.*)"$/', $l, $m); + $k = $m[1]; + $ink = true; + } + + if (substr($l, 0, 8) == 'msgctxt ') { + preg_match('/^msgctxt "(.*)"$/', $l, $m); + $c = $m[1]; + } + + $out .= $l; + } +} file_put_contents($pofile, $out); -?> diff --git a/util/phplogtime b/util/phplogtime index 0fb8a8e2b..d774ecaef 100755 --- a/util/phplogtime +++ b/util/phplogtime @@ -33,8 +33,8 @@ if (! $lines) { if ($lines) { foreach ($lines as $line) { - if (substr($line,0,1) === "[") { - $ts = rtrim(substr($line,1,strpos($line,"]")),"]"); + if (substr($line,0,1) === '[') { + $ts = rtrim(substr($line,1,strpos($line, ']')), ']'); if ($ts) { $arr = explode(' ', $ts); if (count($arr) === 3) { @@ -42,8 +42,8 @@ if ($lines) { $d = new DateTime($arr[1] . ' ' . $arr[2]); $to = new DateTimeZone($dest_tz); $d->setTimeZone($to); - $o = $d->format("Y-m-d H:i:s"); - echo "[" . $o . "]" . substr($line,strlen($ts) + 2); + $o = $d->format('Y-m-d H:i:s'); + echo '[' . $o . ']' . substr($line,strlen($ts) + 2); } } } diff --git a/util/po2php.php b/util/po2php.php index 6bb54f2e9..775b850d4 100644 --- a/util/po2php.php +++ b/util/po2php.php @@ -1,152 +1,173 @@ \n\n"; - return; - } + if ($argc < 2) { + print 'Usage: ' . $argv[0] . " \n\n"; + return; + } - $rtl = false; + $rtl = false; - $pofile = $argv[1]; - $outfile = dirname($pofile)."/strings.php"; + $pofile = $argv[1]; + $outfile = dirname($pofile) . '/strings.php'; - if($argc > 2) { - if($argv[2] === 'rtl') - $rtl = true; - } + if ($argc > 2) { + if ($argv[2] === 'rtl') { + $rtl = true; + } + } - if(strstr($outfile,'util')) - $lang = 'en'; - else - $lang = str_replace('-','_',basename(dirname($pofile))); + if (strstr($outfile, 'util')) { + $lang = 'en'; + } else { + $lang = str_replace('-', '_', basename(dirname($pofile))); + } - if (!file_exists($pofile)){ - print "Unable to find '$pofile'\n"; - return; - } - - print "Out to '$outfile'\n"; - - $out=" " - .preg_replace_callback($escape_s_exp,'escape_s',$match[2]) .",\n"; - } - - if (substr($l,0,6)=="msgid_") { - $ink = False; - $out .= 'App::$strings["'.$k.'"] = '; - } + $infile = file($pofile); + $k = ''; + $v = ''; + $ctx = ''; + $arr = false; + $ink = false; + $inv = false; + $escape_s_exp = '|[^\\\\]\$[a-z]|'; + + function escape_s($match) + { + return str_replace('$', '\$', $match[0]); + } + + foreach ($infile as $l) { + $l = str_replace(array('$projectname','$Projectname'), array('\$projectname','\$Projectname'), $l); + $len = strlen($l); + if ($l[0] == '#') { + $l = ''; + } + if (substr($l, 0, 15) == '"Plural-Forms: ') { + $match = array(); + preg_match("|nplurals=([0-9]*); *plural=(.*)[;\\\\]|", $l, $match); + $cond = str_replace('n', '$n', $match[2]); + $out .= 'if(! function_exists("' . 'string_plural_select_' . $lang . '")) {' . "\n"; + $out .= 'function string_plural_select_' . $lang . '($n){' . "\n"; + $out .= ' return ' . $cond . ';' . "\n"; + $out .= '}}' . "\n"; + + $out .= 'App::$rtl = ' . intval($rtl) ; + } + + if ($k != '' && substr($l, 0, 7) == 'msgstr ') { + if ($ink) { + $ink = false; + $out .= 'App::$strings["' . $k . '"] = '; + } + if ($inv) { + $inv = false; + $out .= '"' . $v . '"'; + } + + $v = substr($l, 8, $len - 10); + $v = preg_replace_callback($escape_s_exp, 'escape_s', $v); + $inv = true; + //$out .= $v; + } + if ($k != '' && substr($l, 0, 7) == 'msgstr[') { + if ($ink) { + $ink = false; + $out .= 'App::$strings["' . $k . '"] = '; + } + if ($inv) { + $inv = false; + $out .= '"' . $v . '"'; + } + if (!$arr) { + $arr = true; + $out .= "[\n"; + } + $match = array(); + preg_match('|\[([0-9]*)\] (.*)|', $l, $match); + $out .= "\t" . + preg_replace_callback($escape_s_exp, 'escape_s', $match[1]) + . ' => ' + . preg_replace_callback($escape_s_exp, 'escape_s', $match[2]) . ",\n"; + } + + if (substr($l, 0, 6) == 'msgid_') { + $ink = false; + $out .= 'App::$strings["' . $k . '"] = '; + } - if ($ink) { - $k .= trim_message($l); - $k = preg_replace_callback($escape_s_exp,'escape_s',$k); - //$out .= 'App::$strings['.$k.'] = '; - } - - if (substr($l,0,6)=="msgid "){ - if ($inv) { $inv = False; $out .= '"'.$v.'"'; } - if ($k!="") $out .= $arr?"];\n":";\n"; - $arr=False; - $k = str_replace("msgid ","",$l); - $k = trim_message($k); - $k = $ctx.$k; - // echo $ctx ? $ctx."\nX\n":""; - $k = preg_replace_callback($escape_s_exp,'escape_s',$k); - $ctx = ""; - $ink = True; - } - - if ($inv && substr($l,0,6)!="msgstr" && substr($l,0,7)!="msgctxt") { - $v .= trim_message($l); - $v = preg_replace_callback($escape_s_exp,'escape_s',$v); - //$out .= 'App::$strings['.$k.'] = '; - } + if ($ink) { + $k .= trim_message($l); + $k = preg_replace_callback($escape_s_exp, 'escape_s', $k); + //$out .= 'App::$strings['.$k.'] = '; + } - if (substr($l,0,7)=="msgctxt") { - $ctx = str_replace("msgctxt ","",$l); - $ctx = trim_message($ctx); - $ctx = "__ctx:".$ctx."__ "; - $ctx = preg_replace_callback($escape_s_exp,'escape_s',$ctx); - } + if (substr($l, 0, 6) == 'msgid ') { + if ($inv) { + $inv = false; + $out .= '"' . $v . '"'; + } + if ($k != '') { + $out .= $arr ? "];\n" : ";\n"; + } + $arr = false; + $k = str_replace('msgid ', '', $l); + $k = trim_message($k); + $k = $ctx . $k; + // echo $ctx ? $ctx."\nX\n":""; + $k = preg_replace_callback($escape_s_exp, 'escape_s', $k); + $ctx = ''; + $ink = true; + } - } + if ($inv && substr($l, 0, 6) != 'msgstr' && substr($l, 0, 7) != 'msgctxt') { + $v .= trim_message($l); + $v = preg_replace_callback($escape_s_exp, 'escape_s', $v); + //$out .= 'App::$strings['.$k.'] = '; + } - if ($inv) { $inv = False; $out .= '"'.$v.'"'; } - if ($k!="") $out .= $arr?"];\n":";\n"; - - file_put_contents($outfile, $out); - + if (substr($l, 0, 7) == 'msgctxt') { + $ctx = str_replace('msgctxt ', '', $l); + $ctx = trim_message($ctx); + $ctx = '__ctx:' . $ctx . '__ '; + $ctx = preg_replace_callback($escape_s_exp, 'escape_s', $ctx); + } + } + + if ($inv) { + $inv = false; + $out .= '"' . $v . '"'; + } + if ($k != '') { + $out .= $arr ? "];\n" : ";\n"; + } + + file_put_contents($outfile, $out); } -function trim_message($str) { - // Almost same as trim("\"\r\n") except that escaped quotes are preserved - $str = trim($str, "\r\n"); - $str = ltrim($str, "\""); - $str = preg_replace('/(?setTemplateDir($folders); - -$s->setCompileDir(TEMPLATE_BUILD_PATH . '/compiled/'); -$s->setConfigDir(TEMPLATE_BUILD_PATH . '/config/'); -$s->setCacheDir(TEMPLATE_BUILD_PATH . '/cache/'); - -$s->left_delimiter = "{{"; -$s->right_delimiter = "}}"; - -$s->compileAllTemplates('.tpl',true); \ No newline at end of file +setTemplateDir($folders); + +$s->setCompileDir(TEMPLATE_BUILD_PATH . '/compiled/'); +$s->setConfigDir(TEMPLATE_BUILD_PATH . '/config/'); +$s->setCacheDir(TEMPLATE_BUILD_PATH . '/cache/'); + +$s->left_delimiter = '{{'; +$s->right_delimiter = '}}'; + +$s->compileAllTemplates('.tpl', true); diff --git a/util/schemaspy b/util/schemaspy index fdae74965..29a631300 100755 --- a/util/schemaspy +++ b/util/schemaspy @@ -2,7 +2,7 @@ 0"); + $x = q('SELECT COUNT(id) AS qty FROM photo WHERE resource_id IN (SELECT DISTINCT resource_id FROM photo WHERE photo_usage = 0 and os_storage = 1) AND imgscale > 0'); echo 'Thumbnails total: ' . $x[0]['qty'] . PHP_EOL; - $x = q("SELECT COUNT(id) AS qty FROM photo WHERE resource_id IN (SELECT DISTINCT resource_id FROM photo WHERE photo_usage = 0 and os_storage = 1) AND os_storage != %d AND imgscale > 0", + $x = q('SELECT COUNT(id) AS qty FROM photo WHERE resource_id IN (SELECT DISTINCT resource_id FROM photo WHERE photo_usage = 0 and os_storage = 1) AND os_storage != %d AND imgscale > 0', $storage ); echo 'Thumbnails to convert: ' . $x[0]['qty'] . PHP_EOL; @@ -45,7 +45,7 @@ if($argc == 2) { break; } - $x = q("SELECT resource_id, content FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0"); + $x = q('SELECT resource_id, content FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0'); if($x) { foreach($x as $xx) { @@ -88,7 +88,7 @@ if($argc == 2) { break; } - $x = q("SELECT resource_id FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0"); + $x = q('SELECT resource_id FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0'); if($x) { foreach($x as $xx) { diff --git a/util/strings.php b/util/strings.php index d8c571b63..f368ed7d6 100644 --- a/util/strings.php +++ b/util/strings.php @@ -1,2743 +1,2742 @@ may apply to this list and any future members. If this is not what you intended, please create another list with a different name."] = ""; -App::$strings["Add new connections to this access list"] = ""; -App::$strings["edit"] = ""; -App::$strings["Edit list"] = ""; -App::$strings["Create new list"] = ""; -App::$strings["Channels not in any access list"] = ""; -App::$strings["add"] = ""; -App::$strings["Source code of failed update: "] = ""; -App::$strings["Update Error at %s"] = ""; -App::$strings["Update %s failed. See error logs."] = ""; -App::$strings["__ctx:permcat__ default"] = ""; -App::$strings["__ctx:permcat__ follower"] = ""; -App::$strings["__ctx:permcat__ contributor"] = ""; -App::$strings["__ctx:permcat__ publisher"] = ""; -App::$strings["%1\$s wrote the following %2\$s %3\$s"] = ""; -App::$strings["post"] = ""; -App::$strings["Private Message"] = ""; -App::$strings["Privacy conflict. Discretion advised."] = ""; -App::$strings["Admin Delete"] = ""; -App::$strings["Select"] = ""; -App::$strings["Save to Folder"] = ""; -App::$strings["I will attend"] = ""; -App::$strings["I will not attend"] = ""; -App::$strings["I might attend"] = ""; -App::$strings["I agree"] = ""; -App::$strings["I disagree"] = ""; -App::$strings["I abstain"] = ""; -App::$strings["View all"] = ""; -App::$strings["__ctx:noun__ Like"] = [ - 0 => "", - 1 => "", +App::$strings['Social Networking'] = ''; +App::$strings['Social - Normal'] = ''; +App::$strings['Social - Restricted'] = ''; +App::$strings['Community Group'] = ''; +App::$strings['Group - Normal'] = ''; +App::$strings['Group - Restricted'] = ''; +App::$strings['Group - Moderated'] = ''; +App::$strings['Collection'] = ''; +App::$strings['Collection - Normal'] = ''; +App::$strings['Collection - Restricted'] = ''; +App::$strings['Grant viewing access to and delivery of your channel stream and posts'] = ''; +App::$strings['Grant viewing access to your default channel profile'] = ''; +App::$strings['Grant viewing access to your address book (connections)'] = ''; +App::$strings['Grant viewing access to your file storage and photos'] = ''; +App::$strings['Grant permission to post on your channel (wall) page'] = ''; +App::$strings['Accept delivery of their posts and all comments to their posts'] = ''; +App::$strings['Accept delivery of comments and likes on your posts'] = ''; +App::$strings['Accept delivery of their likes of your profile'] = ''; +App::$strings['Grant upload permissions to your file storage and photos'] = ''; +App::$strings['Grant permission to republish/mirror your posts'] = ''; +App::$strings['Accept comments and wall posts only after approval (moderation)'] = ''; +App::$strings['Grant channel administration (delegation) permission'] = ''; +App::$strings['Missing room name'] = ''; +App::$strings['Duplicate room name'] = ''; +App::$strings['Invalid room specifier.'] = ''; +App::$strings['Room not found.'] = ''; +App::$strings['Permission denied.'] = ''; +App::$strings['Room is full'] = ''; +App::$strings['Apps'] = ''; +App::$strings['Friend Zoom'] = ''; +App::$strings['Articles'] = ''; +App::$strings['Cards'] = ''; +App::$strings['Calendar'] = ''; +App::$strings['Categories'] = ''; +App::$strings['Clients'] = ''; +App::$strings['Site Admin'] = ''; +App::$strings['Content Filter'] = ''; +App::$strings['Content Import'] = ''; +App::$strings['Report Bug'] = ''; +App::$strings['View Bookmarks'] = ''; +App::$strings['Chatrooms'] = ''; +App::$strings['Connections'] = ''; +App::$strings['Expire Posts'] = ''; +App::$strings['Future Posting'] = ''; +App::$strings['Remote Diagnostics'] = ''; +App::$strings['Suggest Channels'] = ''; +App::$strings['Login'] = ''; +App::$strings['Channel Manager'] = ''; +App::$strings['Notes'] = ''; +App::$strings['Stream'] = ''; +App::$strings['Settings'] = ''; +App::$strings['Files'] = ''; +App::$strings['Webpages'] = ''; +App::$strings['Wiki'] = ''; +App::$strings['Channel Home'] = ''; +App::$strings['View Profile'] = ''; +App::$strings['Photos'] = ''; +App::$strings['Photomap'] = ''; +App::$strings['Events'] = ''; +App::$strings['Tasks'] = ''; +App::$strings['No Comment'] = ''; +App::$strings['Directory'] = ''; +App::$strings['Help'] = ''; +App::$strings['Mail'] = ''; +App::$strings['Mood'] = ''; +App::$strings['Poke'] = ''; +App::$strings['Chat'] = ''; +App::$strings['Search'] = ''; +App::$strings['Stream Order'] = ''; +App::$strings['Probe'] = ''; +App::$strings['Suggest'] = ''; +App::$strings['Random Channel'] = ''; +App::$strings['Invite'] = ''; +App::$strings['Features'] = ''; +App::$strings['Language'] = ''; +App::$strings['Post'] = ''; +App::$strings['ZotPost'] = ''; +App::$strings['Profile Photo'] = ''; +App::$strings['Profile'] = ''; +App::$strings['Profiles'] = ''; +App::$strings['Lists'] = ''; +App::$strings['Notifications'] = ''; +App::$strings['Order Apps'] = ''; +App::$strings['CalDAV'] = ''; +App::$strings['CardDAV'] = ''; +App::$strings['Channel Sources'] = ''; +App::$strings['Gallery'] = ''; +App::$strings['Guest Access'] = ''; +App::$strings['OAuth Apps Manager'] = ''; +App::$strings['OAuth2 Apps Manager'] = ''; +App::$strings['PDL Editor'] = ''; +App::$strings['Permission Categories'] = ''; +App::$strings['Premium Channel'] = ''; +App::$strings['Public Stream'] = ''; +App::$strings['My Chatrooms'] = ''; +App::$strings['Update'] = ''; +App::$strings['Install'] = ''; +App::$strings['Purchase'] = ''; +App::$strings['Edit'] = ''; +App::$strings['Delete'] = ''; +App::$strings['Undelete'] = ''; +App::$strings['Add to app-tray'] = ''; +App::$strings['Remove from app-tray'] = ''; +App::$strings['Pin to navbar'] = ''; +App::$strings['Unpin from navbar'] = ''; +App::$strings['Unknown'] = ''; +App::$strings['Visible to your default audience'] = ''; +App::$strings['Only me'] = ''; +App::$strings['Public'] = ''; +App::$strings["Anybody in the \$Projectname network"] = ''; +App::$strings['Any account on %s'] = ''; +App::$strings['Any of my connections'] = ''; +App::$strings['Only connections I specifically allow'] = ''; +App::$strings['Anybody authenticated (could include visitors from other networks)'] = ''; +App::$strings["Any connections including those who haven't yet been approved"] = ''; +App::$strings['This is your default setting for the audience of your normal stream, and posts.'] = ''; +App::$strings['This is your default setting for who can view your default channel profile'] = ''; +App::$strings['This is your default setting for who can view your connections'] = ''; +App::$strings['This is your default setting for who can view your file storage and photos'] = ''; +App::$strings['This is your default setting for the audience of your webpages'] = ''; +App::$strings['Channel is blocked on this site.'] = ''; +App::$strings['Channel location missing.'] = ''; +App::$strings['Remote channel or protocol unavailable.'] = ''; +App::$strings['Channel discovery failed.'] = ''; +App::$strings['Protocol not supported'] = ''; +App::$strings['Cannot connect to yourself.'] = ''; +App::$strings['error saving data'] = ''; +App::$strings['A deleted list with this name was revived. Existing item permissions may apply to this list and any future members. If this is not what you intended, please create another list with a different name.'] = ''; +App::$strings['Add new connections to this access list'] = ''; +App::$strings['edit'] = ''; +App::$strings['Edit list'] = ''; +App::$strings['Create new list'] = ''; +App::$strings['Channels not in any access list'] = ''; +App::$strings['add'] = ''; +App::$strings['Source code of failed update: '] = ''; +App::$strings['Update Error at %s'] = ''; +App::$strings['Update %s failed. See error logs.'] = ''; +App::$strings['__ctx:permcat__ default'] = ''; +App::$strings['__ctx:permcat__ follower'] = ''; +App::$strings['__ctx:permcat__ contributor'] = ''; +App::$strings['__ctx:permcat__ publisher'] = ''; +App::$strings["%1\$s wrote the following %2\$s %3\$s"] = ''; +App::$strings['post'] = ''; +App::$strings['Private Message'] = ''; +App::$strings['Privacy conflict. Discretion advised.'] = ''; +App::$strings['Admin Delete'] = ''; +App::$strings['Select'] = ''; +App::$strings['Save to Folder'] = ''; +App::$strings['I will attend'] = ''; +App::$strings['I will not attend'] = ''; +App::$strings['I might attend'] = ''; +App::$strings['I agree'] = ''; +App::$strings['I disagree'] = ''; +App::$strings['I abstain'] = ''; +App::$strings['View all'] = ''; +App::$strings['__ctx:noun__ Like'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:noun__ Likes"] = ""; -App::$strings["__ctx:noun__ Dislike"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:noun__ Likes'] = ''; +App::$strings['__ctx:noun__ Dislike'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:noun__ Dislikes"] = ""; -App::$strings["Save"] = ""; -App::$strings["Message signature validated"] = ""; -App::$strings["Message signature incorrect"] = ""; -App::$strings["Add Tag"] = ""; -App::$strings["I like this (toggle)"] = ""; -App::$strings["like"] = ""; -App::$strings["I don't like this (toggle)"] = ""; -App::$strings["dislike"] = ""; -App::$strings["Repeat This"] = ""; -App::$strings["Share this"] = ""; -App::$strings["Delivery Report"] = ""; -App::$strings["%d comment"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:noun__ Dislikes'] = ''; +App::$strings['Save'] = ''; +App::$strings['Message signature validated'] = ''; +App::$strings['Message signature incorrect'] = ''; +App::$strings['Add Tag'] = ''; +App::$strings['I like this (toggle)'] = ''; +App::$strings['like'] = ''; +App::$strings["I don't like this (toggle)"] = ''; +App::$strings['dislike'] = ''; +App::$strings['Repeat This'] = ''; +App::$strings['Share this'] = ''; +App::$strings['Delivery Report'] = ''; +App::$strings['%d comment'] = [ + 0 => '', + 1 => '', ]; -App::$strings["%d unseen"] = ""; -App::$strings["View %s's profile - %s"] = ""; -App::$strings["to"] = ""; -App::$strings["via"] = ""; -App::$strings["Wall-to-Wall"] = ""; -App::$strings["via Wall-To-Wall:"] = ""; -App::$strings["from %s"] = ""; -App::$strings["last edited: %s"] = ""; -App::$strings["Expires: %s"] = ""; -App::$strings["Attend"] = ""; -App::$strings["Attendance Options"] = ""; -App::$strings["Vote"] = ""; -App::$strings["Voting Options"] = ""; -App::$strings["Reply"] = ""; -App::$strings["Pinned post"] = ""; -App::$strings["Unpin this post"] = ""; -App::$strings["Pin this post"] = ""; -App::$strings["Save Bookmarks"] = ""; -App::$strings["Add to Calendar"] = ""; -App::$strings["Mark all seen"] = ""; -App::$strings["Close"] = ""; -App::$strings["This is an unsaved preview"] = ""; -App::$strings["Please wait"] = ""; -App::$strings["%s show all"] = ""; -App::$strings["This is you"] = ""; -App::$strings["Comment"] = ""; -App::$strings["Submit"] = ""; -App::$strings["Bold"] = ""; -App::$strings["Italic"] = ""; -App::$strings["Underline"] = ""; -App::$strings["Quote"] = ""; -App::$strings["Code"] = ""; -App::$strings["Image"] = ""; -App::$strings["Attach/Upload file"] = ""; -App::$strings["Insert Link"] = ""; -App::$strings["Video"] = ""; -App::$strings["Preview"] = ""; -App::$strings["Reset"] = ""; -App::$strings["Encrypt text"] = ""; -App::$strings["Your full name (required)"] = ""; -App::$strings["Your email address (required)"] = ""; -App::$strings["Your website URL (optional)"] = ""; -App::$strings["Likes %1\$s's %2\$s"] = ""; -App::$strings["Doesn't like %1\$s's %2\$s"] = ""; -App::$strings["Will attend %s's event"] = ""; -App::$strings["Will not attend %s's event"] = ""; -App::$strings["May attend %s's event"] = ""; -App::$strings["May not attend %s's event"] = ""; -App::$strings["🔁 Repeated %1\$s's %2\$s"] = ""; -App::$strings["%1\$s (%2\$s)"] = ""; -App::$strings["\$Projectname Notification"] = ""; -App::$strings["\$projectname"] = ""; -App::$strings["Thank You,"] = ""; -App::$strings["%s Administrator"] = ""; -App::$strings["This email was sent by %1\$s at %2\$s."] = ""; -App::$strings["\$Projectname"] = ""; -App::$strings["To stop receiving these messages, please adjust your Notification Settings at %s"] = ""; -App::$strings["To stop receiving these messages, please adjust your %s."] = ""; -App::$strings["Notification Settings"] = ""; -App::$strings["%s "] = ""; -App::$strings["[\$Projectname:Notify] New mail received at %s"] = ""; -App::$strings["%1\$s sent you a new private message at %2\$s."] = ""; -App::$strings["%1\$s sent you %2\$s."] = ""; -App::$strings["a private message"] = ""; -App::$strings["Please visit %s to view and/or reply to your private messages."] = ""; -App::$strings["commented on"] = ""; -App::$strings["liked"] = ""; -App::$strings["disliked"] = ""; -App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = ""; -App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = ""; -App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = ""; -App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = ""; -App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = ""; -App::$strings["%1\$s commented on an item/conversation you have been following."] = ""; -App::$strings["(Moderated)"] = ""; -App::$strings["Please visit %s to view and/or reply to the conversation."] = ""; -App::$strings["Please visit %s to approve or reject this comment."] = ""; -App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = ""; -App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = ""; -App::$strings["%1\$s liked an item/conversation you created."] = ""; -App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = ""; -App::$strings["%1\$s posted to your profile wall at %2\$s"] = ""; -App::$strings["%1\$s posted to [zrl=%2\$s]your wall[/zrl]"] = ""; -App::$strings[" - "] = ""; -App::$strings["Moderated"] = ""; -App::$strings["Please visit %s to approve or reject this post."] = ""; -App::$strings["[\$Projectname:Notify] %s tagged you"] = ""; -App::$strings["%1\$s tagged you at %2\$s"] = ""; -App::$strings["%1\$s [zrl=%2\$s]tagged you[/zrl]."] = ""; -App::$strings["[\$Projectname:Notify] %1\$s poked you"] = ""; -App::$strings["%1\$s poked you at %2\$s"] = ""; -App::$strings["%1\$s [zrl=%2\$s]poked you[/zrl]."] = ""; -App::$strings["[\$Projectname:Notify] %s tagged your post"] = ""; -App::$strings["%1\$s tagged your post at %2\$s"] = ""; -App::$strings["%1\$s tagged [zrl=%2\$s]your post[/zrl]"] = ""; -App::$strings["[\$Projectname:Notify] Introduction received"] = ""; -App::$strings["You've received an new connection request from '%1\$s' at %2\$s"] = ""; -App::$strings["You've received [zrl=%1\$s]a new connection request[/zrl] from %2\$s."] = ""; -App::$strings["You may visit their profile at %s"] = ""; -App::$strings["Please visit %s to approve or reject the connection request."] = ""; -App::$strings["[\$Projectname:Notify] Friend suggestion received"] = ""; -App::$strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = ""; -App::$strings["You've received [zrl=%1\$s]a friend suggestion[/zrl] for %2\$s from %3\$s."] = ""; -App::$strings["Name:"] = ""; -App::$strings["Photo:"] = ""; -App::$strings["Please visit %s to approve or reject the suggestion."] = ""; -App::$strings["[\$Projectname:Notify]"] = ""; -App::$strings["created a new post"] = ""; -App::$strings["reacted to %s's conversation"] = ""; -App::$strings["shared %s's post"] = ""; -App::$strings["edited a post dated %s"] = ""; -App::$strings["edited a comment dated %s"] = ""; -App::$strings["Unable to verify site signature for %s"] = ""; -App::$strings["Requested channel is not available."] = ""; -App::$strings["Requested profile is not available."] = ""; -App::$strings["Change profile photo"] = ""; -App::$strings["Edit Profiles"] = ""; -App::$strings["Create New Profile"] = ""; -App::$strings["Edit Profile"] = ""; -App::$strings["Profile Image"] = ""; -App::$strings["Visible to everybody"] = ""; -App::$strings["Edit visibility"] = ""; -App::$strings["Connect"] = ""; -App::$strings["Location:"] = ""; -App::$strings["Gender:"] = ""; -App::$strings["Status:"] = ""; -App::$strings["Homepage:"] = ""; -App::$strings["Change your profile photo"] = ""; -App::$strings["Female"] = ""; -App::$strings["Male"] = ""; -App::$strings["Trans"] = ""; -App::$strings["Inter"] = ""; -App::$strings["Neuter"] = ""; -App::$strings["Non-specific"] = ""; -App::$strings["Full Name:"] = ""; -App::$strings["Like this channel"] = ""; -App::$strings["j F, Y"] = ""; -App::$strings["j F"] = ""; -App::$strings["Birthday:"] = ""; -App::$strings["Age:"] = ""; -App::$strings["for %1\$d %2\$s"] = ""; -App::$strings["Tags:"] = ""; -App::$strings["Sexual Preference:"] = ""; -App::$strings["Hometown:"] = ""; -App::$strings["Political Views:"] = ""; -App::$strings["Religion:"] = ""; -App::$strings["About:"] = ""; -App::$strings["Hobbies/Interests:"] = ""; -App::$strings["Likes:"] = ""; -App::$strings["Dislikes:"] = ""; -App::$strings["Contact information and Social Networks:"] = ""; -App::$strings["My other channels:"] = ""; -App::$strings["Musical interests:"] = ""; -App::$strings["Books, literature:"] = ""; -App::$strings["Television:"] = ""; -App::$strings["Film/dance/culture/entertainment:"] = ""; -App::$strings["Love/Romance:"] = ""; -App::$strings["Work/employment:"] = ""; -App::$strings["School/education:"] = ""; -App::$strings["Like this thing"] = ""; -App::$strings["Export"] = ""; -App::$strings["Unable to verify channel signature"] = ""; -App::$strings["default"] = ""; -App::$strings["Select an alternate language"] = ""; -App::$strings["Directory Options"] = ""; -App::$strings["Safe Mode"] = ""; -App::$strings["No"] = ""; -App::$strings["Yes"] = ""; -App::$strings["Public Groups Only"] = ""; -App::$strings["Collections Only"] = ""; -App::$strings["This Website Only"] = ""; -App::$strings["Remote privacy information not available."] = ""; -App::$strings["Visible to:"] = ""; -App::$strings["__ctx:acl__ Profile"] = ""; -App::$strings["Event can not end before it has started."] = ""; -App::$strings["Unable to generate preview."] = ""; -App::$strings["Event title and start time are required."] = ""; -App::$strings["Event not found."] = ""; -App::$strings["event"] = ""; -App::$strings["Edit event"] = ""; -App::$strings["Delete event"] = ""; -App::$strings["Link to source"] = ""; -App::$strings["calendar"] = ""; -App::$strings["Failed to remove event"] = ""; -App::$strings["sent you a private message"] = ""; -App::$strings["added your channel"] = ""; -App::$strings["requires approval"] = ""; -App::$strings["g A l F d"] = ""; -App::$strings["[today]"] = ""; -App::$strings["posted an event"] = ""; -App::$strings["shared a file with you"] = ""; -App::$strings["reported content"] = ""; -App::$strings["Private group"] = ""; -App::$strings["Public group"] = ""; -App::$strings["Off"] = ""; -App::$strings["On"] = ""; -App::$strings["Lock feature %s"] = ""; -App::$strings["Manage Additional Features"] = ""; -App::$strings["Log settings updated."] = ""; -App::$strings["Administration"] = ""; -App::$strings["Logs"] = ""; -App::$strings["Clear"] = ""; -App::$strings["Debugging"] = ""; -App::$strings["Log file"] = ""; -App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = ""; -App::$strings["Log level"] = ""; -App::$strings["New Profile Field"] = ""; -App::$strings["Field nickname"] = ""; -App::$strings["System name of field"] = ""; -App::$strings["Input type"] = ""; -App::$strings["Field Name"] = ""; -App::$strings["Label on profile pages"] = ""; -App::$strings["Help text"] = ""; -App::$strings["Additional info (optional)"] = ""; -App::$strings["Field definition not found"] = ""; -App::$strings["Edit Profile Field"] = ""; -App::$strings["Profile Fields"] = ""; -App::$strings["Basic Profile Fields"] = ""; -App::$strings["Advanced Profile Fields"] = ""; -App::$strings["(In addition to basic fields)"] = ""; -App::$strings["All available fields"] = ""; -App::$strings["Custom Fields"] = ""; -App::$strings["Create Custom Field"] = ""; -App::$strings["Queue Statistics"] = ""; -App::$strings["Total Entries"] = ""; -App::$strings["Priority"] = ""; -App::$strings["Destination URL"] = ""; -App::$strings["Mark hub permanently offline"] = ""; -App::$strings["Empty queue for this hub"] = ""; -App::$strings["Last known contact"] = ""; -App::$strings["Theme settings updated."] = ""; -App::$strings["No themes found."] = ""; -App::$strings["Item not found."] = ""; -App::$strings["Disable"] = ""; -App::$strings["Enable"] = ""; -App::$strings["Screenshot"] = ""; -App::$strings["Themes"] = ""; -App::$strings["Toggle"] = ""; -App::$strings["Author: "] = ""; -App::$strings["Maintainer: "] = ""; -App::$strings["[Experimental]"] = ""; -App::$strings["[Unsupported]"] = ""; -App::$strings["Update has been marked successful"] = ""; -App::$strings["Verification of update %s failed. Check system logs."] = ""; -App::$strings["Update %s was successfully applied."] = ""; -App::$strings["Verifying update %s did not return a status. Unknown if it succeeded."] = ""; -App::$strings["Update %s does not contain a verification function."] = ""; -App::$strings["Update function %s could not be found."] = ""; -App::$strings["Executing update procedure %s failed. Check system logs."] = ""; -App::$strings["Update %s did not return a status. It cannot be determined if it was successful."] = ""; -App::$strings["Failed Updates"] = ""; -App::$strings["Mark success (if update was manually applied)"] = ""; -App::$strings["Attempt to verify this update if a verification procedure exists"] = ""; -App::$strings["Attempt to execute this update step automatically"] = ""; -App::$strings["No failed updates."] = ""; -App::$strings["Password changed for account %d."] = ""; -App::$strings["Account settings updated."] = ""; -App::$strings["Account not found."] = ""; -App::$strings["Account Edit"] = ""; -App::$strings["New Password"] = ""; -App::$strings["New Password again"] = ""; -App::$strings["Account language (for emails)"] = ""; -App::$strings["Service class"] = ""; -App::$strings["%s account blocked/unblocked"] = [ - 0 => "", - 1 => "", +App::$strings['%d unseen'] = ''; +App::$strings["View %s's profile - %s"] = ''; +App::$strings['to'] = ''; +App::$strings['via'] = ''; +App::$strings['Wall-to-Wall'] = ''; +App::$strings['via Wall-To-Wall:'] = ''; +App::$strings['from %s'] = ''; +App::$strings['last edited: %s'] = ''; +App::$strings['Expires: %s'] = ''; +App::$strings['Attend'] = ''; +App::$strings['Attendance Options'] = ''; +App::$strings['Vote'] = ''; +App::$strings['Voting Options'] = ''; +App::$strings['Reply'] = ''; +App::$strings['Pinned post'] = ''; +App::$strings['Unpin this post'] = ''; +App::$strings['Pin this post'] = ''; +App::$strings['Save Bookmarks'] = ''; +App::$strings['Add to Calendar'] = ''; +App::$strings['Mark all seen'] = ''; +App::$strings['Close'] = ''; +App::$strings['This is an unsaved preview'] = ''; +App::$strings['Please wait'] = ''; +App::$strings['%s show all'] = ''; +App::$strings['This is you'] = ''; +App::$strings['Comment'] = ''; +App::$strings['Submit'] = ''; +App::$strings['Bold'] = ''; +App::$strings['Italic'] = ''; +App::$strings['Underline'] = ''; +App::$strings['Quote'] = ''; +App::$strings['Code'] = ''; +App::$strings['Image'] = ''; +App::$strings['Attach/Upload file'] = ''; +App::$strings['Insert Link'] = ''; +App::$strings['Video'] = ''; +App::$strings['Preview'] = ''; +App::$strings['Reset'] = ''; +App::$strings['Encrypt text'] = ''; +App::$strings['Your full name (required)'] = ''; +App::$strings['Your email address (required)'] = ''; +App::$strings['Your website URL (optional)'] = ''; +App::$strings["Likes %1\$s's %2\$s"] = ''; +App::$strings["Doesn't like %1\$s's %2\$s"] = ''; +App::$strings["Will attend %s's event"] = ''; +App::$strings["Will not attend %s's event"] = ''; +App::$strings["May attend %s's event"] = ''; +App::$strings["May not attend %s's event"] = ''; +App::$strings["🔁 Repeated %1\$s's %2\$s"] = ''; +App::$strings["%1\$s (%2\$s)"] = ''; +App::$strings["\$Projectname Notification"] = ''; +App::$strings["\$projectname"] = ''; +App::$strings['Thank You,'] = ''; +App::$strings['%s Administrator'] = ''; +App::$strings["This email was sent by %1\$s at %2\$s."] = ''; +App::$strings["\$Projectname"] = ''; +App::$strings['To stop receiving these messages, please adjust your Notification Settings at %s'] = ''; +App::$strings['To stop receiving these messages, please adjust your %s.'] = ''; +App::$strings['Notification Settings'] = ''; +App::$strings['%s '] = ''; +App::$strings["[\$Projectname:Notify] New mail received at %s"] = ''; +App::$strings["%1\$s sent you a new private message at %2\$s."] = ''; +App::$strings["%1\$s sent you %2\$s."] = ''; +App::$strings['a private message'] = ''; +App::$strings['Please visit %s to view and/or reply to your private messages.'] = ''; +App::$strings['commented on'] = ''; +App::$strings['liked'] = ''; +App::$strings['disliked'] = ''; +App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = ''; +App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = ''; +App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = ''; +App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = ''; +App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = ''; +App::$strings["%1\$s commented on an item/conversation you have been following."] = ''; +App::$strings['(Moderated)'] = ''; +App::$strings['Please visit %s to view and/or reply to the conversation.'] = ''; +App::$strings['Please visit %s to approve or reject this comment.'] = ''; +App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = ''; +App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = ''; +App::$strings["%1\$s liked an item/conversation you created."] = ''; +App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = ''; +App::$strings["%1\$s posted to your profile wall at %2\$s"] = ''; +App::$strings["%1\$s posted to [zrl=%2\$s]your wall[/zrl]"] = ''; +App::$strings[' - '] = ''; +App::$strings['Moderated'] = ''; +App::$strings['Please visit %s to approve or reject this post.'] = ''; +App::$strings["[\$Projectname:Notify] %s tagged you"] = ''; +App::$strings["%1\$s tagged you at %2\$s"] = ''; +App::$strings["%1\$s [zrl=%2\$s]tagged you[/zrl]."] = ''; +App::$strings["[\$Projectname:Notify] %1\$s poked you"] = ''; +App::$strings["%1\$s poked you at %2\$s"] = ''; +App::$strings["%1\$s [zrl=%2\$s]poked you[/zrl]."] = ''; +App::$strings["[\$Projectname:Notify] %s tagged your post"] = ''; +App::$strings["%1\$s tagged your post at %2\$s"] = ''; +App::$strings["%1\$s tagged [zrl=%2\$s]your post[/zrl]"] = ''; +App::$strings["[\$Projectname:Notify] Introduction received"] = ''; +App::$strings["You've received an new connection request from '%1\$s' at %2\$s"] = ''; +App::$strings["You've received [zrl=%1\$s]a new connection request[/zrl] from %2\$s."] = ''; +App::$strings['You may visit their profile at %s'] = ''; +App::$strings['Please visit %s to approve or reject the connection request.'] = ''; +App::$strings["[\$Projectname:Notify] Friend suggestion received"] = ''; +App::$strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = ''; +App::$strings["You've received [zrl=%1\$s]a friend suggestion[/zrl] for %2\$s from %3\$s."] = ''; +App::$strings['Name:'] = ''; +App::$strings['Photo:'] = ''; +App::$strings['Please visit %s to approve or reject the suggestion.'] = ''; +App::$strings["[\$Projectname:Notify]"] = ''; +App::$strings['created a new post'] = ''; +App::$strings["reacted to %s's conversation"] = ''; +App::$strings["shared %s's post"] = ''; +App::$strings['edited a post dated %s'] = ''; +App::$strings['edited a comment dated %s'] = ''; +App::$strings['Unable to verify site signature for %s'] = ''; +App::$strings['Requested channel is not available.'] = ''; +App::$strings['Requested profile is not available.'] = ''; +App::$strings['Change profile photo'] = ''; +App::$strings['Edit Profiles'] = ''; +App::$strings['Create New Profile'] = ''; +App::$strings['Edit Profile'] = ''; +App::$strings['Profile Image'] = ''; +App::$strings['Visible to everybody'] = ''; +App::$strings['Edit visibility'] = ''; +App::$strings['Connect'] = ''; +App::$strings['Location:'] = ''; +App::$strings['Gender:'] = ''; +App::$strings['Status:'] = ''; +App::$strings['Homepage:'] = ''; +App::$strings['Change your profile photo'] = ''; +App::$strings['Female'] = ''; +App::$strings['Male'] = ''; +App::$strings['Trans'] = ''; +App::$strings['Inter'] = ''; +App::$strings['Neuter'] = ''; +App::$strings['Non-specific'] = ''; +App::$strings['Full Name:'] = ''; +App::$strings['Like this channel'] = ''; +App::$strings['j F, Y'] = ''; +App::$strings['j F'] = ''; +App::$strings['Birthday:'] = ''; +App::$strings['Age:'] = ''; +App::$strings["for %1\$d %2\$s"] = ''; +App::$strings['Tags:'] = ''; +App::$strings['Sexual Preference:'] = ''; +App::$strings['Hometown:'] = ''; +App::$strings['Political Views:'] = ''; +App::$strings['Religion:'] = ''; +App::$strings['About:'] = ''; +App::$strings['Hobbies/Interests:'] = ''; +App::$strings['Likes:'] = ''; +App::$strings['Dislikes:'] = ''; +App::$strings['Contact information and Social Networks:'] = ''; +App::$strings['My other channels:'] = ''; +App::$strings['Musical interests:'] = ''; +App::$strings['Books, literature:'] = ''; +App::$strings['Television:'] = ''; +App::$strings['Film/dance/culture/entertainment:'] = ''; +App::$strings['Love/Romance:'] = ''; +App::$strings['Work/employment:'] = ''; +App::$strings['School/education:'] = ''; +App::$strings['Like this thing'] = ''; +App::$strings['Export'] = ''; +App::$strings['Unable to verify channel signature'] = ''; +App::$strings['default'] = ''; +App::$strings['Select an alternate language'] = ''; +App::$strings['Directory Options'] = ''; +App::$strings['Safe Mode'] = ''; +App::$strings['No'] = ''; +App::$strings['Yes'] = ''; +App::$strings['Public Groups Only'] = ''; +App::$strings['Collections Only'] = ''; +App::$strings['This Website Only'] = ''; +App::$strings['Remote privacy information not available.'] = ''; +App::$strings['Visible to:'] = ''; +App::$strings['__ctx:acl__ Profile'] = ''; +App::$strings['Event can not end before it has started.'] = ''; +App::$strings['Unable to generate preview.'] = ''; +App::$strings['Event title and start time are required.'] = ''; +App::$strings['Event not found.'] = ''; +App::$strings['event'] = ''; +App::$strings['Edit event'] = ''; +App::$strings['Delete event'] = ''; +App::$strings['Link to source'] = ''; +App::$strings['calendar'] = ''; +App::$strings['Failed to remove event'] = ''; +App::$strings['sent you a private message'] = ''; +App::$strings['added your channel'] = ''; +App::$strings['requires approval'] = ''; +App::$strings['g A l F d'] = ''; +App::$strings['[today]'] = ''; +App::$strings['posted an event'] = ''; +App::$strings['shared a file with you'] = ''; +App::$strings['reported content'] = ''; +App::$strings['Private group'] = ''; +App::$strings['Public group'] = ''; +App::$strings['Off'] = ''; +App::$strings['On'] = ''; +App::$strings['Lock feature %s'] = ''; +App::$strings['Manage Additional Features'] = ''; +App::$strings['Log settings updated.'] = ''; +App::$strings['Administration'] = ''; +App::$strings['Logs'] = ''; +App::$strings['Clear'] = ''; +App::$strings['Debugging'] = ''; +App::$strings['Log file'] = ''; +App::$strings['Must be writable by web server. Relative to your top-level webserver directory.'] = ''; +App::$strings['Log level'] = ''; +App::$strings['New Profile Field'] = ''; +App::$strings['Field nickname'] = ''; +App::$strings['System name of field'] = ''; +App::$strings['Input type'] = ''; +App::$strings['Field Name'] = ''; +App::$strings['Label on profile pages'] = ''; +App::$strings['Help text'] = ''; +App::$strings['Additional info (optional)'] = ''; +App::$strings['Field definition not found'] = ''; +App::$strings['Edit Profile Field'] = ''; +App::$strings['Profile Fields'] = ''; +App::$strings['Basic Profile Fields'] = ''; +App::$strings['Advanced Profile Fields'] = ''; +App::$strings['(In addition to basic fields)'] = ''; +App::$strings['All available fields'] = ''; +App::$strings['Custom Fields'] = ''; +App::$strings['Create Custom Field'] = ''; +App::$strings['Queue Statistics'] = ''; +App::$strings['Total Entries'] = ''; +App::$strings['Priority'] = ''; +App::$strings['Destination URL'] = ''; +App::$strings['Mark hub permanently offline'] = ''; +App::$strings['Empty queue for this hub'] = ''; +App::$strings['Last known contact'] = ''; +App::$strings['Theme settings updated.'] = ''; +App::$strings['No themes found.'] = ''; +App::$strings['Item not found.'] = ''; +App::$strings['Disable'] = ''; +App::$strings['Enable'] = ''; +App::$strings['Screenshot'] = ''; +App::$strings['Themes'] = ''; +App::$strings['Toggle'] = ''; +App::$strings['Author: '] = ''; +App::$strings['Maintainer: '] = ''; +App::$strings['[Experimental]'] = ''; +App::$strings['[Unsupported]'] = ''; +App::$strings['Update has been marked successful'] = ''; +App::$strings['Verification of update %s failed. Check system logs.'] = ''; +App::$strings['Update %s was successfully applied.'] = ''; +App::$strings['Verifying update %s did not return a status. Unknown if it succeeded.'] = ''; +App::$strings['Update %s does not contain a verification function.'] = ''; +App::$strings['Update function %s could not be found.'] = ''; +App::$strings['Executing update procedure %s failed. Check system logs.'] = ''; +App::$strings['Update %s did not return a status. It cannot be determined if it was successful.'] = ''; +App::$strings['Failed Updates'] = ''; +App::$strings['Mark success (if update was manually applied)'] = ''; +App::$strings['Attempt to verify this update if a verification procedure exists'] = ''; +App::$strings['Attempt to execute this update step automatically'] = ''; +App::$strings['No failed updates.'] = ''; +App::$strings['Password changed for account %d.'] = ''; +App::$strings['Account settings updated.'] = ''; +App::$strings['Account not found.'] = ''; +App::$strings['Account Edit'] = ''; +App::$strings['New Password'] = ''; +App::$strings['New Password again'] = ''; +App::$strings['Account language (for emails)'] = ''; +App::$strings['Service class'] = ''; +App::$strings['%s account blocked/unblocked'] = [ + 0 => '', + 1 => '', ]; -App::$strings["%s account deleted"] = [ - 0 => "", - 1 => "", +App::$strings['%s account deleted'] = [ + 0 => '', + 1 => '', ]; -App::$strings["Account not found"] = ""; -App::$strings["Account '%s' deleted"] = ""; -App::$strings["Account '%s' blocked"] = ""; -App::$strings["Account '%s' unblocked"] = ""; -App::$strings["Accounts"] = ""; -App::$strings["select all"] = ""; -App::$strings["Registrations waiting for confirm"] = ""; -App::$strings["Request date"] = ""; -App::$strings["Email"] = ""; -App::$strings["No registrations."] = ""; -App::$strings["Approve"] = ""; -App::$strings["Deny"] = ""; -App::$strings["Block"] = ""; -App::$strings["Unblock"] = ""; -App::$strings["ID"] = ""; -App::$strings["All Channels"] = ""; -App::$strings["Register date"] = ""; -App::$strings["Last login"] = ""; -App::$strings["Expires"] = ""; -App::$strings["Service Class"] = ""; -App::$strings["Selected accounts will be deleted!\\n\\nEverything these accounts had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = ""; -App::$strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = ""; -App::$strings["Plugin %s disabled."] = ""; -App::$strings["Plugin %s enabled."] = ""; -App::$strings["Addons"] = ""; -App::$strings["Minimum project version: "] = ""; -App::$strings["Maximum project version: "] = ""; -App::$strings["Minimum PHP version: "] = ""; -App::$strings["Compatible Server Roles: "] = ""; -App::$strings["Requires: "] = ""; -App::$strings["Disabled - version incompatibility"] = ""; -App::$strings["Enter the public git repository URL of the addon repo."] = ""; -App::$strings["Addon repo git URL"] = ""; -App::$strings["Custom repo name"] = ""; -App::$strings["(optional)"] = ""; -App::$strings["Download Addon Repo"] = ""; -App::$strings["Install new repo"] = ""; -App::$strings["Cancel"] = ""; -App::$strings["Manage Repos"] = ""; -App::$strings["Installed Addon Repositories"] = ""; -App::$strings["Install a New Addon Repository"] = ""; -App::$strings["Switch branch"] = ""; -App::$strings["Remove"] = ""; -App::$strings["Site settings updated."] = ""; -App::$strings["Default"] = ""; -App::$strings["%s - (Incompatible)"] = ""; -App::$strings["mobile"] = ""; -App::$strings["experimental"] = ""; -App::$strings["unsupported"] = ""; -App::$strings["Yes - with approval"] = ""; -App::$strings["My site is not a public server"] = ""; -App::$strings["My site provides free public access"] = ""; -App::$strings["My site provides paid public access"] = ""; -App::$strings["My site provides free public access and premium paid plans"] = ""; -App::$strings["Default permission role for new accounts"] = ""; -App::$strings["This role will be used for the first channel created after registration."] = ""; -App::$strings["Site"] = ""; -App::$strings["Site Configuration"] = ""; -App::$strings["Registration"] = ""; -App::$strings["File upload"] = ""; -App::$strings["Policies"] = ""; -App::$strings["Advanced"] = ""; -App::$strings["Site name"] = ""; -App::$strings["Banner/Logo"] = ""; -App::$strings["Unfiltered HTML/CSS/JS is allowed"] = ""; -App::$strings["Administrator Information"] = ""; -App::$strings["Contact information for site administrators. Displayed on siteinfo page. BBCode may be used here."] = ""; -App::$strings["Site Information"] = ""; -App::$strings["Publicly visible description of this site. Displayed on siteinfo page. BBCode may be used here."] = ""; -App::$strings["System language"] = ""; -App::$strings["System theme"] = ""; -App::$strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = ""; -App::$strings["Allow ActivityPub Connections"] = ""; -App::$strings["Provides access to software supporting the ActivityPub protocol."] = ""; -App::$strings["Maximum image size"] = ""; -App::$strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = ""; -App::$strings["Cache all public images"] = ""; -App::$strings["By default proxy non-SSL images, but do not cache"] = ""; -App::$strings["Does this site allow new member registration?"] = ""; -App::$strings["Invitation only"] = ""; -App::$strings["Only allow new member registrations with an invitation code. New member registration must be allowed for this to work."] = ""; -App::$strings["Minimum age"] = ""; -App::$strings["Minimum age (in years) for who may register on this site."] = ""; -App::$strings["Which best describes the types of account offered by this hub?"] = ""; -App::$strings["If a public server policy is selected, this information may be displayed on the public server site list."] = ""; -App::$strings["Register text"] = ""; -App::$strings["Will be displayed prominently on the registration page."] = ""; -App::$strings["Site homepage to show visitors (default: login box)"] = ""; -App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = ""; -App::$strings["Preserve site homepage URL"] = ""; -App::$strings["Present the site homepage in a frame at the original location instead of redirecting"] = ""; -App::$strings["Accounts abandoned after x days"] = ""; -App::$strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = ""; -App::$strings["Verify Email Addresses"] = ""; -App::$strings["Check to verify email addresses used in account registration (recommended)."] = ""; -App::$strings["Force publish"] = ""; -App::$strings["Check to force all profiles on this site to be listed in the site directory."] = ""; -App::$strings["Import Public Streams"] = ""; -App::$strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = ""; -App::$strings["Site only Public Streams"] = ""; -App::$strings["Allow access to public content originating only from this site if Imported Public Streams are disabled."] = ""; -App::$strings["Allow anybody on the internet to access the Public streams"] = ""; -App::$strings["Default is to only allow viewing by site members. Warning: this content is unmoderated."] = ""; -App::$strings["Show numbers of likes and dislikes in conversations"] = ""; -App::$strings["If disabled, the presence of likes and dislikes will be shown, but without totals."] = ""; -App::$strings["Only import Public stream posts with this text"] = ""; -App::$strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = ""; -App::$strings["Do not import Public stream posts with this text"] = ""; -App::$strings["Login on Homepage"] = ""; -App::$strings["Present a login box to visitors on the home page if no other content has been configured."] = ""; -App::$strings["Enable context help"] = ""; -App::$strings["Display contextual help for the current page when the help button is pressed."] = ""; -App::$strings["Reply-to email address for system generated email."] = ""; -App::$strings["Sender (From) email address for system generated email."] = ""; -App::$strings["Name of email sender for system generated email."] = ""; -App::$strings["Directory Server URL"] = ""; -App::$strings["Default directory server"] = ""; -App::$strings["Proxy user"] = ""; -App::$strings["Proxy URL"] = ""; -App::$strings["Network timeout"] = ""; -App::$strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = ""; -App::$strings["Delivery interval"] = ""; -App::$strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = ""; -App::$strings["Deliveries per process"] = ""; -App::$strings["Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5."] = ""; -App::$strings["Queue Threshold"] = ""; -App::$strings["Always defer immediate delivery if queue contains more than this number of entries."] = ""; -App::$strings["Poll interval"] = ""; -App::$strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = ""; -App::$strings["Path to ImageMagick convert program"] = ""; -App::$strings["If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert"] = ""; -App::$strings["Maximum Load Average"] = ""; -App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = ""; -App::$strings["Expiration period in days for imported streams and cached images"] = ""; -App::$strings["0 for no expiration of imported content"] = ""; -App::$strings["Do not expire any posts which have comments less than this many days ago"] = ""; -App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = ""; -App::$strings["Create this page first. Default is %s/register"] = ""; -App::$strings["Page to display after creating a new channel"] = ""; -App::$strings["Default: profiles"] = ""; -App::$strings["Optional: site location"] = ""; -App::$strings["Region or country"] = ""; -App::$strings["%s channel censored/uncensored"] = [ - 0 => "", - 1 => "", +App::$strings['Account not found'] = ''; +App::$strings["Account '%s' deleted"] = ''; +App::$strings["Account '%s' blocked"] = ''; +App::$strings["Account '%s' unblocked"] = ''; +App::$strings['Accounts'] = ''; +App::$strings['select all'] = ''; +App::$strings['Registrations waiting for confirm'] = ''; +App::$strings['Request date'] = ''; +App::$strings['Email'] = ''; +App::$strings['No registrations.'] = ''; +App::$strings['Approve'] = ''; +App::$strings['Deny'] = ''; +App::$strings['Block'] = ''; +App::$strings['Unblock'] = ''; +App::$strings['ID'] = ''; +App::$strings['All Channels'] = ''; +App::$strings['Register date'] = ''; +App::$strings['Last login'] = ''; +App::$strings['Expires'] = ''; +App::$strings['Service Class'] = ''; +App::$strings["Selected accounts will be deleted!\\n\\nEverything these accounts had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = ''; +App::$strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = ''; +App::$strings['Plugin %s disabled.'] = ''; +App::$strings['Plugin %s enabled.'] = ''; +App::$strings['Addons'] = ''; +App::$strings['Minimum project version: '] = ''; +App::$strings['Maximum project version: '] = ''; +App::$strings['Minimum PHP version: '] = ''; +App::$strings['Compatible Server Roles: '] = ''; +App::$strings['Requires: '] = ''; +App::$strings['Disabled - version incompatibility'] = ''; +App::$strings['Enter the public git repository URL of the addon repo.'] = ''; +App::$strings['Addon repo git URL'] = ''; +App::$strings['Custom repo name'] = ''; +App::$strings['(optional)'] = ''; +App::$strings['Download Addon Repo'] = ''; +App::$strings['Install new repo'] = ''; +App::$strings['Cancel'] = ''; +App::$strings['Manage Repos'] = ''; +App::$strings['Installed Addon Repositories'] = ''; +App::$strings['Install a New Addon Repository'] = ''; +App::$strings['Switch branch'] = ''; +App::$strings['Remove'] = ''; +App::$strings['Site settings updated.'] = ''; +App::$strings['Default'] = ''; +App::$strings['%s - (Incompatible)'] = ''; +App::$strings['mobile'] = ''; +App::$strings['experimental'] = ''; +App::$strings['unsupported'] = ''; +App::$strings['Yes - with approval'] = ''; +App::$strings['My site is not a public server'] = ''; +App::$strings['My site provides free public access'] = ''; +App::$strings['My site provides paid public access'] = ''; +App::$strings['My site provides free public access and premium paid plans'] = ''; +App::$strings['Default permission role for new accounts'] = ''; +App::$strings['This role will be used for the first channel created after registration.'] = ''; +App::$strings['Site'] = ''; +App::$strings['Site Configuration'] = ''; +App::$strings['Registration'] = ''; +App::$strings['File upload'] = ''; +App::$strings['Policies'] = ''; +App::$strings['Advanced'] = ''; +App::$strings['Site name'] = ''; +App::$strings['Banner/Logo'] = ''; +App::$strings['Unfiltered HTML/CSS/JS is allowed'] = ''; +App::$strings['Administrator Information'] = ''; +App::$strings['Contact information for site administrators. Displayed on siteinfo page. BBCode may be used here.'] = ''; +App::$strings['Site Information'] = ''; +App::$strings['Publicly visible description of this site. Displayed on siteinfo page. BBCode may be used here.'] = ''; +App::$strings['System language'] = ''; +App::$strings['System theme'] = ''; +App::$strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = ''; +App::$strings['Allow ActivityPub Connections'] = ''; +App::$strings['Provides access to software supporting the ActivityPub protocol.'] = ''; +App::$strings['Maximum image size'] = ''; +App::$strings['Maximum size in bytes of uploaded images. Default is 0, which means no limits.'] = ''; +App::$strings['Cache all public images'] = ''; +App::$strings['By default proxy non-SSL images, but do not cache'] = ''; +App::$strings['Does this site allow new member registration?'] = ''; +App::$strings['Invitation only'] = ''; +App::$strings['Only allow new member registrations with an invitation code. New member registration must be allowed for this to work.'] = ''; +App::$strings['Minimum age'] = ''; +App::$strings['Minimum age (in years) for who may register on this site.'] = ''; +App::$strings['Which best describes the types of account offered by this hub?'] = ''; +App::$strings['If a public server policy is selected, this information may be displayed on the public server site list.'] = ''; +App::$strings['Register text'] = ''; +App::$strings['Will be displayed prominently on the registration page.'] = ''; +App::$strings['Site homepage to show visitors (default: login box)'] = ''; +App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = ''; +App::$strings['Preserve site homepage URL'] = ''; +App::$strings['Present the site homepage in a frame at the original location instead of redirecting'] = ''; +App::$strings['Accounts abandoned after x days'] = ''; +App::$strings['Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.'] = ''; +App::$strings['Verify Email Addresses'] = ''; +App::$strings['Check to verify email addresses used in account registration (recommended).'] = ''; +App::$strings['Force publish'] = ''; +App::$strings['Check to force all profiles on this site to be listed in the site directory.'] = ''; +App::$strings['Import Public Streams'] = ''; +App::$strings['Import and allow access to public content pulled from other sites. Warning: this content is unmoderated.'] = ''; +App::$strings['Site only Public Streams'] = ''; +App::$strings['Allow access to public content originating only from this site if Imported Public Streams are disabled.'] = ''; +App::$strings['Allow anybody on the internet to access the Public streams'] = ''; +App::$strings['Default is to only allow viewing by site members. Warning: this content is unmoderated.'] = ''; +App::$strings['Show numbers of likes and dislikes in conversations'] = ''; +App::$strings['If disabled, the presence of likes and dislikes will be shown, but without totals.'] = ''; +App::$strings['Only import Public stream posts with this text'] = ''; +App::$strings['words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts'] = ''; +App::$strings['Do not import Public stream posts with this text'] = ''; +App::$strings['Login on Homepage'] = ''; +App::$strings['Present a login box to visitors on the home page if no other content has been configured.'] = ''; +App::$strings['Enable context help'] = ''; +App::$strings['Display contextual help for the current page when the help button is pressed.'] = ''; +App::$strings['Reply-to email address for system generated email.'] = ''; +App::$strings['Sender (From) email address for system generated email.'] = ''; +App::$strings['Name of email sender for system generated email.'] = ''; +App::$strings['Directory Server URL'] = ''; +App::$strings['Default directory server'] = ''; +App::$strings['Proxy user'] = ''; +App::$strings['Proxy URL'] = ''; +App::$strings['Network timeout'] = ''; +App::$strings['Value is in seconds. Set to 0 for unlimited (not recommended).'] = ''; +App::$strings['Delivery interval'] = ''; +App::$strings['Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.'] = ''; +App::$strings['Deliveries per process'] = ''; +App::$strings['Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5.'] = ''; +App::$strings['Queue Threshold'] = ''; +App::$strings['Always defer immediate delivery if queue contains more than this number of entries.'] = ''; +App::$strings['Poll interval'] = ''; +App::$strings['Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.'] = ''; +App::$strings['Path to ImageMagick convert program'] = ''; +App::$strings['If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert'] = ''; +App::$strings['Maximum Load Average'] = ''; +App::$strings['Maximum system load before delivery and poll processes are deferred - default 50.'] = ''; +App::$strings['Expiration period in days for imported streams and cached images'] = ''; +App::$strings['0 for no expiration of imported content'] = ''; +App::$strings['Do not expire any posts which have comments less than this many days ago'] = ''; +App::$strings['Public servers: Optional landing (marketing) webpage for new registrants'] = ''; +App::$strings['Create this page first. Default is %s/register'] = ''; +App::$strings['Page to display after creating a new channel'] = ''; +App::$strings['Default: profiles'] = ''; +App::$strings['Optional: site location'] = ''; +App::$strings['Region or country'] = ''; +App::$strings['%s channel censored/uncensored'] = [ + 0 => '', + 1 => '', ]; -App::$strings["%s channel code allowed/disallowed"] = [ - 0 => "", - 1 => "", +App::$strings['%s channel code allowed/disallowed'] = [ + 0 => '', + 1 => '', ]; -App::$strings["%s channel deleted"] = [ - 0 => "", - 1 => "", +App::$strings['%s channel deleted'] = [ + 0 => '', + 1 => '', ]; -App::$strings["Channel not found"] = ""; -App::$strings["Channel '%s' deleted"] = ""; -App::$strings["Channel '%s' censored"] = ""; -App::$strings["Channel '%s' uncensored"] = ""; -App::$strings["Channel '%s' code allowed"] = ""; -App::$strings["Channel '%s' code disallowed"] = ""; -App::$strings["Channels"] = ""; -App::$strings["Censor"] = ""; -App::$strings["Uncensor"] = ""; -App::$strings["Allow Code"] = ""; -App::$strings["Disallow Code"] = ""; -App::$strings["Channel"] = ""; -App::$strings["UID"] = ""; -App::$strings["Name"] = ""; -App::$strings["Address"] = ""; -App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = ""; -App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = ""; -App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = ""; -App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = ""; -App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = ""; -App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = ""; -App::$strings["Security"] = ""; -App::$strings["Block public"] = ""; -App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = ""; -App::$strings["Block public search"] = ""; -App::$strings["Prevent access to search content unless you are currently authenticated."] = ""; -App::$strings["Hide local directory"] = ""; -App::$strings["Only use the global directory"] = ""; -App::$strings["Provide a cloud root directory"] = ""; -App::$strings["The cloud root directory lists all channel names which provide public files"] = ""; -App::$strings["Show total disk space available to cloud uploads"] = ""; -App::$strings["Allow SVG thumbnails in file browser"] = ""; -App::$strings["WARNING: SVG images may contain malicious code."] = ""; -App::$strings["Allow embedded (inline) PDF files"] = ""; -App::$strings["Set \"Transport Security\" HTTP header"] = ""; -App::$strings["Set \"Content Security Policy\" HTTP header"] = ""; -App::$strings["Allowed email domains"] = ""; -App::$strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = ""; -App::$strings["Not allowed email domains"] = ""; -App::$strings["Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined."] = ""; -App::$strings["Allow communications only from these sites"] = ""; -App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = ""; -App::$strings["Block communications from these sites"] = ""; -App::$strings["Allow communications only from these channels"] = ""; -App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = ""; -App::$strings["Block communications from these channels"] = ""; -App::$strings["Allow public stream communications only from these sites"] = ""; -App::$strings["Block public stream communications from these sites"] = ""; -App::$strings["Allow public stream communications only from these channels"] = ""; -App::$strings["Block public stream communications from these channels"] = ""; -App::$strings["Only allow embeds from secure (SSL) websites and links."] = ""; -App::$strings["Allow unfiltered embedded HTML content only from these domains"] = ""; -App::$strings["One site per line. By default embedded content is filtered."] = ""; -App::$strings["Block embedded HTML from these domains"] = ""; -App::$strings["You must be logged in to see this page."] = ""; -App::$strings["Posts and comments"] = ""; -App::$strings["Only posts"] = ""; -App::$strings["This is the home page of %s."] = ""; -App::$strings["Insufficient permissions. Request redirected to profile page."] = ""; -App::$strings["Search Results For:"] = ""; -App::$strings["Reset form"] = ""; -App::$strings["You must enable javascript for your browser to be able to view this content."] = ""; -App::$strings["Authorize application connection"] = ""; -App::$strings["Return to your app and insert this Security Code:"] = ""; -App::$strings["Please login to continue."] = ""; -App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = ""; -App::$strings["Change Order of Pinned Navbar Apps"] = ""; -App::$strings["Change Order of App Tray Apps"] = ""; -App::$strings["Use arrows to move the corresponding app left (top) or right (bottom) in the navbar"] = ""; -App::$strings["Use arrows to move the corresponding app up or down in the app tray"] = ""; -App::$strings["Available Apps"] = ""; -App::$strings["Installed Apps"] = ""; -App::$strings["Manage apps"] = ""; -App::$strings["Create Custom App"] = ""; -App::$strings["No channel."] = ""; -App::$strings["No connections in common."] = ""; -App::$strings["View Common Connections"] = ""; -App::$strings["Item not available."] = ""; -App::$strings["Unknown App"] = ""; -App::$strings["Authorize"] = ""; -App::$strings["Do you authorize the app %s to access your channel data?"] = ""; -App::$strings["Allow"] = ""; -App::$strings["Channel not found."] = ""; -App::$strings["Permissions denied."] = ""; -App::$strings["l, F j"] = ""; -App::$strings["Link to Source"] = ""; -App::$strings["Edit Event"] = ""; -App::$strings["Create Event"] = ""; -App::$strings["Previous"] = ""; -App::$strings["Next"] = ""; -App::$strings["Import"] = ""; -App::$strings["Today"] = ""; -App::$strings["Expiration settings updated."] = ""; -App::$strings["This app allows you to set an optional expiration date/time for posts, after which they will be deleted. This must be at least fifteen minutes into the future. You may also choose to automatically delete all your posts after a set number of days"] = ""; -App::$strings["Expire and delete all my posts after this many days"] = ""; -App::$strings["Leave at 0 if you wish to manually control expiration of specific posts."] = ""; -App::$strings["Automatic Expiration Settings"] = ""; -App::$strings["Blocked accounts"] = ""; -App::$strings["Expired accounts"] = ""; -App::$strings["Expiring accounts"] = ""; -App::$strings["Primary"] = ""; -App::$strings["Clones"] = ""; -App::$strings["Message queues"] = ""; -App::$strings["Your software should be updated"] = ""; -App::$strings["Summary"] = ""; -App::$strings["Registered accounts"] = ""; -App::$strings["Pending registrations"] = ""; -App::$strings["Registered channels"] = ""; -App::$strings["Active addons"] = ""; -App::$strings["Version"] = ""; -App::$strings["Repository version (release)"] = ""; -App::$strings["Repository version (dev)"] = ""; -App::$strings["Invalid item."] = ""; -App::$strings["Page not found."] = ""; -App::$strings["Create personal planning cards"] = ""; -App::$strings["Add Card"] = ""; -App::$strings["Create"] = ""; -App::$strings["Block Name"] = ""; -App::$strings["Blocks"] = ""; -App::$strings["Block Title"] = ""; -App::$strings["Created"] = ""; -App::$strings["Edited"] = ""; -App::$strings["Share"] = ""; -App::$strings["View"] = ""; -App::$strings["Calendar entries imported."] = ""; -App::$strings["No calendar entries found."] = ""; -App::$strings["INVALID EVENT DISMISSED!"] = ""; -App::$strings["Summary: "] = ""; -App::$strings["Date: "] = ""; -App::$strings["Reason: "] = ""; -App::$strings["INVALID CARD DISMISSED!"] = ""; -App::$strings["Name: "] = ""; -App::$strings["CardDAV App"] = ""; -App::$strings["Not Installed"] = ""; -App::$strings["CalDAV capable addressbook"] = ""; -App::$strings["Event title"] = ""; -App::$strings["Start date and time"] = ""; -App::$strings["End date and time"] = ""; -App::$strings["Description"] = ""; -App::$strings["Location"] = ""; -App::$strings["Month"] = ""; -App::$strings["Week"] = ""; -App::$strings["Day"] = ""; -App::$strings["List month"] = ""; -App::$strings["List week"] = ""; -App::$strings["List day"] = ""; -App::$strings["More"] = ""; -App::$strings["Less"] = ""; -App::$strings["Select calendar"] = ""; -App::$strings["Channel Calendars"] = ""; -App::$strings["CalDAV Calendars"] = ""; -App::$strings["Delete all"] = ""; -App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = ""; -App::$strings["Organisation"] = ""; -App::$strings["Title"] = ""; -App::$strings["Phone"] = ""; -App::$strings["Instant messenger"] = ""; -App::$strings["Website"] = ""; -App::$strings["Note"] = ""; -App::$strings["Mobile"] = ""; -App::$strings["Home"] = ""; -App::$strings["Work"] = ""; -App::$strings["Other"] = ""; -App::$strings["Add Contact"] = ""; -App::$strings["Add Field"] = ""; -App::$strings["P.O. Box"] = ""; -App::$strings["Additional"] = ""; -App::$strings["Street"] = ""; -App::$strings["Locality"] = ""; -App::$strings["Region"] = ""; -App::$strings["ZIP Code"] = ""; -App::$strings["Country"] = ""; -App::$strings["Default Calendar"] = ""; -App::$strings["Default Addressbook"] = ""; -App::$strings["Channel name changes are not allowed within 48 hours of changing the account password."] = ""; -App::$strings["Reserved nickname. Please choose another."] = ""; -App::$strings["Nickname has unsupported characters or is already being used on this site."] = ""; -App::$strings["Feature has been disabled"] = ""; -App::$strings["Change channel nickname/address"] = ""; -App::$strings["WARNING: "] = ""; -App::$strings["Any/all connections on other networks will be lost!"] = ""; -App::$strings["Please enter your password for verification:"] = ""; -App::$strings["New channel address"] = ""; -App::$strings["Rename Channel"] = ""; -App::$strings["toggle full screen mode"] = ""; -App::$strings["Documentation Search"] = ""; -App::$strings["\$Projectname Documentation"] = ""; -App::$strings["Contents"] = ""; -App::$strings["Away"] = ""; -App::$strings["Online"] = ""; -App::$strings["Could not access contact record."] = ""; -App::$strings["Could not locate selected profile."] = ""; -App::$strings["Connection updated."] = ""; -App::$strings["Failed to update connection record."] = ""; -App::$strings["is now connected to"] = ""; -App::$strings["Could not access address book record."] = ""; -App::$strings["Refresh failed - channel is currently unavailable."] = ""; -App::$strings["Added by Connedit"] = ""; -App::$strings["Unable to set address book parameters."] = ""; -App::$strings["Connection has been removed."] = ""; -App::$strings["View %s's profile"] = ""; -App::$strings["Refresh Permissions"] = ""; -App::$strings["Fetch updated permissions"] = ""; -App::$strings["Refresh Photo"] = ""; -App::$strings["Fetch updated photo"] = ""; -App::$strings["Recent Activity"] = ""; -App::$strings["View recent posts and comments"] = ""; -App::$strings["Block (or Unblock) all communications with this connection"] = ""; -App::$strings["This connection is blocked!"] = ""; -App::$strings["Unignore"] = ""; -App::$strings["Ignore"] = ""; -App::$strings["Ignore (or Unignore) all inbound communications from this connection"] = ""; -App::$strings["This connection is ignored!"] = ""; -App::$strings["Censor (or Uncensor) images from this connection"] = ""; -App::$strings["This connection is censored!"] = ""; -App::$strings["Unarchive"] = ""; -App::$strings["Archive"] = ""; -App::$strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = ""; -App::$strings["This connection is archived!"] = ""; -App::$strings["Unhide"] = ""; -App::$strings["Hide"] = ""; -App::$strings["Hide or Unhide this connection from your other connections"] = ""; -App::$strings["This connection is hidden!"] = ""; -App::$strings["Delete this connection"] = ""; -App::$strings["Fetch Vcard"] = ""; -App::$strings["Fetch electronic calling card for this connection"] = ""; -App::$strings["Permissions"] = ""; -App::$strings["Open Individual Permissions section by default"] = ""; -App::$strings["Open Friend Zoom section by default"] = ""; -App::$strings["Me"] = ""; -App::$strings["Family"] = ""; -App::$strings["Friends"] = ""; -App::$strings["Peers"] = ""; -App::$strings["All"] = ""; -App::$strings["Filter"] = ""; -App::$strings["Open Custom Filter section by default"] = ""; -App::$strings["Approve this connection"] = ""; -App::$strings["Accept connection to allow communication"] = ""; -App::$strings["Set Friend Zoom"] = ""; -App::$strings["Set Profile"] = ""; -App::$strings["Set Friend Zoom & Profile"] = ""; -App::$strings["This connection is unreachable from this location."] = ""; -App::$strings["This connection may be unreachable from other channel locations."] = ""; -App::$strings["Location independence is not supported by their network."] = ""; -App::$strings["This connection is unreachable from this location. Location independence is not supported by their network."] = ""; -App::$strings["Connection Default Permissions"] = ""; -App::$strings["Connection: %s"] = ""; -App::$strings["Apply these permissions automatically"] = ""; -App::$strings["Connection requests will be approved without your interaction"] = ""; -App::$strings["Permission role"] = ""; -App::$strings["Loading"] = ""; -App::$strings["Add permission role"] = ""; -App::$strings["This connection's primary address is"] = ""; -App::$strings["Available locations:"] = ""; -App::$strings["The permissions indicated on this page will be applied to all new connections."] = ""; -App::$strings["Connection Tools"] = ""; -App::$strings["Slide to adjust your degree of friendship"] = ""; -App::$strings["Rating"] = ""; -App::$strings["Slide to adjust your rating"] = ""; -App::$strings["Optionally explain your rating"] = ""; -App::$strings["Custom Filter"] = ""; -App::$strings["Only import posts with this text"] = ""; -App::$strings["words one per line or #tags, \$categories, /patterns/, or lang=xx, leave blank to import all posts"] = ""; -App::$strings["Do not import posts with this text"] = ""; -App::$strings["Nickname"] = ""; -App::$strings["optional - allows you to search by a name that you have chosen"] = ""; -App::$strings["This information is public!"] = ""; -App::$strings["Connection Pending Approval"] = ""; -App::$strings["inherited"] = ""; -App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = ""; -App::$strings["Their Settings"] = ""; -App::$strings["My Settings"] = ""; -App::$strings["Individual Permissions"] = ""; -App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can not change those settings here."] = ""; -App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = ""; -App::$strings["Last update:"] = ""; -App::$strings["Details"] = ""; -App::$strings["Active"] = ""; -App::$strings["Blocked"] = ""; -App::$strings["Ignored"] = ""; -App::$strings["Hidden"] = ""; -App::$strings["Archived/Unreachable"] = ""; -App::$strings["New"] = ""; -App::$strings["Active Connections"] = ""; -App::$strings["Show active connections"] = ""; -App::$strings["New Connections"] = ""; -App::$strings["Show pending (new) connections"] = ""; -App::$strings["Only show blocked connections"] = ""; -App::$strings["Only show ignored connections"] = ""; -App::$strings["Only show archived/unreachable connections"] = ""; -App::$strings["Only show hidden connections"] = ""; -App::$strings["All Connections"] = ""; -App::$strings["Show all connections"] = ""; -App::$strings["Order by name"] = ""; -App::$strings["Recent"] = ""; -App::$strings["Order by recent"] = ""; -App::$strings["Order by date"] = ""; -App::$strings["Pending approval"] = ""; -App::$strings["Archived"] = ""; -App::$strings["Not connected at this location"] = ""; -App::$strings["%1\$s [%2\$s]"] = ""; -App::$strings["Edit connection"] = ""; -App::$strings["Delete connection"] = ""; -App::$strings["Channel address"] = ""; -App::$strings["Network"] = ""; -App::$strings["Call"] = ""; -App::$strings["Status"] = ""; -App::$strings["Connected"] = ""; -App::$strings["Approve connection"] = ""; -App::$strings["Ignore connection"] = ""; -App::$strings["Recent activity"] = ""; -App::$strings["Filter by"] = ""; -App::$strings["Sort by"] = ""; -App::$strings["Search your connections"] = ""; -App::$strings["Connections search"] = ""; -App::$strings["Find"] = ""; -App::$strings["network"] = ""; -App::$strings["App installed."] = ""; -App::$strings["Malformed app."] = ""; -App::$strings["Embed code"] = ""; -App::$strings["Edit App"] = ""; -App::$strings["Create App"] = ""; -App::$strings["Name of app"] = ""; -App::$strings["Required"] = ""; -App::$strings["Location (URL) of app"] = ""; -App::$strings["Photo icon URL"] = ""; -App::$strings["80 x 80 pixels - optional"] = ""; -App::$strings["Categories (optional, comma separated list)"] = ""; -App::$strings["Version ID"] = ""; -App::$strings["Price of app"] = ""; -App::$strings["Location (URL) to purchase app"] = ""; -App::$strings["Image uploaded but image cropping failed."] = ""; -App::$strings["Cover Photos"] = ""; -App::$strings["Image resize failed."] = ""; -App::$strings["Unable to process image"] = ""; -App::$strings["female"] = ""; -App::$strings["%1\$s updated her %2\$s"] = ""; -App::$strings["male"] = ""; -App::$strings["%1\$s updated his %2\$s"] = ""; -App::$strings["%1\$s updated their %2\$s"] = ""; -App::$strings["cover photo"] = ""; -App::$strings["Photo not available."] = ""; -App::$strings["Your cover photo may be visible to anybody on the internet"] = ""; -App::$strings["Upload File:"] = ""; -App::$strings["Select a profile:"] = ""; -App::$strings["Change Cover Photo"] = ""; -App::$strings["Upload"] = ""; -App::$strings["Use a photo from your albums"] = ""; -App::$strings["OK"] = ""; -App::$strings["Choose images to embed"] = ""; -App::$strings["Choose an album"] = ""; -App::$strings["Choose a different album"] = ""; -App::$strings["Error getting album list"] = ""; -App::$strings["Error getting photo link"] = ""; -App::$strings["Error getting album"] = ""; -App::$strings["Select previously uploaded photo"] = ""; -App::$strings["Crop Image"] = ""; -App::$strings["Please adjust the image cropping for optimum viewing."] = ""; -App::$strings["Done Editing"] = ""; -App::$strings["Settings updated."] = ""; -App::$strings["If enabled, connection requests will be approved without your interaction"] = ""; -App::$strings["Automatic approval settings"] = ""; -App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = ""; -App::$strings["Invalid request."] = ""; -App::$strings["channel"] = ""; -App::$strings["thing"] = ""; -App::$strings["Permission denied"] = ""; -App::$strings["photo"] = ""; -App::$strings["status"] = ""; -App::$strings["%1\$s likes %2\$s's %3\$s"] = ""; -App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = ""; -App::$strings["%1\$s is attending %2\$s's %3\$s"] = ""; -App::$strings["%1\$s is not attending %2\$s's %3\$s"] = ""; -App::$strings["%1\$s may attend %2\$s's %3\$s"] = ""; -App::$strings["Item not found"] = ""; -App::$strings["Item is not editable"] = ""; -App::$strings["Edit post"] = ""; -App::$strings["day(s)"] = ""; -App::$strings["week(s)"] = ""; -App::$strings["month(s)"] = ""; -App::$strings["year(s)"] = ""; -App::$strings["Edit event title"] = ""; -App::$strings["Categories (comma-separated list)"] = ""; -App::$strings["Edit Category"] = ""; -App::$strings["Category"] = ""; -App::$strings["Edit start date and time"] = ""; -App::$strings["Finish date and time are not known or not relevant"] = ""; -App::$strings["Edit finish date and time"] = ""; -App::$strings["Finish date and time"] = ""; -App::$strings["Adjust for viewer timezone"] = ""; -App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = ""; -App::$strings["Edit Description"] = ""; -App::$strings["Edit Location"] = ""; -App::$strings["Permission settings"] = ""; -App::$strings["Timezone:"] = ""; -App::$strings["Advanced Options"] = ""; -App::$strings["Event repeat"] = ""; -App::$strings["Repeat frequency"] = ""; -App::$strings["Repeat every"] = ""; -App::$strings["Number of total repeats"] = ""; -App::$strings["Event removed"] = ""; -App::$strings["Layout Name"] = ""; -App::$strings["Layout Description (Optional)"] = ""; -App::$strings["Edit Layout"] = ""; -App::$strings["This app allows you to create private notes for your personal use."] = ""; -App::$strings["This app is installed. The Notes tool can be found on your stream page."] = ""; -App::$strings["Page link"] = ""; -App::$strings["Insert web link"] = ""; -App::$strings["Edit Webpage"] = ""; -App::$strings["Token verification failed."] = ""; -App::$strings["Email verification resent"] = ""; -App::$strings["Unable to resend email verification message."] = ""; -App::$strings["Email Verification Required"] = ""; -App::$strings["A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message."] = ""; -App::$strings["Resend Email"] = ""; -App::$strings["Validation token"] = ""; -App::$strings["Image/photo"] = ""; -App::$strings["View Photo"] = ""; -App::$strings["Edit Album"] = ""; -App::$strings["Nothing to import."] = ""; -App::$strings["Unable to download data from old server"] = ""; -App::$strings["Imported file is empty."] = ""; -App::$strings["Your service plan only allows %d channels."] = ""; -App::$strings["No channel. Import failed."] = ""; -App::$strings["Import completed."] = ""; -App::$strings["You must be logged in to use this feature."] = ""; -App::$strings["Import Channel"] = ""; -App::$strings["Use this form to import an existing channel from a different server. You may retrieve the channel identity from the old server via the network or provide an export file."] = ""; -App::$strings["File to Upload"] = ""; -App::$strings["Or provide the old server details"] = ""; -App::$strings["Your old identity address (xyz@example.com)"] = ""; -App::$strings["Your old login email address"] = ""; -App::$strings["Your old login password"] = ""; -App::$strings["Import a few months of posts if possible (limited by available memory"] = ""; -App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = ""; -App::$strings["Make this hub my primary location"] = ""; -App::$strings["Move this channel (disable all previous locations)"] = ""; -App::$strings["Use this channel nickname instead of the one provided"] = ""; -App::$strings["Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site."] = ""; -App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = ""; -App::$strings["Total invitation limit exceeded."] = ""; -App::$strings["%s : Not a valid email address."] = ""; -App::$strings["Please join us on \$Projectname"] = ""; -App::$strings["Invitation limit exceeded. Please contact your site administrator."] = ""; -App::$strings["%s : Message delivery failed."] = ""; -App::$strings["%d message sent."] = [ - 0 => "", - 1 => "", +App::$strings['Channel not found'] = ''; +App::$strings["Channel '%s' deleted"] = ''; +App::$strings["Channel '%s' censored"] = ''; +App::$strings["Channel '%s' uncensored"] = ''; +App::$strings["Channel '%s' code allowed"] = ''; +App::$strings["Channel '%s' code disallowed"] = ''; +App::$strings['Channels'] = ''; +App::$strings['Censor'] = ''; +App::$strings['Uncensor'] = ''; +App::$strings['Allow Code'] = ''; +App::$strings['Disallow Code'] = ''; +App::$strings['Channel'] = ''; +App::$strings['UID'] = ''; +App::$strings['Name'] = ''; +App::$strings['Address'] = ''; +App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = ''; +App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = ''; +App::$strings['By default, unfiltered HTML is allowed in embedded media. This is inherently insecure.'] = ''; +App::$strings['The recommended setting is to only allow unfiltered HTML from the following sites:'] = ''; +App::$strings['https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
'] = ''; +App::$strings['All other embedded content will be filtered, unless embedded content from that site is explicitly blocked.'] = ''; +App::$strings['Security'] = ''; +App::$strings['Block public'] = ''; +App::$strings['Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.'] = ''; +App::$strings['Block public search'] = ''; +App::$strings['Prevent access to search content unless you are currently authenticated.'] = ''; +App::$strings['Hide local directory'] = ''; +App::$strings['Only use the global directory'] = ''; +App::$strings['Provide a cloud root directory'] = ''; +App::$strings['The cloud root directory lists all channel names which provide public files'] = ''; +App::$strings['Show total disk space available to cloud uploads'] = ''; +App::$strings['Allow SVG thumbnails in file browser'] = ''; +App::$strings['WARNING: SVG images may contain malicious code.'] = ''; +App::$strings['Allow embedded (inline) PDF files'] = ''; +App::$strings["Set \"Transport Security\" HTTP header"] = ''; +App::$strings["Set \"Content Security Policy\" HTTP header"] = ''; +App::$strings['Allowed email domains'] = ''; +App::$strings['Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains'] = ''; +App::$strings['Not allowed email domains'] = ''; +App::$strings['Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined.'] = ''; +App::$strings['Allow communications only from these sites'] = ''; +App::$strings['One site per line. Leave empty to allow communication from anywhere by default'] = ''; +App::$strings['Block communications from these sites'] = ''; +App::$strings['Allow communications only from these channels'] = ''; +App::$strings['One channel (hash) per line. Leave empty to allow from any channel by default'] = ''; +App::$strings['Block communications from these channels'] = ''; +App::$strings['Allow public stream communications only from these sites'] = ''; +App::$strings['Block public stream communications from these sites'] = ''; +App::$strings['Allow public stream communications only from these channels'] = ''; +App::$strings['Block public stream communications from these channels'] = ''; +App::$strings['Only allow embeds from secure (SSL) websites and links.'] = ''; +App::$strings['Allow unfiltered embedded HTML content only from these domains'] = ''; +App::$strings['One site per line. By default embedded content is filtered.'] = ''; +App::$strings['Block embedded HTML from these domains'] = ''; +App::$strings['You must be logged in to see this page.'] = ''; +App::$strings['Posts and comments'] = ''; +App::$strings['Only posts'] = ''; +App::$strings['This is the home page of %s.'] = ''; +App::$strings['Insufficient permissions. Request redirected to profile page.'] = ''; +App::$strings['Search Results For:'] = ''; +App::$strings['Reset form'] = ''; +App::$strings['You must enable javascript for your browser to be able to view this content.'] = ''; +App::$strings['Authorize application connection'] = ''; +App::$strings['Return to your app and insert this Security Code:'] = ''; +App::$strings['Please login to continue.'] = ''; +App::$strings['Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'] = ''; +App::$strings['Change Order of Pinned Navbar Apps'] = ''; +App::$strings['Change Order of App Tray Apps'] = ''; +App::$strings['Use arrows to move the corresponding app left (top) or right (bottom) in the navbar'] = ''; +App::$strings['Use arrows to move the corresponding app up or down in the app tray'] = ''; +App::$strings['Available Apps'] = ''; +App::$strings['Installed Apps'] = ''; +App::$strings['Manage apps'] = ''; +App::$strings['Create Custom App'] = ''; +App::$strings['No channel.'] = ''; +App::$strings['No connections in common.'] = ''; +App::$strings['View Common Connections'] = ''; +App::$strings['Item not available.'] = ''; +App::$strings['Unknown App'] = ''; +App::$strings['Authorize'] = ''; +App::$strings['Do you authorize the app %s to access your channel data?'] = ''; +App::$strings['Allow'] = ''; +App::$strings['Channel not found.'] = ''; +App::$strings['Permissions denied.'] = ''; +App::$strings['l, F j'] = ''; +App::$strings['Link to Source'] = ''; +App::$strings['Edit Event'] = ''; +App::$strings['Create Event'] = ''; +App::$strings['Previous'] = ''; +App::$strings['Next'] = ''; +App::$strings['Import'] = ''; +App::$strings['Today'] = ''; +App::$strings['Expiration settings updated.'] = ''; +App::$strings['This app allows you to set an optional expiration date/time for posts, after which they will be deleted. This must be at least fifteen minutes into the future. You may also choose to automatically delete all your posts after a set number of days'] = ''; +App::$strings['Expire and delete all my posts after this many days'] = ''; +App::$strings['Leave at 0 if you wish to manually control expiration of specific posts.'] = ''; +App::$strings['Automatic Expiration Settings'] = ''; +App::$strings['Blocked accounts'] = ''; +App::$strings['Expired accounts'] = ''; +App::$strings['Expiring accounts'] = ''; +App::$strings['Primary'] = ''; +App::$strings['Clones'] = ''; +App::$strings['Message queues'] = ''; +App::$strings['Your software should be updated'] = ''; +App::$strings['Summary'] = ''; +App::$strings['Registered accounts'] = ''; +App::$strings['Pending registrations'] = ''; +App::$strings['Registered channels'] = ''; +App::$strings['Active addons'] = ''; +App::$strings['Version'] = ''; +App::$strings['Repository version (release)'] = ''; +App::$strings['Repository version (dev)'] = ''; +App::$strings['Invalid item.'] = ''; +App::$strings['Page not found.'] = ''; +App::$strings['Create personal planning cards'] = ''; +App::$strings['Add Card'] = ''; +App::$strings['Create'] = ''; +App::$strings['Block Name'] = ''; +App::$strings['Blocks'] = ''; +App::$strings['Block Title'] = ''; +App::$strings['Created'] = ''; +App::$strings['Edited'] = ''; +App::$strings['Share'] = ''; +App::$strings['View'] = ''; +App::$strings['Calendar entries imported.'] = ''; +App::$strings['No calendar entries found.'] = ''; +App::$strings['INVALID EVENT DISMISSED!'] = ''; +App::$strings['Summary: '] = ''; +App::$strings['Date: '] = ''; +App::$strings['Reason: '] = ''; +App::$strings['INVALID CARD DISMISSED!'] = ''; +App::$strings['Name: '] = ''; +App::$strings['CardDAV App'] = ''; +App::$strings['Not Installed'] = ''; +App::$strings['CalDAV capable addressbook'] = ''; +App::$strings['Event title'] = ''; +App::$strings['Start date and time'] = ''; +App::$strings['End date and time'] = ''; +App::$strings['Description'] = ''; +App::$strings['Location'] = ''; +App::$strings['Month'] = ''; +App::$strings['Week'] = ''; +App::$strings['Day'] = ''; +App::$strings['List month'] = ''; +App::$strings['List week'] = ''; +App::$strings['List day'] = ''; +App::$strings['More'] = ''; +App::$strings['Less'] = ''; +App::$strings['Select calendar'] = ''; +App::$strings['Channel Calendars'] = ''; +App::$strings['CalDAV Calendars'] = ''; +App::$strings['Delete all'] = ''; +App::$strings['Sorry! Editing of recurrent events is not yet implemented.'] = ''; +App::$strings['Organisation'] = ''; +App::$strings['Title'] = ''; +App::$strings['Phone'] = ''; +App::$strings['Instant messenger'] = ''; +App::$strings['Website'] = ''; +App::$strings['Note'] = ''; +App::$strings['Mobile'] = ''; +App::$strings['Home'] = ''; +App::$strings['Work'] = ''; +App::$strings['Other'] = ''; +App::$strings['Add Contact'] = ''; +App::$strings['Add Field'] = ''; +App::$strings['P.O. Box'] = ''; +App::$strings['Additional'] = ''; +App::$strings['Street'] = ''; +App::$strings['Locality'] = ''; +App::$strings['Region'] = ''; +App::$strings['ZIP Code'] = ''; +App::$strings['Country'] = ''; +App::$strings['Default Calendar'] = ''; +App::$strings['Default Addressbook'] = ''; +App::$strings['Channel name changes are not allowed within 48 hours of changing the account password.'] = ''; +App::$strings['Reserved nickname. Please choose another.'] = ''; +App::$strings['Nickname has unsupported characters or is already being used on this site.'] = ''; +App::$strings['Feature has been disabled'] = ''; +App::$strings['Change channel nickname/address'] = ''; +App::$strings['WARNING: '] = ''; +App::$strings['Any/all connections on other networks will be lost!'] = ''; +App::$strings['Please enter your password for verification:'] = ''; +App::$strings['New channel address'] = ''; +App::$strings['Rename Channel'] = ''; +App::$strings['toggle full screen mode'] = ''; +App::$strings['Documentation Search'] = ''; +App::$strings["\$Projectname Documentation"] = ''; +App::$strings['Contents'] = ''; +App::$strings['Away'] = ''; +App::$strings['Online'] = ''; +App::$strings['Could not access contact record.'] = ''; +App::$strings['Could not locate selected profile.'] = ''; +App::$strings['Connection updated.'] = ''; +App::$strings['Failed to update connection record.'] = ''; +App::$strings['is now connected to'] = ''; +App::$strings['Could not access address book record.'] = ''; +App::$strings['Refresh failed - channel is currently unavailable.'] = ''; +App::$strings['Added by Connedit'] = ''; +App::$strings['Unable to set address book parameters.'] = ''; +App::$strings['Connection has been removed.'] = ''; +App::$strings["View %s's profile"] = ''; +App::$strings['Refresh Permissions'] = ''; +App::$strings['Fetch updated permissions'] = ''; +App::$strings['Refresh Photo'] = ''; +App::$strings['Fetch updated photo'] = ''; +App::$strings['Recent Activity'] = ''; +App::$strings['View recent posts and comments'] = ''; +App::$strings['Block (or Unblock) all communications with this connection'] = ''; +App::$strings['This connection is blocked!'] = ''; +App::$strings['Unignore'] = ''; +App::$strings['Ignore'] = ''; +App::$strings['Ignore (or Unignore) all inbound communications from this connection'] = ''; +App::$strings['This connection is ignored!'] = ''; +App::$strings['Censor (or Uncensor) images from this connection'] = ''; +App::$strings['This connection is censored!'] = ''; +App::$strings['Unarchive'] = ''; +App::$strings['Archive'] = ''; +App::$strings['Archive (or Unarchive) this connection - mark channel dead but keep content'] = ''; +App::$strings['This connection is archived!'] = ''; +App::$strings['Unhide'] = ''; +App::$strings['Hide'] = ''; +App::$strings['Hide or Unhide this connection from your other connections'] = ''; +App::$strings['This connection is hidden!'] = ''; +App::$strings['Delete this connection'] = ''; +App::$strings['Fetch Vcard'] = ''; +App::$strings['Fetch electronic calling card for this connection'] = ''; +App::$strings['Permissions'] = ''; +App::$strings['Open Individual Permissions section by default'] = ''; +App::$strings['Open Friend Zoom section by default'] = ''; +App::$strings['Me'] = ''; +App::$strings['Family'] = ''; +App::$strings['Friends'] = ''; +App::$strings['Peers'] = ''; +App::$strings['All'] = ''; +App::$strings['Filter'] = ''; +App::$strings['Open Custom Filter section by default'] = ''; +App::$strings['Approve this connection'] = ''; +App::$strings['Accept connection to allow communication'] = ''; +App::$strings['Set Friend Zoom'] = ''; +App::$strings['Set Profile'] = ''; +App::$strings['Set Friend Zoom & Profile'] = ''; +App::$strings['This connection is unreachable from this location.'] = ''; +App::$strings['This connection may be unreachable from other channel locations.'] = ''; +App::$strings['Location independence is not supported by their network.'] = ''; +App::$strings['This connection is unreachable from this location. Location independence is not supported by their network.'] = ''; +App::$strings['Connection Default Permissions'] = ''; +App::$strings['Connection: %s'] = ''; +App::$strings['Apply these permissions automatically'] = ''; +App::$strings['Connection requests will be approved without your interaction'] = ''; +App::$strings['Permission role'] = ''; +App::$strings['Loading'] = ''; +App::$strings['Add permission role'] = ''; +App::$strings["This connection's primary address is"] = ''; +App::$strings['Available locations:'] = ''; +App::$strings['The permissions indicated on this page will be applied to all new connections.'] = ''; +App::$strings['Connection Tools'] = ''; +App::$strings['Slide to adjust your degree of friendship'] = ''; +App::$strings['Rating'] = ''; +App::$strings['Slide to adjust your rating'] = ''; +App::$strings['Optionally explain your rating'] = ''; +App::$strings['Custom Filter'] = ''; +App::$strings['Only import posts with this text'] = ''; +App::$strings["words one per line or #tags, \$categories, /patterns/, or lang=xx, leave blank to import all posts"] = ''; +App::$strings['Do not import posts with this text'] = ''; +App::$strings['Nickname'] = ''; +App::$strings['optional - allows you to search by a name that you have chosen'] = ''; +App::$strings['This information is public!'] = ''; +App::$strings['Connection Pending Approval'] = ''; +App::$strings['inherited'] = ''; +App::$strings['Please choose the profile you would like to display to %s when viewing your profile securely.'] = ''; +App::$strings['Their Settings'] = ''; +App::$strings['My Settings'] = ''; +App::$strings['Individual Permissions'] = ''; +App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can not change those settings here."] = ''; +App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = ''; +App::$strings['Last update:'] = ''; +App::$strings['Details'] = ''; +App::$strings['Active'] = ''; +App::$strings['Blocked'] = ''; +App::$strings['Ignored'] = ''; +App::$strings['Hidden'] = ''; +App::$strings['Archived/Unreachable'] = ''; +App::$strings['New'] = ''; +App::$strings['Active Connections'] = ''; +App::$strings['Show active connections'] = ''; +App::$strings['New Connections'] = ''; +App::$strings['Show pending (new) connections'] = ''; +App::$strings['Only show blocked connections'] = ''; +App::$strings['Only show ignored connections'] = ''; +App::$strings['Only show archived/unreachable connections'] = ''; +App::$strings['Only show hidden connections'] = ''; +App::$strings['All Connections'] = ''; +App::$strings['Show all connections'] = ''; +App::$strings['Order by name'] = ''; +App::$strings['Recent'] = ''; +App::$strings['Order by recent'] = ''; +App::$strings['Order by date'] = ''; +App::$strings['Pending approval'] = ''; +App::$strings['Archived'] = ''; +App::$strings['Not connected at this location'] = ''; +App::$strings["%1\$s [%2\$s]"] = ''; +App::$strings['Edit connection'] = ''; +App::$strings['Delete connection'] = ''; +App::$strings['Channel address'] = ''; +App::$strings['Network'] = ''; +App::$strings['Call'] = ''; +App::$strings['Status'] = ''; +App::$strings['Connected'] = ''; +App::$strings['Approve connection'] = ''; +App::$strings['Ignore connection'] = ''; +App::$strings['Recent activity'] = ''; +App::$strings['Filter by'] = ''; +App::$strings['Sort by'] = ''; +App::$strings['Search your connections'] = ''; +App::$strings['Connections search'] = ''; +App::$strings['Find'] = ''; +App::$strings['network'] = ''; +App::$strings['App installed.'] = ''; +App::$strings['Malformed app.'] = ''; +App::$strings['Embed code'] = ''; +App::$strings['Edit App'] = ''; +App::$strings['Create App'] = ''; +App::$strings['Name of app'] = ''; +App::$strings['Required'] = ''; +App::$strings['Location (URL) of app'] = ''; +App::$strings['Photo icon URL'] = ''; +App::$strings['80 x 80 pixels - optional'] = ''; +App::$strings['Categories (optional, comma separated list)'] = ''; +App::$strings['Version ID'] = ''; +App::$strings['Price of app'] = ''; +App::$strings['Location (URL) to purchase app'] = ''; +App::$strings['Image uploaded but image cropping failed.'] = ''; +App::$strings['Cover Photos'] = ''; +App::$strings['Image resize failed.'] = ''; +App::$strings['Unable to process image'] = ''; +App::$strings['female'] = ''; +App::$strings["%1\$s updated her %2\$s"] = ''; +App::$strings['male'] = ''; +App::$strings["%1\$s updated his %2\$s"] = ''; +App::$strings["%1\$s updated their %2\$s"] = ''; +App::$strings['cover photo'] = ''; +App::$strings['Photo not available.'] = ''; +App::$strings['Your cover photo may be visible to anybody on the internet'] = ''; +App::$strings['Upload File:'] = ''; +App::$strings['Select a profile:'] = ''; +App::$strings['Change Cover Photo'] = ''; +App::$strings['Upload'] = ''; +App::$strings['Use a photo from your albums'] = ''; +App::$strings['OK'] = ''; +App::$strings['Choose images to embed'] = ''; +App::$strings['Choose an album'] = ''; +App::$strings['Choose a different album'] = ''; +App::$strings['Error getting album list'] = ''; +App::$strings['Error getting photo link'] = ''; +App::$strings['Error getting album'] = ''; +App::$strings['Select previously uploaded photo'] = ''; +App::$strings['Crop Image'] = ''; +App::$strings['Please adjust the image cropping for optimum viewing.'] = ''; +App::$strings['Done Editing'] = ''; +App::$strings['Settings updated.'] = ''; +App::$strings['If enabled, connection requests will be approved without your interaction'] = ''; +App::$strings['Automatic approval settings'] = ''; +App::$strings['Some individual permissions may have been preset or locked based on your channel type and privacy settings.'] = ''; +App::$strings['Invalid request.'] = ''; +App::$strings['channel'] = ''; +App::$strings['thing'] = ''; +App::$strings['Permission denied'] = ''; +App::$strings['photo'] = ''; +App::$strings['status'] = ''; +App::$strings["%1\$s likes %2\$s's %3\$s"] = ''; +App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = ''; +App::$strings["%1\$s is attending %2\$s's %3\$s"] = ''; +App::$strings["%1\$s is not attending %2\$s's %3\$s"] = ''; +App::$strings["%1\$s may attend %2\$s's %3\$s"] = ''; +App::$strings['Item not found'] = ''; +App::$strings['Item is not editable'] = ''; +App::$strings['Edit post'] = ''; +App::$strings['day(s)'] = ''; +App::$strings['week(s)'] = ''; +App::$strings['month(s)'] = ''; +App::$strings['year(s)'] = ''; +App::$strings['Edit event title'] = ''; +App::$strings['Categories (comma-separated list)'] = ''; +App::$strings['Edit Category'] = ''; +App::$strings['Category'] = ''; +App::$strings['Edit start date and time'] = ''; +App::$strings['Finish date and time are not known or not relevant'] = ''; +App::$strings['Edit finish date and time'] = ''; +App::$strings['Finish date and time'] = ''; +App::$strings['Adjust for viewer timezone'] = ''; +App::$strings['Important for events that happen in a particular place. Not practical for global holidays.'] = ''; +App::$strings['Edit Description'] = ''; +App::$strings['Edit Location'] = ''; +App::$strings['Permission settings'] = ''; +App::$strings['Timezone:'] = ''; +App::$strings['Advanced Options'] = ''; +App::$strings['Event repeat'] = ''; +App::$strings['Repeat frequency'] = ''; +App::$strings['Repeat every'] = ''; +App::$strings['Number of total repeats'] = ''; +App::$strings['Event removed'] = ''; +App::$strings['Layout Name'] = ''; +App::$strings['Layout Description (Optional)'] = ''; +App::$strings['Edit Layout'] = ''; +App::$strings['This app allows you to create private notes for your personal use.'] = ''; +App::$strings['This app is installed. The Notes tool can be found on your stream page.'] = ''; +App::$strings['Page link'] = ''; +App::$strings['Insert web link'] = ''; +App::$strings['Edit Webpage'] = ''; +App::$strings['Token verification failed.'] = ''; +App::$strings['Email verification resent'] = ''; +App::$strings['Unable to resend email verification message.'] = ''; +App::$strings['Email Verification Required'] = ''; +App::$strings['A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message.'] = ''; +App::$strings['Resend Email'] = ''; +App::$strings['Validation token'] = ''; +App::$strings['Image/photo'] = ''; +App::$strings['View Photo'] = ''; +App::$strings['Edit Album'] = ''; +App::$strings['Nothing to import.'] = ''; +App::$strings['Unable to download data from old server'] = ''; +App::$strings['Imported file is empty.'] = ''; +App::$strings['Your service plan only allows %d channels.'] = ''; +App::$strings['No channel. Import failed.'] = ''; +App::$strings['Import completed.'] = ''; +App::$strings['You must be logged in to use this feature.'] = ''; +App::$strings['Import Channel'] = ''; +App::$strings['Use this form to import an existing channel from a different server. You may retrieve the channel identity from the old server via the network or provide an export file.'] = ''; +App::$strings['File to Upload'] = ''; +App::$strings['Or provide the old server details'] = ''; +App::$strings['Your old identity address (xyz@example.com)'] = ''; +App::$strings['Your old login email address'] = ''; +App::$strings['Your old login password'] = ''; +App::$strings['Import a few months of posts if possible (limited by available memory'] = ''; +App::$strings['For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media.'] = ''; +App::$strings['Make this hub my primary location'] = ''; +App::$strings['Move this channel (disable all previous locations)'] = ''; +App::$strings['Use this channel nickname instead of the one provided'] = ''; +App::$strings['Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site.'] = ''; +App::$strings['This process may take several minutes to complete. Please submit the form only once and leave this page open until finished.'] = ''; +App::$strings['Total invitation limit exceeded.'] = ''; +App::$strings['%s : Not a valid email address.'] = ''; +App::$strings["Please join us on \$Projectname"] = ''; +App::$strings['Invitation limit exceeded. Please contact your site administrator.'] = ''; +App::$strings['%s : Message delivery failed.'] = ''; +App::$strings['%d message sent.'] = [ + 0 => '', + 1 => '', ]; -App::$strings["Send email invitations to join this network"] = ""; -App::$strings["You have no more invitations available"] = ""; -App::$strings["Send invitations"] = ""; -App::$strings["Enter email addresses, one per line:"] = ""; -App::$strings["Your message:"] = ""; -App::$strings["Please join my community on \$Projectname."] = ""; -App::$strings["You will need to supply this invitation code:"] = ""; -App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = ""; -App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = ""; -App::$strings["or visit"] = ""; -App::$strings["3. Click [Connect]"] = ""; -App::$strings["This app allows you to disable comments on individual posts."] = ""; -App::$strings["This app is installed. A button to control the ability to comment may be found below the post editor."] = ""; -App::$strings["Enter a folder name"] = ""; -App::$strings["or select an existing folder (doubleclick)"] = ""; -App::$strings["File not found."] = ""; -App::$strings["Permission Denied."] = ""; -App::$strings["Edit file permissions"] = ""; -App::$strings["Set/edit permissions"] = ""; -App::$strings["Include all files and sub folders"] = ""; -App::$strings["Return to file list"] = ""; -App::$strings["Copy/paste this code to attach file to a post"] = ""; -App::$strings["Copy/paste this URL to link file from a web page"] = ""; -App::$strings["Share this file"] = ""; -App::$strings["Show URL to this file"] = ""; -App::$strings["Show in your contacts shared folder"] = ""; -App::$strings["Entry censored"] = ""; -App::$strings["Entry uncensored"] = ""; -App::$strings["webpage"] = ""; -App::$strings["block"] = ""; -App::$strings["layout"] = ""; -App::$strings["menu"] = ""; -App::$strings["%s element installed"] = ""; -App::$strings["%s element installation failed"] = ""; -App::$strings["Thing updated"] = ""; -App::$strings["Object store: failed"] = ""; -App::$strings["Thing added"] = ""; -App::$strings["OBJ: %1\$s %2\$s %3\$s"] = ""; -App::$strings["Show Thing"] = ""; -App::$strings["item not found."] = ""; -App::$strings["Edit Thing"] = ""; -App::$strings["Select a profile"] = ""; -App::$strings["Post an activity"] = ""; -App::$strings["Only sends to viewers of the applicable profile"] = ""; -App::$strings["Name of thing e.g. something"] = ""; -App::$strings["URL of thing (optional)"] = ""; -App::$strings["URL for photo of thing (optional)"] = ""; -App::$strings["Add Thing to your Profile"] = ""; -App::$strings["Room not found"] = ""; -App::$strings["Leave Room"] = ""; -App::$strings["Delete Room"] = ""; -App::$strings["I am away right now"] = ""; -App::$strings["I am online"] = ""; -App::$strings["Please enter a link URL:"] = ""; -App::$strings["New Chatroom"] = ""; -App::$strings["Chatroom name"] = ""; -App::$strings["Expiration of chats (minutes)"] = ""; -App::$strings["%1\$s's Chatrooms"] = ""; -App::$strings["No chatrooms available"] = ""; -App::$strings["Create New"] = ""; -App::$strings["Expiration"] = ""; -App::$strings["min"] = ""; -App::$strings["No entries."] = ""; -App::$strings["Comment approved"] = ""; -App::$strings["Comment deleted"] = ""; -App::$strings["Welcome to Hubzilla!"] = ""; -App::$strings["You have got no unseen posts..."] = ""; -App::$strings["Access list created."] = ""; -App::$strings["Could not create access list."] = ""; -App::$strings["Access list not found."] = ""; -App::$strings["Access list updated."] = ""; -App::$strings["List members"] = ""; -App::$strings["List not found"] = ""; -App::$strings["Access Lists"] = ""; -App::$strings["Create access list"] = ""; -App::$strings["Access list name"] = ""; -App::$strings["Members are visible to other channels"] = ""; -App::$strings["Members"] = ""; -App::$strings["Access list removed."] = ""; -App::$strings["Unable to remove access list."] = ""; -App::$strings["Access List: %s"] = ""; -App::$strings["Access list name: "] = ""; -App::$strings["Delete access list"] = ""; -App::$strings["Not in this list"] = ""; -App::$strings["Select a channel to toggle membership"] = ""; -App::$strings["Layouts"] = ""; -App::$strings["Layout Description"] = ""; -App::$strings["Download PDL file"] = ""; -App::$strings["No such group"] = ""; -App::$strings["No such channel"] = ""; -App::$strings["Access list is empty"] = ""; -App::$strings["Access list: "] = ""; -App::$strings["Invalid channel."] = ""; -App::$strings["Title (optional)"] = ""; -App::$strings["Edit Card"] = ""; -App::$strings["Warning: Database versions differ by %1\$d updates."] = ""; -App::$strings["Import completed"] = ""; -App::$strings["Import Items"] = ""; -App::$strings["Use this form to import existing posts and content from an export file."] = ""; -App::$strings["Not found"] = ""; -App::$strings["Please refresh page"] = ""; -App::$strings["Unknown error"] = ""; -App::$strings["Group"] = ""; -App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = ""; -App::$strings["Create a new channel"] = ""; -App::$strings["Current Channel"] = ""; -App::$strings["Switch to one of your channels by selecting it."] = ""; -App::$strings["Default Login Channel"] = ""; -App::$strings["Make Default"] = ""; -App::$strings["Add to menu"] = ""; -App::$strings["%d new messages"] = ""; -App::$strings["%d new introductions"] = ""; -App::$strings["Delegated Channel"] = ""; -App::$strings["Change UI language"] = ""; -App::$strings["Menu not found."] = ""; -App::$strings["Unable to create element."] = ""; -App::$strings["Unable to update menu element."] = ""; -App::$strings["Unable to add menu element."] = ""; -App::$strings["Not found."] = ""; -App::$strings["Menu Item Permissions"] = ""; -App::$strings["(click to open/close)"] = ""; -App::$strings["Link Name"] = ""; -App::$strings["Link or Submenu Target"] = ""; -App::$strings["Enter URL of the link or select a menu name to create a submenu"] = ""; -App::$strings["Use magic-auth if available"] = ""; -App::$strings["Open link in new window"] = ""; -App::$strings["Order in list"] = ""; -App::$strings["Higher numbers will sink to bottom of listing"] = ""; -App::$strings["Submit and finish"] = ""; -App::$strings["Submit and continue"] = ""; -App::$strings["Menu:"] = ""; -App::$strings["Link Target"] = ""; -App::$strings["Edit menu"] = ""; -App::$strings["Edit element"] = ""; -App::$strings["Drop element"] = ""; -App::$strings["New element"] = ""; -App::$strings["Edit this menu container"] = ""; -App::$strings["Add menu element"] = ""; -App::$strings["Delete this menu item"] = ""; -App::$strings["Edit this menu item"] = ""; -App::$strings["Menu item not found."] = ""; -App::$strings["Menu item deleted."] = ""; -App::$strings["Menu item could not be deleted."] = ""; -App::$strings["Edit Menu Element"] = ""; -App::$strings["Link text"] = ""; -App::$strings["Webfinger Diagnostic"] = ""; -App::$strings["Lookup address or URL"] = ""; -App::$strings["Edit Block"] = ""; -App::$strings["Invalid message"] = ""; -App::$strings["no results"] = ""; -App::$strings["channel sync processed"] = ""; -App::$strings["queued"] = ""; -App::$strings["posted"] = ""; -App::$strings["accepted for delivery"] = ""; -App::$strings["updated"] = ""; -App::$strings["update ignored"] = ""; -App::$strings["permission denied"] = ""; -App::$strings["recipient not found"] = ""; -App::$strings["mail recalled"] = ""; -App::$strings["duplicate mail received"] = ""; -App::$strings["mail delivered"] = ""; -App::$strings["Delivery report for %1\$s"] = ""; -App::$strings["Options"] = ""; -App::$strings["Redeliver"] = ""; -App::$strings["Post repeated"] = ""; -App::$strings["No valid account found."] = ""; -App::$strings["Password reset request issued. Check your email."] = ""; -App::$strings["Site Member (%s)"] = ""; -App::$strings["Password reset requested at %s"] = ""; -App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = ""; -App::$strings["Password Reset"] = ""; -App::$strings["Your password has been reset as requested."] = ""; -App::$strings["Your new password is"] = ""; -App::$strings["Save or copy your new password - and then"] = ""; -App::$strings["click here to login"] = ""; -App::$strings["Your password may be changed from the Settings page after successful login."] = ""; -App::$strings["Your password has changed at %s"] = ""; -App::$strings["Forgot your Password?"] = ""; -App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = ""; -App::$strings["Email Address"] = ""; -App::$strings["Unable to update menu."] = ""; -App::$strings["Unable to create menu."] = ""; -App::$strings["Menu Name"] = ""; -App::$strings["Unique name (not visible on webpage) - required"] = ""; -App::$strings["Menu Title"] = ""; -App::$strings["Visible on webpage - leave empty for no title"] = ""; -App::$strings["Allow Bookmarks"] = ""; -App::$strings["Menu may be used to store saved bookmarks"] = ""; -App::$strings["Submit and proceed"] = ""; -App::$strings["Menus"] = ""; -App::$strings["Drop"] = ""; -App::$strings["Bookmarks allowed"] = ""; -App::$strings["Delete this menu"] = ""; -App::$strings["Edit menu contents"] = ""; -App::$strings["Edit this menu"] = ""; -App::$strings["Menu could not be deleted."] = ""; -App::$strings["Edit Menu"] = ""; -App::$strings["Add or remove entries to this menu"] = ""; -App::$strings["Menu name"] = ""; -App::$strings["Must be unique, only seen by you"] = ""; -App::$strings["Menu title"] = ""; -App::$strings["Menu title as seen by others"] = ""; -App::$strings["Allow bookmarks"] = ""; -App::$strings["This setting requires special processing and editing has been blocked."] = ""; -App::$strings["Configuration Editor"] = ""; -App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = ""; -App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = ""; -App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = ""; -App::$strings["Passwords do not match."] = ""; -App::$strings["Registration successful. Continue to create your first channel..."] = ""; -App::$strings["Registration successful. Please check your email for validation instructions."] = ""; -App::$strings["Your registration is pending approval by the site owner."] = ""; -App::$strings["Your registration can not be processed."] = ""; -App::$strings["Registration on this hub is disabled."] = ""; -App::$strings["Registration on this hub is by approval only."] = ""; -App::$strings["Register at another affiliated hub."] = ""; -App::$strings["Registration on this hub is by invitation only."] = ""; -App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = ""; -App::$strings["Terms of Service"] = ""; -App::$strings["I accept the %s for this website"] = ""; -App::$strings["I am over %s years of age and accept the %s for this website"] = ""; -App::$strings["Your email address"] = ""; -App::$strings["Choose a password"] = ""; -App::$strings["Please re-enter your password"] = ""; -App::$strings["Please enter your invitation code"] = ""; -App::$strings["Your Name"] = ""; -App::$strings["Real names are preferred."] = ""; -App::$strings["Choose a short nickname"] = ""; -App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = ""; -App::$strings["Channel role and privacy"] = ""; -App::$strings["Select a channel permission role for your usage needs and privacy requirements."] = ""; -App::$strings["no"] = ""; -App::$strings["yes"] = ""; -App::$strings["Register"] = ""; -App::$strings["This site requires email verification. After completing this form, please check your email for further instructions."] = ""; -App::$strings["Poll not found."] = ""; -App::$strings["Invalid response."] = ""; -App::$strings["Response submitted. Updates may not appear instantly."] = ""; -App::$strings["Location not found."] = ""; -App::$strings["Location lookup failed."] = ""; -App::$strings["Please select another location to become primary before removing the primary location."] = ""; -App::$strings["Pushing location info"] = ""; -App::$strings["No locations found."] = ""; -App::$strings["Manage Channel Locations"] = ""; -App::$strings["Publish these settings"] = ""; -App::$strings["Please wait several minutes between consecutive operations."] = ""; -App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = ""; -App::$strings["Use this form to drop the location if the hub is no longer operating."] = ""; -App::$strings["item"] = ""; -App::$strings["inspect"] = ""; -App::$strings["Your real name is recommended."] = ""; -App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = ""; -App::$strings["This will be used to create a unique network address (like an email address)."] = ""; -App::$strings["Allowed characters are a-z 0-9, - and _"] = ""; -App::$strings["Channel name"] = ""; -App::$strings["Select a channel permission role compatible with your usage needs and privacy requirements."] = ""; -App::$strings["Create a Channel"] = ""; -App::$strings["A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things."] = ""; -App::$strings["or import an existing channel from another location."] = ""; -App::$strings["Validate"] = ""; -App::$strings["Continue"] = ""; -App::$strings["Premium Channel Setup"] = ""; -App::$strings["Enable premium channel connection restrictions"] = ""; -App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = ""; -App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = ""; -App::$strings["Potential connections will then see the following text before proceeding:"] = ""; -App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = ""; -App::$strings["(No specific instructions have been provided by the channel owner.)"] = ""; -App::$strings["Restricted or Premium Channel"] = ""; -App::$strings["No more system notifications."] = ""; -App::$strings["System Notifications"] = ""; -App::$strings["Unable to locate original post."] = ""; -App::$strings["Comment may be moderated."] = ""; -App::$strings["Empty post discarded."] = ""; -App::$strings["Duplicate post suppressed."] = ""; -App::$strings["System error. Post not saved."] = ""; -App::$strings["Your post/comment is awaiting approval."] = ""; -App::$strings["Unable to obtain post information from database."] = ""; -App::$strings["You have reached your limit of %1$.0f top level posts."] = ""; -App::$strings["You have reached your limit of %1$.0f webpages."] = ""; -App::$strings["__ctx:mood__ %1\$s is %2\$s"] = ""; -App::$strings["Set your current mood and tell your friends"] = ""; -App::$strings["Unable to find your hub."] = ""; -App::$strings["Post successful."] = ""; -App::$strings["Public Hubs"] = ""; -App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself may provide additional details."] = ""; -App::$strings["Hub URL"] = ""; -App::$strings["Access Type"] = ""; -App::$strings["Registration Policy"] = ""; -App::$strings["Software"] = ""; -App::$strings["Provide managed web pages on your channel"] = ""; -App::$strings["Import Webpage Elements"] = ""; -App::$strings["Import selected"] = ""; -App::$strings["Export Webpage Elements"] = ""; -App::$strings["Export selected"] = ""; -App::$strings["Actions"] = ""; -App::$strings["Page Link"] = ""; -App::$strings["Page Title"] = ""; -App::$strings["Invalid file type."] = ""; -App::$strings["Error opening zip file"] = ""; -App::$strings["Invalid folder path."] = ""; -App::$strings["No webpage elements detected."] = ""; -App::$strings["Import complete."] = ""; -App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = ""; -App::$strings["vcard"] = ""; -App::$strings["Layout updated."] = ""; -App::$strings["Edit System Page Description"] = ""; -App::$strings["(modified)"] = ""; -App::$strings["Layout not found."] = ""; -App::$strings["Module Name:"] = ""; -App::$strings["Layout Help"] = ""; -App::$strings["Edit another layout"] = ""; -App::$strings["System layout"] = ""; -App::$strings["Zap Server - Setup"] = ""; -App::$strings["Could not connect to database."] = ""; -App::$strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = ""; -App::$strings["Could not create table."] = ""; -App::$strings["Your site database has been installed."] = ""; -App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = ""; -App::$strings["Please see the file \"install/INSTALL.txt\"."] = ""; -App::$strings["System check"] = ""; -App::$strings["Check again"] = ""; -App::$strings["Database connection"] = ""; -App::$strings["In order to install this software we need to know how to connect to your database."] = ""; -App::$strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = ""; -App::$strings["The database you specify below should already exist. If it does not, please create it before continuing."] = ""; -App::$strings["Database Server Name"] = ""; -App::$strings["Default is 127.0.0.1"] = ""; -App::$strings["Database Port"] = ""; -App::$strings["Communication port number - use 0 for default"] = ""; -App::$strings["Database Login Name"] = ""; -App::$strings["Database Login Password"] = ""; -App::$strings["Database Name"] = ""; -App::$strings["Database Type"] = ""; -App::$strings["Site administrator email address"] = ""; -App::$strings["Your account email address must match this in order to use the web admin panel."] = ""; -App::$strings["Website URL"] = ""; -App::$strings["Please use SSL (https) URL if available."] = ""; -App::$strings["Please select a default timezone for your website"] = ""; -App::$strings["Site settings"] = ""; -App::$strings["PHP version 7.1 or greater is required."] = ""; -App::$strings["PHP version"] = ""; -App::$strings["Could not find a command line version of PHP in the web server PATH."] = ""; -App::$strings["If you do not have a command line version of PHP installed on server, you will not be able to run background tasks - including message delivery."] = ""; -App::$strings["PHP executable path"] = ""; -App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = ""; -App::$strings["Command line PHP"] = ""; -App::$strings["Unable to check command line PHP, as shell_exec() is disabled. This is required."] = ""; -App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = ""; -App::$strings["This is required for message delivery to work."] = ""; -App::$strings["PHP register_argc_argv"] = ""; -App::$strings["This is not sufficient to upload larger images or files. You should be able to upload at least 2MB (2097152 bytes) at once."] = ""; -App::$strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = ""; -App::$strings["You can adjust these settings in the server php.ini file."] = ""; -App::$strings["PHP upload limits"] = ""; -App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = ""; -App::$strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = ""; -App::$strings["Generate encryption keys"] = ""; -App::$strings["libCurl PHP module"] = ""; -App::$strings["GD graphics PHP module"] = ""; -App::$strings["OpenSSL PHP module"] = ""; -App::$strings["PDO database PHP module"] = ""; -App::$strings["mb_string PHP module"] = ""; -App::$strings["xml PHP module"] = ""; -App::$strings["zip PHP module"] = ""; -App::$strings["Apache mod_rewrite module"] = ""; -App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = ""; -App::$strings["exec"] = ""; -App::$strings["Error: exec is required but is either not installed or has been disabled in php.ini"] = ""; -App::$strings["shell_exec"] = ""; -App::$strings["Error: shell_exec is required but is either not installed or has been disabled in php.ini"] = ""; -App::$strings["Error: libCURL PHP module required but not installed."] = ""; -App::$strings["Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed."] = ""; -App::$strings["Error: openssl PHP module required but not installed."] = ""; -App::$strings["Error: PDO database PHP module missing a driver for either mysql or pgsql."] = ""; -App::$strings["Error: PDO database PHP module required but not installed."] = ""; -App::$strings["Error: mb_string PHP module required but not installed."] = ""; -App::$strings["Error: xml PHP module required for DAV but not installed."] = ""; -App::$strings["Error: zip PHP module required but not installed."] = ""; -App::$strings[".htconfig.php is writable"] = ""; -App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = ""; -App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = ""; -App::$strings["Please see install/INSTALL.txt for additional information."] = ""; -App::$strings["This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = ""; -App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = ""; -App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = ""; -App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = ""; -App::$strings["%s is writable"] = ""; -App::$strings["This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"] = ""; -App::$strings["store is writable"] = ""; -App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = ""; -App::$strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = ""; -App::$strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = ""; -App::$strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = ""; -App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = ""; -App::$strings["Providers are available that issue free certificates which are browser-valid."] = ""; -App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = ""; -App::$strings["SSL certificate validation"] = ""; -App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = ""; -App::$strings["Url rewrite is working"] = ""; -App::$strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = ""; -App::$strings["Errors encountered creating database tables."] = ""; -App::$strings["What next?
"] = ""; -App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = ""; -App::$strings["Profile not found."] = ""; -App::$strings["Profile deleted."] = ""; -App::$strings["Profile-"] = ""; -App::$strings["New profile created."] = ""; -App::$strings["Profile unavailable to clone."] = ""; -App::$strings["Profile unavailable to export."] = ""; -App::$strings["Profile Name is required."] = ""; -App::$strings["Marital Status"] = ""; -App::$strings["Romantic Partner"] = ""; -App::$strings["Likes"] = ""; -App::$strings["Dislikes"] = ""; -App::$strings["Work/Employment"] = ""; -App::$strings["Religion"] = ""; -App::$strings["Political Views"] = ""; -App::$strings["Gender"] = ""; -App::$strings["Sexual Preference"] = ""; -App::$strings["Homepage"] = ""; -App::$strings["Interests"] = ""; -App::$strings["Profile updated."] = ""; -App::$strings["Hide your connections list from viewers of this profile"] = ""; -App::$strings["Edit Profile Details"] = ""; -App::$strings["View this profile"] = ""; -App::$strings["Profile Tools"] = ""; -App::$strings["Change cover photo"] = ""; -App::$strings["Create a new profile using these settings"] = ""; -App::$strings["Clone this profile"] = ""; -App::$strings["Delete this profile"] = ""; -App::$strings["Add profile things"] = ""; -App::$strings["Personal"] = ""; -App::$strings["Relationship"] = ""; -App::$strings["Miscellaneous"] = ""; -App::$strings["Import profile from file"] = ""; -App::$strings["Export profile to file"] = ""; -App::$strings["Your gender"] = ""; -App::$strings["Marital status"] = ""; -App::$strings["Sexual preference"] = ""; -App::$strings["Profile name"] = ""; -App::$strings["Your full name"] = ""; -App::$strings["Title/Description"] = ""; -App::$strings["Street address"] = ""; -App::$strings["Locality/City"] = ""; -App::$strings["Region/State"] = ""; -App::$strings["Postal/Zip code"] = ""; -App::$strings["Who (if applicable)"] = ""; -App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = ""; -App::$strings["Since (date)"] = ""; -App::$strings["Tell us about yourself"] = ""; -App::$strings["Homepage URL"] = ""; -App::$strings["Hometown"] = ""; -App::$strings["Political views"] = ""; -App::$strings["Religious views"] = ""; -App::$strings["Keywords used in directory listings"] = ""; -App::$strings["Example: fishing photography software"] = ""; -App::$strings["Musical interests"] = ""; -App::$strings["Books, literature"] = ""; -App::$strings["Television"] = ""; -App::$strings["Film/Dance/Culture/Entertainment"] = ""; -App::$strings["Hobbies/Interests"] = ""; -App::$strings["Love/Romance"] = ""; -App::$strings["School/Education"] = ""; -App::$strings["Contact information and social networks"] = ""; -App::$strings["My other channels"] = ""; -App::$strings["Communications"] = ""; -App::$strings[" and "] = ""; -App::$strings[", "] = ""; -App::$strings["public profile"] = ""; -App::$strings["%1\$s changed %2\$s to “%3\$s”"] = ""; -App::$strings["Visit %1\$s's %2\$s"] = ""; -App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = ""; -App::$strings["Currently Male"] = ""; -App::$strings["Currently Female"] = ""; -App::$strings["Mostly Male"] = ""; -App::$strings["Mostly Female"] = ""; -App::$strings["Transgender"] = ""; -App::$strings["Intersex"] = ""; -App::$strings["Transsexual"] = ""; -App::$strings["Hermaphrodite"] = ""; -App::$strings["Undecided"] = ""; -App::$strings["Males"] = ""; -App::$strings["Females"] = ""; -App::$strings["Gay"] = ""; -App::$strings["Lesbian"] = ""; -App::$strings["No Preference"] = ""; -App::$strings["Bisexual"] = ""; -App::$strings["Autosexual"] = ""; -App::$strings["Abstinent"] = ""; -App::$strings["Virgin"] = ""; -App::$strings["Deviant"] = ""; -App::$strings["Fetish"] = ""; -App::$strings["Oodles"] = ""; -App::$strings["Nonsexual"] = ""; -App::$strings["Single"] = ""; -App::$strings["Lonely"] = ""; -App::$strings["Available"] = ""; -App::$strings["Unavailable"] = ""; -App::$strings["Has crush"] = ""; -App::$strings["Infatuated"] = ""; -App::$strings["Dating"] = ""; -App::$strings["Unfaithful"] = ""; -App::$strings["Sex Addict"] = ""; -App::$strings["Friends/Benefits"] = ""; -App::$strings["Casual"] = ""; -App::$strings["Engaged"] = ""; -App::$strings["Married"] = ""; -App::$strings["Imaginarily married"] = ""; -App::$strings["Partners"] = ""; -App::$strings["Cohabiting"] = ""; -App::$strings["Common law"] = ""; -App::$strings["Happy"] = ""; -App::$strings["Not looking"] = ""; -App::$strings["Swinger"] = ""; -App::$strings["Betrayed"] = ""; -App::$strings["Separated"] = ""; -App::$strings["Unstable"] = ""; -App::$strings["Divorced"] = ""; -App::$strings["Imaginarily divorced"] = ""; -App::$strings["Widowed"] = ""; -App::$strings["Uncertain"] = ""; -App::$strings["It's complicated"] = ""; -App::$strings["Don't care"] = ""; -App::$strings["Ask me"] = ""; -App::$strings["Poke somebody in your addressbook"] = ""; -App::$strings["Poke somebody"] = ""; -App::$strings["Poke/Prod"] = ""; -App::$strings["Poke, prod or do other things to somebody"] = ""; -App::$strings["Recipient"] = ""; -App::$strings["Choose what you wish to do to recipient"] = ""; -App::$strings["Make this post private"] = ""; -App::$strings["Profile Photos"] = ""; -App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = ""; -App::$strings["Image upload failed."] = ""; -App::$strings["Unable to process image."] = ""; -App::$strings["Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile"] = ""; -App::$strings["Your profile photo is visible to anybody on the internet and may be distributed to other websites."] = ""; -App::$strings["Use Photo for Profile"] = ""; -App::$strings["Change Profile Photo"] = ""; -App::$strings["Use"] = ""; -App::$strings["Page owner information could not be retrieved."] = ""; -App::$strings["Album not found."] = ""; -App::$strings["Delete Album"] = ""; -App::$strings["Delete Photo"] = ""; -App::$strings["Public access denied."] = ""; -App::$strings["No photos selected"] = ""; -App::$strings["Access to this item is restricted."] = ""; -App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = ""; -App::$strings["%1$.2f MB photo storage used."] = ""; -App::$strings["Upload Photos"] = ""; -App::$strings["Enter an album name"] = ""; -App::$strings["or select an existing album (doubleclick)"] = ""; -App::$strings["Create a status post for this upload"] = ""; -App::$strings["Description (optional)"] = ""; -App::$strings["Date descending"] = ""; -App::$strings["Date ascending"] = ""; -App::$strings["Name ascending"] = ""; -App::$strings["Add Photos"] = ""; -App::$strings["Sort"] = ""; -App::$strings["Permission denied. Access to this item may be restricted."] = ""; -App::$strings["Photo not available"] = ""; -App::$strings["Use as profile photo"] = ""; -App::$strings["Use as cover photo"] = ""; -App::$strings["Private Photo"] = ""; -App::$strings["View Full Size"] = ""; -App::$strings["Edit photo"] = ""; -App::$strings["Move photo to album"] = ""; -App::$strings["Enter a new album name"] = ""; -App::$strings["or select an existing one (doubleclick)"] = ""; -App::$strings["Add a Tag"] = ""; -App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = ""; -App::$strings["Flag as adult in album view"] = ""; -App::$strings["__ctx:title__ Likes"] = ""; -App::$strings["__ctx:title__ Dislikes"] = ""; -App::$strings["__ctx:title__ Attending"] = ""; -App::$strings["__ctx:title__ Not attending"] = ""; -App::$strings["__ctx:title__ Might attend"] = ""; -App::$strings["Photo Tools"] = ""; -App::$strings["In This Photo:"] = ""; -App::$strings["Map"] = ""; -App::$strings["Recent Photos"] = ""; -App::$strings["Invalid profile identifier."] = ""; -App::$strings["Profile Visibility Editor"] = ""; -App::$strings["Click on a contact to add or remove."] = ""; -App::$strings["Visible To"] = ""; -App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = ""; -App::$strings["Remove This Channel"] = ""; -App::$strings["This channel will be completely removed from this server. "] = ""; -App::$strings["This action is permanent and can not be undone!"] = ""; -App::$strings["Remove Channel"] = ""; -App::$strings["Friend Zoom settings updated."] = ""; -App::$strings["This app (when installed) presents a slider control in your connection editor and also on your stream page. The slider represents your degree of friendship with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream."] = ""; -App::$strings["The number below represents the default maximum slider position for your stream page as a percentage."] = ""; -App::$strings["Default friend zoom in/out"] = ""; -App::$strings["Refresh"] = ""; -App::$strings["Friend Zoom Settings"] = ""; -App::$strings["Connection added."] = ""; -App::$strings["Welcome to %s"] = ""; -App::$strings["This site is not a directory server"] = ""; -App::$strings["Please login."] = ""; -App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = ""; -App::$strings["Remove This Account"] = ""; -App::$strings["This account and all its channels will be completely removed from this server. "] = ""; -App::$strings["Remove Account"] = ""; -App::$strings["Authentication failed."] = ""; -App::$strings["Remote Authentication"] = ""; -App::$strings["Enter your channel address (e.g. channel@example.com)"] = ""; -App::$strings["Authenticate"] = ""; -App::$strings["ActivityPub Probe Diagnostic"] = ""; -App::$strings["Object URL"] = ""; -App::$strings["Authenticated fetch"] = ""; -App::$strings["This app provides a simple personal and task list."] = ""; -App::$strings["No service class restrictions found."] = ""; -App::$strings["Not valid email."] = ""; -App::$strings["Protected email address. Cannot change to that email."] = ""; -App::$strings["System failure storing new email. Please try again."] = ""; -App::$strings["Password verification failed."] = ""; -App::$strings["Passwords do not match. Password unchanged."] = ""; -App::$strings["Empty passwords are not allowed. Password unchanged."] = ""; -App::$strings["Password changed."] = ""; -App::$strings["Password update failed. Please try again."] = ""; -App::$strings["Account Settings"] = ""; -App::$strings["Current Password"] = ""; -App::$strings["Enter New Password"] = ""; -App::$strings["Confirm New Password"] = ""; -App::$strings["Leave password fields blank unless changing"] = ""; -App::$strings["Email Address:"] = ""; -App::$strings["Remove this account including all its channels"] = ""; -App::$strings["Affinity Slider settings updated."] = ""; -App::$strings["No feature settings configured"] = ""; -App::$strings["Default maximum affinity level"] = ""; -App::$strings["0-99 default 99"] = ""; -App::$strings["Default minimum affinity level"] = ""; -App::$strings["0-99 - default 0"] = ""; -App::$strings["Affinity Slider Settings"] = ""; -App::$strings["Addon Settings"] = ""; -App::$strings["Please save/submit changes to any panel before opening another."] = ""; -App::$strings["Activity Settings"] = ""; -App::$strings["Search by Date"] = ""; -App::$strings["Ability to select posts by date ranges"] = ""; -App::$strings["Saved Searches"] = ""; -App::$strings["Save search terms for re-use"] = ""; -App::$strings["Alternate Stream Order"] = ""; -App::$strings["Ability to order the stream by last post date, last comment date or unthreaded activities"] = ""; -App::$strings["Contact Filter"] = ""; -App::$strings["Ability to display only posts of a selected contact"] = ""; -App::$strings["Forum Filter"] = ""; -App::$strings["Ability to display only posts of a specific forum"] = ""; -App::$strings["Personal Posts Filter"] = ""; -App::$strings["Ability to display only posts that you've interacted on"] = ""; -App::$strings["Affinity Tool"] = ""; -App::$strings["Filter stream activity by depth of relationships"] = ""; -App::$strings["Show friend and connection suggestions"] = ""; -App::$strings["Connection Filtering"] = ""; -App::$strings["Filter incoming posts from connections based on keywords/content"] = ""; -App::$strings["Name is required"] = ""; -App::$strings["Key and Secret are required"] = ""; -App::$strings["Add application"] = ""; -App::$strings["Name of application"] = ""; -App::$strings["Consumer Key"] = ""; -App::$strings["Automatically generated - change if desired. Max length 20"] = ""; -App::$strings["Consumer Secret"] = ""; -App::$strings["Redirect"] = ""; -App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = ""; -App::$strings["Icon url"] = ""; -App::$strings["Optional"] = ""; -App::$strings["Application not found."] = ""; -App::$strings["Connected Apps"] = ""; -App::$strings["Client key starts with"] = ""; -App::$strings["No name"] = ""; -App::$strings["Remove authorization"] = ""; -App::$strings["Permission Name is required."] = ""; -App::$strings["Permission category saved."] = ""; -App::$strings["Use this form to create permission rules for various classes of people or connections."] = ""; -App::$strings["Permission Name"] = ""; -App::$strings["This channel is limited to %d tokens"] = ""; -App::$strings["Name and Password are required."] = ""; -App::$strings["Token saved."] = ""; -App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content."] = ""; -App::$strings["You may also provide dropbox style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = ""; -App::$strings["Guest Access Tokens"] = ""; -App::$strings["Login Name"] = ""; -App::$strings["Login Password"] = ""; -App::$strings["Expires (yyyy-mm-dd)"] = ""; -App::$strings["Additional Features"] = ""; -App::$strings["ID and Secret are required"] = ""; -App::$strings["Add OAuth2 application"] = ""; -App::$strings["Consumer ID"] = ""; -App::$strings["Grant Types"] = ""; -App::$strings["leave blank unless your application specifically requires this"] = ""; -App::$strings["Authorization scope"] = ""; -App::$strings["OAuth2 Application not found."] = ""; -App::$strings["Connected OAuth2 Apps"] = ""; -App::$strings["%s - (Experimental)"] = ""; -App::$strings["Display Settings"] = ""; -App::$strings["Theme Settings"] = ""; -App::$strings["Custom Theme Settings"] = ""; -App::$strings["Content Settings"] = ""; -App::$strings["Display Theme:"] = ""; -App::$strings["Select scheme"] = ""; -App::$strings["Preload images before rendering the page"] = ""; -App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = ""; -App::$strings["Enable user zoom on mobile devices"] = ""; -App::$strings["Update browser every xx seconds"] = ""; -App::$strings["Minimum of 10 seconds, no maximum"] = ""; -App::$strings["Maximum number of conversations to load at any time:"] = ""; -App::$strings["Maximum of 100 items"] = ""; -App::$strings["Show emoticons (smilies) as images"] = ""; -App::$strings["Provide channel menu in navigation bar"] = ""; -App::$strings["Default: channel menu located in app menu"] = ""; -App::$strings["System Page Layout Editor - (advanced)"] = ""; -App::$strings["Channel page max height of content (in pixels)"] = ""; -App::$strings["click to expand content exceeding this height"] = ""; -App::$strings["Stream page max height of content (in pixels)"] = ""; -App::$strings["Nobody except yourself"] = ""; -App::$strings["Only those you specifically allow"] = ""; -App::$strings["Approved connections"] = ""; -App::$strings["Any connections"] = ""; -App::$strings["Anybody on this website"] = ""; -App::$strings["Anybody in this network"] = ""; -App::$strings["Anybody authenticated"] = ""; -App::$strings["Anybody on the internet"] = ""; -App::$strings["Publish your profile in the network directory"] = ""; -App::$strings["Allow us to suggest you as a potential friend to new members?"] = ""; -App::$strings["or"] = ""; -App::$strings["Your channel address is"] = ""; -App::$strings["Friends using compatible applications can use this address to connect with you."] = ""; -App::$strings["Your files/photos are accessible as a network drive at"] = ""; -App::$strings["(Windows)"] = ""; -App::$strings["(other platforms)"] = ""; -App::$strings["Automatic membership approval"] = ""; -App::$strings["Friend-of-friend conversations"] = ""; -App::$strings["Import public third-party conversations in which your connections participate."] = ""; -App::$strings["Enable ActivityPub protocol"] = ""; -App::$strings["ActivityPub"] = ""; -App::$strings["ActivityPub is an emerging internet standard for social communications. "] = ""; -App::$strings["It provides access to a large and growing number of existing users and supported software applications, however it is still evolving. If this is enabled you will obtain much greater social reach, however it is likely you will also encounter compatibility issues. "] = ""; -App::$strings["Channel Settings"] = ""; -App::$strings["Basic Settings"] = ""; -App::$strings["Full name"] = ""; -App::$strings["Your timezone"] = ""; -App::$strings["This is important for showing the correct time on shared events"] = ""; -App::$strings["Default post location"] = ""; -App::$strings["Optional geographical location to display on your posts"] = ""; -App::$strings["Obtain post location from your web browser or device"] = ""; -App::$strings["Adult content"] = ""; -App::$strings["Enable to indicate if this channel frequently or regularly publishes adult content. (Please also tag any adult material and/or nudity with #NSFW)"] = ""; -App::$strings["Security and Privacy"] = ""; -App::$strings["Your permissions are already configured. Click to view/adjust"] = ""; -App::$strings["Hide my online presence"] = ""; -App::$strings["Prevents displaying in your profile that you are online"] = ""; -App::$strings["Allow others to view your friends and connections"] = ""; -App::$strings["Allow others to tag your posts"] = ""; -App::$strings["Often used by the community to retro-actively flag inappropriate content"] = ""; -App::$strings["Channel Permission Limits"] = ""; -App::$strings["Expire other channel content after this many days"] = ""; -App::$strings["0 or blank to use the website limit."] = ""; -App::$strings["This website expires after %d days."] = ""; -App::$strings["This website does not expire imported content."] = ""; -App::$strings["The website limit takes precedence if lower than your limit."] = ""; -App::$strings["Maximum Friend Requests/Day:"] = ""; -App::$strings["May reduce spam activity"] = ""; -App::$strings["Default Access List"] = ""; -App::$strings["Use my default audience setting for the type of object published"] = ""; -App::$strings["Profile to assign new connections"] = ""; -App::$strings["Default Permissions Group"] = ""; -App::$strings["Maximum private messages per day from unknown people:"] = ""; -App::$strings["Useful to reduce spamming"] = ""; -App::$strings["By default post a status message when:"] = ""; -App::$strings["accepting a friend request"] = ""; -App::$strings["joining a forum/community"] = ""; -App::$strings["making an interesting profile change"] = ""; -App::$strings["Send a notification email when:"] = ""; -App::$strings["You receive a connection request"] = ""; -App::$strings["Someone writes on your profile wall"] = ""; -App::$strings["Someone writes a followup comment"] = ""; -App::$strings["You are tagged in a post"] = ""; -App::$strings["Someone likes your post/comment"] = ""; -App::$strings["Show visual notifications including:"] = ""; -App::$strings["Unseen stream activity"] = ""; -App::$strings["Unseen channel activity"] = ""; -App::$strings["Upcoming events"] = ""; -App::$strings["Events today"] = ""; -App::$strings["Upcoming birthdays"] = ""; -App::$strings["Not available in all themes"] = ""; -App::$strings["System (personal) notifications"] = ""; -App::$strings["System info messages"] = ""; -App::$strings["Recommended"] = ""; -App::$strings["System critical alerts"] = ""; -App::$strings["New connections"] = ""; -App::$strings["System Registrations"] = ""; -App::$strings["Unseen public activity"] = ""; -App::$strings["Unseen likes and dislikes"] = ""; -App::$strings["Unseen forum posts"] = ""; -App::$strings["Reported content"] = ""; -App::$strings["Email notification hub (hostname)"] = ""; -App::$strings["If your channel is mirrored to multiple locations, set this to your preferred location. This will prevent duplicate email notifications. Example: %s"] = ""; -App::$strings["Show new wall posts, private messages and connections under Notices"] = ""; -App::$strings["Accept messages from strangers which mention me"] = ""; -App::$strings["This setting supercedes normal permissions"] = ""; -App::$strings["Accept messages from strangers which include any of the following hashtags"] = ""; -App::$strings["comma separated, do not include the #"] = ""; -App::$strings["Notify me of events this many days in advance"] = ""; -App::$strings["Must be greater than 0"] = ""; -App::$strings["Date and time"] = ""; -App::$strings["This section is reserved for use by optional addons and apps to provide additional settings."] = ""; -App::$strings["Advanced Account/Page Type Settings"] = ""; -App::$strings["Change the behaviour of this account for special situations"] = ""; -App::$strings["Default photo upload folder name"] = ""; -App::$strings["%Y - current year, %m - current month"] = ""; -App::$strings["Default file upload folder name"] = ""; -App::$strings["Personal menu to display in your channel pages"] = ""; -App::$strings["Remove this channel."] = ""; -App::$strings["Mentions should display"] = ""; -App::$strings["Changes to this setting are applied to new posts/comments only. It is not retroactive."] = ""; -App::$strings["the channel display name [example: @Barbara Jenkins]"] = ""; -App::$strings["the channel nickname [example: @barbara1976]"] = ""; -App::$strings["combined [example: @Barbara Jenkins (barbara1976)]"] = ""; -App::$strings["no preference, use the system default"] = ""; -App::$strings["Calendar week begins on"] = ""; -App::$strings["This varies by country/culture"] = ""; -App::$strings["Sunday"] = ""; -App::$strings["Monday"] = ""; -App::$strings["Tuesday"] = ""; -App::$strings["Wednesday"] = ""; -App::$strings["Thursday"] = ""; -App::$strings["Friday"] = ""; -App::$strings["Saturday"] = ""; -App::$strings["Items tagged with: %s"] = ""; -App::$strings["Search results for: %s"] = ""; -App::$strings["%1\$s is following %2\$s's %3\$s"] = ""; -App::$strings["%1\$s stopped following %2\$s's %3\$s"] = ""; -App::$strings["Files: shared with me"] = ""; -App::$strings["NEW"] = ""; -App::$strings["Size"] = ""; -App::$strings["Last Modified"] = ""; -App::$strings["Remove all files"] = ""; -App::$strings["Remove this file"] = ""; -App::$strings["About this site"] = ""; -App::$strings["Site Name"] = ""; -App::$strings["Administrator"] = ""; -App::$strings["Software and Project information"] = ""; -App::$strings["This site is powered by \$Projectname"] = ""; -App::$strings["Federated and decentralised networking and identity services provided by Zot"] = ""; -App::$strings["Federated transport protocols:"] = ""; -App::$strings["Version %s"] = ""; -App::$strings["Project homepage"] = ""; -App::$strings["Developer homepage"] = ""; -App::$strings["Export Channel"] = ""; -App::$strings["Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = ""; -App::$strings["Export Content"] = ""; -App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin."] = ""; -App::$strings["Export your posts from a given year."] = ""; -App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = ""; -App::$strings["To select all posts for a given year, such as this year, visit %2\$s"] = ""; -App::$strings["To select all posts for a given month, such as January of this year, visit %2\$s"] = ""; -App::$strings["These content files may be imported or restored by visiting %2\$s on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = ""; -App::$strings["Failed to create source. No channel selected."] = ""; -App::$strings["Source created."] = ""; -App::$strings["Source updated."] = ""; -App::$strings["*"] = ""; -App::$strings["Manage remote sources of content for your channel."] = ""; -App::$strings["New Source"] = ""; -App::$strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = ""; -App::$strings["Only import content with these words (one per line)"] = ""; -App::$strings["Leave blank to import all public content"] = ""; -App::$strings["Channel Name"] = ""; -App::$strings["Add the following categories to posts imported from this source (comma separated)"] = ""; -App::$strings["Resend posts with this channel as author"] = ""; -App::$strings["Copyrights may apply"] = ""; -App::$strings["Source not found."] = ""; -App::$strings["Edit Source"] = ""; -App::$strings["Delete Source"] = ""; -App::$strings["Source removed"] = ""; -App::$strings["Unable to remove source."] = ""; -App::$strings["Article"] = ""; -App::$strings["Item has been removed."] = ""; -App::$strings["Post not found."] = ""; -App::$strings["comment"] = ""; -App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = ""; -App::$strings["Tag removed"] = ""; -App::$strings["Remove Item Tag"] = ""; -App::$strings["Select a tag to remove: "] = ""; -App::$strings["No default suggestions were found."] = ""; -App::$strings["%d rating"] = [ - 0 => "", - 1 => "", +App::$strings['Send email invitations to join this network'] = ''; +App::$strings['You have no more invitations available'] = ''; +App::$strings['Send invitations'] = ''; +App::$strings['Enter email addresses, one per line:'] = ''; +App::$strings['Your message:'] = ''; +App::$strings["Please join my community on \$Projectname."] = ''; +App::$strings['You will need to supply this invitation code:'] = ''; +App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = ''; +App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = ''; +App::$strings['or visit'] = ''; +App::$strings['3. Click [Connect]'] = ''; +App::$strings['This app allows you to disable comments on individual posts.'] = ''; +App::$strings['This app is installed. A button to control the ability to comment may be found below the post editor.'] = ''; +App::$strings['Enter a folder name'] = ''; +App::$strings['or select an existing folder (doubleclick)'] = ''; +App::$strings['File not found.'] = ''; +App::$strings['Permission Denied.'] = ''; +App::$strings['Edit file permissions'] = ''; +App::$strings['Set/edit permissions'] = ''; +App::$strings['Include all files and sub folders'] = ''; +App::$strings['Return to file list'] = ''; +App::$strings['Copy/paste this code to attach file to a post'] = ''; +App::$strings['Copy/paste this URL to link file from a web page'] = ''; +App::$strings['Share this file'] = ''; +App::$strings['Show URL to this file'] = ''; +App::$strings['Show in your contacts shared folder'] = ''; +App::$strings['Entry censored'] = ''; +App::$strings['Entry uncensored'] = ''; +App::$strings['webpage'] = ''; +App::$strings['block'] = ''; +App::$strings['layout'] = ''; +App::$strings['menu'] = ''; +App::$strings['%s element installed'] = ''; +App::$strings['%s element installation failed'] = ''; +App::$strings['Thing updated'] = ''; +App::$strings['Object store: failed'] = ''; +App::$strings['Thing added'] = ''; +App::$strings["OBJ: %1\$s %2\$s %3\$s"] = ''; +App::$strings['Show Thing'] = ''; +App::$strings['item not found.'] = ''; +App::$strings['Edit Thing'] = ''; +App::$strings['Select a profile'] = ''; +App::$strings['Post an activity'] = ''; +App::$strings['Only sends to viewers of the applicable profile'] = ''; +App::$strings['Name of thing e.g. something'] = ''; +App::$strings['URL of thing (optional)'] = ''; +App::$strings['URL for photo of thing (optional)'] = ''; +App::$strings['Add Thing to your Profile'] = ''; +App::$strings['Room not found'] = ''; +App::$strings['Leave Room'] = ''; +App::$strings['Delete Room'] = ''; +App::$strings['I am away right now'] = ''; +App::$strings['I am online'] = ''; +App::$strings['Please enter a link URL:'] = ''; +App::$strings['New Chatroom'] = ''; +App::$strings['Chatroom name'] = ''; +App::$strings['Expiration of chats (minutes)'] = ''; +App::$strings["%1\$s's Chatrooms"] = ''; +App::$strings['No chatrooms available'] = ''; +App::$strings['Create New'] = ''; +App::$strings['Expiration'] = ''; +App::$strings['min'] = ''; +App::$strings['No entries.'] = ''; +App::$strings['Comment approved'] = ''; +App::$strings['Comment deleted'] = ''; +App::$strings['Welcome to Hubzilla!'] = ''; +App::$strings['You have got no unseen posts...'] = ''; +App::$strings['Access list created.'] = ''; +App::$strings['Could not create access list.'] = ''; +App::$strings['Access list not found.'] = ''; +App::$strings['Access list updated.'] = ''; +App::$strings['List members'] = ''; +App::$strings['List not found'] = ''; +App::$strings['Access Lists'] = ''; +App::$strings['Create access list'] = ''; +App::$strings['Access list name'] = ''; +App::$strings['Members are visible to other channels'] = ''; +App::$strings['Members'] = ''; +App::$strings['Access list removed.'] = ''; +App::$strings['Unable to remove access list.'] = ''; +App::$strings['Access List: %s'] = ''; +App::$strings['Access list name: '] = ''; +App::$strings['Delete access list'] = ''; +App::$strings['Not in this list'] = ''; +App::$strings['Select a channel to toggle membership'] = ''; +App::$strings['Layouts'] = ''; +App::$strings['Layout Description'] = ''; +App::$strings['Download PDL file'] = ''; +App::$strings['No such group'] = ''; +App::$strings['No such channel'] = ''; +App::$strings['Access list is empty'] = ''; +App::$strings['Access list: '] = ''; +App::$strings['Invalid channel.'] = ''; +App::$strings['Title (optional)'] = ''; +App::$strings['Edit Card'] = ''; +App::$strings["Warning: Database versions differ by %1\$d updates."] = ''; +App::$strings['Import completed'] = ''; +App::$strings['Import Items'] = ''; +App::$strings['Use this form to import existing posts and content from an export file.'] = ''; +App::$strings['Not found'] = ''; +App::$strings['Please refresh page'] = ''; +App::$strings['Unknown error'] = ''; +App::$strings['Group'] = ''; +App::$strings['You have created %1$.0f of %2$.0f allowed channels.'] = ''; +App::$strings['Create a new channel'] = ''; +App::$strings['Current Channel'] = ''; +App::$strings['Switch to one of your channels by selecting it.'] = ''; +App::$strings['Default Login Channel'] = ''; +App::$strings['Make Default'] = ''; +App::$strings['Add to menu'] = ''; +App::$strings['%d new messages'] = ''; +App::$strings['%d new introductions'] = ''; +App::$strings['Delegated Channel'] = ''; +App::$strings['Change UI language'] = ''; +App::$strings['Menu not found.'] = ''; +App::$strings['Unable to create element.'] = ''; +App::$strings['Unable to update menu element.'] = ''; +App::$strings['Unable to add menu element.'] = ''; +App::$strings['Not found.'] = ''; +App::$strings['Menu Item Permissions'] = ''; +App::$strings['(click to open/close)'] = ''; +App::$strings['Link Name'] = ''; +App::$strings['Link or Submenu Target'] = ''; +App::$strings['Enter URL of the link or select a menu name to create a submenu'] = ''; +App::$strings['Use magic-auth if available'] = ''; +App::$strings['Open link in new window'] = ''; +App::$strings['Order in list'] = ''; +App::$strings['Higher numbers will sink to bottom of listing'] = ''; +App::$strings['Submit and finish'] = ''; +App::$strings['Submit and continue'] = ''; +App::$strings['Menu:'] = ''; +App::$strings['Link Target'] = ''; +App::$strings['Edit menu'] = ''; +App::$strings['Edit element'] = ''; +App::$strings['Drop element'] = ''; +App::$strings['New element'] = ''; +App::$strings['Edit this menu container'] = ''; +App::$strings['Add menu element'] = ''; +App::$strings['Delete this menu item'] = ''; +App::$strings['Edit this menu item'] = ''; +App::$strings['Menu item not found.'] = ''; +App::$strings['Menu item deleted.'] = ''; +App::$strings['Menu item could not be deleted.'] = ''; +App::$strings['Edit Menu Element'] = ''; +App::$strings['Link text'] = ''; +App::$strings['Webfinger Diagnostic'] = ''; +App::$strings['Lookup address or URL'] = ''; +App::$strings['Edit Block'] = ''; +App::$strings['Invalid message'] = ''; +App::$strings['no results'] = ''; +App::$strings['channel sync processed'] = ''; +App::$strings['queued'] = ''; +App::$strings['posted'] = ''; +App::$strings['accepted for delivery'] = ''; +App::$strings['updated'] = ''; +App::$strings['update ignored'] = ''; +App::$strings['permission denied'] = ''; +App::$strings['recipient not found'] = ''; +App::$strings['mail recalled'] = ''; +App::$strings['duplicate mail received'] = ''; +App::$strings['mail delivered'] = ''; +App::$strings["Delivery report for %1\$s"] = ''; +App::$strings['Options'] = ''; +App::$strings['Redeliver'] = ''; +App::$strings['Post repeated'] = ''; +App::$strings['No valid account found.'] = ''; +App::$strings['Password reset request issued. Check your email.'] = ''; +App::$strings['Site Member (%s)'] = ''; +App::$strings['Password reset requested at %s'] = ''; +App::$strings['Request could not be verified. (You may have previously submitted it.) Password reset failed.'] = ''; +App::$strings['Password Reset'] = ''; +App::$strings['Your password has been reset as requested.'] = ''; +App::$strings['Your new password is'] = ''; +App::$strings['Save or copy your new password - and then'] = ''; +App::$strings['click here to login'] = ''; +App::$strings['Your password may be changed from the Settings page after successful login.'] = ''; +App::$strings['Your password has changed at %s'] = ''; +App::$strings['Forgot your Password?'] = ''; +App::$strings['Enter your email address and submit to have your password reset. Then check your email for further instructions.'] = ''; +App::$strings['Email Address'] = ''; +App::$strings['Unable to update menu.'] = ''; +App::$strings['Unable to create menu.'] = ''; +App::$strings['Menu Name'] = ''; +App::$strings['Unique name (not visible on webpage) - required'] = ''; +App::$strings['Menu Title'] = ''; +App::$strings['Visible on webpage - leave empty for no title'] = ''; +App::$strings['Allow Bookmarks'] = ''; +App::$strings['Menu may be used to store saved bookmarks'] = ''; +App::$strings['Submit and proceed'] = ''; +App::$strings['Menus'] = ''; +App::$strings['Drop'] = ''; +App::$strings['Bookmarks allowed'] = ''; +App::$strings['Delete this menu'] = ''; +App::$strings['Edit menu contents'] = ''; +App::$strings['Edit this menu'] = ''; +App::$strings['Menu could not be deleted.'] = ''; +App::$strings['Edit Menu'] = ''; +App::$strings['Add or remove entries to this menu'] = ''; +App::$strings['Menu name'] = ''; +App::$strings['Must be unique, only seen by you'] = ''; +App::$strings['Menu title'] = ''; +App::$strings['Menu title as seen by others'] = ''; +App::$strings['Allow bookmarks'] = ''; +App::$strings['This setting requires special processing and editing has been blocked.'] = ''; +App::$strings['Configuration Editor'] = ''; +App::$strings['Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature.'] = ''; +App::$strings['Maximum daily site registrations exceeded. Please try again tomorrow.'] = ''; +App::$strings['Please indicate acceptance of the Terms of Service. Registration failed.'] = ''; +App::$strings['Passwords do not match.'] = ''; +App::$strings['Registration successful. Continue to create your first channel...'] = ''; +App::$strings['Registration successful. Please check your email for validation instructions.'] = ''; +App::$strings['Your registration is pending approval by the site owner.'] = ''; +App::$strings['Your registration can not be processed.'] = ''; +App::$strings['Registration on this hub is disabled.'] = ''; +App::$strings['Registration on this hub is by approval only.'] = ''; +App::$strings["Register at another affiliated hub."] = ''; +App::$strings['Registration on this hub is by invitation only.'] = ''; +App::$strings['This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.'] = ''; +App::$strings['Terms of Service'] = ''; +App::$strings['I accept the %s for this website'] = ''; +App::$strings['I am over %s years of age and accept the %s for this website'] = ''; +App::$strings['Your email address'] = ''; +App::$strings['Choose a password'] = ''; +App::$strings['Please re-enter your password'] = ''; +App::$strings['Please enter your invitation code'] = ''; +App::$strings['Your Name'] = ''; +App::$strings['Real names are preferred.'] = ''; +App::$strings['Choose a short nickname'] = ''; +App::$strings['Your nickname will be used to create an easy to remember channel address e.g. nickname%s'] = ''; +App::$strings['Channel role and privacy'] = ''; +App::$strings['Select a channel permission role for your usage needs and privacy requirements.'] = ''; +App::$strings['no'] = ''; +App::$strings['yes'] = ''; +App::$strings['Register'] = ''; +App::$strings['This site requires email verification. After completing this form, please check your email for further instructions.'] = ''; +App::$strings['Poll not found.'] = ''; +App::$strings['Invalid response.'] = ''; +App::$strings['Response submitted. Updates may not appear instantly.'] = ''; +App::$strings['Location not found.'] = ''; +App::$strings['Location lookup failed.'] = ''; +App::$strings['Please select another location to become primary before removing the primary location.'] = ''; +App::$strings['Pushing location info'] = ''; +App::$strings['No locations found.'] = ''; +App::$strings['Manage Channel Locations'] = ''; +App::$strings['Publish these settings'] = ''; +App::$strings['Please wait several minutes between consecutive operations.'] = ''; +App::$strings['When possible, drop a location by logging into that website/hub and removing your channel.'] = ''; +App::$strings['Use this form to drop the location if the hub is no longer operating.'] = ''; +App::$strings['item'] = ''; +App::$strings['inspect'] = ''; +App::$strings['Your real name is recommended.'] = ''; +App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = ''; +App::$strings['This will be used to create a unique network address (like an email address).'] = ''; +App::$strings['Allowed characters are a-z 0-9, - and _'] = ''; +App::$strings['Channel name'] = ''; +App::$strings['Select a channel permission role compatible with your usage needs and privacy requirements.'] = ''; +App::$strings['Create a Channel'] = ''; +App::$strings['A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things.'] = ''; +App::$strings["or import an existing channel from another location."] = ''; +App::$strings['Validate'] = ''; +App::$strings['Continue'] = ''; +App::$strings['Premium Channel Setup'] = ''; +App::$strings['Enable premium channel connection restrictions'] = ''; +App::$strings['Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc.'] = ''; +App::$strings['This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'] = ''; +App::$strings['Potential connections will then see the following text before proceeding:'] = ''; +App::$strings['By continuing, I certify that I have complied with any instructions provided on this page.'] = ''; +App::$strings['(No specific instructions have been provided by the channel owner.)'] = ''; +App::$strings['Restricted or Premium Channel'] = ''; +App::$strings['No more system notifications.'] = ''; +App::$strings['System Notifications'] = ''; +App::$strings['Unable to locate original post.'] = ''; +App::$strings['Comment may be moderated.'] = ''; +App::$strings['Empty post discarded.'] = ''; +App::$strings['Duplicate post suppressed.'] = ''; +App::$strings['System error. Post not saved.'] = ''; +App::$strings['Your post/comment is awaiting approval.'] = ''; +App::$strings['Unable to obtain post information from database.'] = ''; +App::$strings['You have reached your limit of %1$.0f top level posts.'] = ''; +App::$strings['You have reached your limit of %1$.0f webpages.'] = ''; +App::$strings["__ctx:mood__ %1\$s is %2\$s"] = ''; +App::$strings['Set your current mood and tell your friends'] = ''; +App::$strings['Unable to find your hub.'] = ''; +App::$strings['Post successful.'] = ''; +App::$strings['Public Hubs'] = ''; +App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself may provide additional details."] = ''; +App::$strings['Hub URL'] = ''; +App::$strings['Access Type'] = ''; +App::$strings['Registration Policy'] = ''; +App::$strings['Software'] = ''; +App::$strings['Provide managed web pages on your channel'] = ''; +App::$strings['Import Webpage Elements'] = ''; +App::$strings['Import selected'] = ''; +App::$strings['Export Webpage Elements'] = ''; +App::$strings['Export selected'] = ''; +App::$strings['Actions'] = ''; +App::$strings['Page Link'] = ''; +App::$strings['Page Title'] = ''; +App::$strings['Invalid file type.'] = ''; +App::$strings['Error opening zip file'] = ''; +App::$strings['Invalid folder path.'] = ''; +App::$strings['No webpage elements detected.'] = ''; +App::$strings['Import complete.'] = ''; +App::$strings['Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'] = ''; +App::$strings['vcard'] = ''; +App::$strings['Layout updated.'] = ''; +App::$strings['Edit System Page Description'] = ''; +App::$strings['(modified)'] = ''; +App::$strings['Layout not found.'] = ''; +App::$strings['Module Name:'] = ''; +App::$strings['Layout Help'] = ''; +App::$strings['Edit another layout'] = ''; +App::$strings['System layout'] = ''; +App::$strings['Zap Server - Setup'] = ''; +App::$strings['Could not connect to database.'] = ''; +App::$strings['Could not connect to specified site URL. Possible SSL certificate or DNS issue.'] = ''; +App::$strings['Could not create table.'] = ''; +App::$strings['Your site database has been installed.'] = ''; +App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = ''; +App::$strings["Please see the file \"install/INSTALL.txt\"."] = ''; +App::$strings['System check'] = ''; +App::$strings['Check again'] = ''; +App::$strings['Database connection'] = ''; +App::$strings['In order to install this software we need to know how to connect to your database.'] = ''; +App::$strings['Please contact your hosting provider or site administrator if you have questions about these settings.'] = ''; +App::$strings['The database you specify below should already exist. If it does not, please create it before continuing.'] = ''; +App::$strings['Database Server Name'] = ''; +App::$strings['Default is 127.0.0.1'] = ''; +App::$strings['Database Port'] = ''; +App::$strings['Communication port number - use 0 for default'] = ''; +App::$strings['Database Login Name'] = ''; +App::$strings['Database Login Password'] = ''; +App::$strings['Database Name'] = ''; +App::$strings['Database Type'] = ''; +App::$strings['Site administrator email address'] = ''; +App::$strings['Your account email address must match this in order to use the web admin panel.'] = ''; +App::$strings['Website URL'] = ''; +App::$strings['Please use SSL (https) URL if available.'] = ''; +App::$strings['Please select a default timezone for your website'] = ''; +App::$strings['Site settings'] = ''; +App::$strings['PHP version 7.1 or greater is required.'] = ''; +App::$strings['PHP version'] = ''; +App::$strings['Could not find a command line version of PHP in the web server PATH.'] = ''; +App::$strings['If you do not have a command line version of PHP installed on server, you will not be able to run background tasks - including message delivery.'] = ''; +App::$strings['PHP executable path'] = ''; +App::$strings['Enter full path to php executable. You can leave this blank to continue the installation.'] = ''; +App::$strings['Command line PHP'] = ''; +App::$strings['Unable to check command line PHP, as shell_exec() is disabled. This is required.'] = ''; +App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = ''; +App::$strings['This is required for message delivery to work.'] = ''; +App::$strings['PHP register_argc_argv'] = ''; +App::$strings['This is not sufficient to upload larger images or files. You should be able to upload at least 2MB (2097152 bytes) at once.'] = ''; +App::$strings['Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once.'] = ''; +App::$strings['You can adjust these settings in the server php.ini file.'] = ''; +App::$strings['PHP upload limits'] = ''; +App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = ''; +App::$strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = ''; +App::$strings['Generate encryption keys'] = ''; +App::$strings['libCurl PHP module'] = ''; +App::$strings['GD graphics PHP module'] = ''; +App::$strings['OpenSSL PHP module'] = ''; +App::$strings['PDO database PHP module'] = ''; +App::$strings['mb_string PHP module'] = ''; +App::$strings['xml PHP module'] = ''; +App::$strings['zip PHP module'] = ''; +App::$strings['Apache mod_rewrite module'] = ''; +App::$strings['Error: Apache webserver mod-rewrite module is required but not installed.'] = ''; +App::$strings['exec'] = ''; +App::$strings['Error: exec is required but is either not installed or has been disabled in php.ini'] = ''; +App::$strings['shell_exec'] = ''; +App::$strings['Error: shell_exec is required but is either not installed or has been disabled in php.ini'] = ''; +App::$strings['Error: libCURL PHP module required but not installed.'] = ''; +App::$strings['Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed.'] = ''; +App::$strings['Error: openssl PHP module required but not installed.'] = ''; +App::$strings['Error: PDO database PHP module missing a driver for either mysql or pgsql.'] = ''; +App::$strings['Error: PDO database PHP module required but not installed.'] = ''; +App::$strings['Error: mb_string PHP module required but not installed.'] = ''; +App::$strings['Error: xml PHP module required for DAV but not installed.'] = ''; +App::$strings['Error: zip PHP module required but not installed.'] = ''; +App::$strings['.htconfig.php is writable'] = ''; +App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = ''; +App::$strings['This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.'] = ''; +App::$strings['Please see install/INSTALL.txt for additional information.'] = ''; +App::$strings['This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.'] = ''; +App::$strings['In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder.'] = ''; +App::$strings['Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.'] = ''; +App::$strings['Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains.'] = ''; +App::$strings['%s is writable'] = ''; +App::$strings['This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder'] = ''; +App::$strings['store is writable'] = ''; +App::$strings['SSL certificate cannot be validated. Fix certificate or disable https access to this site.'] = ''; +App::$strings['If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!'] = ''; +App::$strings['This restriction is incorporated because public posts from you may for example contain references to images on your own hub.'] = ''; +App::$strings['If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues.'] = ''; +App::$strings['This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement.'] = ''; +App::$strings['Providers are available that issue free certificates which are browser-valid.'] = ''; +App::$strings['If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications.'] = ''; +App::$strings['SSL certificate validation'] = ''; +App::$strings['Url rewrite in .htaccess is not working. Check your server configuration.Test: '] = ''; +App::$strings['Url rewrite is working'] = ''; +App::$strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = ''; +App::$strings['Errors encountered creating database tables.'] = ''; +App::$strings['What next?
'] = ''; +App::$strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = ''; +App::$strings['Profile not found.'] = ''; +App::$strings['Profile deleted.'] = ''; +App::$strings['Profile-'] = ''; +App::$strings['New profile created.'] = ''; +App::$strings['Profile unavailable to clone.'] = ''; +App::$strings['Profile unavailable to export.'] = ''; +App::$strings['Profile Name is required.'] = ''; +App::$strings['Marital Status'] = ''; +App::$strings['Romantic Partner'] = ''; +App::$strings['Likes'] = ''; +App::$strings['Dislikes'] = ''; +App::$strings['Work/Employment'] = ''; +App::$strings['Religion'] = ''; +App::$strings['Political Views'] = ''; +App::$strings['Gender'] = ''; +App::$strings['Sexual Preference'] = ''; +App::$strings['Homepage'] = ''; +App::$strings['Interests'] = ''; +App::$strings['Profile updated.'] = ''; +App::$strings['Hide your connections list from viewers of this profile'] = ''; +App::$strings['Edit Profile Details'] = ''; +App::$strings['View this profile'] = ''; +App::$strings['Profile Tools'] = ''; +App::$strings['Change cover photo'] = ''; +App::$strings['Create a new profile using these settings'] = ''; +App::$strings['Clone this profile'] = ''; +App::$strings['Delete this profile'] = ''; +App::$strings['Add profile things'] = ''; +App::$strings['Personal'] = ''; +App::$strings['Relationship'] = ''; +App::$strings['Miscellaneous'] = ''; +App::$strings['Import profile from file'] = ''; +App::$strings['Export profile to file'] = ''; +App::$strings['Your gender'] = ''; +App::$strings['Marital status'] = ''; +App::$strings['Sexual preference'] = ''; +App::$strings['Profile name'] = ''; +App::$strings['Your full name'] = ''; +App::$strings['Title/Description'] = ''; +App::$strings['Street address'] = ''; +App::$strings['Locality/City'] = ''; +App::$strings['Region/State'] = ''; +App::$strings['Postal/Zip code'] = ''; +App::$strings['Who (if applicable)'] = ''; +App::$strings['Examples: cathy123, Cathy Williams, cathy@example.com'] = ''; +App::$strings['Since (date)'] = ''; +App::$strings['Tell us about yourself'] = ''; +App::$strings['Homepage URL'] = ''; +App::$strings['Hometown'] = ''; +App::$strings['Political views'] = ''; +App::$strings['Religious views'] = ''; +App::$strings['Keywords used in directory listings'] = ''; +App::$strings['Example: fishing photography software'] = ''; +App::$strings['Musical interests'] = ''; +App::$strings['Books, literature'] = ''; +App::$strings['Television'] = ''; +App::$strings['Film/Dance/Culture/Entertainment'] = ''; +App::$strings['Hobbies/Interests'] = ''; +App::$strings['Love/Romance'] = ''; +App::$strings['School/Education'] = ''; +App::$strings['Contact information and social networks'] = ''; +App::$strings['My other channels'] = ''; +App::$strings['Communications'] = ''; +App::$strings[' and '] = ''; +App::$strings[', '] = ''; +App::$strings['public profile'] = ''; +App::$strings["%1\$s changed %2\$s to “%3\$s”"] = ''; +App::$strings["Visit %1\$s's %2\$s"] = ''; +App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = ''; +App::$strings['Currently Male'] = ''; +App::$strings['Currently Female'] = ''; +App::$strings['Mostly Male'] = ''; +App::$strings['Mostly Female'] = ''; +App::$strings['Transgender'] = ''; +App::$strings['Intersex'] = ''; +App::$strings['Transsexual'] = ''; +App::$strings['Hermaphrodite'] = ''; +App::$strings['Undecided'] = ''; +App::$strings['Males'] = ''; +App::$strings['Females'] = ''; +App::$strings['Gay'] = ''; +App::$strings['Lesbian'] = ''; +App::$strings['No Preference'] = ''; +App::$strings['Bisexual'] = ''; +App::$strings['Autosexual'] = ''; +App::$strings['Abstinent'] = ''; +App::$strings['Virgin'] = ''; +App::$strings['Deviant'] = ''; +App::$strings['Fetish'] = ''; +App::$strings['Oodles'] = ''; +App::$strings['Nonsexual'] = ''; +App::$strings['Single'] = ''; +App::$strings['Lonely'] = ''; +App::$strings['Available'] = ''; +App::$strings['Unavailable'] = ''; +App::$strings['Has crush'] = ''; +App::$strings['Infatuated'] = ''; +App::$strings['Dating'] = ''; +App::$strings['Unfaithful'] = ''; +App::$strings['Sex Addict'] = ''; +App::$strings['Friends/Benefits'] = ''; +App::$strings['Casual'] = ''; +App::$strings['Engaged'] = ''; +App::$strings['Married'] = ''; +App::$strings['Imaginarily married'] = ''; +App::$strings['Partners'] = ''; +App::$strings['Cohabiting'] = ''; +App::$strings['Common law'] = ''; +App::$strings['Happy'] = ''; +App::$strings['Not looking'] = ''; +App::$strings['Swinger'] = ''; +App::$strings['Betrayed'] = ''; +App::$strings['Separated'] = ''; +App::$strings['Unstable'] = ''; +App::$strings['Divorced'] = ''; +App::$strings['Imaginarily divorced'] = ''; +App::$strings['Widowed'] = ''; +App::$strings['Uncertain'] = ''; +App::$strings["It's complicated"] = ''; +App::$strings["Don't care"] = ''; +App::$strings['Ask me'] = ''; +App::$strings['Poke somebody in your addressbook'] = ''; +App::$strings['Poke somebody'] = ''; +App::$strings['Poke/Prod'] = ''; +App::$strings['Poke, prod or do other things to somebody'] = ''; +App::$strings['Recipient'] = ''; +App::$strings['Choose what you wish to do to recipient'] = ''; +App::$strings['Make this post private'] = ''; +App::$strings['Profile Photos'] = ''; +App::$strings['Shift-reload the page or clear browser cache if the new photo does not display immediately.'] = ''; +App::$strings['Image upload failed.'] = ''; +App::$strings['Unable to process image.'] = ''; +App::$strings['Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile'] = ''; +App::$strings['Your profile photo is visible to anybody on the internet and may be distributed to other websites.'] = ''; +App::$strings['Use Photo for Profile'] = ''; +App::$strings['Change Profile Photo'] = ''; +App::$strings['Use'] = ''; +App::$strings['Page owner information could not be retrieved.'] = ''; +App::$strings['Album not found.'] = ''; +App::$strings['Delete Album'] = ''; +App::$strings['Delete Photo'] = ''; +App::$strings['Public access denied.'] = ''; +App::$strings['No photos selected'] = ''; +App::$strings['Access to this item is restricted.'] = ''; +App::$strings['%1$.2f MB of %2$.2f MB photo storage used.'] = ''; +App::$strings['%1$.2f MB photo storage used.'] = ''; +App::$strings['Upload Photos'] = ''; +App::$strings['Enter an album name'] = ''; +App::$strings['or select an existing album (doubleclick)'] = ''; +App::$strings['Create a status post for this upload'] = ''; +App::$strings['Description (optional)'] = ''; +App::$strings['Date descending'] = ''; +App::$strings['Date ascending'] = ''; +App::$strings['Name ascending'] = ''; +App::$strings['Add Photos'] = ''; +App::$strings['Sort'] = ''; +App::$strings['Permission denied. Access to this item may be restricted.'] = ''; +App::$strings['Photo not available'] = ''; +App::$strings['Use as profile photo'] = ''; +App::$strings['Use as cover photo'] = ''; +App::$strings['Private Photo'] = ''; +App::$strings['View Full Size'] = ''; +App::$strings['Edit photo'] = ''; +App::$strings['Move photo to album'] = ''; +App::$strings['Enter a new album name'] = ''; +App::$strings['or select an existing one (doubleclick)'] = ''; +App::$strings['Add a Tag'] = ''; +App::$strings['Example: @bob, @Barbara_Jensen, @jim@example.com'] = ''; +App::$strings['Flag as adult in album view'] = ''; +App::$strings['__ctx:title__ Likes'] = ''; +App::$strings['__ctx:title__ Dislikes'] = ''; +App::$strings['__ctx:title__ Attending'] = ''; +App::$strings['__ctx:title__ Not attending'] = ''; +App::$strings['__ctx:title__ Might attend'] = ''; +App::$strings['Photo Tools'] = ''; +App::$strings['In This Photo:'] = ''; +App::$strings['Map'] = ''; +App::$strings['Recent Photos'] = ''; +App::$strings['Invalid profile identifier.'] = ''; +App::$strings['Profile Visibility Editor'] = ''; +App::$strings['Click on a contact to add or remove.'] = ''; +App::$strings['Visible To'] = ''; +App::$strings['Channel removals are not allowed within 48 hours of changing the account password.'] = ''; +App::$strings['Remove This Channel'] = ''; +App::$strings['This channel will be completely removed from this server. '] = ''; +App::$strings['This action is permanent and can not be undone!'] = ''; +App::$strings['Remove Channel'] = ''; +App::$strings['Friend Zoom settings updated.'] = ''; +App::$strings['This app (when installed) presents a slider control in your connection editor and also on your stream page. The slider represents your degree of friendship with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream.'] = ''; +App::$strings['The number below represents the default maximum slider position for your stream page as a percentage.'] = ''; +App::$strings['Default friend zoom in/out'] = ''; +App::$strings['Refresh'] = ''; +App::$strings['Friend Zoom Settings'] = ''; +App::$strings['Connection added.'] = ''; +App::$strings['Welcome to %s'] = ''; +App::$strings['This site is not a directory server'] = ''; +App::$strings['Please login.'] = ''; +App::$strings['Account removals are not allowed within 48 hours of changing the account password.'] = ''; +App::$strings['Remove This Account'] = ''; +App::$strings['This account and all its channels will be completely removed from this server. '] = ''; +App::$strings['Remove Account'] = ''; +App::$strings['Authentication failed.'] = ''; +App::$strings['Remote Authentication'] = ''; +App::$strings['Enter your channel address (e.g. channel@example.com)'] = ''; +App::$strings['Authenticate'] = ''; +App::$strings['ActivityPub Probe Diagnostic'] = ''; +App::$strings['Object URL'] = ''; +App::$strings['Authenticated fetch'] = ''; +App::$strings['This app provides a simple personal and task list.'] = ''; +App::$strings['No service class restrictions found.'] = ''; +App::$strings['Not valid email.'] = ''; +App::$strings['Protected email address. Cannot change to that email.'] = ''; +App::$strings['System failure storing new email. Please try again.'] = ''; +App::$strings['Password verification failed.'] = ''; +App::$strings['Passwords do not match. Password unchanged.'] = ''; +App::$strings['Empty passwords are not allowed. Password unchanged.'] = ''; +App::$strings['Password changed.'] = ''; +App::$strings['Password update failed. Please try again.'] = ''; +App::$strings['Account Settings'] = ''; +App::$strings['Current Password'] = ''; +App::$strings['Enter New Password'] = ''; +App::$strings['Confirm New Password'] = ''; +App::$strings['Leave password fields blank unless changing'] = ''; +App::$strings['Email Address:'] = ''; +App::$strings['Remove this account including all its channels'] = ''; +App::$strings['Affinity Slider settings updated.'] = ''; +App::$strings['No feature settings configured'] = ''; +App::$strings['Default maximum affinity level'] = ''; +App::$strings['0-99 default 99'] = ''; +App::$strings['Default minimum affinity level'] = ''; +App::$strings['0-99 - default 0'] = ''; +App::$strings['Affinity Slider Settings'] = ''; +App::$strings['Addon Settings'] = ''; +App::$strings['Please save/submit changes to any panel before opening another.'] = ''; +App::$strings['Activity Settings'] = ''; +App::$strings['Search by Date'] = ''; +App::$strings['Ability to select posts by date ranges'] = ''; +App::$strings['Saved Searches'] = ''; +App::$strings['Save search terms for re-use'] = ''; +App::$strings['Alternate Stream Order'] = ''; +App::$strings['Ability to order the stream by last post date, last comment date or unthreaded activities'] = ''; +App::$strings['Contact Filter'] = ''; +App::$strings['Ability to display only posts of a selected contact'] = ''; +App::$strings['Forum Filter'] = ''; +App::$strings['Ability to display only posts of a specific forum'] = ''; +App::$strings['Personal Posts Filter'] = ''; +App::$strings["Ability to display only posts that you've interacted on"] = ''; +App::$strings['Affinity Tool'] = ''; +App::$strings['Filter stream activity by depth of relationships'] = ''; +App::$strings['Show friend and connection suggestions'] = ''; +App::$strings['Connection Filtering'] = ''; +App::$strings['Filter incoming posts from connections based on keywords/content'] = ''; +App::$strings['Name is required'] = ''; +App::$strings['Key and Secret are required'] = ''; +App::$strings['Add application'] = ''; +App::$strings['Name of application'] = ''; +App::$strings['Consumer Key'] = ''; +App::$strings['Automatically generated - change if desired. Max length 20'] = ''; +App::$strings['Consumer Secret'] = ''; +App::$strings['Redirect'] = ''; +App::$strings['Redirect URI - leave blank unless your application specifically requires this'] = ''; +App::$strings['Icon url'] = ''; +App::$strings['Optional'] = ''; +App::$strings['Application not found.'] = ''; +App::$strings['Connected Apps'] = ''; +App::$strings['Client key starts with'] = ''; +App::$strings['No name'] = ''; +App::$strings['Remove authorization'] = ''; +App::$strings['Permission Name is required.'] = ''; +App::$strings['Permission category saved.'] = ''; +App::$strings['Use this form to create permission rules for various classes of people or connections.'] = ''; +App::$strings['Permission Name'] = ''; +App::$strings['This channel is limited to %d tokens'] = ''; +App::$strings['Name and Password are required.'] = ''; +App::$strings['Token saved.'] = ''; +App::$strings['Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content.'] = ''; +App::$strings['You may also provide dropbox style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:'] = ''; +App::$strings['Guest Access Tokens'] = ''; +App::$strings['Login Name'] = ''; +App::$strings['Login Password'] = ''; +App::$strings['Expires (yyyy-mm-dd)'] = ''; +App::$strings['Additional Features'] = ''; +App::$strings['ID and Secret are required'] = ''; +App::$strings['Add OAuth2 application'] = ''; +App::$strings['Consumer ID'] = ''; +App::$strings['Grant Types'] = ''; +App::$strings['leave blank unless your application specifically requires this'] = ''; +App::$strings['Authorization scope'] = ''; +App::$strings['OAuth2 Application not found.'] = ''; +App::$strings['Connected OAuth2 Apps'] = ''; +App::$strings['%s - (Experimental)'] = ''; +App::$strings['Display Settings'] = ''; +App::$strings['Theme Settings'] = ''; +App::$strings['Custom Theme Settings'] = ''; +App::$strings['Content Settings'] = ''; +App::$strings['Display Theme:'] = ''; +App::$strings['Select scheme'] = ''; +App::$strings['Preload images before rendering the page'] = ''; +App::$strings['The subjective page load time will be longer but the page will be ready when displayed'] = ''; +App::$strings['Enable user zoom on mobile devices'] = ''; +App::$strings['Update browser every xx seconds'] = ''; +App::$strings['Minimum of 10 seconds, no maximum'] = ''; +App::$strings['Maximum number of conversations to load at any time:'] = ''; +App::$strings['Maximum of 100 items'] = ''; +App::$strings['Show emoticons (smilies) as images'] = ''; +App::$strings['Provide channel menu in navigation bar'] = ''; +App::$strings['Default: channel menu located in app menu'] = ''; +App::$strings['System Page Layout Editor - (advanced)'] = ''; +App::$strings['Channel page max height of content (in pixels)'] = ''; +App::$strings['click to expand content exceeding this height'] = ''; +App::$strings['Stream page max height of content (in pixels)'] = ''; +App::$strings['Nobody except yourself'] = ''; +App::$strings['Only those you specifically allow'] = ''; +App::$strings['Approved connections'] = ''; +App::$strings['Any connections'] = ''; +App::$strings['Anybody on this website'] = ''; +App::$strings['Anybody in this network'] = ''; +App::$strings['Anybody authenticated'] = ''; +App::$strings['Anybody on the internet'] = ''; +App::$strings['Publish your profile in the network directory'] = ''; +App::$strings['Allow us to suggest you as a potential friend to new members?'] = ''; +App::$strings['or'] = ''; +App::$strings['Your channel address is'] = ''; +App::$strings['Friends using compatible applications can use this address to connect with you.'] = ''; +App::$strings['Your files/photos are accessible as a network drive at'] = ''; +App::$strings['(Windows)'] = ''; +App::$strings['(other platforms)'] = ''; +App::$strings['Automatic membership approval'] = ''; +App::$strings['Friend-of-friend conversations'] = ''; +App::$strings['Import public third-party conversations in which your connections participate.'] = ''; +App::$strings['Enable ActivityPub protocol'] = ''; +App::$strings['ActivityPub'] = ''; +App::$strings['ActivityPub is an emerging internet standard for social communications. '] = ''; +App::$strings['It provides access to a large and growing number of existing users and supported software applications, however it is still evolving. If this is enabled you will obtain much greater social reach, however it is likely you will also encounter compatibility issues. '] = ''; +App::$strings['Channel Settings'] = ''; +App::$strings['Basic Settings'] = ''; +App::$strings['Full name'] = ''; +App::$strings['Your timezone'] = ''; +App::$strings['This is important for showing the correct time on shared events'] = ''; +App::$strings['Default post location'] = ''; +App::$strings['Optional geographical location to display on your posts'] = ''; +App::$strings['Obtain post location from your web browser or device'] = ''; +App::$strings['Adult content'] = ''; +App::$strings['Enable to indicate if this channel frequently or regularly publishes adult content. (Please also tag any adult material and/or nudity with #NSFW)'] = ''; +App::$strings['Security and Privacy'] = ''; +App::$strings['Your permissions are already configured. Click to view/adjust'] = ''; +App::$strings['Hide my online presence'] = ''; +App::$strings['Prevents displaying in your profile that you are online'] = ''; +App::$strings['Allow others to view your friends and connections'] = ''; +App::$strings['Allow others to tag your posts'] = ''; +App::$strings['Often used by the community to retro-actively flag inappropriate content'] = ''; +App::$strings['Channel Permission Limits'] = ''; +App::$strings['Expire other channel content after this many days'] = ''; +App::$strings['0 or blank to use the website limit.'] = ''; +App::$strings['This website expires after %d days.'] = ''; +App::$strings['This website does not expire imported content.'] = ''; +App::$strings['The website limit takes precedence if lower than your limit.'] = ''; +App::$strings['Maximum Friend Requests/Day:'] = ''; +App::$strings['May reduce spam activity'] = ''; +App::$strings['Default Access List'] = ''; +App::$strings['Use my default audience setting for the type of object published'] = ''; +App::$strings['Profile to assign new connections'] = ''; +App::$strings['Default Permissions Group'] = ''; +App::$strings['Maximum private messages per day from unknown people:'] = ''; +App::$strings['Useful to reduce spamming'] = ''; +App::$strings['By default post a status message when:'] = ''; +App::$strings['accepting a friend request'] = ''; +App::$strings['joining a forum/community'] = ''; +App::$strings['making an interesting profile change'] = ''; +App::$strings['Send a notification email when:'] = ''; +App::$strings['You receive a connection request'] = ''; +App::$strings['Someone writes on your profile wall'] = ''; +App::$strings['Someone writes a followup comment'] = ''; +App::$strings['You are tagged in a post'] = ''; +App::$strings['Someone likes your post/comment'] = ''; +App::$strings['Show visual notifications including:'] = ''; +App::$strings['Unseen stream activity'] = ''; +App::$strings['Unseen channel activity'] = ''; +App::$strings['Upcoming events'] = ''; +App::$strings['Events today'] = ''; +App::$strings['Upcoming birthdays'] = ''; +App::$strings['Not available in all themes'] = ''; +App::$strings['System (personal) notifications'] = ''; +App::$strings['System info messages'] = ''; +App::$strings['Recommended'] = ''; +App::$strings['System critical alerts'] = ''; +App::$strings['New connections'] = ''; +App::$strings['System Registrations'] = ''; +App::$strings['Unseen public activity'] = ''; +App::$strings['Unseen likes and dislikes'] = ''; +App::$strings['Unseen forum posts'] = ''; +App::$strings['Reported content'] = ''; +App::$strings['Email notification hub (hostname)'] = ''; +App::$strings['If your channel is mirrored to multiple locations, set this to your preferred location. This will prevent duplicate email notifications. Example: %s'] = ''; +App::$strings['Show new wall posts, private messages and connections under Notices'] = ''; +App::$strings['Accept messages from strangers which mention me'] = ''; +App::$strings['This setting supercedes normal permissions'] = ''; +App::$strings['Accept messages from strangers which include any of the following hashtags'] = ''; +App::$strings['comma separated, do not include the #'] = ''; +App::$strings['Notify me of events this many days in advance'] = ''; +App::$strings['Must be greater than 0'] = ''; +App::$strings['Date and time'] = ''; +App::$strings['This section is reserved for use by optional addons and apps to provide additional settings.'] = ''; +App::$strings['Advanced Account/Page Type Settings'] = ''; +App::$strings['Change the behaviour of this account for special situations'] = ''; +App::$strings['Default photo upload folder name'] = ''; +App::$strings['%Y - current year, %m - current month'] = ''; +App::$strings['Default file upload folder name'] = ''; +App::$strings['Personal menu to display in your channel pages'] = ''; +App::$strings['Remove this channel.'] = ''; +App::$strings['Mentions should display'] = ''; +App::$strings['Changes to this setting are applied to new posts/comments only. It is not retroactive.'] = ''; +App::$strings['the channel display name [example: @Barbara Jenkins]'] = ''; +App::$strings['the channel nickname [example: @barbara1976]'] = ''; +App::$strings['combined [example: @Barbara Jenkins (barbara1976)]'] = ''; +App::$strings['no preference, use the system default'] = ''; +App::$strings['Calendar week begins on'] = ''; +App::$strings['This varies by country/culture'] = ''; +App::$strings['Sunday'] = ''; +App::$strings['Monday'] = ''; +App::$strings['Tuesday'] = ''; +App::$strings['Wednesday'] = ''; +App::$strings['Thursday'] = ''; +App::$strings['Friday'] = ''; +App::$strings['Saturday'] = ''; +App::$strings['Items tagged with: %s'] = ''; +App::$strings['Search results for: %s'] = ''; +App::$strings["%1\$s is following %2\$s's %3\$s"] = ''; +App::$strings["%1\$s stopped following %2\$s's %3\$s"] = ''; +App::$strings['Files: shared with me'] = ''; +App::$strings['NEW'] = ''; +App::$strings['Size'] = ''; +App::$strings['Last Modified'] = ''; +App::$strings['Remove all files'] = ''; +App::$strings['Remove this file'] = ''; +App::$strings['About this site'] = ''; +App::$strings['Site Name'] = ''; +App::$strings['Administrator'] = ''; +App::$strings['Software and Project information'] = ''; +App::$strings["This site is powered by \$Projectname"] = ''; +App::$strings['Federated and decentralised networking and identity services provided by Zot'] = ''; +App::$strings['Federated transport protocols:'] = ''; +App::$strings['Version %s'] = ''; +App::$strings['Project homepage'] = ''; +App::$strings['Developer homepage'] = ''; +App::$strings['Export Channel'] = ''; +App::$strings['Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content.'] = ''; +App::$strings['Export Content'] = ''; +App::$strings['Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin.'] = ''; +App::$strings['Export your posts from a given year.'] = ''; +App::$strings['You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range.'] = ''; +App::$strings["To select all posts for a given year, such as this year, visit %2\$s"] = ''; +App::$strings["To select all posts for a given month, such as January of this year, visit %2\$s"] = ''; +App::$strings["These content files may be imported or restored by visiting %2\$s on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = ''; +App::$strings['Failed to create source. No channel selected.'] = ''; +App::$strings['Source created.'] = ''; +App::$strings['Source updated.'] = ''; +App::$strings['*'] = ''; +App::$strings['Manage remote sources of content for your channel.'] = ''; +App::$strings['New Source'] = ''; +App::$strings['Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'] = ''; +App::$strings['Only import content with these words (one per line)'] = ''; +App::$strings['Leave blank to import all public content'] = ''; +App::$strings['Channel Name'] = ''; +App::$strings['Add the following categories to posts imported from this source (comma separated)'] = ''; +App::$strings['Resend posts with this channel as author'] = ''; +App::$strings['Copyrights may apply'] = ''; +App::$strings['Source not found.'] = ''; +App::$strings['Edit Source'] = ''; +App::$strings['Delete Source'] = ''; +App::$strings['Source removed'] = ''; +App::$strings['Unable to remove source.'] = ''; +App::$strings['Article'] = ''; +App::$strings['Item has been removed.'] = ''; +App::$strings['Post not found.'] = ''; +App::$strings['comment'] = ''; +App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = ''; +App::$strings['Tag removed'] = ''; +App::$strings['Remove Item Tag'] = ''; +App::$strings['Select a tag to remove: '] = ''; +App::$strings['No default suggestions were found.'] = ''; +App::$strings['%d rating'] = [ + 0 => '', + 1 => '', ]; -App::$strings["Gender: "] = ""; -App::$strings["Status: "] = ""; -App::$strings["Homepage: "] = ""; -App::$strings["Description:"] = ""; -App::$strings["Keywords: "] = ""; -App::$strings["Don't suggest"] = ""; -App::$strings["Common connections (estimated):"] = ""; -App::$strings["Global Directory"] = ""; -App::$strings["Local Directory"] = ""; -App::$strings["Finding:"] = ""; -App::$strings["Channel Suggestions"] = ""; -App::$strings["next page"] = ""; -App::$strings["previous page"] = ""; -App::$strings["Sort options"] = ""; -App::$strings["Alphabetic"] = ""; -App::$strings["Reverse Alphabetic"] = ""; -App::$strings["Newest to Oldest"] = ""; -App::$strings["Oldest to Newest"] = ""; -App::$strings["No entries (some entries may be hidden)."] = ""; -App::$strings["This directory server requires an access token"] = ""; -App::$strings["Xchan Lookup"] = ""; -App::$strings["Lookup xchan beginning with (or webbie): "] = ""; -App::$strings["This app allows you to add categories to posts and events."] = ""; -App::$strings["Zotfinger Diagnostic"] = ""; -App::$strings["Lookup URL"] = ""; -App::$strings["This app provides a displayable map when viewing detail of photos that contain location information."] = ""; -App::$strings["This app is currently installed."] = ""; -App::$strings["No connections."] = ""; -App::$strings["Visit %1\$s's profile [%2\$s]"] = ""; -App::$strings["View Connections"] = ""; -App::$strings["This app (when installed) displays a small number of friend suggestions on selected pages or you can run the app to display a full list of channel suggestions."] = ""; -App::$strings["This app allows you to authorize mobile apps using OAuth and OpenID to access your channel."] = ""; -App::$strings["Content Filter settings updated."] = ""; -App::$strings["This app (when installed) allows you to filter incoming content from all sources or from specific connections. The filtering may be based on words, tags, regular expressions, or language"] = ""; -App::$strings["The settings on this page apply to all incoming content. To edit the settings for individual connetions, see the similar settings on the Connection Edit page for that connection."] = ""; -App::$strings["words one per line or #tags, \$categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts"] = ""; -App::$strings["Content Filter Settings"] = ""; -App::$strings["This app allows you to set an optional publish date/time for posts, which may be in the future. This must be at least ten minutes into the future to initiate delayed publishing. The posts will be published automatically after that time has passed. Once installed, a new button will appear in the post editor to set the date/time."] = ""; -App::$strings["Added by Superblock"] = ""; -App::$strings["superblock settings updated"] = ""; -App::$strings["Blocked channels"] = ""; -App::$strings["No channels currently blocked"] = ""; -App::$strings["Blocked servers"] = ""; -App::$strings["No servers currently blocked"] = ""; -App::$strings["Manage Blocks"] = ""; -App::$strings["parent"] = ""; -App::$strings["Principal"] = ""; -App::$strings["Addressbook"] = ""; -App::$strings["Schedule Inbox"] = ""; -App::$strings["Schedule Outbox"] = ""; -App::$strings["Total"] = ""; -App::$strings["Shared"] = ""; -App::$strings["Add Files"] = ""; -App::$strings["Type"] = ""; -App::$strings["You are using %1\$s of your available file storage."] = ""; -App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s%)"] = ""; -App::$strings["WARNING:"] = ""; -App::$strings["Create new folder"] = ""; -App::$strings["Upload file"] = ""; -App::$strings["Drop files here to immediately upload"] = ""; -App::$strings["Added by superblock"] = ""; -App::$strings["Member registrations waiting for confirmation"] = ""; -App::$strings["Inspect queue"] = ""; -App::$strings["DB updates"] = ""; -App::$strings["Admin"] = ""; -App::$strings["Addon Features"] = ""; -App::$strings["Everything"] = ""; -App::$strings["App Collections"] = ""; -App::$strings["Installed apps"] = ""; -App::$strings["Archives"] = ""; -App::$strings["Bookmarked Chatrooms"] = ""; -App::$strings["Overview"] = ""; -App::$strings["Chat Members"] = ""; -App::$strings["Click to show more"] = ""; -App::$strings["Events Tools"] = ""; -App::$strings["Export Calendar"] = ""; -App::$strings["Import Calendar"] = ""; -App::$strings["You have %1$.0f of %2$.0f allowed connections."] = ""; -App::$strings["Add New Connection"] = ""; -App::$strings["Enter channel address"] = ""; -App::$strings["Examples: bob@example.com, https://example.com/barbara"] = ""; -App::$strings["Account settings"] = ""; -App::$strings["Channel settings"] = ""; -App::$strings["Display settings"] = ""; -App::$strings["Manage locations"] = ""; -App::$strings["Export channel"] = ""; -App::$strings["OAuth1 apps"] = ""; -App::$strings["Client apps"] = ""; -App::$strings["HQ Control Panel"] = ""; -App::$strings["Create a new post"] = ""; -App::$strings["Private Mail Menu"] = ""; -App::$strings["Combined View"] = ""; -App::$strings["Inbox"] = ""; -App::$strings["Outbox"] = ""; -App::$strings["New Message"] = ""; -App::$strings["photo/image"] = ""; -App::$strings["Rating Tools"] = ""; -App::$strings["Rate Me"] = ""; -App::$strings["View Ratings"] = ""; -App::$strings["Remove term"] = ""; -App::$strings["Commented Date"] = ""; -App::$strings["Order by last commented date"] = ""; -App::$strings["Posted Date"] = ""; -App::$strings["Order by last posted date"] = ""; -App::$strings["Date Unthreaded"] = ""; -App::$strings["Order unthreaded by date"] = ""; -App::$strings["Suggested Chatrooms"] = ""; -App::$strings["Tags"] = ""; -App::$strings["Common Connections"] = ""; -App::$strings["View all %d common connections"] = ""; -App::$strings["Saved Folders"] = ""; -App::$strings["%d invitation available"] = [ - 0 => "", - 1 => "", +App::$strings['Gender: '] = ''; +App::$strings['Status: '] = ''; +App::$strings['Homepage: '] = ''; +App::$strings['Description:'] = ''; +App::$strings['Keywords: '] = ''; +App::$strings["Don't suggest"] = ''; +App::$strings['Common connections (estimated):'] = ''; +App::$strings['Global Directory'] = ''; +App::$strings['Local Directory'] = ''; +App::$strings['Finding:'] = ''; +App::$strings['Channel Suggestions'] = ''; +App::$strings['next page'] = ''; +App::$strings['previous page'] = ''; +App::$strings['Sort options'] = ''; +App::$strings['Alphabetic'] = ''; +App::$strings['Reverse Alphabetic'] = ''; +App::$strings['Newest to Oldest'] = ''; +App::$strings['Oldest to Newest'] = ''; +App::$strings['No entries (some entries may be hidden).'] = ''; +App::$strings['This directory server requires an access token'] = ''; +App::$strings['Xchan Lookup'] = ''; +App::$strings['Lookup xchan beginning with (or webbie): '] = ''; +App::$strings['This app allows you to add categories to posts and events.'] = ''; +App::$strings['Zotfinger Diagnostic'] = ''; +App::$strings['Lookup URL'] = ''; +App::$strings['This app provides a displayable map when viewing detail of photos that contain location information.'] = ''; +App::$strings['This app is currently installed.'] = ''; +App::$strings['No connections.'] = ''; +App::$strings["Visit %1\$s's profile [%2\$s]"] = ''; +App::$strings['View Connections'] = ''; +App::$strings['This app (when installed) displays a small number of friend suggestions on selected pages or you can run the app to display a full list of channel suggestions.'] = ''; +App::$strings['This app allows you to authorize mobile apps using OAuth and OpenID to access your channel.'] = ''; +App::$strings['Content Filter settings updated.'] = ''; +App::$strings['This app (when installed) allows you to filter incoming content from all sources or from specific connections. The filtering may be based on words, tags, regular expressions, or language'] = ''; +App::$strings['The settings on this page apply to all incoming content. To edit the settings for individual connetions, see the similar settings on the Connection Edit page for that connection.'] = ''; +App::$strings["words one per line or #tags, \$categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts"] = ''; +App::$strings['Content Filter Settings'] = ''; +App::$strings['This app allows you to set an optional publish date/time for posts, which may be in the future. This must be at least ten minutes into the future to initiate delayed publishing. The posts will be published automatically after that time has passed. Once installed, a new button will appear in the post editor to set the date/time.'] = ''; +App::$strings['Added by Superblock'] = ''; +App::$strings['superblock settings updated'] = ''; +App::$strings['Blocked channels'] = ''; +App::$strings['No channels currently blocked'] = ''; +App::$strings['Blocked servers'] = ''; +App::$strings['No servers currently blocked'] = ''; +App::$strings['Manage Blocks'] = ''; +App::$strings['parent'] = ''; +App::$strings['Principal'] = ''; +App::$strings['Addressbook'] = ''; +App::$strings['Schedule Inbox'] = ''; +App::$strings['Schedule Outbox'] = ''; +App::$strings['Total'] = ''; +App::$strings['Shared'] = ''; +App::$strings['Add Files'] = ''; +App::$strings['Type'] = ''; +App::$strings["You are using %1\$s of your available file storage."] = ''; +App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s%)"] = ''; +App::$strings['WARNING:'] = ''; +App::$strings['Create new folder'] = ''; +App::$strings['Upload file'] = ''; +App::$strings['Drop files here to immediately upload'] = ''; +App::$strings['Added by superblock'] = ''; +App::$strings['Member registrations waiting for confirmation'] = ''; +App::$strings['Inspect queue'] = ''; +App::$strings['DB updates'] = ''; +App::$strings['Admin'] = ''; +App::$strings['Addon Features'] = ''; +App::$strings['Everything'] = ''; +App::$strings['App Collections'] = ''; +App::$strings['Installed apps'] = ''; +App::$strings['Archives'] = ''; +App::$strings['Bookmarked Chatrooms'] = ''; +App::$strings['Overview'] = ''; +App::$strings['Chat Members'] = ''; +App::$strings['Click to show more'] = ''; +App::$strings['Events Tools'] = ''; +App::$strings['Export Calendar'] = ''; +App::$strings['Import Calendar'] = ''; +App::$strings['You have %1$.0f of %2$.0f allowed connections.'] = ''; +App::$strings['Add New Connection'] = ''; +App::$strings['Enter channel address'] = ''; +App::$strings['Examples: bob@example.com, https://example.com/barbara'] = ''; +App::$strings['Account settings'] = ''; +App::$strings['Channel settings'] = ''; +App::$strings['Display settings'] = ''; +App::$strings['Manage locations'] = ''; +App::$strings['Export channel'] = ''; +App::$strings['OAuth1 apps'] = ''; +App::$strings['Client apps'] = ''; +App::$strings['HQ Control Panel'] = ''; +App::$strings['Create a new post'] = ''; +App::$strings['Private Mail Menu'] = ''; +App::$strings['Combined View'] = ''; +App::$strings['Inbox'] = ''; +App::$strings['Outbox'] = ''; +App::$strings['New Message'] = ''; +App::$strings['photo/image'] = ''; +App::$strings['Rating Tools'] = ''; +App::$strings['Rate Me'] = ''; +App::$strings['View Ratings'] = ''; +App::$strings['Remove term'] = ''; +App::$strings['Commented Date'] = ''; +App::$strings['Order by last commented date'] = ''; +App::$strings['Posted Date'] = ''; +App::$strings['Order by last posted date'] = ''; +App::$strings['Date Unthreaded'] = ''; +App::$strings['Order unthreaded by date'] = ''; +App::$strings['Suggested Chatrooms'] = ''; +App::$strings['Tags'] = ''; +App::$strings['Common Connections'] = ''; +App::$strings['View all %d common connections'] = ''; +App::$strings['Saved Folders'] = ''; +App::$strings['%d invitation available'] = [ + 0 => '', + 1 => '', ]; -App::$strings["Find Channels"] = ""; -App::$strings["Enter name or interest"] = ""; -App::$strings["Connect/Follow"] = ""; -App::$strings["Examples: Robert Morgenstein, Fishing"] = ""; -App::$strings["Advanced example: name=fred and country=iceland"] = ""; -App::$strings["Friend zoom in/out"] = ""; -App::$strings["Ignore/Hide"] = ""; -App::$strings["Suggestions"] = ""; -App::$strings["See more..."] = ""; -App::$strings["New Stream Activity"] = ""; -App::$strings["New Stream Activity Notifications"] = ""; -App::$strings["View your stream activity"] = ""; -App::$strings["Mark all notifications read"] = ""; -App::$strings["Show new posts only"] = ""; -App::$strings["Filter by name"] = ""; -App::$strings["New Home Activity"] = ""; -App::$strings["New Home Activity Notifications"] = ""; -App::$strings["View your home activity"] = ""; -App::$strings["Mark all notifications seen"] = ""; -App::$strings["New Mails"] = ""; -App::$strings["New Mails Notifications"] = ""; -App::$strings["View your private mails"] = ""; -App::$strings["Mark all messages seen"] = ""; -App::$strings["New Events"] = ""; -App::$strings["New Events Notifications"] = ""; -App::$strings["View events"] = ""; -App::$strings["Mark all events seen"] = ""; -App::$strings["New Connections Notifications"] = ""; -App::$strings["View all connections"] = ""; -App::$strings["New Files"] = ""; -App::$strings["New Files Notifications"] = ""; -App::$strings["Notices"] = ""; -App::$strings["View all notices"] = ""; -App::$strings["Mark all notices seen"] = ""; -App::$strings["Groups"] = ""; -App::$strings["New Registrations"] = ""; -App::$strings["New Registrations Notifications"] = ""; -App::$strings["Public Stream Notifications"] = ""; -App::$strings["View the public stream"] = ""; -App::$strings["Sorry, you have got no notifications at the moment"] = ""; -App::$strings["__ctx:widget__ Activity"] = ""; -App::$strings["Profile Creation"] = ""; -App::$strings["Upload profile photo"] = ""; -App::$strings["Upload cover photo"] = ""; -App::$strings["Edit your profile"] = ""; -App::$strings["Find and Connect with others"] = ""; -App::$strings["View the directory"] = ""; -App::$strings["View friend suggestions"] = ""; -App::$strings["Manage your connections"] = ""; -App::$strings["Communicate"] = ""; -App::$strings["View your channel homepage"] = ""; -App::$strings["View your stream"] = ""; -App::$strings["View public stream"] = ""; -App::$strings["New Member Links"] = ""; -App::$strings["Direct Messages"] = ""; -App::$strings["Show direct (private) messages"] = ""; -App::$strings["Personal Posts"] = ""; -App::$strings["Show posts that mention or involve me"] = ""; -App::$strings["Saved Posts"] = ""; -App::$strings["Show posts that I have saved"] = ""; -App::$strings["Show posts that include events"] = ""; -App::$strings["Polls"] = ""; -App::$strings["Show posts that include polls"] = ""; -App::$strings["Show posts related to the %s access list"] = ""; -App::$strings["Show my access lists"] = ""; -App::$strings["Show posts to this group"] = ""; -App::$strings["New post"] = ""; -App::$strings["Show groups"] = ""; -App::$strings["Show posts to this collection"] = ""; -App::$strings["Collections"] = ""; -App::$strings["Show collections"] = ""; -App::$strings["Show posts that I have filed to %s"] = ""; -App::$strings["Show filed post categories"] = ""; -App::$strings["Show posts with hashtag %s"] = ""; -App::$strings["Followed Hashtags"] = ""; -App::$strings["Show followed hashtags"] = ""; -App::$strings["Remove active filter"] = ""; -App::$strings["Stream Filters"] = ""; -App::$strings["Select Channel"] = ""; -App::$strings["Read-write"] = ""; -App::$strings["Read-only"] = ""; -App::$strings["Channel Calendar"] = ""; -App::$strings["Shared CalDAV Calendars"] = ""; -App::$strings["Share this calendar"] = ""; -App::$strings["Calendar name and color"] = ""; -App::$strings["Create new CalDAV calendar"] = ""; -App::$strings["Calendar Name"] = ""; -App::$strings["Calendar Tools"] = ""; -App::$strings["Import calendar"] = ""; -App::$strings["Select a calendar to import to"] = ""; -App::$strings["Addressbooks"] = ""; -App::$strings["Addressbook name"] = ""; -App::$strings["Create new addressbook"] = ""; -App::$strings["Addressbook Name"] = ""; -App::$strings["Addressbook Tools"] = ""; -App::$strings["Import addressbook"] = ""; -App::$strings["Select an addressbook to import to"] = ""; -App::$strings["Delete this item?"] = ""; -App::$strings["%s show less"] = ""; -App::$strings["%s expand"] = ""; -App::$strings["%s collapse"] = ""; -App::$strings["Password too short"] = ""; -App::$strings["Passwords do not match"] = ""; -App::$strings["everybody"] = ""; -App::$strings["Secret Passphrase"] = ""; -App::$strings["Passphrase hint"] = ""; -App::$strings["Notice: Permissions have changed but have not yet been submitted."] = ""; -App::$strings["close all"] = ""; -App::$strings["Nothing new here"] = ""; -App::$strings["Rate This Channel (this is public)"] = ""; -App::$strings["Describe (optional)"] = ""; -App::$strings["Please enter a link URL"] = ""; -App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = ""; -App::$strings["lovely"] = ""; -App::$strings["wonderful"] = ""; -App::$strings["fantastic"] = ""; -App::$strings["great"] = ""; -App::$strings["Your chosen nickname was either already taken or not valid. Please use our suggestion ("] = ""; -App::$strings[") or enter a new one."] = ""; -App::$strings["Thank you, this nickname is valid."] = ""; -App::$strings["A channel name is required."] = ""; -App::$strings["This is a "] = ""; -App::$strings[" channel name"] = ""; -App::$strings["Pinned"] = ""; -App::$strings["timeago.prefixAgo"] = ""; -App::$strings["timeago.prefixFromNow"] = ""; -App::$strings["timeago.suffixAgo"] = ""; -App::$strings["timeago.suffixFromNow"] = ""; -App::$strings["less than a minute"] = ""; -App::$strings["about a minute"] = ""; -App::$strings["%d minutes"] = ""; -App::$strings["about an hour"] = ""; -App::$strings["about %d hours"] = ""; -App::$strings["a day"] = ""; -App::$strings["%d days"] = ""; -App::$strings["about a month"] = ""; -App::$strings["%d months"] = ""; -App::$strings["about a year"] = ""; -App::$strings["%d years"] = ""; -App::$strings[" "] = ""; -App::$strings["timeago.numbers"] = ""; -App::$strings["January"] = ""; -App::$strings["February"] = ""; -App::$strings["March"] = ""; -App::$strings["April"] = ""; -App::$strings["__ctx:long__ May"] = ""; -App::$strings["June"] = ""; -App::$strings["July"] = ""; -App::$strings["August"] = ""; -App::$strings["September"] = ""; -App::$strings["October"] = ""; -App::$strings["November"] = ""; -App::$strings["December"] = ""; -App::$strings["Jan"] = ""; -App::$strings["Feb"] = ""; -App::$strings["Mar"] = ""; -App::$strings["Apr"] = ""; -App::$strings["__ctx:short__ May"] = ""; -App::$strings["Jun"] = ""; -App::$strings["Jul"] = ""; -App::$strings["Aug"] = ""; -App::$strings["Sep"] = ""; -App::$strings["Oct"] = ""; -App::$strings["Nov"] = ""; -App::$strings["Dec"] = ""; -App::$strings["Sun"] = ""; -App::$strings["Mon"] = ""; -App::$strings["Tue"] = ""; -App::$strings["Wed"] = ""; -App::$strings["Thu"] = ""; -App::$strings["Fri"] = ""; -App::$strings["Sat"] = ""; -App::$strings["__ctx:calendar__ today"] = ""; -App::$strings["__ctx:calendar__ month"] = ""; -App::$strings["__ctx:calendar__ week"] = ""; -App::$strings["__ctx:calendar__ day"] = ""; -App::$strings["__ctx:calendar__ All day"] = ""; -App::$strings["Delegation session ended."] = ""; -App::$strings["Logged out."] = ""; -App::$strings["Email validation is incomplete. Please check your email."] = ""; -App::$strings["Failed authentication"] = ""; -App::$strings["Login failed."] = ""; -App::$strings["Birthday"] = ""; -App::$strings["Age: "] = ""; -App::$strings["YYYY-MM-DD or MM-DD"] = ""; -App::$strings["never"] = ""; -App::$strings["less than a second ago"] = ""; -App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = ""; -App::$strings["__ctx:relative_date__ year"] = [ - 0 => "", - 1 => "", +App::$strings['Find Channels'] = ''; +App::$strings['Enter name or interest'] = ''; +App::$strings['Connect/Follow'] = ''; +App::$strings['Examples: Robert Morgenstein, Fishing'] = ''; +App::$strings['Advanced example: name=fred and country=iceland'] = ''; +App::$strings['Friend zoom in/out'] = ''; +App::$strings['Ignore/Hide'] = ''; +App::$strings['Suggestions'] = ''; +App::$strings['See more...'] = ''; +App::$strings['New Stream Activity'] = ''; +App::$strings['New Stream Activity Notifications'] = ''; +App::$strings['View your stream activity'] = ''; +App::$strings['Mark all notifications read'] = ''; +App::$strings['Show new posts only'] = ''; +App::$strings['Filter by name'] = ''; +App::$strings['New Home Activity'] = ''; +App::$strings['New Home Activity Notifications'] = ''; +App::$strings['View your home activity'] = ''; +App::$strings['Mark all notifications seen'] = ''; +App::$strings['New Mails'] = ''; +App::$strings['New Mails Notifications'] = ''; +App::$strings['View your private mails'] = ''; +App::$strings['Mark all messages seen'] = ''; +App::$strings['New Events'] = ''; +App::$strings['New Events Notifications'] = ''; +App::$strings['View events'] = ''; +App::$strings['Mark all events seen'] = ''; +App::$strings['New Connections Notifications'] = ''; +App::$strings['View all connections'] = ''; +App::$strings['New Files'] = ''; +App::$strings['New Files Notifications'] = ''; +App::$strings['Notices'] = ''; +App::$strings['View all notices'] = ''; +App::$strings['Mark all notices seen'] = ''; +App::$strings['Groups'] = ''; +App::$strings['New Registrations'] = ''; +App::$strings['New Registrations Notifications'] = ''; +App::$strings['Public Stream Notifications'] = ''; +App::$strings['View the public stream'] = ''; +App::$strings['Sorry, you have got no notifications at the moment'] = ''; +App::$strings['__ctx:widget__ Activity'] = ''; +App::$strings['Profile Creation'] = ''; +App::$strings['Upload profile photo'] = ''; +App::$strings['Upload cover photo'] = ''; +App::$strings['Edit your profile'] = ''; +App::$strings['Find and Connect with others'] = ''; +App::$strings['View the directory'] = ''; +App::$strings['View friend suggestions'] = ''; +App::$strings['Manage your connections'] = ''; +App::$strings['Communicate'] = ''; +App::$strings['View your channel homepage'] = ''; +App::$strings['View your stream'] = ''; +App::$strings['View public stream'] = ''; +App::$strings['New Member Links'] = ''; +App::$strings['Direct Messages'] = ''; +App::$strings['Show direct (private) messages'] = ''; +App::$strings['Personal Posts'] = ''; +App::$strings['Show posts that mention or involve me'] = ''; +App::$strings['Saved Posts'] = ''; +App::$strings['Show posts that I have saved'] = ''; +App::$strings['Show posts that include events'] = ''; +App::$strings['Polls'] = ''; +App::$strings['Show posts that include polls'] = ''; +App::$strings['Show posts related to the %s access list'] = ''; +App::$strings['Show my access lists'] = ''; +App::$strings['Show posts to this group'] = ''; +App::$strings['New post'] = ''; +App::$strings['Show groups'] = ''; +App::$strings['Show posts to this collection'] = ''; +App::$strings['Collections'] = ''; +App::$strings['Show collections'] = ''; +App::$strings['Show posts that I have filed to %s'] = ''; +App::$strings['Show filed post categories'] = ''; +App::$strings['Show posts with hashtag %s'] = ''; +App::$strings['Followed Hashtags'] = ''; +App::$strings['Show followed hashtags'] = ''; +App::$strings['Remove active filter'] = ''; +App::$strings['Stream Filters'] = ''; +App::$strings['Select Channel'] = ''; +App::$strings['Read-write'] = ''; +App::$strings['Read-only'] = ''; +App::$strings['Channel Calendar'] = ''; +App::$strings['Shared CalDAV Calendars'] = ''; +App::$strings['Share this calendar'] = ''; +App::$strings['Calendar name and color'] = ''; +App::$strings['Create new CalDAV calendar'] = ''; +App::$strings['Calendar Name'] = ''; +App::$strings['Calendar Tools'] = ''; +App::$strings['Import calendar'] = ''; +App::$strings['Select a calendar to import to'] = ''; +App::$strings['Addressbooks'] = ''; +App::$strings['Addressbook name'] = ''; +App::$strings['Create new addressbook'] = ''; +App::$strings['Addressbook Name'] = ''; +App::$strings['Addressbook Tools'] = ''; +App::$strings['Import addressbook'] = ''; +App::$strings['Select an addressbook to import to'] = ''; +App::$strings['Delete this item?'] = ''; +App::$strings['%s show less'] = ''; +App::$strings['%s expand'] = ''; +App::$strings['%s collapse'] = ''; +App::$strings['Password too short'] = ''; +App::$strings['Passwords do not match'] = ''; +App::$strings['everybody'] = ''; +App::$strings['Secret Passphrase'] = ''; +App::$strings['Passphrase hint'] = ''; +App::$strings['Notice: Permissions have changed but have not yet been submitted.'] = ''; +App::$strings['close all'] = ''; +App::$strings['Nothing new here'] = ''; +App::$strings['Rate This Channel (this is public)'] = ''; +App::$strings['Describe (optional)'] = ''; +App::$strings['Please enter a link URL'] = ''; +App::$strings['Unsaved changes. Are you sure you wish to leave this page?'] = ''; +App::$strings['lovely'] = ''; +App::$strings['wonderful'] = ''; +App::$strings['fantastic'] = ''; +App::$strings['great'] = ''; +App::$strings['Your chosen nickname was either already taken or not valid. Please use our suggestion ('] = ''; +App::$strings[') or enter a new one.'] = ''; +App::$strings['Thank you, this nickname is valid.'] = ''; +App::$strings['A channel name is required.'] = ''; +App::$strings['This is a '] = ''; +App::$strings[' channel name'] = ''; +App::$strings['Pinned'] = ''; +App::$strings['timeago.prefixAgo'] = ''; +App::$strings['timeago.prefixFromNow'] = ''; +App::$strings['timeago.suffixAgo'] = ''; +App::$strings['timeago.suffixFromNow'] = ''; +App::$strings['less than a minute'] = ''; +App::$strings['about a minute'] = ''; +App::$strings['%d minutes'] = ''; +App::$strings['about an hour'] = ''; +App::$strings['about %d hours'] = ''; +App::$strings['a day'] = ''; +App::$strings['%d days'] = ''; +App::$strings['about a month'] = ''; +App::$strings['%d months'] = ''; +App::$strings['about a year'] = ''; +App::$strings['%d years'] = ''; +App::$strings[' '] = ''; +App::$strings['timeago.numbers'] = ''; +App::$strings['January'] = ''; +App::$strings['February'] = ''; +App::$strings['March'] = ''; +App::$strings['April'] = ''; +App::$strings['__ctx:long__ May'] = ''; +App::$strings['June'] = ''; +App::$strings['July'] = ''; +App::$strings['August'] = ''; +App::$strings['September'] = ''; +App::$strings['October'] = ''; +App::$strings['November'] = ''; +App::$strings['December'] = ''; +App::$strings['Jan'] = ''; +App::$strings['Feb'] = ''; +App::$strings['Mar'] = ''; +App::$strings['Apr'] = ''; +App::$strings['__ctx:short__ May'] = ''; +App::$strings['Jun'] = ''; +App::$strings['Jul'] = ''; +App::$strings['Aug'] = ''; +App::$strings['Sep'] = ''; +App::$strings['Oct'] = ''; +App::$strings['Nov'] = ''; +App::$strings['Dec'] = ''; +App::$strings['Sun'] = ''; +App::$strings['Mon'] = ''; +App::$strings['Tue'] = ''; +App::$strings['Wed'] = ''; +App::$strings['Thu'] = ''; +App::$strings['Fri'] = ''; +App::$strings['Sat'] = ''; +App::$strings['__ctx:calendar__ today'] = ''; +App::$strings['__ctx:calendar__ month'] = ''; +App::$strings['__ctx:calendar__ week'] = ''; +App::$strings['__ctx:calendar__ day'] = ''; +App::$strings['__ctx:calendar__ All day'] = ''; +App::$strings['Delegation session ended.'] = ''; +App::$strings['Logged out.'] = ''; +App::$strings['Email validation is incomplete. Please check your email.'] = ''; +App::$strings['Failed authentication'] = ''; +App::$strings['Login failed.'] = ''; +App::$strings['Birthday'] = ''; +App::$strings['Age: '] = ''; +App::$strings['YYYY-MM-DD or MM-DD'] = ''; +App::$strings['never'] = ''; +App::$strings['less than a second ago'] = ''; +App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = ''; +App::$strings['__ctx:relative_date__ year'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:relative_date__ month"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:relative_date__ month'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:relative_date__ week"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:relative_date__ week'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:relative_date__ day"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:relative_date__ day'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:relative_date__ hour"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:relative_date__ hour'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:relative_date__ minute"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:relative_date__ minute'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:relative_date__ second"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:relative_date__ second'] = [ + 0 => '', + 1 => '', ]; -App::$strings["%1\$s's birthday"] = ""; -App::$strings["Happy Birthday %1\$s"] = ""; -App::$strings["Cannot locate DNS info for database server '%s'"] = ""; -App::$strings["View PDF"] = ""; -App::$strings[" by "] = ""; -App::$strings[" on "] = ""; -App::$strings["Embedded content"] = ""; -App::$strings["Embedding disabled"] = ""; -App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = ""; -App::$strings["Friendica"] = ""; -App::$strings["OStatus"] = ""; -App::$strings["GNU-Social"] = ""; -App::$strings["RSS/Atom"] = ""; -App::$strings["Diaspora"] = ""; -App::$strings["Facebook"] = ""; -App::$strings["Zot"] = ""; -App::$strings["LinkedIn"] = ""; -App::$strings["XMPP/IM"] = ""; -App::$strings["MySpace"] = ""; -App::$strings["Remote authentication"] = ""; -App::$strings["Click to authenticate to your home hub"] = ""; -App::$strings["Manage your channels"] = ""; -App::$strings["Manage your access lists"] = ""; -App::$strings["Account/Channel Settings"] = ""; -App::$strings["(is on)"] = ""; -App::$strings["(is off)"] = ""; -App::$strings["Content filtering"] = ""; -App::$strings["Logout"] = ""; -App::$strings["End this session"] = ""; -App::$strings["Your profile page"] = ""; -App::$strings["Manage/Edit profiles"] = ""; -App::$strings["Sign in"] = ""; -App::$strings["Take me home"] = ""; -App::$strings["Log me out of this site"] = ""; -App::$strings["Create an account"] = ""; -App::$strings["Help and documentation"] = ""; -App::$strings["Search site @name, #tag, content"] = ""; -App::$strings["Site Setup and Configuration"] = ""; -App::$strings["Powered by \$Projectname"] = ""; -App::$strings["@name, #tag, content"] = ""; -App::$strings["Please wait..."] = ""; -App::$strings["Add/Manage Apps"] = ""; -App::$strings["Arrange Apps"] = ""; -App::$strings["Toggle System Apps"] = ""; -App::$strings["Status Messages and Posts"] = ""; -App::$strings["About"] = ""; -App::$strings["Profile Details"] = ""; -App::$strings["Photo Albums"] = ""; -App::$strings["Files and Storage"] = ""; -App::$strings["Bookmarks"] = ""; -App::$strings["Saved Bookmarks"] = ""; -App::$strings["View Cards"] = ""; -App::$strings["View Articles"] = ""; -App::$strings["View Webpages"] = ""; -App::$strings["Wikis"] = ""; -App::$strings["l F d, Y \\@ g:i A"] = ""; -App::$strings["Starts:"] = ""; -App::$strings["Finishes:"] = ""; -App::$strings["This event has been added to your calendar."] = ""; -App::$strings["Not specified"] = ""; -App::$strings["Needs Action"] = ""; -App::$strings["Completed"] = ""; -App::$strings["In Process"] = ""; -App::$strings["Cancelled"] = ""; -App::$strings["Home, Voice"] = ""; -App::$strings["Home, Fax"] = ""; -App::$strings["Work, Voice"] = ""; -App::$strings["Work, Fax"] = ""; -App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = ""; -App::$strings["Trending"] = ""; -App::$strings["Keywords"] = ""; -App::$strings["have"] = ""; -App::$strings["has"] = ""; -App::$strings["want"] = ""; -App::$strings["wants"] = ""; -App::$strings["likes"] = ""; -App::$strings["dislikes"] = ""; -App::$strings["Not a valid email address"] = ""; -App::$strings["Your email domain is not among those allowed on this site"] = ""; -App::$strings["Your email address is already registered at this site."] = ""; -App::$strings["An invitation is required."] = ""; -App::$strings["Invitation could not be verified."] = ""; -App::$strings["Please enter the required information."] = ""; -App::$strings["Failed to store account information."] = ""; -App::$strings["Registration confirmation for %s"] = ""; -App::$strings["Registration request at %s"] = ""; -App::$strings["your registration password"] = ""; -App::$strings["Registration details for %s"] = ""; -App::$strings["Account approved."] = ""; -App::$strings["Registration revoked for %s"] = ""; -App::$strings["Click here to upgrade."] = ""; -App::$strings["This action exceeds the limits set by your subscription plan."] = ""; -App::$strings["This action is not available under your subscription plan."] = ""; -App::$strings["Encrypted content"] = ""; -App::$strings["(Embedded app '%s' could not be displayed)."] = ""; -App::$strings["Install %1\$s element %2\$s"] = ""; -App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = ""; -App::$strings["card"] = ""; -App::$strings["article"] = ""; -App::$strings["Click to open/close"] = ""; -App::$strings["spoiler"] = ""; -App::$strings["Different viewers will see this text differently"] = ""; -App::$strings["$1 wrote:"] = ""; -App::$strings["Item was not found."] = ""; -App::$strings["Unknown error."] = ""; -App::$strings["No source file."] = ""; -App::$strings["Cannot locate file to replace"] = ""; -App::$strings["Cannot locate file to revise/update"] = ""; -App::$strings["File exceeds size limit of %d"] = ""; -App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = ""; -App::$strings["File upload failed. Possible system limit or action terminated."] = ""; -App::$strings["Stored file could not be verified. Upload failed."] = ""; -App::$strings["Path not available."] = ""; -App::$strings["Empty pathname"] = ""; -App::$strings["duplicate filename or path"] = ""; -App::$strings["Path not found."] = ""; -App::$strings["mkdir failed."] = ""; -App::$strings["database storage failed."] = ""; -App::$strings["Empty path"] = ""; -App::$strings["Unable to obtain identity information from database"] = ""; -App::$strings["Empty name"] = ""; -App::$strings["Name too long"] = ""; -App::$strings["No account identifier"] = ""; -App::$strings["Nickname is required."] = ""; -App::$strings["Unable to retrieve created identity"] = ""; -App::$strings["Default Profile"] = ""; -App::$strings["Unable to retrieve modified identity"] = ""; -App::$strings["(Unknown)"] = ""; -App::$strings["Visible to anybody on the internet."] = ""; -App::$strings["Visible to you only."] = ""; -App::$strings["Visible to anybody in this network."] = ""; -App::$strings["Visible to anybody authenticated."] = ""; -App::$strings["Visible to anybody on %s."] = ""; -App::$strings["Visible to all connections."] = ""; -App::$strings["Visible to approved connections."] = ""; -App::$strings["Visible to specific connections."] = ""; -App::$strings["Privacy group not found."] = ""; -App::$strings["Privacy group is empty."] = ""; -App::$strings["Privacy group: %s"] = ""; -App::$strings["Connection not found."] = ""; -App::$strings["profile photo"] = ""; -App::$strings["[Edited %s]"] = ""; -App::$strings["__ctx:edit_activity__ Post"] = ""; -App::$strings["__ctx:edit_activity__ Comment"] = ""; -App::$strings["prev"] = ""; -App::$strings["first"] = ""; -App::$strings["last"] = ""; -App::$strings["next"] = ""; -App::$strings["older"] = ""; -App::$strings["newer"] = ""; -App::$strings["poke"] = ""; -App::$strings["poked"] = ""; -App::$strings["ping"] = ""; -App::$strings["pinged"] = ""; -App::$strings["prod"] = ""; -App::$strings["prodded"] = ""; -App::$strings["slap"] = ""; -App::$strings["slapped"] = ""; -App::$strings["finger"] = ""; -App::$strings["fingered"] = ""; -App::$strings["rebuff"] = ""; -App::$strings["rebuffed"] = ""; -App::$strings["happy"] = ""; -App::$strings["sad"] = ""; -App::$strings["mellow"] = ""; -App::$strings["tired"] = ""; -App::$strings["perky"] = ""; -App::$strings["angry"] = ""; -App::$strings["stupefied"] = ""; -App::$strings["puzzled"] = ""; -App::$strings["interested"] = ""; -App::$strings["bitter"] = ""; -App::$strings["cheerful"] = ""; -App::$strings["alive"] = ""; -App::$strings["annoyed"] = ""; -App::$strings["anxious"] = ""; -App::$strings["cranky"] = ""; -App::$strings["disturbed"] = ""; -App::$strings["frustrated"] = ""; -App::$strings["depressed"] = ""; -App::$strings["motivated"] = ""; -App::$strings["relaxed"] = ""; -App::$strings["surprised"] = ""; -App::$strings["May"] = ""; -App::$strings["Unknown Attachment"] = ""; -App::$strings["unknown"] = ""; -App::$strings["remove category"] = ""; -App::$strings["remove from file"] = ""; -App::$strings["Added to your calendar"] = ""; -App::$strings["Link"] = ""; -App::$strings["Poll has ended."] = ""; -App::$strings["Poll ends: %s"] = ""; -App::$strings["vote"] = ""; -App::$strings["Download binary/encrypted content"] = ""; -App::$strings["Page layout"] = ""; -App::$strings["You can create your own with the layouts tool"] = ""; -App::$strings["BBcode"] = ""; -App::$strings["HTML"] = ""; -App::$strings["Markdown"] = ""; -App::$strings["Text"] = ""; -App::$strings["Comanche Layout"] = ""; -App::$strings["PHP"] = ""; -App::$strings["Page content type"] = ""; -App::$strings["activity"] = ""; -App::$strings["a-z, 0-9, -, and _ only"] = ""; -App::$strings["Design Tools"] = ""; -App::$strings["Pages"] = ""; -App::$strings["Import website..."] = ""; -App::$strings["Select folder to import"] = ""; -App::$strings["Import from a zipped folder:"] = ""; -App::$strings["Import from cloud files:"] = ""; -App::$strings["/cloud/channel/path/to/folder"] = ""; -App::$strings["Enter path to website files"] = ""; -App::$strings["Select folder"] = ""; -App::$strings["Export website..."] = ""; -App::$strings["Export to a zip file"] = ""; -App::$strings["website.zip"] = ""; -App::$strings["Enter a name for the zip file."] = ""; -App::$strings["Export to cloud files"] = ""; -App::$strings["/path/to/export/folder"] = ""; -App::$strings["Enter a path to a cloud files destination."] = ""; -App::$strings["Specify folder"] = ""; -App::$strings["General Features"] = ""; -App::$strings["Display new member quick links menu"] = ""; -App::$strings["Advanced Profiles"] = ""; -App::$strings["Additional profile sections and selections"] = ""; -App::$strings["Private Notes"] = ""; -App::$strings["Enables a tool to store notes and reminders (note: not encrypted)"] = ""; -App::$strings["Create interactive articles"] = ""; -App::$strings["Photo Location"] = ""; -App::$strings["If location data is available on uploaded photos, link this to a map."] = ""; -App::$strings["Event Timezone Selection"] = ""; -App::$strings["Allow event creation in timezones other than your own."] = ""; -App::$strings["Advanced Directory Search"] = ""; -App::$strings["Allows creation of complex directory search queries"] = ""; -App::$strings["Advanced Theme and Layout Settings"] = ""; -App::$strings["Allows fine tuning of themes and page layouts"] = ""; -App::$strings["Access Control and Permissions"] = ""; -App::$strings["Privacy Groups"] = ""; -App::$strings["Enable management and selection of privacy groups"] = ""; -App::$strings["OAuth2 Clients"] = ""; -App::$strings["Manage OAuth2 authenticatication tokens for mobile and remote apps."] = ""; -App::$strings["Post Composition Features"] = ""; -App::$strings["Auto-save drafts of posts and comments"] = ""; -App::$strings["Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions"] = ""; -App::$strings["Network and Stream Filtering"] = ""; -App::$strings["Post/Comment Tools"] = ""; -App::$strings["Community Tagging"] = ""; -App::$strings["Ability to tag existing posts"] = ""; -App::$strings["Post Categories"] = ""; -App::$strings["Add categories to your posts"] = ""; -App::$strings["Emoji Reactions"] = ""; -App::$strings["Add emoji reaction ability to posts"] = ""; -App::$strings["Ability to file posts under folders"] = ""; -App::$strings["Dislike Posts"] = ""; -App::$strings["Ability to dislike posts/comments"] = ""; -App::$strings["Tag Cloud"] = ""; -App::$strings["Provide a personal tag cloud on your channel page"] = ""; -App::$strings["Who can see this?"] = ""; -App::$strings["Custom selection"] = ""; -App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = ""; -App::$strings["Show"] = ""; -App::$strings["Don't show"] = ""; -App::$strings["Post permissions cannot be changed after a post is shared.These permissions set who is allowed to view the post."] = ""; -App::$strings["New window"] = ""; -App::$strings["Open the selected location in a different window or browser tab"] = ""; -App::$strings["No connections"] = ""; -App::$strings["View all %s connections"] = ""; -App::$strings["Network: %s"] = ""; -App::$strings["Unable to import a removed channel."] = ""; -App::$strings["A channel with these settings was discovered and is not usable as it was removed or reserved for system use. Import failed."] = ""; -App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = ""; -App::$strings["Unable to create a unique channel address. Import failed."] = ""; -App::$strings["Cloned channel not found. Import failed."] = ""; -App::$strings["Image exceeds website size limit of %lu bytes"] = ""; -App::$strings["Image file is empty."] = ""; -App::$strings["Photo storage failed."] = ""; -App::$strings["a new photo"] = ""; -App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = ""; -App::$strings["Upload New Photos"] = ""; -App::$strings["%1\$s repeated %2\$s's %3\$s"] = ""; -App::$strings["likes %1\$s's %2\$s"] = ""; -App::$strings["doesn't like %1\$s's %2\$s"] = ""; -App::$strings["repeated %1\$s's %2\$s"] = ""; -App::$strings["%1\$s is now connected with %2\$s"] = ""; -App::$strings["%1\$s poked %2\$s"] = ""; -App::$strings["Toggle Star Status"] = ""; -App::$strings["View %s's profile @ %s"] = ""; -App::$strings["Categories:"] = ""; -App::$strings["Filed under:"] = ""; -App::$strings["View Conversation"] = ""; -App::$strings["remove"] = ""; -App::$strings["Loading..."] = ""; -App::$strings["Delete Selected Items"] = ""; -App::$strings["View Source"] = ""; -App::$strings["Follow Thread"] = ""; -App::$strings["Unfollow Thread"] = ""; -App::$strings["Visit"] = ""; -App::$strings["Edit Connection"] = ""; -App::$strings["Message"] = ""; -App::$strings["Block author's site"] = ""; -App::$strings["Block author"] = ""; -App::$strings["%s likes this."] = ""; -App::$strings["%s doesn't like this."] = ""; +App::$strings["%1\$s's birthday"] = ''; +App::$strings["Happy Birthday %1\$s"] = ''; +App::$strings["Cannot locate DNS info for database server '%s'"] = ''; +App::$strings['View PDF'] = ''; +App::$strings[' by '] = ''; +App::$strings[' on '] = ''; +App::$strings['Embedded content'] = ''; +App::$strings['Embedding disabled'] = ''; +App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = ''; +App::$strings['Friendica'] = ''; +App::$strings['OStatus'] = ''; +App::$strings['GNU-Social'] = ''; +App::$strings['RSS/Atom'] = ''; +App::$strings['Diaspora'] = ''; +App::$strings['Facebook'] = ''; +App::$strings['Zot'] = ''; +App::$strings['LinkedIn'] = ''; +App::$strings['XMPP/IM'] = ''; +App::$strings['MySpace'] = ''; +App::$strings['Remote authentication'] = ''; +App::$strings['Click to authenticate to your home hub'] = ''; +App::$strings['Manage your channels'] = ''; +App::$strings['Manage your access lists'] = ''; +App::$strings['Account/Channel Settings'] = ''; +App::$strings['(is on)'] = ''; +App::$strings['(is off)'] = ''; +App::$strings['Content filtering'] = ''; +App::$strings['Logout'] = ''; +App::$strings['End this session'] = ''; +App::$strings['Your profile page'] = ''; +App::$strings['Manage/Edit profiles'] = ''; +App::$strings['Sign in'] = ''; +App::$strings['Take me home'] = ''; +App::$strings['Log me out of this site'] = ''; +App::$strings['Create an account'] = ''; +App::$strings['Help and documentation'] = ''; +App::$strings['Search site @name, #tag, content'] = ''; +App::$strings['Site Setup and Configuration'] = ''; +App::$strings["Powered by \$Projectname"] = ''; +App::$strings['@name, #tag, content'] = ''; +App::$strings['Please wait...'] = ''; +App::$strings['Add/Manage Apps'] = ''; +App::$strings['Arrange Apps'] = ''; +App::$strings['Toggle System Apps'] = ''; +App::$strings['Status Messages and Posts'] = ''; +App::$strings['About'] = ''; +App::$strings['Profile Details'] = ''; +App::$strings['Photo Albums'] = ''; +App::$strings['Files and Storage'] = ''; +App::$strings['Bookmarks'] = ''; +App::$strings['Saved Bookmarks'] = ''; +App::$strings['View Cards'] = ''; +App::$strings['View Articles'] = ''; +App::$strings['View Webpages'] = ''; +App::$strings['Wikis'] = ''; +App::$strings["l F d, Y \\@ g:i A"] = ''; +App::$strings['Starts:'] = ''; +App::$strings['Finishes:'] = ''; +App::$strings['This event has been added to your calendar.'] = ''; +App::$strings['Not specified'] = ''; +App::$strings['Needs Action'] = ''; +App::$strings['Completed'] = ''; +App::$strings['In Process'] = ''; +App::$strings['Cancelled'] = ''; +App::$strings['Home, Voice'] = ''; +App::$strings['Home, Fax'] = ''; +App::$strings['Work, Voice'] = ''; +App::$strings['Work, Fax'] = ''; +App::$strings['The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.'] = ''; +App::$strings['Trending'] = ''; +App::$strings['Keywords'] = ''; +App::$strings['have'] = ''; +App::$strings['has'] = ''; +App::$strings['want'] = ''; +App::$strings['wants'] = ''; +App::$strings['likes'] = ''; +App::$strings['dislikes'] = ''; +App::$strings['Not a valid email address'] = ''; +App::$strings['Your email domain is not among those allowed on this site'] = ''; +App::$strings['Your email address is already registered at this site.'] = ''; +App::$strings['An invitation is required.'] = ''; +App::$strings['Invitation could not be verified.'] = ''; +App::$strings['Please enter the required information.'] = ''; +App::$strings['Failed to store account information.'] = ''; +App::$strings['Registration confirmation for %s'] = ''; +App::$strings['Registration request at %s'] = ''; +App::$strings['your registration password'] = ''; +App::$strings['Registration details for %s'] = ''; +App::$strings['Account approved.'] = ''; +App::$strings['Registration revoked for %s'] = ''; +App::$strings['Click here to upgrade.'] = ''; +App::$strings['This action exceeds the limits set by your subscription plan.'] = ''; +App::$strings['This action is not available under your subscription plan.'] = ''; +App::$strings['Encrypted content'] = ''; +App::$strings["(Embedded app '%s' could not be displayed)."] = ''; +App::$strings["Install %1\$s element %2\$s"] = ''; +App::$strings['This post contains an installable %s element, however you lack permissions to install it on this site.'] = ''; +App::$strings['card'] = ''; +App::$strings['article'] = ''; +App::$strings['Click to open/close'] = ''; +App::$strings['spoiler'] = ''; +App::$strings['Different viewers will see this text differently'] = ''; +App::$strings['$1 wrote:'] = ''; +App::$strings['Item was not found.'] = ''; +App::$strings['Unknown error.'] = ''; +App::$strings['No source file.'] = ''; +App::$strings['Cannot locate file to replace'] = ''; +App::$strings['Cannot locate file to revise/update'] = ''; +App::$strings['File exceeds size limit of %d'] = ''; +App::$strings['You have reached your limit of %1$.0f Mbytes attachment storage.'] = ''; +App::$strings['File upload failed. Possible system limit or action terminated.'] = ''; +App::$strings['Stored file could not be verified. Upload failed.'] = ''; +App::$strings['Path not available.'] = ''; +App::$strings['Empty pathname'] = ''; +App::$strings['duplicate filename or path'] = ''; +App::$strings['Path not found.'] = ''; +App::$strings['mkdir failed.'] = ''; +App::$strings['database storage failed.'] = ''; +App::$strings['Empty path'] = ''; +App::$strings['Unable to obtain identity information from database'] = ''; +App::$strings['Empty name'] = ''; +App::$strings['Name too long'] = ''; +App::$strings['No account identifier'] = ''; +App::$strings['Nickname is required.'] = ''; +App::$strings['Unable to retrieve created identity'] = ''; +App::$strings['Default Profile'] = ''; +App::$strings['Unable to retrieve modified identity'] = ''; +App::$strings['(Unknown)'] = ''; +App::$strings['Visible to anybody on the internet.'] = ''; +App::$strings['Visible to you only.'] = ''; +App::$strings['Visible to anybody in this network.'] = ''; +App::$strings['Visible to anybody authenticated.'] = ''; +App::$strings['Visible to anybody on %s.'] = ''; +App::$strings['Visible to all connections.'] = ''; +App::$strings['Visible to approved connections.'] = ''; +App::$strings['Visible to specific connections.'] = ''; +App::$strings['Privacy group not found.'] = ''; +App::$strings['Privacy group is empty.'] = ''; +App::$strings['Privacy group: %s'] = ''; +App::$strings['Connection not found.'] = ''; +App::$strings['profile photo'] = ''; +App::$strings['[Edited %s]'] = ''; +App::$strings['__ctx:edit_activity__ Post'] = ''; +App::$strings['__ctx:edit_activity__ Comment'] = ''; +App::$strings['prev'] = ''; +App::$strings['first'] = ''; +App::$strings['last'] = ''; +App::$strings['next'] = ''; +App::$strings['older'] = ''; +App::$strings['newer'] = ''; +App::$strings['poke'] = ''; +App::$strings['poked'] = ''; +App::$strings['ping'] = ''; +App::$strings['pinged'] = ''; +App::$strings['prod'] = ''; +App::$strings['prodded'] = ''; +App::$strings['slap'] = ''; +App::$strings['slapped'] = ''; +App::$strings['finger'] = ''; +App::$strings['fingered'] = ''; +App::$strings['rebuff'] = ''; +App::$strings['rebuffed'] = ''; +App::$strings['happy'] = ''; +App::$strings['sad'] = ''; +App::$strings['mellow'] = ''; +App::$strings['tired'] = ''; +App::$strings['perky'] = ''; +App::$strings['angry'] = ''; +App::$strings['stupefied'] = ''; +App::$strings['puzzled'] = ''; +App::$strings['interested'] = ''; +App::$strings['bitter'] = ''; +App::$strings['cheerful'] = ''; +App::$strings['alive'] = ''; +App::$strings['annoyed'] = ''; +App::$strings['anxious'] = ''; +App::$strings['cranky'] = ''; +App::$strings['disturbed'] = ''; +App::$strings['frustrated'] = ''; +App::$strings['depressed'] = ''; +App::$strings['motivated'] = ''; +App::$strings['relaxed'] = ''; +App::$strings['surprised'] = ''; +App::$strings['May'] = ''; +App::$strings['Unknown Attachment'] = ''; +App::$strings['unknown'] = ''; +App::$strings['remove category'] = ''; +App::$strings['remove from file'] = ''; +App::$strings['Added to your calendar'] = ''; +App::$strings['Link'] = ''; +App::$strings['Poll has ended.'] = ''; +App::$strings['Poll ends: %s'] = ''; +App::$strings['vote'] = ''; +App::$strings['Download binary/encrypted content'] = ''; +App::$strings['Page layout'] = ''; +App::$strings['You can create your own with the layouts tool'] = ''; +App::$strings['BBcode'] = ''; +App::$strings['HTML'] = ''; +App::$strings['Markdown'] = ''; +App::$strings['Text'] = ''; +App::$strings['Comanche Layout'] = ''; +App::$strings['PHP'] = ''; +App::$strings['Page content type'] = ''; +App::$strings['activity'] = ''; +App::$strings['a-z, 0-9, -, and _ only'] = ''; +App::$strings['Design Tools'] = ''; +App::$strings['Pages'] = ''; +App::$strings['Import website...'] = ''; +App::$strings['Select folder to import'] = ''; +App::$strings['Import from a zipped folder:'] = ''; +App::$strings['Import from cloud files:'] = ''; +App::$strings['/cloud/channel/path/to/folder'] = ''; +App::$strings['Enter path to website files'] = ''; +App::$strings['Select folder'] = ''; +App::$strings['Export website...'] = ''; +App::$strings['Export to a zip file'] = ''; +App::$strings['website.zip'] = ''; +App::$strings['Enter a name for the zip file.'] = ''; +App::$strings['Export to cloud files'] = ''; +App::$strings['/path/to/export/folder'] = ''; +App::$strings['Enter a path to a cloud files destination.'] = ''; +App::$strings['Specify folder'] = ''; +App::$strings['General Features'] = ''; +App::$strings['Display new member quick links menu'] = ''; +App::$strings['Advanced Profiles'] = ''; +App::$strings['Additional profile sections and selections'] = ''; +App::$strings['Private Notes'] = ''; +App::$strings['Enables a tool to store notes and reminders (note: not encrypted)'] = ''; +App::$strings['Create interactive articles'] = ''; +App::$strings['Photo Location'] = ''; +App::$strings['If location data is available on uploaded photos, link this to a map.'] = ''; +App::$strings['Event Timezone Selection'] = ''; +App::$strings['Allow event creation in timezones other than your own.'] = ''; +App::$strings['Advanced Directory Search'] = ''; +App::$strings['Allows creation of complex directory search queries'] = ''; +App::$strings['Advanced Theme and Layout Settings'] = ''; +App::$strings['Allows fine tuning of themes and page layouts'] = ''; +App::$strings['Access Control and Permissions'] = ''; +App::$strings['Privacy Groups'] = ''; +App::$strings['Enable management and selection of privacy groups'] = ''; +App::$strings['OAuth2 Clients'] = ''; +App::$strings['Manage OAuth2 authenticatication tokens for mobile and remote apps.'] = ''; +App::$strings['Post Composition Features'] = ''; +App::$strings['Auto-save drafts of posts and comments'] = ''; +App::$strings['Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions'] = ''; +App::$strings['Network and Stream Filtering'] = ''; +App::$strings['Post/Comment Tools'] = ''; +App::$strings['Community Tagging'] = ''; +App::$strings['Ability to tag existing posts'] = ''; +App::$strings['Post Categories'] = ''; +App::$strings['Add categories to your posts'] = ''; +App::$strings['Emoji Reactions'] = ''; +App::$strings['Add emoji reaction ability to posts'] = ''; +App::$strings['Ability to file posts under folders'] = ''; +App::$strings['Dislike Posts'] = ''; +App::$strings['Ability to dislike posts/comments'] = ''; +App::$strings['Tag Cloud'] = ''; +App::$strings['Provide a personal tag cloud on your channel page'] = ''; +App::$strings['Who can see this?'] = ''; +App::$strings['Custom selection'] = ''; +App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = ''; +App::$strings['Show'] = ''; +App::$strings["Don't show"] = ''; +App::$strings['Post permissions cannot be changed after a post is shared.These permissions set who is allowed to view the post.'] = ''; +App::$strings['New window'] = ''; +App::$strings['Open the selected location in a different window or browser tab'] = ''; +App::$strings['No connections'] = ''; +App::$strings['View all %s connections'] = ''; +App::$strings['Network: %s'] = ''; +App::$strings['Unable to import a removed channel.'] = ''; +App::$strings['A channel with these settings was discovered and is not usable as it was removed or reserved for system use. Import failed.'] = ''; +App::$strings['Cannot create a duplicate channel identifier on this system. Import failed.'] = ''; +App::$strings['Unable to create a unique channel address. Import failed.'] = ''; +App::$strings['Cloned channel not found. Import failed.'] = ''; +App::$strings['Image exceeds website size limit of %lu bytes'] = ''; +App::$strings['Image file is empty.'] = ''; +App::$strings['Photo storage failed.'] = ''; +App::$strings['a new photo'] = ''; +App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = ''; +App::$strings['Upload New Photos'] = ''; +App::$strings["%1\$s repeated %2\$s's %3\$s"] = ''; +App::$strings["likes %1\$s's %2\$s"] = ''; +App::$strings["doesn't like %1\$s's %2\$s"] = ''; +App::$strings["repeated %1\$s's %2\$s"] = ''; +App::$strings["%1\$s is now connected with %2\$s"] = ''; +App::$strings["%1\$s poked %2\$s"] = ''; +App::$strings['Toggle Star Status'] = ''; +App::$strings["View %s's profile @ %s"] = ''; +App::$strings['Categories:'] = ''; +App::$strings['Filed under:'] = ''; +App::$strings['View Conversation'] = ''; +App::$strings['remove'] = ''; +App::$strings['Loading...'] = ''; +App::$strings['Delete Selected Items'] = ''; +App::$strings['View Source'] = ''; +App::$strings['Follow Thread'] = ''; +App::$strings['Unfollow Thread'] = ''; +App::$strings['Visit'] = ''; +App::$strings['Edit Connection'] = ''; +App::$strings['Message'] = ''; +App::$strings["Block author's site"] = ''; +App::$strings['Block author'] = ''; +App::$strings['%s likes this.'] = ''; +App::$strings["%s doesn't like this."] = ''; App::$strings["%2\$d people like this."] = [ - 0 => "", - 1 => "", + 0 => '', + 1 => '', ]; App::$strings["%2\$d people don't like this."] = [ - 0 => "", - 1 => "", + 0 => '', + 1 => '', ]; -App::$strings["and"] = ""; -App::$strings[", and %d other people"] = [ - 0 => "", - 1 => "", +App::$strings['and'] = ''; +App::$strings[', and %d other people'] = [ + 0 => '', + 1 => '', ]; -App::$strings["%s like this."] = ""; -App::$strings["%s don't like this."] = ""; -App::$strings["Set your location"] = ""; -App::$strings["Clear browser location"] = ""; -App::$strings["Embed (existing) photo from your photo albums"] = ""; -App::$strings["Tag term:"] = ""; -App::$strings["Where are you right now?"] = ""; -App::$strings["Choose a different album..."] = ""; -App::$strings["Comments enabled"] = ""; -App::$strings["Comments disabled"] = ""; -App::$strings["Page link name"] = ""; -App::$strings["Post as"] = ""; -App::$strings["Please enter a link location (URL)"] = ""; -App::$strings["Insert link only"] = ""; -App::$strings["Embed content if possible"] = ""; -App::$strings["Embed an image from your albums"] = ""; -App::$strings["Toggle voting"] = ""; -App::$strings["Toggle poll"] = ""; -App::$strings["Option"] = ""; -App::$strings["Add option"] = ""; -App::$strings["Minutes"] = ""; -App::$strings["Hours"] = ""; -App::$strings["Days"] = ""; -App::$strings["Allow multiple answers"] = ""; -App::$strings["Disable comments"] = ""; -App::$strings["Toggle comments"] = ""; -App::$strings["Categories (optional, comma-separated list)"] = ""; -App::$strings["Other networks and post services"] = ""; -App::$strings["Set expiration date"] = ""; -App::$strings["Set publish date"] = ""; -App::$strings["Find remote media players (oEmbed)"] = ""; -App::$strings["Find shareable objects (Zot)"] = ""; -App::$strings["Post to Collections"] = ""; -App::$strings["articles"] = ""; -App::$strings["__ctx:noun__ Attending"] = [ - 0 => "", - 1 => "", +App::$strings['%s like this.'] = ''; +App::$strings["%s don't like this."] = ''; +App::$strings['Set your location'] = ''; +App::$strings['Clear browser location'] = ''; +App::$strings['Embed (existing) photo from your photo albums'] = ''; +App::$strings['Tag term:'] = ''; +App::$strings['Where are you right now?'] = ''; +App::$strings['Choose a different album...'] = ''; +App::$strings['Comments enabled'] = ''; +App::$strings['Comments disabled'] = ''; +App::$strings['Page link name'] = ''; +App::$strings['Post as'] = ''; +App::$strings['Please enter a link location (URL)'] = ''; +App::$strings['Insert link only'] = ''; +App::$strings['Embed content if possible'] = ''; +App::$strings['Embed an image from your albums'] = ''; +App::$strings['Toggle voting'] = ''; +App::$strings['Toggle poll'] = ''; +App::$strings['Option'] = ''; +App::$strings['Add option'] = ''; +App::$strings['Minutes'] = ''; +App::$strings['Hours'] = ''; +App::$strings['Days'] = ''; +App::$strings['Allow multiple answers'] = ''; +App::$strings['Disable comments'] = ''; +App::$strings['Toggle comments'] = ''; +App::$strings['Categories (optional, comma-separated list)'] = ''; +App::$strings['Other networks and post services'] = ''; +App::$strings['Set expiration date'] = ''; +App::$strings['Set publish date'] = ''; +App::$strings['Find remote media players (oEmbed)'] = ''; +App::$strings['Find shareable objects (Zot)'] = ''; +App::$strings['Post to Collections'] = ''; +App::$strings['articles'] = ''; +App::$strings['__ctx:noun__ Attending'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:noun__ Not Attending"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:noun__ Not Attending'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:noun__ Undecided"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:noun__ Undecided'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:noun__ Agree"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:noun__ Agree'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:noun__ Disagree"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:noun__ Disagree'] = [ + 0 => '', + 1 => '', ]; -App::$strings["__ctx:noun__ Abstain"] = [ - 0 => "", - 1 => "", +App::$strings['__ctx:noun__ Abstain'] = [ + 0 => '', + 1 => '', ]; -App::$strings["Source channel not found."] = ""; -App::$strings["Focus (Hubzilla default)"] = ""; -App::$strings["Theme settings"] = ""; -App::$strings["Narrow navbar"] = ""; -App::$strings["Navigation bar background color"] = ""; -App::$strings["Navigation bar icon color "] = ""; -App::$strings["Navigation bar active icon color "] = ""; -App::$strings["Link color"] = ""; -App::$strings["Set font-color for banner"] = ""; -App::$strings["Set the background color"] = ""; -App::$strings["Set the background image"] = ""; -App::$strings["Set the background color of items"] = ""; -App::$strings["Set the background color of comments"] = ""; -App::$strings["Set font-size for the entire application"] = ""; -App::$strings["Examples: 1rem, 100%, 16px"] = ""; -App::$strings["Set font-color for posts and comments"] = ""; -App::$strings["Set radius of corners"] = ""; -App::$strings["Example: 4px"] = ""; -App::$strings["Set shadow depth of photos"] = ""; -App::$strings["Set maximum width of content region in pixel"] = ""; -App::$strings["Leave empty for default width"] = ""; -App::$strings["Set size of conversation author photo"] = ""; -App::$strings["Set size of followup author photos"] = ""; -App::$strings["Cover Photo"] = ""; -App::$strings["An account has been created for you."] = ""; -App::$strings["Authentication successful but rejected: account creation is disabled."] = ""; -App::$strings["Logfile archive directory"] = ""; -App::$strings["Directory to store rotated logs"] = ""; -App::$strings["Logfile size in bytes before rotating, example 10M"] = ""; -App::$strings["Number of logfiles to retain"] = ""; -App::$strings["NSFW Settings saved."] = ""; -App::$strings["This addon app looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; -App::$strings["Comma separated list of keywords to hide"] = ""; -App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = ""; -App::$strings["Collapse entire conversation if a match is found"] = ""; -App::$strings["Not Safe For Work Settings"] = ""; -App::$strings["General Purpose Content Filter"] = ""; -App::$strings["Conversation muted"] = ""; -App::$strings["Possible adult content"] = ""; -App::$strings["%s - view"] = ""; -App::$strings["This addon app provides a selector on your stream page allowing you to change the sort order of the page between 'recently commented' (default), 'posted order', or 'unthreaded' which displays single activities as received."] = ""; -App::$strings["Channel is required."] = ""; -App::$strings["Zotpost Settings saved."] = ""; -App::$strings["This addon app allows you to cross-post to other Zot services and channels. After installing the app, select it to configure the destination settings and preferences."] = ""; -App::$strings["Zot server URL"] = ""; -App::$strings["https://example.com"] = ""; -App::$strings["Zot channel name"] = ""; -App::$strings["Zot password"] = ""; -App::$strings["Send public postings to Zot channel by default"] = ""; -App::$strings["Zotpost Settings"] = ""; -App::$strings["Post to Zot"] = ""; -App::$strings["Add some colour to tag clouds"] = ""; -App::$strings["Rainbow Tag"] = ""; -App::$strings["No server specified"] = ""; -App::$strings["Posts imported"] = ""; -App::$strings["Files imported"] = ""; -App::$strings["This addon app copies existing content and file storage to a cloned/copied channel. Once the app is installed, visit the newly installed app. This will allow you to set the location of your original channel and an optional date range of files/conversations to copy."] = ""; -App::$strings["This will import all your conversations and cloud files from a cloned channel on another server. This may take a while if you have lots of posts and or files."] = ""; -App::$strings["Include posts"] = ""; -App::$strings["Conversations, Articles, Cards, and other posted content"] = ""; -App::$strings["Include files"] = ""; -App::$strings["Files, Photos and other cloud storage"] = ""; -App::$strings["Original Server base URL"] = ""; -App::$strings["Since modified date yyyy-mm-dd"] = ""; -App::$strings["Until modified date yyyy-mm-dd"] = ""; -App::$strings["View Larger"] = ""; -App::$strings["Tile Server URL"] = ""; -App::$strings["A list of public tile servers"] = ""; -App::$strings["Nominatim (reverse geocoding) Server URL"] = ""; -App::$strings["A list of Nominatim servers"] = ""; -App::$strings["Default zoom"] = ""; -App::$strings["The default zoom level. (1:world, 18:highest, also depends on tile server)"] = ""; -App::$strings["Include marker on map"] = ""; -App::$strings["Include a marker on the map."] = ""; -App::$strings["Profile Unavailable."] = ""; -App::$strings["Not allowed."] = ""; -App::$strings["Photo Gallery"] = ""; -App::$strings["Gallery App"] = ""; -App::$strings["A simple gallery for your photo albums"] = ""; -App::$strings["Face detection is not activated"] = ""; -App::$strings["Face detection is still busy"] = ""; -App::$strings["Errors encountered deleting all rows of database table "] = ""; -App::$strings["Create an account to access services and applications"] = ""; -App::$strings["Login/Email"] = ""; -App::$strings["Password"] = ""; -App::$strings["Remember me"] = ""; -App::$strings["Forgot your password?"] = ""; -App::$strings["[\$Projectname] Website SSL error for %s"] = ""; -App::$strings["Website SSL certificate is not valid. Please correct."] = ""; -App::$strings["[\$Projectname] Cron tasks not running on %s"] = ""; -App::$strings["Cron/Scheduled tasks not running."] = ""; +App::$strings['Source channel not found.'] = ''; +App::$strings['Focus (Hubzilla default)'] = ''; +App::$strings['Theme settings'] = ''; +App::$strings['Narrow navbar'] = ''; +App::$strings['Navigation bar background color'] = ''; +App::$strings['Navigation bar icon color '] = ''; +App::$strings['Navigation bar active icon color '] = ''; +App::$strings['Link color'] = ''; +App::$strings['Set font-color for banner'] = ''; +App::$strings['Set the background color'] = ''; +App::$strings['Set the background image'] = ''; +App::$strings['Set the background color of items'] = ''; +App::$strings['Set the background color of comments'] = ''; +App::$strings['Set font-size for the entire application'] = ''; +App::$strings['Examples: 1rem, 100%, 16px'] = ''; +App::$strings['Set font-color for posts and comments'] = ''; +App::$strings['Set radius of corners'] = ''; +App::$strings['Example: 4px'] = ''; +App::$strings['Set shadow depth of photos'] = ''; +App::$strings['Set maximum width of content region in pixel'] = ''; +App::$strings['Leave empty for default width'] = ''; +App::$strings['Set size of conversation author photo'] = ''; +App::$strings['Set size of followup author photos'] = ''; +App::$strings['Cover Photo'] = ''; +App::$strings['An account has been created for you.'] = ''; +App::$strings['Authentication successful but rejected: account creation is disabled.'] = ''; +App::$strings['Logfile archive directory'] = ''; +App::$strings['Directory to store rotated logs'] = ''; +App::$strings['Logfile size in bytes before rotating, example 10M'] = ''; +App::$strings['Number of logfiles to retain'] = ''; +App::$strings['NSFW Settings saved.'] = ''; +App::$strings['This addon app looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter.'] = ''; +App::$strings['Comma separated list of keywords to hide'] = ''; +App::$strings['Word, /regular-expression/, lang=xx, lang!=xx'] = ''; +App::$strings['Collapse entire conversation if a match is found'] = ''; +App::$strings['Not Safe For Work Settings'] = ''; +App::$strings['General Purpose Content Filter'] = ''; +App::$strings['Conversation muted'] = ''; +App::$strings['Possible adult content'] = ''; +App::$strings['%s - view'] = ''; +App::$strings["This addon app provides a selector on your stream page allowing you to change the sort order of the page between 'recently commented' (default), 'posted order', or 'unthreaded' which displays single activities as received."] = ''; +App::$strings['Channel is required.'] = ''; +App::$strings['Zotpost Settings saved.'] = ''; +App::$strings['This addon app allows you to cross-post to other Zot services and channels. After installing the app, select it to configure the destination settings and preferences.'] = ''; +App::$strings['Zot server URL'] = ''; +App::$strings['https://example.com'] = ''; +App::$strings['Zot channel name'] = ''; +App::$strings['Zot password'] = ''; +App::$strings['Send public postings to Zot channel by default'] = ''; +App::$strings['Zotpost Settings'] = ''; +App::$strings['Post to Zot'] = ''; +App::$strings['Add some colour to tag clouds'] = ''; +App::$strings['Rainbow Tag'] = ''; +App::$strings['No server specified'] = ''; +App::$strings['Posts imported'] = ''; +App::$strings['Files imported'] = ''; +App::$strings['This addon app copies existing content and file storage to a cloned/copied channel. Once the app is installed, visit the newly installed app. This will allow you to set the location of your original channel and an optional date range of files/conversations to copy.'] = ''; +App::$strings['This will import all your conversations and cloud files from a cloned channel on another server. This may take a while if you have lots of posts and or files.'] = ''; +App::$strings['Include posts'] = ''; +App::$strings['Conversations, Articles, Cards, and other posted content'] = ''; +App::$strings['Include files'] = ''; +App::$strings['Files, Photos and other cloud storage'] = ''; +App::$strings['Original Server base URL'] = ''; +App::$strings['Since modified date yyyy-mm-dd'] = ''; +App::$strings['Until modified date yyyy-mm-dd'] = ''; +App::$strings['View Larger'] = ''; +App::$strings['Tile Server URL'] = ''; +App::$strings["A list of public tile servers"] = ''; +App::$strings['Nominatim (reverse geocoding) Server URL'] = ''; +App::$strings["A list of Nominatim servers"] = ''; +App::$strings['Default zoom'] = ''; +App::$strings['The default zoom level. (1:world, 18:highest, also depends on tile server)'] = ''; +App::$strings['Include marker on map'] = ''; +App::$strings['Include a marker on the map.'] = ''; +App::$strings['Profile Unavailable.'] = ''; +App::$strings['Not allowed.'] = ''; +App::$strings['Photo Gallery'] = ''; +App::$strings['Gallery App'] = ''; +App::$strings['A simple gallery for your photo albums'] = ''; +App::$strings['Face detection is not activated'] = ''; +App::$strings['Face detection is still busy'] = ''; +App::$strings['Errors encountered deleting all rows of database table '] = ''; +App::$strings['Create an account to access services and applications'] = ''; +App::$strings['Login/Email'] = ''; +App::$strings['Password'] = ''; +App::$strings['Remember me'] = ''; +App::$strings['Forgot your password?'] = ''; +App::$strings["[\$Projectname] Website SSL error for %s"] = ''; +App::$strings['Website SSL certificate is not valid. Please correct.'] = ''; +App::$strings["[\$Projectname] Cron tasks not running on %s"] = ''; +App::$strings['Cron/Scheduled tasks not running.'] = ''; diff --git a/util/typo.php b/util/typo.php index 41475e050..ccd004dfb 100644 --- a/util/typo.php +++ b/util/typo.php @@ -1,84 +1,86 @@- +- {{/if}}- + +- {{/if}} - ' . ucwords(str_replace('_',' ',notags($fname))) . '
into `\n` instead of ` \n` - 'list_item_style' => '-', // Set the default character for each