Examples:
author_link == " -"'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Exemples:
author_link == " -"'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Examples:
author_link == 'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Exemples:
author_link == 'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Examples:
author_link == " -"'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Examples:
author_link == " -"'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Examples:
author_link == 'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Examples:
author_link == 'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Examples:
author_link == " "'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Exemples :
author_link == " -"'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Examples:
author_link == 'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Exemples :
author_link == 'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Examples:
author_link == 'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Examples:
author_link == " -"'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Примеры:
author_link == " -"'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Examples:
author_link == 'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Примеры:
author_link == 'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Examples:
author_link == 'https://friendica.mrpetovan.com/profile/hypolite'
- tags
Exempel:
author_link == 'https://friendica.mrpetovan.com/profile/hypolite'
- taggar
Examples:
author_link == " -"'https://friendica.mrpetovan.com/profile/hypolite'
- tags
例子：
author_link == " -"'https://friendica.mrpetovan.com/profile/hypolite
- tags
Examples:
author_link == 'https://friendica.mrpetovan.com/profile/hypolite'
- tags
例子：
author_link == 'https://friendica.mrpetovan.com/profile/hypolite
- tags
-crawlerdetect.io
-
-
-
-
-
-
-
-
-
-
' . DI::l10n()->t('Blockem') . '
'; + $s .= '' . L10n::t('Blockem') . '
'; $s .= ''; $s .= ''; + $s .= ''; return; @@ -65,13 +78,14 @@ function blockem_addon_settings_post(App $a, array &$b) } if (!empty($_POST['blockem-submit'])) { - DI::pConfig()->set(local_user(), 'blockem', 'words', trim($_POST['blockem-words'])); + PConfig::set(local_user(), 'blockem', 'words', trim($_POST['blockem-words'])); + info(L10n::t('BLOCKEM Settings saved.') . EOL); } } function blockem_enotify_store(App $a, array &$b) { - $words = DI::pConfig()->get($b['uid'], 'blockem', 'words'); + $words = PConfig::get($b['uid'], 'blockem', 'words'); if ($words) { $arr = explode(',', $words); @@ -95,8 +109,7 @@ function blockem_enotify_store(App $a, array &$b) } if ($found) { - // empty out the fields - $b = []; + $b['abort'] = true; } } @@ -109,7 +122,7 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data) $profiles_string = null; if (local_user()) { - $profiles_string = DI::pConfig()->get(local_user(), 'blockem', 'words'); + $profiles_string = PConfig::get(local_user(), 'blockem', 'words'); } if ($profiles_string) { @@ -128,14 +141,14 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data) } if ($found) { - $hook_data['filter_reasons'][] = DI::l10n()->t('Filtered user: %s', $hook_data['item']['author-name']); + $hook_data['filter_reasons'][] = L10n::t('Filtered user: %s', $hook_data['item']['author-name']); } } function blockem_display_item(App $a, array &$b = null) { if (!empty($b['output']['body']) && strstr($b['output']['body'], 'id="blockem-wrap-')) { - $b['output']['thumb'] = DI::baseUrl()->get() . "/images/person-80.jpg"; + $b['output']['thumb'] = $a->getBaseURL() . "/images/person-80.jpg"; } } @@ -145,13 +158,13 @@ function blockem_conversation_start(App $a, array &$b) return; } - $words = DI::pConfig()->get(local_user(), 'blockem', 'words'); + $words = PConfig::get(local_user(), 'blockem', 'words'); if ($words) { $a->data['blockem'] = explode(',', $words); } - DI::page()['htmlhead'] .= <<< EOT + $a->page['htmlhead'] .= <<< EOT - -EOT; -DI::page()['htmlhead'] .= $x; -} - -function calc_content($app) { - -$o = ''; - -$o .= <<< EOT - -Calculator
--
-
|
Calculator
++
+
|
| $value $from_unit | "; - $i=0; - foreach ($cells as $cell) { - if ($i==0) { - $string .= "".$cell['value']." | "; - $i++; - } else { - $string .= "
| ".$cell['value']." | "; - } - } - $string .= "
Unit Conversions
'; - - - if (isset($_POST['from_unit']) && isset($_POST['value'])) { - $_POST['value'] = $_POST['value'] + 0; - - - $o .= ($conv->getTable($_POST['value'], $_POST['from_unit'], $_POST['to_unit'], 5)).""; - } else { - $o .= "Select:
"; - } - - if(isset($_POST['value'])) - $value = $_POST['value']; - else - $value = ''; - - $o .= ''; - - return $o; -} + + */ +use Friendica\Core\Hook; + +function convert_install() { + Hook::register('app_menu', 'addon/convert/convert.php', 'convert_app_menu'); +} + +function convert_uninstall() { + Hook::unregister('app_menu', 'addon/convert/convert.php', 'convert_app_menu'); +} + +function convert_app_menu($a,&$b) { + $b['app_menu'][] = ''; +} + + +function convert_module() {} + + + + + + + +function convert_content($app) { + +include("UnitConvertor.php"); + + class TP_Converter extends UnitConvertor { + function TP_Converter($lang = "en") + { + if ($lang != 'en' ) { + $dec_point = '.'; $thousand_sep = "'"; + } else { + $dec_point = '.'; $thousand_sep = ","; + } + + $this->UnitConvertor($dec_point , $thousand_sep ); + + } // end func UnitConvertor + + function find_base_unit($from,$to) { + while (list($skey,$sval) = each($this->bases)) { + if ($skey == $from || $to == $skey || in_array($to,$sval) || in_array($from,$sval)) { + return $skey; + } + } + return false; + } + + function getTable($value, $from_unit, $to_unit, $precision) { + + if ($base_unit = $this->find_base_unit($from_unit,$to_unit)) { + + // A baseunit was found now lets convert from -> $base_unit + + $cell ['value'] = $this->convert($value, $from_unit, $base_unit, $precision)." ".$base_unit; + $cell ['class'] = ($base_unit == $from_unit || $base_unit == $to_unit) ? "framedred": ""; + $cells[] = $cell; + // We now have the base unit and value now lets produce the table; + while (list($key,$val) = each($this->bases[$base_unit])) { + $cell ['value'] = $this->convert($value, $from_unit, $val, $precision)." ".$val; + $cell ['class'] = ($val == $from_unit || $val == $to_unit) ? "framedred": ""; + $cells[] = $cell; + } + + $cc = count($cells); + $string = "| $value $from_unit | "; + $i=0; + foreach ($cells as $cell) { + if ($i==0) { + $string .= "".$cell['value']." | "; + $i++; + } else { + $string .= "
| ".$cell['value']." | "; + } + } + $string .= "
Unit Conversions
'; + + + if (isset($_POST['from_unit']) && isset($_POST['value'])) { + $_POST['value'] = $_POST['value'] + 0; + + + $o .= ($conv->getTable($_POST['value'], $_POST['from_unit'], $_POST['to_unit'], 5)).""; + } else { + $o .= "Select:
"; + } + + if(isset($_POST['value'])) + $value = $_POST['value']; + else + $value = ''; + + $o .= ''; + + return $o; +} diff --git a/cookienotice/README b/cookienotice/README index 247f53b1..74edd44a 100644 --- a/cookienotice/README +++ b/cookienotice/README @@ -2,8 +2,6 @@ Cookie Notice For server admins only. -Configure, show and handle a simple cookie usage notice. -This absolute annoying but eventually necessary notification about the usage of cookies. -This kind of things you click ok on but don't read. +Configure, show and handle a simple cookie usage notice. This absolute annoying but eventually necessary notification about the usage of cookies. This kind of things you klick ok on but don't read. -Author: Peter Liebetrau{{$description nofilter}}
-{{include file="field_textarea.tpl" field=$text}} -{{include file="field_input.tpl" field=$oktext}} -
-
-
diff --git a/cookienotice/templates/settings.tpl b/cookienotice/templates/settings.tpl
new file mode 100644
index 00000000..99489b9c
--- /dev/null
+++ b/cookienotice/templates/settings.tpl
@@ -0,0 +1,15 @@
+
+
+
diff --git a/curweather/curweather.php b/curweather/curweather.php
index 2b8682d1..6d7edc06 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -2,7 +2,7 @@
/**
* Name: Current Weather
* Description: Shows current weather conditions for user's location on their network page.
- * Version: 1.2
+ * Version: 1.1
* Author: Tony Baldwin '
+ . L10n::t('Post to Diaspora') . '
';
+ }
+}
+
+function diaspora_queue_hook(App $a, &$b) {
+ $hostname = $a->getHostName();
+
+ $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
+ DBA::escape(Protocol::DIASPORA2)
+ );
+
+ if (!DBA::isResult($qi)) {
+ return;
+ }
+
+ foreach ($qi as $x) {
+ if ($x['network'] !== Protocol::DIASPORA2) {
+ continue;
+ }
+
+ Logger::log('diaspora_queue: run');
+
+ $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
+ WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
+ intval($x['cid'])
+ );
+
+ if (!DBA::isResult($r)) {
+ continue;
+ }
+
+ $userdata = $r[0];
+
+ $handle = PConfig::get($userdata['uid'], 'diaspora', 'handle');
+ $password = PConfig::get($userdata['uid'], 'diaspora', 'password');
+ $aspect = PConfig::get($userdata['uid'], 'diaspora', 'aspect');
+
+ $success = false;
+
+ if ($handle && $password) {
+ Logger::log('diaspora_queue: able to post for user '.$handle);
+
+ $z = unserialize($x['content']);
+
+ $post = $z['post'];
+
+ Logger::log('diaspora_queue: post: '.$post, Logger::DATA);
+
+ try {
+ Logger::log('diaspora_queue: prepare', Logger::DEBUG);
+ $conn = new Diaspora_Connection($handle, $password);
+ Logger::log('diaspora_queue: try to log in '.$handle, Logger::DEBUG);
+ $conn->logIn();
+ Logger::log('diaspora_queue: try to send '.$body, Logger::DEBUG);
+ $conn->provider = $hostname;
+ $conn->postStatusMessage($post, $aspect);
+
+ Logger::log('diaspora_queue: send '.$userdata['uid'].' success', Logger::DEBUG);
+
+ $success = true;
+
+ Queue::removeItem($x['id']);
+ } catch (Exception $e) {
+ Logger::log("diaspora_queue: Send ".$userdata['uid']." failed: ".$e->getMessage(), Logger::DEBUG);
+ }
+ } else {
+ Logger::log('diaspora_queue: send '.$userdata['uid'].' missing username or password', Logger::DEBUG);
+ }
+
+ if (!$success) {
+ Logger::log('diaspora_queue: delayed');
+ Queue::updateTime($x['id']);
+ }
}
}
@@ -53,81 +137,121 @@ function diaspora_settings(App $a, &$s)
return;
}
+ /* Add our stylesheet to the page so we can make our settings look nice */
+
+ $a->page['htmlhead'] .= '' . "\r\n";
+
/* Get the current state of our config variables */
- $enabled = DI::pConfig()->get(local_user(),'diaspora','post');
- $def_enabled = DI::pConfig()->get(local_user(),'diaspora','post_by_default');
+ $enabled = PConfig::get(local_user(),'diaspora','post');
+ $checked = (($enabled) ? ' checked="checked" ' : '');
+ $css = (($enabled) ? '' : '-disabled');
- $handle = DI::pConfig()->get(local_user(), 'diaspora', 'handle');
- $password = DI::pConfig()->get(local_user(), 'diaspora', 'password');
- $aspect = DI::pConfig()->get(local_user(),'diaspora','aspect');
+ $def_enabled = PConfig::get(local_user(),'diaspora','post_by_default');
- $info = '';
- $error = '';
- if (Session::get('my_address')) {
- $info = DI::l10n()->t('Please remember: You can always be reached from Diaspora with your Friendica handle %s. ', Session::get('my_address'));
- $info .= DI::l10n()->t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
- $info .= DI::l10n()->t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.', Session::get('my_address'));
+ $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+ $handle = PConfig::get(local_user(), 'diaspora', 'handle');
+ $password = PConfig::get(local_user(), 'diaspora', 'password');
+ $aspect = PConfig::get(local_user(),'diaspora','aspect');
+
+ $status = "";
+
+ $r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
+
+ if (DBA::isResult($r)) {
+ $status = L10n::t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. ", $r[0]['addr']);
+ $status .= L10n::t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
+ $status .= L10n::t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.', $r[0]['addr']);
}
- $aspect_select = '';
+ $aspects = false;
+
if ($handle && $password) {
$conn = new Diaspora_Connection($handle, $password);
$conn->logIn();
- $rawAspects = $conn->getAspects();
- if ($rawAspects) {
- $availableAspects = [
- 'all_aspects' => DI::l10n()->t('All aspects'),
- 'public' => DI::l10n()->t('Public'),
- ];
- foreach ($rawAspects as $rawAspect) {
- $availableAspects[$rawAspect->id] = $rawAspect->name;
- }
+ $aspects = $conn->getAspects();
- $aspect_select = ['aspect', DI::l10n()->t('Post to aspect:'), $aspect, '', $availableAspects];
- $info = DI::l10n()->t('Connected with your Diaspora account %s', $handle);
- } else {
- $info = '';
- $error = DI::l10n()->t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.");
+ if (!$aspects) {
+ $status = L10n::t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.");
}
}
- DI::page()->registerStylesheet('addon/diaspora/diaspora.css');
+ /* Add some HTML to the existing form */
+
+ $s .= '';
+ $s .= '
'. L10n::t('Diaspora Export').'
'; + $s .= ''; + $s .= ''; - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/diaspora/'); - $s .= Renderer::replaceMacros($t, [ - '$header' => DI::l10n()->t('Diaspora Export'), - '$info_header' => DI::l10n()->t('Information'), - '$error_header' => DI::l10n()->t('Error'), - '$submit' => DI::l10n()->t('Save Settings'), - '$info' => $info, - '$error' => $error, - '$enabled' => $enabled, - '$enabled_checkbox' => ['enabled', DI::l10n()->t('Enable Diaspora Post Addon'), $enabled], - '$handle' => ['handle', DI::l10n()->t('Diaspora handle'), $handle, null, null, 'placeholder="user@domain.tld"'], - '$password' => ['password', DI::l10n()->t('Diaspora password'), '', DI::l10n()->t('Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.')], - '$aspect_select' => $aspect_select, - '$post_by_default' => ['post_by_default', DI::l10n()->t('Post to Diaspora by default'), $def_enabled], - ]); } function diaspora_settings_post(App $a, &$b) { if (!empty($_POST['diaspora-submit'])) { - DI::pConfig()->set(local_user(),'diaspora', 'post' , intval($_POST['enabled'])); - if (intval($_POST['enabled'])) { - if (isset($_POST['handle'])) { - DI::pConfig()->set(local_user(),'diaspora', 'handle' , trim($_POST['handle'])); - DI::pConfig()->set(local_user(),'diaspora', 'password' , trim($_POST['password'])); - } - if (!empty($_POST['aspect'])) { - DI::pConfig()->set(local_user(),'diaspora', 'aspect' , trim($_POST['aspect'])); - DI::pConfig()->set(local_user(),'diaspora', 'post_by_default', intval($_POST['post_by_default'])); - } - } else { - DI::pConfig()->delete(local_user(), 'diaspora', 'password'); - } + PConfig::set(local_user(),'diaspora', 'post' , intval($_POST['diaspora'])); + PConfig::set(local_user(),'diaspora', 'post_by_default', intval($_POST['diaspora_bydefault'])); + PConfig::set(local_user(),'diaspora', 'handle' , trim($_POST['handle'])); + PConfig::set(local_user(),'diaspora', 'password' , trim($_POST['password'])); + PConfig::set(local_user(),'diaspora', 'aspect' , trim($_POST['aspect'])); } } @@ -160,11 +284,11 @@ function diaspora_post_local(App $a, array &$b) return; } - $diaspora_post = intval(DI::pConfig()->get(local_user(),'diaspora','post')); + $diaspora_post = intval(PConfig::get(local_user(),'diaspora','post')); $diaspora_enable = (($diaspora_post && !empty($_REQUEST['diaspora_enable'])) ? intval($_REQUEST['diaspora_enable']) : 0); - if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'diaspora','post_by_default'))) { + if ($b['api_source'] && intval(PConfig::get(local_user(),'diaspora','post_by_default'))) { $diaspora_enable = 1; } @@ -181,7 +305,7 @@ function diaspora_post_local(App $a, array &$b) function diaspora_send(App $a, array &$b) { - $hostname = DI::baseUrl()->getHostname(); + $hostname = $a->getHostName(); Logger::log('diaspora_send: invoked'); @@ -207,13 +331,27 @@ function diaspora_send(App $a, array &$b) Logger::log('diaspora_send: prepare posting', Logger::DEBUG); - $handle = DI::pConfig()->get($b['uid'],'diaspora','handle'); - $password = DI::pConfig()->get($b['uid'],'diaspora','password'); - $aspect = DI::pConfig()->get($b['uid'],'diaspora','aspect'); + $handle = PConfig::get($b['uid'],'diaspora','handle'); + $password = PConfig::get($b['uid'],'diaspora','password'); + $aspect = PConfig::get($b['uid'],'diaspora','aspect'); if ($handle && $password) { Logger::log('diaspora_send: all values seem to be okay', Logger::DEBUG); + $tag_arr = []; + $tags = ''; + $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER); + + if ($x) { + foreach ($matches as $mtch) { + $tag_arr[] = $mtch[2]; + } + } + + if (count($tag_arr)) { + $tags = implode(',',$tag_arr); + } + $title = $b['title']; $body = $b['body']; // Insert a newline before and after a quote @@ -258,7 +396,14 @@ function diaspora_send(App $a, array &$b) Logger::log('diaspora_send: requeueing '.$b['uid'], Logger::DEBUG); - Worker::defer(); + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']); + if (count($r)) + $a->contact = $r[0]["id"]; + + $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $body]); + + Queue::add($a->contact, Protocol::DIASPORA2, $s); + notice(L10n::t('Diaspora post failed. Queued for retry.').EOL); } } } diff --git a/diaspora/lang/C/messages.po b/diaspora/lang/C/messages.po index 82660b50..6764eaf1 100644 --- a/diaspora/lang/C/messages.po +++ b/diaspora/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-07 00:15-0400\n" +"POT-Creation-Date: 2014-06-22 13:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME
- {{$header}}
- - \ No newline at end of file diff --git a/discourse/README b/discourse/README deleted file mode 100644 index 338b10bf..00000000 --- a/discourse/README +++ /dev/null @@ -1,28 +0,0 @@ -Discourse connector -=================== - -The Discourse connectors detects incoming mails from Discourse and -improves them by fetching the content and user data via API. - -Prerequisites -------------- -The user has to configure the mail interface so that the user's mails -can be fetched via Friendica. Then the user has to activate the -mailing list mode in Discourse. - -The mailing list mode in Discourse knows two different options: -1. Get all posts - including your own. This will create duplicates - if you post via Friendica. -2. Don't get your own posts. Then you will missing all your posts - that you made directly on Discourse. Since you cannot create - a new post via this connector (only comments are possible) - this is not a good choice either. - -Known problems --------------- -- You can't create starting posts -- Either you don't get your own posts you made directly on Discourse - or you do get duplicates for every post you made via Friendica. -- Non public categories are currently only working via some workaround - without the API, which most likely will cause some content problems. -- links to Discourse profiles in the posts are invalid. diff --git a/discourse/discourse.php b/discourse/discourse.php deleted file mode 100644 index 3ee980ce..00000000 --- a/discourse/discourse.php +++ /dev/null @@ -1,337 +0,0 @@ - - * - */ - -use Friendica\App; -use Friendica\Content\Text\Markdown; -use Friendica\Core\Hook; -use Friendica\Core\Logger; -use Friendica\Core\Protocol; -use Friendica\Core\Renderer; -use Friendica\Database\DBA; -use Friendica\DI; -use Friendica\Model\Contact; -use Friendica\Util\DateTimeFormat; -use Friendica\Util\Strings; - -/* Todo: - * - Obtaining API tokens to be able to read non public posts as well - * - Handling duplicates (possibly using some non visible marker) - * - Fetching missing posts - * - Fetch topic information - * - Support mail free mode when write tokens are available - * - Fix incomplete (relative) links (hosts are missing) -*/ - -function discourse_install() -{ - Hook::register('email_getmessage', __FILE__, 'discourse_email_getmessage'); - Hook::register('connector_settings', __FILE__, 'discourse_settings'); - Hook::register('connector_settings_post', __FILE__, 'discourse_settings_post'); -} - -function discourse_settings(App $a, &$s) -{ - if (!local_user()) { - return; - } - - $enabled = intval(DI::pConfig()->get(local_user(), 'discourse', 'enabled')); - - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/discourse/'); - $s .= Renderer::replaceMacros($t, [ - '$title' => DI::l10n()->t('Discourse'), - '$enabled' => ['enabled', DI::l10n()->t('Enable processing of Discourse mailing list mails'), $enabled, DI::l10n()->t('If enabled, incoming mails from Discourse will be improved so they look much better. To make it work, you have to configure the e-mail settings in Friendica. You also have to enable the mailing list mode in Discourse. Then you have to add the Discourse mail account as contact.')], - '$submit' => DI::l10n()->t('Save Settings'), - ]); -} - -function discourse_settings_post(App $a) -{ - if (!local_user() || empty($_POST['discourse-submit'])) { - return; - } - - DI::pConfig()->set(local_user(), 'discourse', 'enabled', intval($_POST['enabled'])); -} - -function discourse_email_getmessage(App $a, &$message) -{ - if (empty($message['item']['uid'])) { - return; - } - - if (!DI::pConfig()->get($message['item']['uid'], 'discourse', 'enabled')) { - return; - } - - // We do assume that all Discourse servers are running with SSL - if (preg_match('=topic/(.*\d)/(.*\d)@(.*)=', $message['item']['uri'], $matches) && - discourse_fetch_post_from_api($message, $matches[2], $matches[3])) { - Logger::info('Fetched comment via API (message-id mode)', ['host' => $matches[3], 'topic' => $matches[1], 'post' => $matches[2]]); - return; - } - - if (preg_match('=topic/(.*\d)@(.*)=', $message['item']['uri'], $matches) && - discourse_fetch_topic_from_api($message, 'https://' . $matches[2], $matches[1], 1)) { - Logger::info('Fetched starting post via API (message-id mode)', ['host' => $matches[2], 'topic' => $matches[1]]); - return; - } - - // Search in the text part for the link to the discourse entry and the text body - if (!empty($message['text'])) { - $message = discourse_get_text($message); - } - - if (empty($message['item']['plink']) || !preg_match('=(http.*)/t/.*/(.*\d)/(.*\d)=', $message['item']['plink'], $matches)) { - Logger::info('This is no Discourse post'); - return; - } - - if (discourse_fetch_topic_from_api($message, $matches[1], $matches[2], $matches[3])) { - Logger::info('Fetched post via API (plink mode)', ['host' => $matches[1], 'topic' => $matches[2], 'id' => $matches[3]]); - return; - } - - Logger::info('Fallback mode', ['plink' => $message['item']['plink']]); - // Search in the HTML part for the discourse entry and the author profile - if (!empty($message['html'])) { - $message = discourse_get_html($message); - } - - // Remove the title on comments, they don't serve any purpose there - if ($message['item']['parent-uri'] != $message['item']['uri']) { - unset($message['item']['title']); - } -} - -function discourse_fetch_post($host, $topic, $pid) -{ - $url = $host . '/t/' . $topic . '/' . $pid . '.json'; - $curlResult = DI::httpRequest()->get($url); - if (!$curlResult->isSuccess()) { - Logger::info('No success', ['url' => $url]); - return false; - } - - $raw = $curlResult->getBody(); - $data = json_decode($raw, true); - $posts = $data['post_stream']['posts']; - foreach($posts as $post) { - if ($post['post_number'] != $pid) { - /// @todo Possibly fetch missing posts here - continue; - } - Logger::info('Got post data from topic', $post); - return $post; - } - - Logger::info('Post not found', ['host' => $host, 'topic' => $topic, 'pid' => $pid]); - return false; -} - -function discourse_fetch_topic_from_api(&$message, $host, $topic, $pid) -{ - $post = discourse_fetch_post($host, $topic, $pid); - if (empty($post)) { - return false; - } - - $message = discourse_process_post($message, $post, $host); - return true; -} - -function discourse_fetch_post_from_api(&$message, $post, $host) -{ - $hostaddr = 'https://' . $host; - $url = $hostaddr . '/posts/' . $post . '.json'; - $curlResult = DI::httpRequest()->get($url); - if (!$curlResult->isSuccess()) { - return false; - } - - $raw = $curlResult->getBody(); - $data = json_decode($raw, true); - if (empty($data)) { - return false; - } - - $message = discourse_process_post($message, $data, $hostaddr); - - Logger::info('Got API data', $message); - return true; -} - -function discourse_get_user($post, $hostaddr) -{ - $host = parse_url($hostaddr, PHP_URL_HOST); - - // Currently unused contact fields: - // - display_username - // - user_id - - $contact = []; - $contact['uid'] = 0; - $contact['network'] = Protocol::DISCOURSE; - $contact['name'] = $contact['nick'] = $post['username']; - if (!empty($post['name'])) { - $contact['name'] = $post['name']; - } - - $contact['about'] = $post['user_title']; - - if (parse_url($post['avatar_template'], PHP_URL_SCHEME)) { - $contact['photo'] = str_replace('{size}', '300', $post['avatar_template']); - } else { - $contact['photo'] = $hostaddr . str_replace('{size}', '300', $post['avatar_template']); - } - - $contact['addr'] = $contact['nick'] . '@' . $host; - $contact['contact-type'] = Contact::TYPE_PERSON; - $contact['url'] = $hostaddr . '/u/' . $contact['nick']; - $contact['nurl'] = Strings::normaliseLink($contact['url']); - $contact['baseurl'] = $hostaddr; - Logger::info('Contact', $contact); - $contact['id'] = Contact::getIdForURL($contact['url'], 0, false, $contact); - if (!empty($contact['id'])) { - $avatar = $contact['photo']; - unset($contact['photo']); - DBA::update('contact', $contact, ['id' => $contact['id']]); - Contact::updateAvatar($contact['id'], $avatar); - $contact['photo'] = $avatar; - } - - return $contact; -} - -function discourse_process_post($message, $post, $hostaddr) -{ - $host = parse_url($hostaddr, PHP_URL_HOST); - - $message['html'] = $post['cooked']; - - $contact = discourse_get_user($post, $hostaddr); - $message['item']['author-id'] = $contact['id']; - $message['item']['author-link'] = $contact['url']; - $message['item']['author-name'] = $contact['name']; - $message['item']['author-avatar'] = $contact['photo']; - $message['item']['created'] = DateTimeFormat::utc($post['created_at']); - $message['item']['plink'] = $hostaddr . '/t/' . $post['topic_slug'] . '/' . $post['topic_id'] . '/' . $post['post_number']; - - if ($post['post_number'] == 1) { - $message['item']['parent-uri'] = $message['item']['uri'] = 'topic/' . $post['topic_id'] . '@' . $host; - - // Remove the Discourse forum name from the subject - $pattern = '=\[.*\].*\s(\[.*\].*)='; - if (preg_match($pattern, $message['item']['title'])) { - $message['item']['title'] = preg_replace($pattern, '$1', $message['item']['title']); - } - /// @ToDo Fetch thread information - } else { - $message['item']['uri'] = 'topic/' . $post['topic_id'] . '/' . $post['id'] . '@' . $host; - unset($message['item']['title']); - if (empty($post['reply_to_post_number']) || $post['reply_to_post_number'] == 1) { - $message['item']['parent-uri'] = 'topic/' . $post['topic_id'] . '@' . $host; - } else { - $reply = discourse_fetch_post($hostaddr, $post['topic_id'], $post['reply_to_post_number']); - $message['item']['parent-uri'] = 'topic/' . $post['topic_id'] . '/' . $reply['id'] . '@' . $host; - } - } - - return $message; -} - -function discourse_get_html($message) -{ - $doc = new DOMDocument(); - $doc2 = new DOMDocument(); - $doc->preserveWhiteSpace = false; - - $html = mb_convert_encoding($message['html'], 'HTML-ENTITIES', "UTF-8"); - @$doc->loadHTML($html, LIBXML_HTML_NODEFDTD); - - $xpath = new DomXPath($doc); - - // Fetch the first 'div' before the 'hr' - hopefully this fits for all systems - $result = $xpath->query("//hr//preceding::div[1]"); - $div = $doc2->importNode($result->item(0), true); - $doc2->appendChild($div); - $message['html'] = $doc2->saveHTML(); - Logger::info('Found html body', ['html' => $message['html']]); - - $profile = discourse_get_profile($xpath); - if (!empty($profile['url'])) { - Logger::info('Found profile', $profile); - $message['item']['author-id'] = Contact::getIdForURL($profile['url'], 0, false, $profile); - $message['item']['author-link'] = $profile['url']; - $message['item']['author-name'] = $profile['name']; - $message['item']['author-avatar'] = $profile['photo']; - } - - return $message; -} - -function discourse_get_text($message) -{ - $text = $message['text']; - $text = str_replace("\r", '', $text); - $pos = strpos($text, "\n---\n"); - if ($pos == 0) { - Logger::info('No separator found', ['text' => $text]); - return $message; - } - - $message['text'] = trim(substr($text, 0, $pos)); - - Logger::info('Found text body', ['text' => $message['text']]); - - $message['text'] = Markdown::toBBCode($message['text']); - - $text = substr($text, $pos); - Logger::info('Found footer', ['text' => $text]); - if (preg_match('=\((http.*/t/.*/.*\d/.*\d)\)=', $text, $link)) { - $message['item']['plink'] = $link[1]; - Logger::info('Found plink', ['plink' => $message['item']['plink']]); - } - return $message; -} - -function discourse_get_profile($xpath) -{ - $profile = []; - $list = $xpath->query("//td//following::img"); - foreach ($list as $node) { - $attr = []; - foreach ($node->attributes as $attribute) { - $attr[$attribute->name] = $attribute->value; - } - - if (!empty($attr['src']) && !empty($attr['title']) - && !empty($attr['width']) && !empty($attr['height']) - && ($attr['width'] == $attr['height'])) { - $profile = ['photo' => $attr['src'], 'name' => $attr['title']]; - break; - } - } - - $list = $xpath->query("//td//following::a"); - foreach ($list as $node) { - if (!empty(trim($node->textContent)) && $node->attributes->length) { - $attr = []; - foreach ($node->attributes as $attribute) { - $attr[$attribute->name] = $attribute->value; - } - if (!empty($attr['href']) && (strpos($attr['href'], '/' . $profile['name']))) { - $profile['url'] = $attr['href']; - break; - } - } - } - return $profile; -} diff --git a/discourse/templates/settings.tpl b/discourse/templates/settings.tpl deleted file mode 100644 index d4b0bf8c..00000000 --- a/discourse/templates/settings.tpl +++ /dev/null @@ -1,15 +0,0 @@ - -
{{$title}}
- - diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index da35aa0f..1fdf003d 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -11,11 +11,12 @@ use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; +use Friendica\Core\L10n; use Friendica\Core\Logger; +use Friendica\Core\PConfig; use Friendica\Database\DBA; -use Friendica\DI; -use Friendica\Model\Tag; use Friendica\Util\DateTimeFormat; +use Friendica\Util\Network; use Friendica\Util\XML; function dwpost_install() @@ -27,21 +28,29 @@ function dwpost_install() Hook::register('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post'); } -function dwpost_jot_nets(App $a, array &$jotnets_fields) +function dwpost_uninstall() +{ + Hook::unregister('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local'); + Hook::unregister('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send'); + Hook::unregister('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets'); + Hook::unregister('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings'); + Hook::unregister('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post'); +} + +function dwpost_jot_nets(App $a, &$b) { if (!local_user()) { return; } - if (DI::pConfig()->get(local_user(), 'dwpost', 'post')) { - $jotnets_fields[] = [ - 'type' => 'checkbox', - 'field' => [ - 'dwpost_enable', - DI::l10n()->t('Post to Dreamwidth'), - DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default') - ] - ]; + $dw_post = PConfig::get(local_user(), 'dwpost', 'post'); + + if (intval($dw_post) == 1) { + $dw_defpost = PConfig::get(local_user(), 'dwpost', 'post_by_default'); + $selected = ((intval($dw_defpost) == 1) ? ' checked="checked" ' : ''); + + $b .= ' '
+ . L10n::t('Post to Dreamwidth') . '
';
}
}
@@ -53,61 +62,61 @@ function dwpost_settings(App $a, &$s)
}
/* Add our stylesheet to the page so we can make our settings look nice */
- DI::page()['htmlhead'] .= '' . "\r\n";
+ $a->page['htmlhead'] .= '' . "\r\n";
/* Get the current state of our config variables */
- $enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post');
+ $enabled = PConfig::get(local_user(), 'dwpost', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $def_enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default');
+ $def_enabled = PConfig::get(local_user(), 'dwpost', 'post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $dw_username = DI::pConfig()->get(local_user(), 'dwpost', 'dw_username');
- $dw_password = DI::pConfig()->get(local_user(), 'dwpost', 'dw_password');
+ $dw_username = PConfig::get(local_user(), 'dwpost', 'dw_username');
+ $dw_password = PConfig::get(local_user(), 'dwpost', 'dw_password');
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
'. DI::l10n()->t("Dreamwidth Export").'
'; + $s .= ''. L10n::t("Dreamwidth Export").'
'; $s .= ''; $s .= ''; + $s .= ''; } function dwpost_settings_post(App $a, array &$b) { if (!empty($_POST['dwpost-submit'])) { - DI::pConfig()->set(local_user(), 'dwpost', 'post', intval($_POST['dwpost'])); - DI::pConfig()->set(local_user(), 'dwpost', 'post_by_default', intval($_POST['dw_bydefault'])); - DI::pConfig()->set(local_user(), 'dwpost', 'dw_username', trim($_POST['dw_username'])); - DI::pConfig()->set(local_user(), 'dwpost', 'dw_password', trim($_POST['dw_password'])); + PConfig::set(local_user(), 'dwpost', 'post', intval($_POST['dwpost'])); + PConfig::set(local_user(), 'dwpost', 'post_by_default', intval($_POST['dw_bydefault'])); + PConfig::set(local_user(), 'dwpost', 'dw_username', trim($_POST['dw_username'])); + PConfig::set(local_user(), 'dwpost', 'dw_password', trim($_POST['dw_password'])); } } @@ -126,11 +135,11 @@ function dwpost_post_local(App $a, array &$b) return; } - $dw_post = intval(DI::pConfig()->get(local_user(),'dwpost','post')); + $dw_post = intval(PConfig::get(local_user(),'dwpost','post')); $dw_enable = (($dw_post && !empty($_REQUEST['dwpost_enable'])) ? intval($_REQUEST['dwpost_enable']) : 0); - if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'dwpost','post_by_default'))) { + if ($b['api_source'] && intval(PConfig::get(local_user(),'dwpost','post_by_default'))) { $dw_enable = 1; } @@ -174,15 +183,15 @@ function dwpost_send(App $a, array &$b) $tz = $x[0]['timezone']; } - $dw_username = DI::pConfig()->get($b['uid'],'dwpost','dw_username'); - $dw_password = DI::pConfig()->get($b['uid'],'dwpost','dw_password'); + $dw_username = PConfig::get($b['uid'],'dwpost','dw_username'); + $dw_password = PConfig::get($b['uid'],'dwpost','dw_password'); $dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc'; if ($dw_username && $dw_password && $dw_blog) { $title = $b['title']; $post = BBCode::convert($b['body']); $post = XML::escape($post); - $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]); + $tags = dwpost_get_tags($b['tag']); $date = DateTimeFormat::convert($b['created'], $tz); $year = intval(substr($date,0,4)); @@ -221,9 +230,18 @@ EOT; Logger::log('dwpost: data: ' . $xml, Logger::DATA); if ($dw_blog !== 'test') { - $x = DI::httpRequest()->post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody(); + $x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody(); } Logger::log('posted to dreamwidth: ' . ($x) ? $x : '', Logger::DEBUG); } } + +function dwpost_get_tags($post) +{ + preg_match_all("/\]([^\[#]+)\[/", $post, $matches); + + $tags = implode(', ', $matches[1]); + + return $tags; +} diff --git a/dwpost/lang/ca/messages.po b/dwpost/lang/ca/messages.po deleted file mode 100644 index e1fbf94d..00000000 --- a/dwpost/lang/ca/messages.po +++ /dev/null @@ -1,48 +0,0 @@ -# ADDON dwpost -# Copyright (C) -# This file is distributed under the same license as the Friendica dwpost addon package. -# -# -# Translators: -# Joan Bar[{$x['category']}]
" : ""); + } + return $r; +} + + +function do_stats($table,$length,$numlines,$adult,$cat,$limit,$lang,$pattern,$regex,$equal) { + global $db; + $rnd = mt_rand(); + $r = []; + + $typesql = (($table) ? " WHERE `category` = '$table' " : " WHERE 1 "); + $lengthsql = (($length) ? " AND LENGTH(`text`) < $length " : "" ); + + if($adult == 2) + $adultsql = " AND offensive = 1 "; + elseif($adult == 1) + $adultsql = ""; + else + $adultsql = " AND offensive = 0 "; + + + if($numlines) + $lengthsql .= + " AND (LENGTH(`text`) - LENGTH(REPLACE(`text`,\"\n\",\"\"))) <= $numlines "; + + $langsql = " AND lang = '$lang' "; + + $patsql = ''; + if(strlen($pattern)) + $patsql = " AND MATCH text AGAINST ('$pattern' IN BOOLEAN MODE) "; + + $regexsql = ''; + if(strlen($regex)) + $regexsql = " AND text REGEXP '$regex' "; + + $eqsql = ''; + + $result = @$db->query("SELECT `text`, `category` FROM `fortune` + $typesql + $adultsql + $lengthsql + $langsql + $patsql + $regexsql + $eqsql"); + + + echo '
' . $result->num_rows . ' matching quotations.
'; + + + $res = @$db->query("SELECT DISTINCT ( `category` ) FROM `fortune` + $typesql + $adultsql + $lengthsql + $langsql + $patsql + $regexsql "); + if($res->num_rows) { + echo '
Matching Databases:
'; + while($x = $res->fetch_array(MYSQL_ASSOC)) + echo $x['category'].'
'; + + } + else + echo '
No matching databases using those search parameters - please refine your options.
'; + + +} + + +function fortune_to_html($s) { + + // First pass - escape all the HTML entities, and while we're at it + // get rid of any MS-DOS end-of-line characters and expand tabs to + // 8 non-breaking spaces, and translate linefeeds to
. + // We also get rid of ^G which used to sound the terminal beep or bell + // on ASCII terminals and were humourous in some fortunes. + // We could map these to autoplay a short sound file but browser support + // is still sketchy and then there's the issue of where to locate the + // URL, and a lot of people find autoplay sounds downright annoying. + // So for now, just remove them. + + $s = str_replace( + ["&", + "<", + ">", + '"', + "\007", + "\t", + "\r", + "\n"], + + ["&", + "<", + ">", + """, + "", + " ", + "", + "
"], + $s); + // Replace pseudo diacritics + // These were used to produce accented characters. For instance an accented + // e would have been encoded by '^He - the backspace moving the cursor + // backward so both the single quote and the e would appear in the same + // character position. Umlauts were quite clever - they used a double quote + // as the accent mark over a normal character. + + $s = preg_replace("/'\010([a-zA-Z])/","&\\1acute;",$s); + $s = preg_replace("/\"\010([a-zA-Z])/","&\\1uml;",$s); + $s = preg_replace("/\`\010([a-zA-Z])/","&\\1grave;",$s); + $s = preg_replace("/\^\010([a-zA-Z])/","&\\1circ;",$s); + $s = preg_replace("/\~\010([a-zA-Z])/","&\\1tilde;",$s); + + // Ignore multiple underlines for the same character. These were + // most useful when sent to a line printer back in the day as it + // would type over the same character a number of times making it + // much darker (e.g. bold). I think there are only one or two + // instances of this in the current (2008) fortune cookie database. + + $s = preg_replace("/(_\010)+/","_\010",$s); + // Map the characters which sit underneath a backspace. + // If you can come up with a regex to do all of the following + // madness - be my guest. + // It's not as simple as you think. We need to take something + // that has been backspaced over an arbitrary number of times + // and wrap a forward looking matching number of characters in + // HTML, whilst deciding if it's intended as an underline or + // strikeout sequence. + + // Essentially we produce a string of '1' and '0' characters + // the same length as the source text. + // Any position which is marked '1' has been backspaced over. + + $cursor = 0; + $dst = $s; + $bs_found = false; + for($x = 0; $x < strlen($s); $x ++) { + if($s[$x] == "\010" && $cursor) { + $bs_found = true; + $cursor --; + $dst[$cursor] = '1'; + $dst[$x] = '0'; + $continue; + } + else { + if($bs_found) { + $bs_found = false; + $cursor = $x; + } + $dst[$cursor] = '0'; + $cursor ++; + } + + } + + $out = ''; + $strike = false; + $bold = false; + + // Underline sequence, convert to bold to avoid confusion with links. + // These were generally used for emphasis so it's a reasonable choice. + // Please note that this logic will fail if there is an underline sequence + // and also a strikeout sequence in the same fortune. + + if(strstr($s,"_\010")) { + $len = 0; + for($x = 0; $x < strlen($s); $x ++) { + if($dst[$x] == '1') { + $len ++; + $bold = true; + } + else { + if($bold) { + $out .= ''; + while($s[$x] == "\010") + $x ++; + $out .= substr($s,$x,$len); + $out .= ''; + $x = $x + $len - 1; + $len = 0; + $bold = false; + } + else + $out .= $s[$x]; + } + } + } + + // These aren't seen very often these days - simulation of + // backspace/replace. You could occasionally see the original text + // on slower terminals before it got replaced. Once modems reached + // 4800/9600 baud in the late 70's and early 80's the effect was + // mostly lost - but if you find a really old fortune file you might + // encounter a few of these. + + else { + for($x = 0; $x < strlen($s); $x ++) { + if($dst[$x] == '1') { + if($strike) + $out .= $s[$x]; + else + $out .= '
' . $s . '
';
+ }
+}
diff --git a/fortunate/fortunemod.sql.gz b/fortunate/fortunemod.sql.gz
new file mode 100644
index 00000000..2ce0e557
Binary files /dev/null and b/fortunate/fortunemod.sql.gz differ
diff --git a/fortunate/lang/C/messages.po b/fortunate/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 530239fd..7879d47d 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -10,19 +10,29 @@ use Friendica\App;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Content\Widget;
+use Friendica\Core\Config;
use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
-use Friendica\DI;
use Friendica\Model\Profile;
use Friendica\Model\User;
use Friendica\Util\Strings;
+use Friendica\Util\Temporal;
+
+include_once 'mod/directory.php';
function forumdirectory_install()
{
Hook::register('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
}
+function forumdirectory_uninstall()
+{
+ Hook::unregister('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
+}
+
function forumdirectory_module()
{
return;
@@ -30,13 +40,15 @@ function forumdirectory_module()
function forumdirectory_app_menu(App $a, array &$b)
{
- $b['app_menu'][] = '';
+ $b['app_menu'][] = '';
}
function forumdirectory_init(App $a)
{
if (local_user()) {
- DI::page()['aside'] .= Widget::findPeople();
+ $a->page['aside'] .= Widget::findPeople();
+ } else {
+ unset($_SESSION['theme']);
}
}
@@ -49,8 +61,8 @@ function forumdirectory_post(App $a)
function forumdirectory_content(App $a)
{
- if ((DI::config()->get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
- notice(DI::l10n()->t('Public access denied.') . EOL);
+ if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
+ notice(L10n::t('Public access denied.') . EOL);
return;
}
@@ -66,7 +78,7 @@ function forumdirectory_content(App $a)
}
$gdirpath = '';
- $dirurl = DI::config()->get('system', 'directory');
+ $dirurl = Config::get('system', 'directory');
if (strlen($dirurl)) {
$gdirpath = Profile::zrl($dirurl, true);
}
@@ -77,37 +89,43 @@ function forumdirectory_content(App $a)
$sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
(`user`.`nickname` LIKE '%$search%') OR
- (`profile`.`about` LIKE '%$search%') OR
+ (`profile`.`pdesc` LIKE '%$search%') OR
(`profile`.`locality` LIKE '%$search%') OR
(`profile`.`region` LIKE '%$search%') OR
(`profile`.`country-name` LIKE '%$search%') OR
+ (`profile`.`gender` LIKE '%$search%') OR
+ (`profile`.`marital` LIKE '%$search%') OR
+ (`profile`.`sexual` LIKE '%$search%') OR
+ (`profile`.`about` LIKE '%$search%') OR
+ (`profile`.`romance` LIKE '%$search%') OR
+ (`profile`.`work` LIKE '%$search%') OR
+ (`profile`.`education` LIKE '%$search%') OR
(`profile`.`pub_keywords` LIKE '%$search%') OR
(`profile`.`prv_keywords` LIKE '%$search%'))";
}
- $publish = DI::config()->get('system', 'publish_all') ? '' : "`publish` = 1";
+ $publish = Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 ";
$total = 0;
$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
- INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
- WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? $sql_extra",
- User::PAGE_FLAGS_COMMUNITY);
+ LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
+ WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` `user`.`page-flags` = 2 $sql_extra");
if (DBA::isResult($cnt)) {
$total = $cnt['total'];
}
- $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 60);
+ $pager = new Pager($a->query_string, 60);
$order = " ORDER BY `name` ASC ";
$limit = $pager->getStart()."," . $pager->getItemsPerPage();
- $r = DBA::p("SELECT `profile`.*, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
- `contact`.`addr`, `contact`.`url` FROM `profile`
- INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
- INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
- WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? AND `contact`.`self`
- $sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY
+ $r = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
+ `contact`.`addr`, `contact`.`url` AS `profile_url` FROM `profile`
+ LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
+ LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
+ WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = 2 AND `contact`.`self`
+ $sql_extra $order LIMIT $limit"
);
if (DBA::isResult($r)) {
@@ -118,25 +136,25 @@ function forumdirectory_content(App $a)
}
while ($rr = DBA::fetch($r)) {
- $entries[] = Friendica\Module\Directory::formatEntry($rr, $photo);
+ $entries[] = format_directory_entry($rr, $photo);
}
DBA::close($r);
} else {
- notice(DI::l10n()->t("No entries \x28some entries may be hidden\x29."));
+ info(L10n::t("No entries \x28some entries may be hidden\x29.") . EOL);
}
$tpl = Renderer::getMarkupTemplate('directory_header.tpl');
$o .= Renderer::replaceMacros($tpl, [
'$search' => $search,
- '$globaldir' => DI::l10n()->t('Global Directory'),
+ '$globaldir' => L10n::t('Global Directory'),
'$gdirpath' => $gdirpath,
- '$desc' => DI::l10n()->t('Find on this site'),
+ '$desc' => L10n::t('Find on this site'),
'$contacts' => $entries,
- '$finding' => DI::l10n()->t('Results for:'),
+ '$finding' => L10n::t('Results for:'),
'$findterm' => (strlen($search) ? $search : ""),
- '$title' => DI::l10n()->t('Forum Directory'),
+ '$title' => L10n::t('Forum Directory'),
'$search_mod' => 'forumdirectory',
- '$submit' => DI::l10n()->t('Find'),
+ '$submit' => L10n::t('Find'),
'$paginate' => $pager->renderFull($total),
]);
diff --git a/forumdirectory/lang/ca/messages.po b/forumdirectory/lang/ca/messages.po
deleted file mode 100644
index 0aa19b1c..00000000
--- a/forumdirectory/lang/ca/messages.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-#
-#
-# Translators:
-# Joan Bar ' . DI::l10n()->t('FromApp Settings') . '
'; + $s .= '' . L10n::t('FromApp Settings') . '
'; $s .= ''; $s .= ''; + $s .= ''; } function fromapp_post_hook(&$a, &$item) @@ -81,8 +93,8 @@ function fromapp_post_hook(&$a, &$item) return; } - $app = DI::pConfig()->get(local_user(), 'fromapp', 'app'); - $force = intval(DI::pConfig()->get(local_user(), 'fromapp', 'force')); + $app = PConfig::get(local_user(), 'fromapp', 'app'); + $force = intval(PConfig::get(local_user(), 'fromapp', 'force')); if (is_null($app) || (! strlen($app))) { return; diff --git a/fromapp/lang/ca/messages.po b/fromapp/lang/ca/messages.po deleted file mode 100644 index 5cd22868..00000000 --- a/fromapp/lang/ca/messages.po +++ /dev/null @@ -1,43 +0,0 @@ -# ADDON fromapp -# Copyright (C) -# This file is distributed under the same license as the Friendica fromapp addon package. -# -# -# Translators: -# Joan Bar
'. L10n::t('Google+ Mirror').'
'; + $s .= ''; + $s .= ''; + + return; +} + +function fromgplus_addon_settings_post(&$a,&$b) { + + if (!local_user()) + return; + + if (!empty($_POST['fromgplus-submit'])) { + PConfig::set(local_user(),'fromgplus','account',trim($_POST['fromgplus-account'])); + $enable = (!empty($_POST['fromgplus-enable']) ? intval($_POST['fromgplus-enable']) : 0); + PConfig::set(local_user(),'fromgplus','enable', $enable); + $keywords = (!empty($_POST['fromgplus-keywords']) ? intval($_POST['fromgplus-keywords']) : 0); + PConfig::set(local_user(),'fromgplus', 'keywords', $keywords); + + if (!$enable) + PConfig::delete(local_user(),'fromgplus','lastdate'); + + info(L10n::t('Google+ Import Settings saved.') . EOL); + } +} + +function fromgplus_addon_admin(&$a, &$o) +{ + $t = Renderer::getMarkupTemplate("admin.tpl", "addon/fromgplus/"); + + $o = Renderer::replaceMacros($t, [ + '$submit' => L10n::t('Save Settings'), + '$key' => ['key', L10n::t('Key'), trim(Config::get('fromgplus', 'key')), ''], + ]); +} + +function fromgplus_addon_admin_post(&$a) +{ + $key = (!empty($_POST['key']) ? trim($_POST['key']) : ''); + Config::set('fromgplus', 'key', $key); + info(L10n::t('Settings updated.'). EOL); +} + +function fromgplus_cron($a,$b) { + $last = Config::get('fromgplus','last_poll'); + + $poll_interval = intval(Config::get('fromgplus','poll_interval')); + if(! $poll_interval) + $poll_interval = FROMGPLUS_DEFAULT_POLL_INTERVAL; + + if($last) { + $next = $last + ($poll_interval * 60); + if($next > time()) { + Logger::log('fromgplus: poll intervall not reached'); + return; + } + } + + Logger::log('fromgplus: cron_start'); + + $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'fromgplus' AND `k` = 'enable' AND `v` = '1' ORDER BY RAND() "); + if(count($r)) { + foreach($r as $rr) { + $account = PConfig::get($rr['uid'],'fromgplus','account'); + if ($account) { + Logger::log('fromgplus: fetching for user '.$rr['uid']); + fromgplus_fetch($a, $rr['uid']); + } + } + } + + Logger::log('fromgplus: cron_end'); + + Config::set('fromgplus','last_poll', time()); +} + +function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) { + + //$uid = 2; + + // Don't know what it is. Maybe some trash from the mobile client + $trash = html_entity_decode("", ENT_QUOTES, 'UTF-8'); + $body = str_replace($trash, "", $body); + + $body = trim($body); + + if (substr($body, 0, 3) == "[b]") { + $pos = strpos($body, "[/b]"); + $title = substr($body, 3, $pos-3); + $body = trim(substr($body, $pos+4)); + } else + $title = ""; + + $_SESSION['authenticated'] = true; + $_SESSION['uid'] = $uid; + + unset($_REQUEST); + $_REQUEST['api_source'] = true; + + $_REQUEST['profile_uid'] = $uid; + $_REQUEST['source'] = $source; + $_REQUEST['extid'] = Protocol::GPLUS; + + if (isset($id)) { + $_REQUEST['message_id'] = Item::newURI($uid, Protocol::GPLUS.':'.$id); + } + + // $_REQUEST['verb'] + // $_REQUEST['parent'] + // $_REQUEST['parent_uri'] + + $_REQUEST['title'] = $title; + $_REQUEST['body'] = $body; + $_REQUEST['location'] = $location; + $_REQUEST['coord'] = $coord; + + if (($_REQUEST['title'] == "") && ($_REQUEST['body'] == "")) { + Logger::log('fromgplus: empty post for user '.$uid." ".print_r($_REQUEST, true)); + return; + } + + require_once('mod/item.php'); + //print_r($_REQUEST); + Logger::log('fromgplus: posting for user '.$uid." ".print_r($_REQUEST, true)); + item_post($a); + Logger::log('fromgplus: done for user '.$uid); +} + +function fromgplus_html2bbcode($html) { + + $bbcode = html_entity_decode($html, ENT_QUOTES, 'UTF-8'); + + $bbcode = str_ireplace(["\n"], [""], $bbcode); + $bbcode = str_ireplace(["", ""], ["[b]", "[/b]"], $bbcode); + $bbcode = str_ireplace(["", ""], ["[i]", "[/i]"], $bbcode); + $bbcode = str_ireplace([""], ["\n"], $bbcode); + $bbcode = str_ireplace(["
"], ["\n"], $bbcode); + $bbcode = str_ireplace(["
"], ["\n"], $bbcode); + + $bbcode = trim(strip_tags($bbcode)); + return($bbcode); +} + +function fromgplus_parse_query($var) + { + /** + * Use this function to parse out the query array element from + * the output of parse_url(). + */ + $var = parse_url($var, PHP_URL_QUERY); + $var = html_entity_decode($var); + $var = explode('&', $var); + $arr = []; + + foreach($var as $val) { + $x = explode('=', $val); + if (count($x) > 1) { + $arr[$x[0]] = $x[1]; + } + } + unset($val, $x, $var); + return $arr; +} + +function fromgplus_cleanupgoogleproxy($fullImage, $image) { + //$preview = "/w".$fullImage->width."-h".$fullImage->height."/"; + //$preview2 = "/w".$fullImage->width."-h".$fullImage->height."-p/"; + //$fullImage = str_replace(array($preview, $preview2), array("/", "/"), $fullImage->url); + $fullImage = $fullImage->url; + + //$preview = "/w".$image->width."-h".$image->height."/"; + //$preview2 = "/w".$image->width."-h".$image->height."-p/"; + //$image = str_replace(array($preview, $preview2), array("/", "/"), $image->url); + $image = $image->url; + + $cleaned = []; + + $queryvar = fromgplus_parse_query($fullImage); + if (!empty($queryvar['url'])) + $cleaned["full"] = urldecode($queryvar['url']); + else + $cleaned["full"] = $fullImage; + if (@exif_imagetype($cleaned["full"]) == 0) + $cleaned["full"] = ""; + + $queryvar = fromgplus_parse_query($image); + if (!empty($queryvar['url'])) + $cleaned["preview"] = urldecode($queryvar['url']); + else + $cleaned["preview"] = $image; + if (@exif_imagetype($cleaned["preview"]) == 0) + $cleaned["preview"] = ""; + + if (empty($cleaned["full"])) { + $cleaned["full"] = $cleaned["preview"]; + $cleaned["preview"] = ""; + } + + if (!empty($cleaned["full"])) + $infoFull = Image::getInfoFromURL($cleaned["full"]); + else + $infoFull = ["0" => 0, "1" => 0]; + + if (!empty($cleaned["preview"])) + $infoPreview = Image::getInfoFromURL($cleaned["preview"]); + else + $infoPreview = ["0" => 0, "1" => 0]; + + if (($infoPreview[0] >= $infoFull[0]) && ($infoPreview[1] >= $infoFull[1])) { + $temp = $cleaned["full"]; + $cleaned["full"] = $cleaned["preview"]; + $cleaned["preview"] = $temp; + } + + if (($cleaned["full"] == $cleaned["preview"]) || (($infoPreview[0] == $infoFull[0]) && ($infoPreview[1] == $infoFull[1]))) + $cleaned["preview"] = ""; + + if ($cleaned["full"] == "") + if (@exif_imagetype($fullImage) != 0) + $cleaned["full"] = $fullImage; + + if ($cleaned["full"] == "") + if (@exif_imagetype($image) != 0) + $cleaned["full"] = $image; + + // Could be changed in the future to a link to the album + $cleaned["page"] = $cleaned["full"]; + + return($cleaned); +} + +function fromgplus_cleantext($text) { + + // Don't know what it is. But it is added to the text. + $trash = html_entity_decode("", ENT_QUOTES, 'UTF-8'); + + $text = strip_tags($text); + $text = html_entity_decode($text, ENT_QUOTES); + $text = trim($text); + $text = str_replace(["\n", "\r", " ", $trash], ["", "", "", ""], $text); + return($text); +} + +function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) { + $post = ""; + $quote = ""; + $pagedata = []; + $pagedata["type"] = ""; + + foreach ($item->object->attachments as $attachment) { + switch($attachment->objectType) { + case "video": + $pagedata["type"] = "video"; + $pagedata["url"] = Network::finalUrl($attachment->url); + $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); + break; + + case "article": + $pagedata["type"] = "link"; + $pagedata["url"] = Network::finalUrl($attachment->url); + $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); + + $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image); + if ($images["full"] != "") + $pagedata["images"][0]["src"] = $images["full"]; + + if (!empty($attachment->content)) { + $quote = trim(fromgplus_html2bbcode($attachment->content)); + } + + if (!empty($quote)) { + $pagedata["text"] = $quote; + } + + // Add Keywords to page link + $data = parseurl_getsiteinfo_cached($pagedata["url"], true); + if (isset($data["keywords"]) && PConfig::get($uid, 'fromgplus', 'keywords')) { + $pagedata["keywords"] = $data["keywords"]; + } + break; + + case "photo": + // Don't store shared pictures in your wall photos (to prevent a possible violating of licenses) + if ($shared) { + $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image); + } else { + if ($attachment->fullImage->url != "") { + $images = Image::storePhoto($a, $uid, "", $attachment->fullImage->url); + } elseif ($attachment->image->url != "") { + $images = Image::storePhoto($a, $uid, "", $attachment->image->url); + } + } + + if (!empty($images["preview"])) { + $post .= "\n[url=".$images["page"]."][img]".$images["preview"]."[/img][/url]\n"; + $pagedata["images"][0]["src"] = $images["preview"]; + $pagedata["url"] = $images["page"]; + } elseif (!empty($images["full"])) { + $post .= "\n[img]".$images["full"]."[/img]\n"; + $pagedata["images"][0]["src"] = $images["full"]; + + if ($images["preview"] != "") { + $pagedata["images"][1]["src"] = $images["preview"]; + } + } + + if (($attachment->displayName != "") && (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext))) { + $post .= fromgplus_html2bbcode($attachment->displayName)."\n"; + $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); + } + break; + + case "photo-album": + $pagedata["url"] = Network::finalUrl($attachment->url); + $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); + $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n"; + + $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image); + + if ($images["preview"] != "") { + $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n"; + $pagedata["images"][0]["src"] = $images["preview"]; + $pagedata["url"] = $images["full"]; + } elseif ($images["full"] != "") { + $post .= "\n[img]".$images["full"]."[/img]\n"; + $pagedata["images"][0]["src"] = $images["full"]; + + if ($images["preview"] != "") + $pagedata["images"][1]["src"] = $images["preview"]; + } + break; + + case "album": + $pagedata["type"] = "link"; + $pagedata["url"] = Network::finalUrl($attachment->url); + $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); + + $thumb = $attachment->thumbnails[0]; + $pagedata["images"][0]["src"] = $thumb->image->url; + + $quote = trim(fromgplus_html2bbcode($thumb->description)); + if ($quote != "") + $pagedata["text"] = $quote; + + break; + + case "audio": + $pagedata["url"] = Network::finalUrl($attachment->url); + $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); + $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n"; + break; + + //default: + // die($attachment->objectType); + } + } + + if ($pagedata["type"] != "") + return(add_page_info_data($pagedata)); + + return($post.$quote); +} + +function fromgplus_fetch($a, $uid) { + $maxfetch = 20; + + // Special blank to identify postings from the googleplus connector + $blank = html_entity_decode(" ", ENT_QUOTES, 'UTF-8'); + + $account = PConfig::get($uid,'fromgplus','account'); + $key = Config::get('fromgplus','key'); + + $result = Network::fetchUrl("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch); + //$result = file_get_contents("google.txt"); + //file_put_contents("google.txt", $result); + + $activities = json_decode($result); + + $initiallastdate = PConfig::get($uid,'fromgplus','lastdate'); + + $first_time = ($initiallastdate == ""); + + $lastdate = 0; + + if (empty($activities->items)) + return; + + $reversed = array_reverse($activities->items); + + foreach($reversed as $item) { + + if (strtotime($item->published) <= $initiallastdate) + continue; + + // Don't publish items that are too young + if (strtotime($item->published) > (time() - 3*60)) { + Logger::log('fromgplus_fetch: item too new '.$item->published); + continue; + } + + if ($lastdate < strtotime($item->published)) + $lastdate = strtotime($item->published); + + PConfig::set($uid,'fromgplus','lastdate', $lastdate); + + if ($first_time) + continue; + + if ($item->access->description == "Public") { + + // Loop prevention through the special blank from the googleplus connector + //if (strstr($item->object->content, $blank)) + if (strrpos($item->object->content, $blank) >= strlen($item->object->content) - 5) + continue; + + switch($item->object->objectType) { + case "note": + $post = fromgplus_html2bbcode($item->object->content); + + if (!empty($item->object->attachments)) { + $post .= fromgplus_handleattachments($a, $uid, $item, $item->object->content, false); + } + + $coord = ""; + $location = ""; + if (isset($item->location)) { + if (isset($item->location->address->formatted)) + $location = $item->location->address->formatted; + + if (isset($item->location->displayName)) + $location = $item->location->displayName; + + if (isset($item->location->position->latitude) && + isset($item->location->position->longitude)) + $coord = $item->location->position->latitude." ".$item->location->position->longitude; + + } elseif (isset($item->address)) + $location = $item->address; + + fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord, $item->id); + + break; + + case "activity": + $post = fromgplus_html2bbcode($item->annotation)."\n"; + + if (!intval(Config::get('system','old_share'))) { + + if (function_exists("share_header")) + $post .= share_header($item->object->actor->displayName, $item->object->actor->url, + $item->object->actor->image->url, "", + DateTimeFormat::utc($item->published),$item->object->url); + else + $post .= "[share author='".str_replace("'", "'",$item->object->actor->displayName). + "' profile='".$item->object->actor->url. + "' avatar='".$item->object->actor->image->url. + "' posted='".DateTimeFormat::utc($item->published). + "' link='".$item->object->url."']"; + + $post .= fromgplus_html2bbcode($item->object->content); + + if (is_array($item->object->attachments)) + $post .= "\n".trim(fromgplus_handleattachments($a, $uid, $item, $item->object->content, true)); + + $post .= "[/share]"; + } else { + $post .= fromgplus_html2bbcode("♲"); + $post .= " [url=".$item->object->actor->url."]".$item->object->actor->displayName."[/url] \n"; + $post .= fromgplus_html2bbcode($item->object->content); + + if (is_array($item->object->attachments)) + $post .= "\n".trim(fromgplus_handleattachments($a, $uid, $item, $item->object->content, true)); + } + + $coord = ""; + $location = ""; + if (isset($item->location)) { + if (isset($item->location->address->formatted)) + $location = $item->location->address->formatted; + + if (isset($item->location->displayName)) + $location = $item->location->displayName; + + if (isset($item->location->position->latitude) && + isset($item->location->position->longitude)) + $coord = $item->location->position->latitude." ".$item->location->position->longitude; + + } elseif (isset($item->address)) + $location = $item->address; + + fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord, $item->id); + break; + } + } + } + if ($lastdate != 0) + PConfig::set($uid,'fromgplus','lastdate', $lastdate); +} diff --git a/blockbot/lang/C/messages.po b/fromgplus/lang/C/messages.po similarity index 51% rename from blockbot/lang/C/messages.po rename to fromgplus/lang/C/messages.po index 1bdd56a7..e83a0ff9 100644 --- a/blockbot/lang/C/messages.po +++ b/fromgplus/lang/C/messages.po @@ -1,6 +1,6 @@ -# ADDON blockbot +# ADDON fromgplus # Copyright (C) -# This file is distributed under the same license as the Friendica blockbot addon package. +# This file is distributed under the same license as the Friendica fromgplus addon package. # # #, fuzzy @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-07 09:03+0200\n" +"POT-Creation-Date: 2018-04-01 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME
';
+ $s .= '
';
+
}
diff --git a/geonames/lang/fr/messages.po b/geonames/lang/fr/messages.po
deleted file mode 100644
index 8d70fed7..00000000
--- a/geonames/lang/fr/messages.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# ADDON geonames
-# Copyright (C)
-# This file is distributed under the same license as the Friendica geonames addon package.
-#
-#
-# Translators:
-# ButterflyOfFire, 2020
-# Hypolite Petovan ' . L10n::t('Geonames Settings') . '
'; + $s .= '';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
+
+ /* provide a submit button */
+
+ $s .= '{{$title}}
- - - \ No newline at end of file diff --git a/gnot/gnot.php b/gnot/gnot.php index 8420ffe4..7adf045f 100644 --- a/gnot/gnot.php +++ b/gnot/gnot.php @@ -8,10 +8,9 @@ * */ use Friendica\Core\Hook; +use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\Renderer; -use Friendica\DI; -use Friendica\Model\Notify\Type; +use Friendica\Core\PConfig; function gnot_install() { @@ -22,6 +21,19 @@ function gnot_install() { Logger::log("installed gnot"); } + +function gnot_uninstall() { + + Hook::unregister('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings'); + Hook::unregister('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post'); + Hook::unregister('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail'); + + + Logger::log("removed gnot"); +} + + + /** * * Callback from the settings post function. @@ -35,7 +47,8 @@ function gnot_settings_post($a,$post) { if(! local_user() || empty($_POST['gnot-submit'])) return; - DI::pConfig()->set(local_user(),'gnot','enable',intval($_POST['gnot'])); + PConfig::set(local_user(),'gnot','enable',intval($_POST['gnot'])); + info(L10n::t('Gnot settings updated.') . EOL); } @@ -55,30 +68,34 @@ function gnot_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - DI::page()['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variable */ - $gnot = intval(DI::pConfig()->get(local_user(),'gnot','enable')); + $gnot = intval(PConfig::get(local_user(),'gnot','enable')); $gnot_checked = (($gnot) ? ' checked="checked" ' : '' ); - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/gnot/'); /* Add some HTML to the existing form */ - $s .= Renderer::replaceMacros($t, [ - '$title' => DI::l10n()->t('Gnot Settings') , - '$submit' => DI::l10n()->t('Save Settings'), - '$enable' => DI::l10n()->t('Enable this addon?'), - '$enabled' => $gnot_checked, - '$text' => DI::l10n()->t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") - ]); + $s .= '';
+ $s .= '
';
+
}
function gnot_enotify_mail(&$a,&$b) {
- if((! $b['uid']) || (! intval(DI::pConfig()->get($b['uid'], 'gnot','enable'))))
+ if((! $b['uid']) || (! intval(PConfig::get($b['uid'], 'gnot','enable'))))
return;
- if($b['type'] == Type::COMMENT)
- $b['subject'] = DI::l10n()->t('[Friendica:Notify] Comment to conversation #%d', $b['parent']);
+ if($b['type'] == NOTIFY_COMMENT)
+ $b['subject'] = L10n::t('[Friendica:Notify] Comment to conversation #%d', $b['parent']);
}
diff --git a/gnot/lang/ca/messages.po b/gnot/lang/ca/messages.po
deleted file mode 100644
index be2b159e..00000000
--- a/gnot/lang/ca/messages.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# ADDON gnot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gnot addon package.
-#
-#
-# Translators:
-# Joan Bar ' . L10n::t('Gnot Settings') . '
'; + $s .= '';
+ $s .= '
';
+
+ /* provide a submit button */
+
+ $s .= '' . L10n::t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") . '
';
+ $s .= '';
+ $s .= '';
+ $s .= '{{$title}}
- - diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php index 5555ec5a..09a566e8 100644 --- a/googlemaps/googlemaps.php +++ b/googlemaps/googlemaps.php @@ -16,6 +16,13 @@ function googlemaps_install() Logger::log("installed googlemaps"); } +function googlemaps_uninstall() +{ + Hook::unregister('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location'); + + Logger::log("removed googlemaps"); +} + function googlemaps_location($a, &$item) { diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index 894abda6..d14cf9ba 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -8,12 +8,12 @@ use Friendica\App; use Friendica\BaseModule; +use Friendica\Core\Config; use Friendica\Core\Hook; +use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Database\DBA; -use Friendica\DI; -use Friendica\Util\ConfigFileLoader; use Friendica\Util\Strings; /** @@ -26,7 +26,17 @@ function gravatar_install() { Logger::log("registered gravatar in avatar_lookup hook"); } -function gravatar_load_config(App $a, ConfigFileLoader $loader) +/** + * Removes the addon hook + */ +function gravatar_uninstall() { + Hook::unregister('load_config', 'addon/gravatar/gravatar.php', 'gravatar_load_config'); + Hook::unregister('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup'); + + Logger::log("unregistered gravatar in avatar_lookup hook"); +} + +function gravatar_load_config(App $a, Config\Cache\ConfigCacheLoader $loader) { $a->getConfigCache()->load($loader->loadAddonConfig('gravatar')); } @@ -38,8 +48,8 @@ function gravatar_load_config(App $a, ConfigFileLoader $loader) * @param &$b array */ function gravatar_lookup($a, &$b) { - $default_avatar = DI::config()->get('gravatar', 'default_avatar'); - $rating = DI::config()->get('gravatar', 'rating'); + $default_avatar = Config::get('gravatar', 'default_avatar'); + $rating = Config::get('gravatar', 'rating'); // setting default value if nothing configured if(! $default_avatar) @@ -64,8 +74,8 @@ function gravatar_lookup($a, &$b) { function gravatar_addon_admin (&$a, &$o) { $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/gravatar/" ); - $default_avatar = DI::config()->get('gravatar', 'default_avatar'); - $rating = DI::config()->get('gravatar', 'rating'); + $default_avatar = Config::get('gravatar', 'default_avatar'); + $rating = Config::get('gravatar', 'rating'); // set default values for first configuration if(! $default_avatar) @@ -75,11 +85,11 @@ function gravatar_addon_admin (&$a, &$o) { // Available options for the select boxes $default_avatars = [ - 'mm' => DI::l10n()->t('generic profile image'), - 'identicon' => DI::l10n()->t('random geometric pattern'), - 'monsterid' => DI::l10n()->t('monster face'), - 'wavatar' => DI::l10n()->t('computer generated face'), - 'retro' => DI::l10n()->t('retro arcade style face'), + 'mm' => L10n::t('generic profile image'), + 'identicon' => L10n::t('random geometric pattern'), + 'monsterid' => L10n::t('monster face'), + 'wavatar' => L10n::t('computer generated face'), + 'retro' => L10n::t('retro arcade style face'), ]; $ratings = [ 'g' => 'g', @@ -93,15 +103,15 @@ function gravatar_addon_admin (&$a, &$o) { DBA::escape('libravatar') ); if (count($r)) { - $o = '' .DI::l10n()->t('Information') .'
' .DI::l10n()->t('Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'
'; + $o = '
' .L10n::t('Information') .'
' .L10n::t('Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'
'; } // output Gravatar settings $o .= ''; $o .= Renderer::replaceMacros( $t, [ - '$submit' => DI::l10n()->t('Save Settings'), - '$default_avatar' => ['avatar', DI::l10n()->t('Default avatar image'), $default_avatar, DI::l10n()->t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars], - '$rating' => ['rating', DI::l10n()->t('Rating of images'), $rating, DI::l10n()->t('Select the appropriate avatar rating for your site. See README'), $ratings], + '$submit' => L10n::t('Save Settings'), + '$default_avatar' => ['avatar', L10n::t('Default avatar image'), $default_avatar, L10n::t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars], + '$rating' => ['rating', L10n::t('Rating of images'), $rating, L10n::t('Select the appropriate avatar rating for your site. See README'), $ratings], ]); } @@ -113,6 +123,7 @@ function gravatar_addon_admin_post (&$a) { $default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon'); $rating = (!empty($_POST['rating']) ? Strings::escapeTags(trim($_POST['rating'])) : 'g'); - DI::config()->set('gravatar', 'default_avatar', $default_avatar); - DI::config()->set('gravatar', 'rating', $rating); + Config::set('gravatar', 'default_avatar', $default_avatar); + Config::set('gravatar', 'rating', $rating); + info(L10n::t('Gravatar settings updated.') .EOL); } diff --git a/gravatar/lang/ca/messages.po b/gravatar/lang/ca/messages.po deleted file mode 100644 index 1b86ea16..00000000 --- a/gravatar/lang/ca/messages.po +++ /dev/null @@ -1,75 +0,0 @@ -# ADDON gravatar -# Copyright (C) -# This file is distributed under the same license as the Friendica gravatar addon package. -# -# -# Translators: -# Joan Bar
The Libravatar addon will fall back to Gravatar if " -"nothing was found at Libravatar." -msgstr "També hi ha instal·lat l’addon Libravatar. Inhabiliteu l'addon Libravatar o aquest addon Gravatar.
Si no es va trobar res a Libravatar, l'afegit de Libravatar tornarà a aparèixer a Gravatar." - -#: gravatar.php:95 -msgid "Submit" -msgstr "Presentar" - -#: gravatar.php:96 -msgid "Default avatar image" -msgstr "Imatge predeterminada d’avatar" - -#: gravatar.php:96 -msgid "Select default avatar image if none was found at Gravatar. See README" -msgstr "Seleccioneu la imatge d'avatar per defecte si no s'ha trobat cap a Gravatar. Vegeu LLEGIR" - -#: gravatar.php:97 -msgid "Rating of images" -msgstr "Valoració d'imatges" - -#: gravatar.php:97 -msgid "Select the appropriate avatar rating for your site. See README" -msgstr "Seleccioneu la qualificació d'avatar adequada per al vostre lloc. Vegeu LLEGIR" - -#: gravatar.php:111 -msgid "Gravatar settings updated." -msgstr "S'han actualitzat els paràmetres de Gravatar." diff --git a/gravatar/lang/ca/strings.php b/gravatar/lang/ca/strings.php index 2c950e4c..44a7ff8c 100644 --- a/gravatar/lang/ca/strings.php +++ b/gravatar/lang/ca/strings.php @@ -1,21 +1,15 @@ -strings["generic profile image"] = "imatge de perfil genèrica"; -$a->strings["random geometric pattern"] = "patró geomètric aleatori"; -$a->strings["monster face"] = "cara de monstre"; -$a->strings["computer generated face"] = "cara generada per ordinador"; -$a->strings["retro arcade style face"] = "cara d’estil d’arcades retro"; -$a->strings["Information"] = "Informació"; -$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "També hi ha instal·lat l’addon Libravatar. Inhabiliteu l'addon Libravatar o aquest addon Gravatar.
Si no es va trobar res a Libravatar, l'afegit de Libravatar tornarà a aparèixer a Gravatar."; -$a->strings["Submit"] = "Presentar"; -$a->strings["Default avatar image"] = "Imatge predeterminada d’avatar"; -$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Seleccioneu la imatge d'avatar per defecte si no s'ha trobat cap a Gravatar. Vegeu LLEGIR"; -$a->strings["Rating of images"] = "Valoració d'imatges"; -$a->strings["Select the appropriate avatar rating for your site. See README"] = "Seleccioneu la qualificació d'avatar adequada per al vostre lloc. Vegeu LLEGIR"; -$a->strings["Gravatar settings updated."] = "S'han actualitzat els paràmetres de Gravatar."; +strings["generic profile image"] = "imatge de perfil genérica"; +$a->strings["random geometric pattern"] = "Patró geometric aleatori"; +$a->strings["monster face"] = "Cara monstruosa"; +$a->strings["computer generated face"] = "Cara monstruosa generada per ordinador"; +$a->strings["retro arcade style face"] = "Cara d'estil arcade retro"; +$a->strings["Information"] = "informació"; +$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = ""; +$a->strings["Submit"] = "Enviar"; +$a->strings["Default avatar image"] = "Imatge d'avatar per defecte"; +$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Se selecciona la imatge d'avatar per defecte si no es troba cap en Gravatar. Veure el README"; +$a->strings["Rating of images"] = "Classificació de les imatges"; +$a->strings["Select the appropriate avatar rating for your site. See README"] = "Selecciona la classe d'avatar apropiat pel teu lloc. Veure el README"; +$a->strings["Gravatar settings updated."] = "Ajustos de Gravatar actualitzats."; diff --git a/gravatar/lang/nl/messages.po b/gravatar/lang/nl/messages.po index da18b107..95b06ecd 100644 --- a/gravatar/lang/nl/messages.po +++ b/gravatar/lang/nl/messages.po @@ -4,15 +4,14 @@ # # # Translators: -# Casper
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = ""; $a->strings["Submit"] = ""; $a->strings["Default avatar image"] = ""; diff --git a/group_text/group_text.php b/group_text/group_text.php index e0e61ee5..47768df2 100644 --- a/group_text/group_text.php +++ b/group_text/group_text.php @@ -6,8 +6,9 @@ * Author: Thomas Willingham
';
- $s .= '
';
+ $s .= '';
}
diff --git a/group_text/lang/ca/messages.po b/group_text/lang/ca/messages.po
deleted file mode 100644
index 7081c0d7..00000000
--- a/group_text/lang/ca/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-#
-#
-# Translators:
-# Joan Bar ' . DI::l10n()->t('Group Text') . '
'; + $s .= '' . L10n::t('Group Text') . '
'; $s .= '';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
/* provide a submit button */
- $s .= '
' . DI::l10n()->t('IFTTT Mirror') . '
'; + $s .= '' . L10n::t('IFTTT Mirror') . '
'; $s .= ''; $s .= ''; } function ifttt_settings_post() { if (!empty($_POST['ifttt-submit']) && isset($_POST['ifttt-rekey'])) { - DI::pConfig()->delete(local_user(), 'ifttt', 'key'); + PConfig::delete(local_user(), 'ifttt', 'key'); } } @@ -112,7 +118,7 @@ function ifttt_post(App $a) $key = $_REQUEST['key']; // Check the key - if ($key != DI::pConfig()->get($uid, 'ifttt', 'key')) { + if ($key != PConfig::get($uid, 'ifttt', 'key')) { Logger::log('Invalid key for user ' . $uid, Logger::DEBUG); return; } @@ -159,7 +165,7 @@ function ifttt_post(App $a) function ifttt_message($uid, $item) { - $a = DI::app(); + $a = \get_app(); $_SESSION['authenticated'] = true; $_SESSION['uid'] = $uid; @@ -180,7 +186,7 @@ function ifttt_message($uid, $item) } if ($item['type'] == 'link') { - $data = PageInfo::queryUrl($item['link']); + $data = query_page_info($item['link']); if (isset($item['title']) && (trim($item['title']) != '')) { $data['title'] = $item['title']; @@ -190,7 +196,7 @@ function ifttt_message($uid, $item) $data['text'] = $item['description']; } - $_REQUEST['body'] .= "\n" . PageInfo::getFooterFromData($data); + $_REQUEST['body'] .= add_page_info_data($data); } elseif (($item['type'] == 'photo') && ($item['image'] != '')) { $_REQUEST['body'] .= "\n\n[img]" . $item['image'] . "[/img]\n"; } diff --git a/ifttt/lang/en-gb/messages.po b/ifttt/lang/en-gb/messages.po index 09264292..13cabc13 100644 --- a/ifttt/lang/en-gb/messages.po +++ b/ifttt/lang/en-gb/messages.po @@ -3,18 +3,14 @@ # This file is distributed under the same license as the Friendica ifttt addon package. # # -# Translators: -# Kris, 2018 -# Andy H3 '
+ . L10n::t('Post to Insanejournal') . '
';
}
}
@@ -51,61 +58,61 @@ function ijpost_settings(&$a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
- DI::page()['htmlhead'] .= '' . "\r\n";
+ $a->page['htmlhead'] .= '' . "\r\n";
/* Get the current state of our config variables */
- $enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post');
+ $enabled = PConfig::get(local_user(), 'ijpost', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $def_enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default');
+ $def_enabled = PConfig::get(local_user(), 'ijpost', 'post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $ij_username = DI::pConfig()->get(local_user(), 'ijpost', 'ij_username');
- $ij_password = DI::pConfig()->get(local_user(), 'ijpost', 'ij_password');
+ $ij_username = PConfig::get(local_user(), 'ijpost', 'ij_username');
+ $ij_password = PConfig::get(local_user(), 'ijpost', 'ij_password');
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
'. DI::l10n()->t("InsaneJournal Export").'
'; + $s .= ''. L10n::t("InsaneJournal Export").'
'; $s .= ''; $s .= ''; + $s .= ''; } function ijpost_settings_post(&$a, &$b) { if (!empty($_POST['ijpost-submit'])) { - DI::pConfig()->set(local_user(), 'ijpost', 'post', intval($_POST['ijpost'])); - DI::pConfig()->set(local_user(), 'ijpost', 'post_by_default', intval($_POST['ij_bydefault'])); - DI::pConfig()->set(local_user(), 'ijpost', 'ij_username', trim($_POST['ij_username'])); - DI::pConfig()->set(local_user(), 'ijpost', 'ij_password', trim($_POST['ij_password'])); + PConfig::set(local_user(), 'ijpost', 'post', intval($_POST['ijpost'])); + PConfig::set(local_user(), 'ijpost', 'post_by_default', intval($_POST['ij_bydefault'])); + PConfig::set(local_user(), 'ijpost', 'ij_username', trim($_POST['ij_username'])); + PConfig::set(local_user(), 'ijpost', 'ij_password', trim($_POST['ij_password'])); } } @@ -125,11 +132,11 @@ function ijpost_post_local(&$a, &$b) return; } - $ij_post = intval(DI::pConfig()->get(local_user(), 'ijpost', 'post')); + $ij_post = intval(PConfig::get(local_user(), 'ijpost', 'post')); $ij_enable = (($ij_post && !empty($_REQUEST['ijpost_enable'])) ? intval($_REQUEST['ijpost_enable']) : 0); - if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default'))) { + if ($b['api_source'] && intval(PConfig::get(local_user(), 'ijpost', 'post_by_default'))) { $ij_enable = 1; } @@ -172,15 +179,15 @@ function ijpost_send(&$a, &$b) $tz = $x[0]['timezone']; } - $ij_username = DI::pConfig()->get($b['uid'], 'ijpost', 'ij_username'); - $ij_password = DI::pConfig()->get($b['uid'], 'ijpost', 'ij_password'); + $ij_username = PConfig::get($b['uid'], 'ijpost', 'ij_username'); + $ij_password = PConfig::get($b['uid'], 'ijpost', 'ij_password'); $ij_blog = 'http://www.insanejournal.com/interface/xmlrpc'; if ($ij_username && $ij_password && $ij_blog) { $title = $b['title']; $post = BBCode::convert($b['body']); $post = XML::escape($post); - $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]); + $tags = ijpost_get_tags($b['tag']); $date = DateTimeFormat::convert($b['created'], $tz); $year = intval(substr($date,0,4)); @@ -219,8 +226,15 @@ EOT; Logger::log('ijpost: data: ' . $xml, Logger::DATA); if ($ij_blog !== 'test') { - $x = DI::httpRequest()->post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody(); + $x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody(); } Logger::log('posted to insanejournal: ' . $x ? $x : '', Logger::DEBUG); } } + +function ijpost_get_tags($post) +{ + preg_match_all("/\]([^\[#]+)\[/", $post, $matches); + $tags = implode(', ', $matches[1]); + return $tags; +} diff --git a/ijpost/lang/ca/messages.po b/ijpost/lang/ca/messages.po deleted file mode 100644 index 8bea3f16..00000000 --- a/ijpost/lang/ca/messages.po +++ /dev/null @@ -1,48 +0,0 @@ -# ADDON ijpost -# Copyright (C) -# This file is distributed under the same license as the Friendica ijpost addon package. -# -# -# Translators: -# Joan Bar'.DI::l10n()->t('Impressum').'
'; - $owner = DI::config()->get('impressum', 'owner'); - $owner_profile = DI::config()->get('impressum','ownerprofile'); - $postal = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum', 'postal'))); - $notes = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum', 'notes'))); - $email = obfuscate_email( DI::config()->get('impressum','email') ); + $b .= ''.L10n::t('Impressum').'
'; + $owner = Config::get('impressum', 'owner'); + $owner_profile = Config::get('impressum','ownerprofile'); + $postal = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum', 'postal'))); + $notes = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum', 'notes'))); + $email = obfuscate_email( Config::get('impressum','email') ); if (strlen($owner)) { if (strlen($owner_profile)) { $tmp = ''.$owner.''; @@ -63,18 +71,18 @@ function impressum_show($a,&$b) { $tmp = $owner; } if (strlen($email)) { - $b .= ''.DI::l10n()->t('Site Owner').': '. $tmp .'
'.DI::l10n()->t('Email Address').': '.$email.'
'.L10n::t('Site Owner').': '. $tmp .'
'.L10n::t('Email Address').': '.$email.'
'.DI::l10n()->t('Site Owner').': '. $tmp .'
'; + $b .= ''.L10n::t('Site Owner').': '. $tmp .'
'; } if (strlen($postal)) { - $b .= ''.DI::l10n()->t('Postal Address').'
'. $postal .'
'.L10n::t('Postal Address').'
'. $postal .'
'.$notes.'
'; } } else { - $b .= ''.DI::l10n()->t('The impressum addon needs to be configured!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon.').'
'.L10n::t('The impressum addon needs to be configured!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon.').'
Please add at least the " -"owner variable to your config file. For other variables please " -"refer to the README file of the addon." -msgstr "Cal configurar l’addon impressum
Afegiu com a mínim la secció owner variable del fitxer de configuració. Per a altres variables, consulteu el fitxer README de l’adjunció." - -#: impressum.php:78 -msgid "Settings updated." -msgstr "La configuració s'ha actualitzat." - -#: impressum.php:83 -msgid "Submit" -msgstr "sotmetre's" - -#: impressum.php:84 -msgid "The page operators name." -msgstr "El nom dels operadors de pàgina." - -#: impressum.php:85 -msgid "Site Owners Profile" -msgstr "Perfil dels propietaris del lloc" - -#: impressum.php:85 -msgid "Profile address of the operator." -msgstr "Adreça del perfil de l'operador." - -#: impressum.php:86 -msgid "How to contact the operator via snail mail. You can use BBCode here." -msgstr "Com contactar amb l'operador mitjançant correu cargol. Podeu utilitzar BBCode aquí." - -#: impressum.php:87 -msgid "Notes" -msgstr "nota" - -#: impressum.php:87 -msgid "" -"Additional notes that are displayed beneath the contact information. You can" -" use BBCode here." -msgstr "Notes addicionals que es mostren a sota de la informació de contacte. Podeu utilitzar BBCode aquí." - -#: impressum.php:88 -msgid "How to contact the operator via email. (will be displayed obfuscated)" -msgstr "Com contactar amb l'operador per correu electrònic. (es mostrarà ofuscat)" - -#: impressum.php:89 -msgid "Footer note" -msgstr "Nota de peu de pàgina" - -#: impressum.php:89 -msgid "Text for the footer. You can use BBCode here." -msgstr "Text for the footer. You can use BBCode here." diff --git a/impressum/lang/ca/strings.php b/impressum/lang/ca/strings.php index 2f2e59e2..4de1f0c3 100644 --- a/impressum/lang/ca/strings.php +++ b/impressum/lang/ca/strings.php @@ -1,24 +1,18 @@ -strings["Impressum"] = "empremta"; -$a->strings["Site Owner"] = "Propietari del lloc"; -$a->strings["Email Address"] = "Correu electrònic"; -$a->strings["Postal Address"] = "Adreça postal"; -$a->strings["The impressum addon needs to be configured!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = "Cal configurar l’addon impressum
Afegiu com a mínim la secció owner variable del fitxer de configuració. Per a altres variables, consulteu el fitxer README de l’adjunció."; -$a->strings["Settings updated."] = "La configuració s'ha actualitzat."; -$a->strings["Submit"] = "sotmetre's"; -$a->strings["The page operators name."] = "El nom dels operadors de pàgina."; -$a->strings["Site Owners Profile"] = "Perfil dels propietaris del lloc"; -$a->strings["Profile address of the operator."] = "Adreça del perfil de l'operador."; -$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Com contactar amb l'operador mitjançant correu cargol. Podeu utilitzar BBCode aquí."; -$a->strings["Notes"] = "nota"; -$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Notes addicionals que es mostren a sota de la informació de contacte. Podeu utilitzar BBCode aquí."; -$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Com contactar amb l'operador per correu electrònic. (es mostrarà ofuscat)"; -$a->strings["Footer note"] = "Nota de peu de pàgina"; -$a->strings["Text for the footer. You can use BBCode here."] = "Text for the footer. You can use BBCode here."; +strings["Impressum"] = "Impressum"; +$a->strings["Site Owner"] = "Propietari del lloc"; +$a->strings["Email Address"] = "Adreça de correu"; +$a->strings["Postal Address"] = "Adreça postal"; +$a->strings["The impressum addon needs to be configured!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = "El complement impressum s'ha de configurar!
Si us plau afegiu almenys la variable propietari al fitxer de configuració. Per a les altres variables, consulteu el fitxer README del complement."; +$a->strings["Settings updated."] = "Ajustos actualitzats."; +$a->strings["Submit"] = "Enviar"; +$a->strings["The page operators name."] = "Nom de la pàgina del gestor."; +$a->strings["Site Owners Profile"] = "Perfil del Propietari del Lloc"; +$a->strings["Profile address of the operator."] = "Adreça del perfil del gestor."; +$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Com posar-se en contacte amb l'operador a través de correu postal. Vostè pot utilitzar BBCode aquí."; +$a->strings["Notes"] = "Notes"; +$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Notes addicionals que es mostren sota de la informació de contacte. Vostè pot usar BBCode aquí."; +$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Com contactar amb el gestor via correu electronic. ( es visualitzara ofuscat)"; +$a->strings["Footer note"] = "Nota a peu de pàgina"; +$a->strings["Text for the footer. You can use BBCode here."] = "Text pel peu de pàgina. Pots emprar BBCode aquí."; diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php index a4998264..a71fe651 100644 --- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php +++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php @@ -6,16 +6,21 @@ * Author: Thomas Willingham
IRC chat
-A beginner's guide to using IRC. [en]
+A beginner's guide to using IRC. [en]
EOT; @@ -122,17 +132,19 @@ function irc_addon_admin_post (&$a) { return; if($_POST['irc-submit']) { - DI::config()->set('irc','autochans',trim($_POST['autochans'])); - DI::config()->set('irc','sitechats',trim($_POST['sitechats'])); + Config::set('irc','autochans',trim($_POST['autochans'])); + Config::set('irc','sitechats',trim($_POST['sitechats'])); + /* stupid pop-up thing */ + info(L10n::t('IRC settings saved.') . EOL); } } function irc_addon_admin (&$a, &$o) { - $sitechats = DI::config()->get('irc','sitechats'); /* popular channels */ - $autochans = DI::config()->get('irc','autochans'); /* auto connect chans */ + $sitechats = Config::get('irc','sitechats'); /* popular channels */ + $autochans = Config::get('irc','autochans'); /* auto connect chans */ $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/irc/" ); $o = Renderer::replaceMacros($t, [ - '$submit' => DI::l10n()->t('Save Settings'), - '$autochans' => [ 'autochans', DI::l10n()->t('Channel(s) to auto connect (comma separated)'), $autochans, DI::l10n()->t('List of channels that shall automatically connected to when the app is launched.')], - '$sitechats' => [ 'sitechats', DI::l10n()->t('Popular Channels (comma separated)'), $sitechats, DI::l10n()->t('List of popular channels, will be displayed at the side and hotlinked for easy joining.') ] + '$submit' => L10n::t('Save Settings'), + '$autochans' => [ 'autochans', L10n::t('Channel(s) to auto connect (comma separated)'), $autochans, L10n::t('List of channels that shall automatically connected to when the app is launched.')], + '$sitechats' => [ 'sitechats', L10n::t('Popular Channels (comma separated)'), $sitechats, L10n::t('List of popular channels, will be displayed at the side and hotlinked for easy joining.') ] ]); } diff --git a/irc/lang/fr/messages.po b/irc/lang/fr/messages.po deleted file mode 100644 index 330048bb..00000000 --- a/irc/lang/fr/messages.po +++ /dev/null @@ -1,68 +0,0 @@ -# ADDON irc -# Copyright (C) -# This file is distributed under the same license as the Friendica irc addon package. -# -# -# Translators: -# ButterflyOfFire, 2020 -# StefOfficielWarning: The cron job has not yet been executed. If this message is still there after some time (usually 10 minutes), this means that autosubscribe and autoaccept will not work.
"; } // bosh proxy - $bosh_proxy = intval(DI::config()->get("jappixmini", "bosh_proxy")); + $bosh_proxy = intval(Config::get("jappixmini", "bosh_proxy")); $bosh_proxy = intval($bosh_proxy) ? ' checked="checked"' : ''; $o .= ''; $o .= ''; // bosh address - $bosh_address = DI::config()->get("jappixmini", "bosh_address"); + $bosh_address = Config::get("jappixmini", "bosh_address"); $o .= '
';
$o .= '
';
$o .= '
'; // info text field - $info_text = DI::config()->get("jappixmini", "infotext"); + $info_text = Config::get("jappixmini", "infotext"); $o .= '
';
$o .= '
", $info_text); @@ -308,69 +324,69 @@ function jappixmini_settings(App $a, &$s) if (!$activate) { // load scripts if not yet activated so that password can be saved - DI::page()['htmlhead'] .= '' . "\r\n"; - DI::page()['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; - DI::page()['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; } $s .= ''; - $s .= '