friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'Art4/remove-app-usage' into develop

develop
Hypolite Petovan 2024-12-16 09:04:45 -05:00
parent 04c402607b c4bea164c7
commit 6cf388f141
66 changed files with 57 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
advancedcontentfilter/advancedcontentfilter.php
View File

@ -33,7 +33,6 @@
* *
*/ */
use Friendica\App;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Content\Text\Markdown; use Friendica\Content\Text\Markdown;
use Friendica\Core\Hook; use Friendica\Core\Hook;
@ -42,7 +41,6 @@ use Friendica\Core\Renderer;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\Tag; use Friendica\Model\Tag;
use Friendica\Model\User; use Friendica\Model\User;
@ -273,7 +271,7 @@ function advancedcontentfilter_content()
'rule_expression' => DI::l10n()->t('Rule Expression'), 'rule_expression' => DI::l10n()->t('Rule Expression'),
'cancel' => DI::l10n()->t('Cancel'), 'cancel' => DI::l10n()->t('Cancel'),
], ],
'$current_theme' => DI::app()->getCurrentTheme(), '$current_theme' => DI::appHelper()->getCurrentTheme(),
'$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])), '$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])),
'$form_security_token' => BaseModule::getFormSecurityToken() '$form_security_token' => BaseModule::getFormSecurityToken()
]); ]);

1
birdavatar/birdavatar.php
View File

@ -6,7 +6,6 @@
* Author: Fabio <https://kirgroup.com/profile/fabrixxm> * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;

1
blackout/blackout.php
View File

@ -44,7 +44,6 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;

2
bluesky/bluesky.php
View File

@ -98,7 +98,7 @@ function bluesky_install()
function bluesky_load_config(ConfigFileManager $loader) function bluesky_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
function bluesky_check_item_notification(array &$notification_data) function bluesky_check_item_notification(array &$notification_data)

1
buglink/buglink.php
View File

@ -6,7 +6,6 @@
* Author: Mike Macgirvin <mike@macgirvin.com> * Author: Mike Macgirvin <mike@macgirvin.com>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;

11
calc/calc.php
View File

@ -6,7 +6,6 @@
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;
@ -16,7 +15,7 @@ function calc_install() {
function calc_app_menu(array &$b) function calc_app_menu(array &$b)
{ {
$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>'; $b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>';
} }
/** /**
@ -296,7 +295,7 @@ $o .= <<< EOT
<h3>Calculator</h3> <h3>Calculator</h3>
<br /><br /> <br /><br />
<table> <table>
<tbody><tr><td> <tbody><tr><td>
<table bgcolor="#af9999" border="1"> <table bgcolor="#af9999" border="1">
<tbody><tr><td> <tbody><tr><td>
<table border="1" cellpadding="2" cellspacing="2"> <table border="1" cellpadding="2" cellspacing="2">
@ -323,7 +322,7 @@ $o .= <<< EOT
<td><input name="multiplication" value="&nbsp;&nbsp;*&nbsp;&nbsp;&nbsp;&nbsp;" onclick="multiplyNumbers()" type="button"></td> <td><input name="multiplication" value="&nbsp;&nbsp;*&nbsp;&nbsp;&nbsp;&nbsp;" onclick="multiplyNumbers()" type="button"></td>
</tr><tr align="left" valign="middle"> </tr><tr align="left" valign="middle">
<td><input name="zero" value="&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;" onclick="addDisplay(0)" type="button"></td> <td><input name="zero" value="&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;" onclick="addDisplay(0)" type="button"></td>
<td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td> <td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td>
<td><input name="dot" value="&nbsp;&nbsp;&nbsp;.&nbsp;&nbsp;&nbsp;" onclick='addDisplay(".")' type="button"></td> <td><input name="dot" value="&nbsp;&nbsp;&nbsp;.&nbsp;&nbsp;&nbsp;" onclick='addDisplay(".")' type="button"></td>
<td><input name="division" value="&nbsp;&nbsp;&nbsp;/&nbsp;&nbsp;&nbsp;" onclick="divideNumbers()" type="button"></td> <td><input name="division" value="&nbsp;&nbsp;&nbsp;/&nbsp;&nbsp;&nbsp;" onclick="divideNumbers()" type="button"></td>
</tr><tr align="left" valign="middle"> </tr><tr align="left" valign="middle">
@ -345,13 +344,13 @@ $o .= <<< EOT
</form> </form>
<!-- <!--
<TD VALIGN=top> <TD VALIGN=top>
<B>NOTE:</B> All sine and cosine calculations are <B>NOTE:</B> All sine and cosine calculations are
<br>done in radians. Remember to convert first <br>done in radians. Remember to convert first
<br>if using degrees. <br>if using degrees.
</TD> </TD>
--> -->
</td></tr></tbody></table> </td></tr></tbody></table>

2
catavatar/catavatar.php
View File

@ -6,11 +6,9 @@
* Author: Fabio <https://kirgroup.com/profile/fabrixxm> * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;

1
cookienotice/cookienotice.php
View File

@ -7,7 +7,6 @@
* Author: Peter Liebetrau <https://socivitas/profile/peerteer> * Author: Peter Liebetrau <https://socivitas/profile/peerteer>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;

1
diaspora/diaspora.php
View File

@ -9,7 +9,6 @@
require_once 'addon/diaspora/Diaspora_Connection.php'; require_once 'addon/diaspora/Diaspora_Connection.php';
use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;

1
discourse/discourse.php
View File

@ -8,7 +8,6 @@
* *
*/ */
use Friendica\App;
use Friendica\Content\Text\Markdown; use Friendica\Content\Text\Markdown;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;

1
dwpost/dwpost.php
View File

@ -8,7 +8,6 @@
* Author: Cat Gray <https://free-haven.org/profile/catness> * Author: Cat Gray <https://free-haven.org/profile/catness>
*/ */
use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;

3
fancybox/fancybox.php
View File

@ -7,7 +7,6 @@
* Status: Unsupported * Status: Unsupported
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;
@ -40,7 +39,7 @@ function fancybox_render(array &$b){
function ($text) use ($gallery) { function ($text) use ($gallery) {
// This processes images inlined in posts // This processes images inlined in posts
// Frio / Vier hooks für lightbox are un-hooked in fancybox-config.js. So this works for them, too! // Frio / Vier hooks für lightbox are un-hooked in fancybox-config.js. So this works for them, too!
//if (!in_array(DI::app()->getCurrentTheme(),['vier','frio'])) //if (!in_array(DI::appHelper()->getCurrentTheme(),['vier','frio']))
$text = preg_replace( $text = preg_replace(
'#<a[^>]*href="([^"]*)"[^>]*>(<img[^>]*src="[^"]*"[^>]*>)</a>#', '#<a[^>]*href="([^"]*)"[^>]*>(<img[^>]*src="[^"]*"[^>]*>)</a>#',
'<a data-fancybox="' . $gallery . '" href="$1">$2</a>', '<a data-fancybox="' . $gallery . '" href="$1">$2</a>',

3
fromapp/fromapp.php
View File

@ -7,7 +7,6 @@
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
@ -76,6 +75,6 @@ function fromapp_post_hook(&$item)
$apps = explode(',', $app); $apps = explode(',', $app);
$item['app'] = trim($apps[mt_rand(0, count($apps)-1)]); $item['app'] = trim($apps[mt_rand(0, count($apps)-1)]);
return; return;
} }

1
geocoordinates/geocoordinates.php
View File

@ -6,7 +6,6 @@
* Author: Michael Vogel <https://pirati.ca/profile/heluecht> * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;

3
geonames/geonames.php
View File

@ -6,7 +6,6 @@
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
@ -35,7 +34,7 @@ function geonames_install()
function geonames_load_config(ConfigFileManager $loader) function geonames_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
function geonames_post_hook(array &$item) function geonames_post_hook(array &$item)

5
gnot/gnot.php
View File

@ -4,11 +4,10 @@
* Description: Thread email comment notifications on Gmail and anonymise them * Description: Thread email comment notifications on Gmail and anonymise them
* Version: 1.0 * Version: 1.0
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
* *
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
@ -38,7 +37,7 @@ function gnot_settings_post($post) {
} }
/** /**
* Called from the Addon Setting form. * Called from the Addon Setting form.
* Add our own settings info to the page. * Add our own settings info to the page.
*/ */
function gnot_settings(array &$data) function gnot_settings(array &$data)

1
googlemaps/googlemaps.php
View File

@ -7,7 +7,6 @@
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;

5
gravatar/gravatar.php
View File

@ -6,15 +6,12 @@
* Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus> * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
*/ */
use Friendica\App;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Util\ConfigFileManager; use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Util\Strings;
/** /**
* Installs the addon hook * Installs the addon hook
@ -28,7 +25,7 @@ function gravatar_install() {
function gravatar_load_config(ConfigFileManager $loader) function gravatar_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
/** /**

2
group_text/group_text.php
View File

@ -8,9 +8,7 @@
* Note: Please use Circle Text instead * Note: Please use Circle Text instead
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;

3
highlightjs/highlightjs.php
View File

@ -6,7 +6,6 @@
* Author: Hypolite Petovan <hypolite@mrpetovan.com> * Author: Hypolite Petovan <hypolite@mrpetovan.com>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;
@ -18,7 +17,7 @@ function highlightjs_install()
function highlightjs_head(string &$str) function highlightjs_head(string &$str)
{ {
if (DI::app()->getCurrentTheme() == 'frio') { if (DI::appHelper()->getCurrentTheme() == 'frio') {
$style = 'bootstrap'; $style = 'bootstrap';
} else { } else {
$style = 'default'; $style = 'default';

1
ifttt/ifttt.php
View File

@ -6,7 +6,6 @@
* Version: 0.1 * Version: 0.1
* Author: Michael Vogel <https://pirati.ca/profile/heluecht> * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
*/ */
use Friendica\App;
use Friendica\Content\PageInfo; use Friendica\Content\PageInfo;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;

1
ijpost/ijpost.php
View File

@ -8,7 +8,6 @@
* Author: Cat Gray <https://free-haven.org/profile/catness> * Author: Cat Gray <https://free-haven.org/profile/catness>
*/ */
use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;

3
impressum/impressum.php
View File

@ -7,7 +7,6 @@
* License: 3-clause BSD license * License: 3-clause BSD license
*/ */
use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
@ -56,7 +55,7 @@ function impressum_footer(string &$body)
function impressum_load_config(ConfigFileManager $loader) function impressum_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
function impressum_show(string &$body) function impressum_show(string &$body)

1
infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
View File

@ -6,7 +6,6 @@
* Author: Thomas Willingham <https://kakste.com/profile/beardyunixer> * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;

1
irc/irc.php
View File

@ -7,7 +7,6 @@
* Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias> * Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;

1
krynn/krynn.php
View File

@ -10,7 +10,6 @@
*"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere *"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;

3
ldapauth/ldapauth.php
View File

@ -29,7 +29,6 @@
* The configuration options for this module are described in the config/ldapauth.config.php file * The configuration options for this module are described in the config/ldapauth.config.php file
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Database\DBA; use Friendica\Database\DBA;
@ -45,7 +44,7 @@ function ldapauth_install()
function ldapauth_load_config(ConfigFileManager $loader) function ldapauth_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
function ldapauth_hook_authenticate(array &$b) function ldapauth_hook_authenticate(array &$b)

1
libertree/libertree.php
View File

@ -6,7 +6,6 @@
* Author: Tony Baldwin <https://free-haven.org/u/tony> * Author: Tony Baldwin <https://free-haven.org/u/tony>
*/ */
use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;

3
libravatar/libravatar.php
View File

@ -6,7 +6,6 @@
* Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus> * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
*/ */
use Friendica\App;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
@ -26,7 +25,7 @@ function libravatar_install()
function libravatar_load_config(ConfigFileManager $loader) function libravatar_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
/** /**

1
markdown/markdown.php
View File

@ -5,7 +5,6 @@
* Version: 0.1 * Version: 0.1
* Author: Michael Vogel <https://pirati.ca/profile/heluecht> * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Content\Text\Markdown; use Friendica\Content\Text\Markdown;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;

1
mathjax/mathjax.php
View File

@ -8,7 +8,6 @@
* License: 3-clause BSD license * License: 3-clause BSD license
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;

1
morechoice/morechoice.php
View File

@ -8,7 +8,6 @@
* Status: Deprecated * Status: Deprecated
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;

1
morepokes/morepokes.php
View File

@ -7,7 +7,6 @@
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;

1
newmemberwidget/newmemberwidget.php
View File

@ -6,7 +6,6 @@
* Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias> * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
***/ ***/
use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;

1
nitter/nitter.php
View File

@ -25,7 +25,6 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;

1
nominatim/nominatim.php
View File

@ -6,7 +6,6 @@
* Author: Michael Vogel <https://pirati.ca/profile/heluecht> * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;

2
notifyall/notifyall.php
View File

@ -9,9 +9,7 @@
*/ */
use Friendica\Addon\notifyall\NotifyAllEmail; use Friendica\Addon\notifyall\NotifyAllEmail;
use Friendica\App;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;

5
numfriends/numfriends.php
View File

@ -6,7 +6,6 @@
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
@ -39,7 +38,7 @@ function numfriends_settings_post($post) {
/** /**
* *
* Called from the Addon Setting form. * Called from the Addon Setting form.
* Add our own settings info to the page. * Add our own settings info to the page.
* *
*/ */
@ -50,7 +49,7 @@ function numfriends_settings(array &$data)
} }
$numfriends = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'display_friend_count', 24); $numfriends = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'display_friend_count', 24);
$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/numfriends/'); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/numfriends/');
$html = Renderer::replaceMacros($t, [ $html = Renderer::replaceMacros($t, [
'$numfriends' => ['numfriends', DI::l10n()->t('How many contacts to display on profile sidebar'), $numfriends], '$numfriends' => ['numfriends', DI::l10n()->t('How many contacts to display on profile sidebar'), $numfriends],

3
openstreetmap/openstreetmap.php
View File

@ -9,7 +9,6 @@
* *
*/ */
use Friendica\App;
use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Cache\Enum\Duration;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
@ -37,7 +36,7 @@ function openstreetmap_install()
function openstreetmap_load_config(ConfigFileManager $loader) function openstreetmap_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
function openstreetmap_alterheader(&$navHtml) function openstreetmap_alterheader(&$navHtml)

4
opmlexport/opmlexport.php
View File

@ -8,12 +8,8 @@
*/ */
use Friendica\DI; use Friendica\DI;
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Network\HTTPException;
use Friendica\Database\DBA;
use Friendica\Core\Renderer;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\User; use Friendica\Model\User;

3
pageheader/pageheader.php
View File

@ -5,10 +5,9 @@
* Version: 1.1 * Version: 1.1
* Author: Keith Fernie <http://friendika.me4.it/profile/keith> * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
* Hauke Altmann <https://snarl.de/profile/tugelblend> * Hauke Altmann <https://snarl.de/profile/tugelblend>
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;

3
phpmailer/phpmailer.php
View File

@ -7,7 +7,6 @@
* Maintainer: Hypolite Petovan <hypolite@friendica.mrpetovan.com> * Maintainer: Hypolite Petovan <hypolite@friendica.mrpetovan.com>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;
use Friendica\Object\EMail\IEmail; use Friendica\Object\EMail\IEmail;
@ -25,7 +24,7 @@ function phpmailer_install()
function phpmailer_load_config(ConfigFileManager $loader) function phpmailer_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
/** /**

5
piwik/piwik.php
View File

@ -35,7 +35,6 @@
* setting. * setting.
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
@ -51,7 +50,7 @@ function piwik_install() {
function piwik_load_config(ConfigFileManager $loader) function piwik_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
function piwik_analytics(string &$b) function piwik_analytics(string &$b)
@ -76,7 +75,7 @@ function piwik_analytics(string &$b)
* Add the Piwik tracking code for the site. * Add the Piwik tracking code for the site.
* If async is set to true use asynchronous tracking * If async is set to true use asynchronous tracking
*/ */
$scriptAsyncValue = $async ? 'true' : 'false'; $scriptAsyncValue = $async ? 'true' : 'false';
$scriptPhpEndpoint = $shortendpoint ? 'js/' : 'piwik.php'; $scriptPhpEndpoint = $shortendpoint ? 'js/' : 'piwik.php';
$scriptJsEndpoint = $shortendpoint ? 'js/' : 'piwik.js'; $scriptJsEndpoint = $shortendpoint ? 'js/' : 'piwik.js';

1
planets/planets.php
View File

@ -7,7 +7,6 @@
* Author: Tony Baldwin <https://free-haven.org/profile/tony> * Author: Tony Baldwin <https://free-haven.org/profile/tony>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;

2
pnut/pnut.php
View File

@ -90,7 +90,7 @@ function pnut_connect()
function pnut_load_config(ConfigFileManager $loader) function pnut_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
function pnut_addon_admin(string &$o) function pnut_addon_admin(string &$o)

3
public_server/public_server.php
View File

@ -6,7 +6,6 @@
* Author: Keith Fernie <http://friendika.me4.it/profile/keith> * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
*/ */
use Friendica\App;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
@ -29,7 +28,7 @@ function public_server_install()
function public_server_load_config(ConfigFileManager $loader) function public_server_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
function public_server_register_account($b) function public_server_register_account($b)

2
pumpio/pumpio.php
View File

@ -319,7 +319,7 @@ function pumpio_settings_post(array &$b)
function pumpio_load_config(ConfigFileManager $loader) function pumpio_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
function pumpio_hook_fork(array &$b) function pumpio_hook_fork(array &$b)

1
qcomment/qcomment.php
View File

@ -18,7 +18,6 @@
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;

1
randplace/randplace.php
View File

@ -19,7 +19,6 @@
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;

1
rendertime/rendertime.php
View File

@ -7,7 +7,6 @@
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;

1
s3_storage/s3_storage.php
View File

@ -8,7 +8,6 @@
use Friendica\Addon\s3_storage\src\S3Client; use Friendica\Addon\s3_storage\src\S3Client;
use Friendica\Addon\s3_storage\src\S3Config; use Friendica\Addon\s3_storage\src\S3Config;
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;

1
securemail/SecureTestEmail.php
View File

@ -21,7 +21,6 @@
namespace Friendica\Addon\securemail; namespace Friendica\Addon\securemail;
use Friendica\App;
use Friendica\App\BaseURL; use Friendica\App\BaseURL;
use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;

7
securemail/securemail.php
View File

@ -7,7 +7,6 @@
*/ */
use Friendica\Addon\securemail\SecureTestEmail; use Friendica\Addon\securemail\SecureTestEmail;
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
@ -32,8 +31,6 @@ function securemail_install()
* @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings 'addon_settings' hook * @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings 'addon_settings' hook
* *
* @param array $data * @param array $data
*
* @see App
*/ */
function securemail_settings(array &$data) function securemail_settings(array &$data)
{ {
@ -67,8 +64,6 @@ function securemail_settings(array &$data)
* @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings_post 'addon_settings_post' hook * @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings_post 'addon_settings_post' hook
* *
* @param array $b hook data * @param array $b hook data
*
* @see App
*/ */
function securemail_settings_post(array &$b) function securemail_settings_post(array &$b)
{ {
@ -102,8 +97,6 @@ function securemail_settings_post(array &$b)
* @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#emailer_send_prepare 'emailer_send_prepare' hook * @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#emailer_send_prepare 'emailer_send_prepare' hook
* *
* @param IEmail $email Email * @param IEmail $email Email
*
* @see App
*/ */
function securemail_emailer_send_prepare(IEmail &$email) function securemail_emailer_send_prepare(IEmail &$email)
{ {

4
showmore_dyn/showmore_dyn.php
View File

@ -7,12 +7,8 @@
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
function showmore_dyn_install() function showmore_dyn_install()

21
smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
View File

@ -3,11 +3,10 @@
* Name: Smiley Pack (Español) * Name: Smiley Pack (Español)
* Description: Pack of smileys that make master too AOLish. * Description: Pack of smileys that make master too AOLish.
* Version: 1.02 * Version: 1.02
* Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template) * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
* All smileys from sites offering them as Public Domain * All smileys from sites offering them as Public Domain
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;
@ -19,7 +18,7 @@ function smiley_pack_smilies_es(array &$b) {
#Smileys are split into various directories by the intended range of emotions. This is in case we get too big and need to modularise things. We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever. #Smileys are split into various directories by the intended range of emotions. This is in case we get too big and need to modularise things. We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
#Be careful with invocation strings. If you have a smiley called foo, and another called foobar, typing :foobar will call foo. Avoid this with clever naming, using ~ instead of : #Be careful with invocation strings. If you have a smiley called foo, and another called foobar, typing :foobar will call foo. Avoid this with clever naming, using ~ instead of :
#when all else fails. #when all else fails.
@ -49,7 +48,7 @@ function smiley_pack_smilies_es(array &$b) {
$b['texts'][] = ':vaca'; $b['texts'][] = ':vaca';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />';
$b['texts'][] = ':cangrejo'; $b['texts'][] = ':cangrejo';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />';
@ -70,7 +69,7 @@ function smiley_pack_smilies_es(array &$b) {
$b['texts'][] = ':caballo'; $b['texts'][] = ':caballo';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />';
$b['texts'][] = ':loro'; $b['texts'][] = ':loro';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />';
@ -107,7 +106,7 @@ function smiley_pack_smilies_es(array &$b) {
$b['texts'][] = ':cuna'; $b['texts'][] = ':cuna';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />';
$b['texts'][] = ':embarazada'; $b['texts'][] = ':embarazada';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />';
@ -116,10 +115,10 @@ function smiley_pack_smilies_es(array &$b) {
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />';
#Confused Smileys #Confused Smileys
$b['texts'][] = ':confundido'; $b['texts'][] = ':confundido';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />';
$b['texts'][] = ':encogehombros'; $b['texts'][] = ':encogehombros';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />';
@ -154,13 +153,13 @@ function smiley_pack_smilies_es(array &$b) {
$b['texts'][] = ':diabólico'; $b['texts'][] = ':diabólico';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />';
$b['texts'][] = ':adbalancín'; $b['texts'][] = ':adbalancín';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />';
$b['texts'][] = ':vuelvedemonio'; $b['texts'][] = ':vuelvedemonio';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />';
$b['texts'][] = ':santo'; $b['texts'][] = ':santo';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />';
@ -242,7 +241,7 @@ function smiley_pack_smilies_es(array &$b) {
$b['texts'][] = ':billar'; $b['texts'][] = ':billar';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />';
$b['texts'][] = ':tenis'; $b['texts'][] = ':tenis';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />';

19
smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
View File

@ -9,7 +9,6 @@
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;
@ -23,7 +22,7 @@ function smiley_pack_fr_smilies(array &$b)
#Smileys are split into various directories by the intended range of emotions. This is in case we get too big and need to modularise things. We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever. #Smileys are split into various directories by the intended range of emotions. This is in case we get too big and need to modularise things. We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
#Be careful with invocation strings. If you have a smiley called foo, and another called foobar, typing :foobar will call foo. Avoid this with clever naming, using ~ instead of : #Be careful with invocation strings. If you have a smiley called foo, and another called foobar, typing :foobar will call foo. Avoid this with clever naming, using ~ instead of :
#when all else fails. #when all else fails.
@ -56,7 +55,7 @@ function smiley_pack_fr_smilies(array &$b)
$b['texts'][] = ':vache'; $b['texts'][] = ':vache';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vache' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vache' . '" />';
$b['texts'][] = ':crabe'; $b['texts'][] = ':crabe';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crabe' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crabe' . '" />';
@ -74,7 +73,7 @@ function smiley_pack_fr_smilies(array &$b)
$b['texts'][] = ':cheval'; $b['texts'][] = ':cheval';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':cheval' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':cheval' . '" />';
$b['texts'][] = ':perroquet'; $b['texts'][] = ':perroquet';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':perroquet' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':perroquet' . '" />';
@ -108,7 +107,7 @@ function smiley_pack_fr_smilies(array &$b)
$b['texts'][] = ':litbébé'; $b['texts'][] = ':litbébé';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':litbébé' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':litbébé' . '" />';
$b['texts'][] = ':enceinte'; $b['texts'][] = ':enceinte';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':enceinte' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':enceinte' . '" />';
@ -117,10 +116,10 @@ function smiley_pack_fr_smilies(array &$b)
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigogne' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigogne' . '" />';
#Confused Smileys #Confused Smileys
$b['texts'][] = ':paumé'; $b['texts'][] = ':paumé';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':paumé' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':paumé' . '" />';
$b['texts'][] = ':hausseépaules'; $b['texts'][] = ':hausseépaules';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':hausseépaules' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':hausseépaules' . '" />';
@ -152,13 +151,13 @@ function smiley_pack_fr_smilies(array &$b)
$b['texts'][] = ':démoniaque'; $b['texts'][] = ':démoniaque';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':démoniaque' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':démoniaque' . '" />';
$b['texts'][] = ':bascule'; $b['texts'][] = ':bascule';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':bascule' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':bascule' . '" />';
$b['texts'][] = ':possédé'; $b['texts'][] = ':possédé';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':possédé' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':possédé' . '" />';
$b['texts'][] = ':tombe'; $b['texts'][] = ':tombe';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tombe' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tombe' . '" />';
@ -225,7 +224,7 @@ function smiley_pack_fr_smilies(array &$b)
$b['texts'][] = ':billard'; $b['texts'][] = ':billard';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billard' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billard' . '" />';
$b['texts'][] = ':équitation'; $b['texts'][] = ':équitation';
$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':équitation' . '" />'; $b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':équitation' . '" />';

7
smileybutton/smileybutton.php
View File

@ -7,7 +7,6 @@
* Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite> * Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;
@ -20,7 +19,7 @@ function smileybutton_install()
function smileybutton_jot_tool(string &$body) function smileybutton_jot_tool(string &$body)
{ {
// Disable if theme is quattro // Disable if theme is quattro
if (DI::app()->getCurrentTheme() == 'quattro') { if (DI::appHelper()->getCurrentTheme() == 'quattro') {
return; return;
} }
@ -97,7 +96,7 @@ function smileybutton_jot_tool(string &$body)
$s .= '</tr></table>'; $s .= '</tr></table>';
//Add css to header //Add css to header
$css_file = __DIR__ . '/view/' . DI::app()->getCurrentTheme() . '.css'; $css_file = __DIR__ . '/view/' . DI::appHelper()->getCurrentTheme() . '.css';
if (!file_exists($css_file)) { if (!file_exists($css_file)) {
$css_file = __DIR__ . '/view/default.css'; $css_file = __DIR__ . '/view/default.css';
} }
@ -105,7 +104,7 @@ function smileybutton_jot_tool(string &$body)
DI::page()->registerStylesheet($css_file); DI::page()->registerStylesheet($css_file);
//Get the correct image for the theme //Get the correct image for the theme
$image = 'addon/smileybutton/view/' . DI::app()->getCurrentTheme() . '.png'; $image = 'addon/smileybutton/view/' . DI::appHelper()->getCurrentTheme() . '.png';
if (!file_exists($image)) { if (!file_exists($image)) {
$image = 'addon/smileybutton/view/default.png'; $image = 'addon/smileybutton/view/default.png';
} }

5
smilies_adult/smilies_adult.php
View File

@ -4,12 +4,11 @@
* Description: Smily icons that could or should not be included in core * Description: Smily icons that could or should not be included in core
* Version: 1.0 * Version: 1.0
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
* *
* This is a template for how to extend the "smily" code. * This is a template for how to extend the "smily" code.
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;

1
startpage/startpage.php
View File

@ -7,7 +7,6 @@
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;

1
statusnet/statusnet.php
View File

@ -38,7 +38,6 @@ define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'statusnetoauth.php'; require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'statusnetoauth.php';
use CodebirdSN\CodebirdSN; use CodebirdSN\CodebirdSN;
use Friendica\App;
use Friendica\Content\Text\Plaintext; use Friendica\Content\Text\Plaintext;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;

3
testdrive/testdrive.php
View File

@ -6,7 +6,6 @@
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Search; use Friendica\Core\Search;
use Friendica\Database\DBA; use Friendica\Database\DBA;
@ -27,7 +26,7 @@ function testdrive_install()
function testdrive_load_config(ConfigFileManager $loader) function testdrive_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
function testdrive_globaldir_update(array &$b) function testdrive_globaldir_update(array &$b)

2
tumblr/tumblr.php
View File

@ -65,7 +65,7 @@ function tumblr_install()
function tumblr_load_config(ConfigFileManager $loader) function tumblr_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('tumblr'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('tumblr'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
function tumblr_check_item_notification(array &$notification_data) function tumblr_check_item_notification(array &$notification_data)

2
twitter/twitter.php
View File

@ -67,7 +67,7 @@ function twitter_install()
function twitter_load_config(ConfigFileManager $loader) function twitter_load_config(ConfigFileManager $loader)
{ {
DI::app()->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
} }
function twitter_jot_nets(array &$jotnets_fields) function twitter_jot_nets(array &$jotnets_fields)

7
unicode_smilies/unicode_smilies.php
View File

@ -7,7 +7,6 @@
* Author: Matthias Ebers <https://loma.ml/profile/one> * Author: Matthias Ebers <https://loma.ml/profile/one>
*/ */
use Friendica\App;
use Friendica\Content\Smilies; use Friendica\Content\Smilies;
use Friendica\Core\Hook; use Friendica\Core\Hook;
@ -691,7 +690,7 @@ function unicode_smilies_smilies(array &$b)
Smilies::add($b, ':custard:', '&#x1F36E'); Smilies::add($b, ':custard:', '&#x1F36E');
Smilies::add($b, ':honey pot:', '&#x1F36F'); Smilies::add($b, ':honey pot:', '&#x1F36F');
// drink // drink
Smilies::add($b, ':baby bottle:', '&#x1F37C'); Smilies::add($b, ':baby bottle:', '&#x1F37C');
Smilies::add($b, ':glass of milk:', '&#x1F95B'); Smilies::add($b, ':glass of milk:', '&#x1F95B');
Smilies::add($b, ':hot beverage:', '&#x2615'); Smilies::add($b, ':hot beverage:', '&#x2615');
@ -1123,7 +1122,7 @@ function unicode_smilies_smilies(array &$b)
Smilies::add($b, ':control knobs:', '&#x1F39B'); Smilies::add($b, ':control knobs:', '&#x1F39B');
Smilies::add($b, ':microphone:', '&#x1F3A4'); Smilies::add($b, ':microphone:', '&#x1F3A4');
Smilies::add($b, ':headphone:', '&#x1F3A7'); Smilies::add($b, ':headphone:', '&#x1F3A7');
Smilies::add($b, ':radio:', '&#x1F4FB'); Smilies::add($b, ':radio:', '&#x1F4FB');
// musical-instrument // musical-instrument
Smilies::add($b, ':saxophone:', '&#x1F3B7'); Smilies::add($b, ':saxophone:', '&#x1F3B7');
@ -1529,7 +1528,7 @@ function unicode_smilies_smilies(array &$b)
Smilies::add($b, ':O button (blood type):', '&#x1F17E'); Smilies::add($b, ':O button (blood type):', '&#x1F17E');
Smilies::add($b, ':OK button:', '&#x1F197'); Smilies::add($b, ':OK button:', '&#x1F197');
Smilies::add($b, ':P button:', '&#x1F17F'); Smilies::add($b, ':P button:', '&#x1F17F');
Smilies::add($b, ':SOS button:', '&#x1F198'); Smilies::add($b, ':SOS button:', '&#x1F198');
Smilies::add($b, ':UP! button:', '&#x1F199'); Smilies::add($b, ':UP! button:', '&#x1F199');
Smilies::add($b, ':VS button:', '&#x1F19A'); Smilies::add($b, ':VS button:', '&#x1F19A');
Smilies::add($b, ':Japanese “here” button:', '&#x1F201'); Smilies::add($b, ':Japanese “here” button:', '&#x1F201');

1
viewsrc/viewsrc.php
View File

@ -7,7 +7,6 @@
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;

1
webrtc/webrtc.php
View File

@ -7,7 +7,6 @@
* Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias> * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;