mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2025-07-09 09:58:49 +00:00
Merge branch '3.6-rc'
This commit is contained in:
commit
39dd3dffe0
733 changed files with 10943 additions and 8237 deletions
|
@ -7,13 +7,15 @@
|
|||
*
|
||||
*
|
||||
*/
|
||||
|
||||
use Friendica\Core\Addon;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\PConfig;
|
||||
|
||||
function gnot_install() {
|
||||
|
||||
register_hook('plugin_settings', 'addon/gnot/gnot.php', 'gnot_settings');
|
||||
register_hook('plugin_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
|
||||
register_hook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
|
||||
Addon::registerHook('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings');
|
||||
Addon::registerHook('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
|
||||
Addon::registerHook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
|
||||
|
||||
logger("installed gnot");
|
||||
}
|
||||
|
@ -21,9 +23,9 @@ function gnot_install() {
|
|||
|
||||
function gnot_uninstall() {
|
||||
|
||||
unregister_hook('plugin_settings', 'addon/gnot/gnot.php', 'gnot_settings');
|
||||
unregister_hook('plugin_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
|
||||
unregister_hook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
|
||||
Addon::unregisterHook('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings');
|
||||
Addon::unregisterHook('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
|
||||
Addon::unregisterHook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
|
||||
|
||||
|
||||
logger("removed gnot");
|
||||
|
@ -44,14 +46,14 @@ function gnot_settings_post($a,$post) {
|
|||
if(! local_user() || (! x($_POST,'gnot-submit')))
|
||||
return;
|
||||
|
||||
set_pconfig(local_user(),'gnot','enable',intval($_POST['gnot']));
|
||||
info( t('Gnot settings updated.') . EOL);
|
||||
PConfig::set(local_user(),'gnot','enable',intval($_POST['gnot']));
|
||||
info(L10n::t('Gnot settings updated.') . EOL);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* Called from the Plugin Setting form.
|
||||
* Called from the Addon Setting form.
|
||||
* Add our own settings info to the page.
|
||||
*
|
||||
*/
|
||||
|
@ -76,16 +78,16 @@ function gnot_settings(&$a,&$s) {
|
|||
/* Add some HTML to the existing form */
|
||||
|
||||
$s .= '<div class="settings-block">';
|
||||
$s .= '<h3>' . t('Gnot Settings') . '</h3>';
|
||||
$s .= '<h3>' . L10n::t('Gnot Settings') . '</h3>';
|
||||
$s .= '<div id="gnot-wrapper">';
|
||||
$s .= '<div id="gnot-desc">' . t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") . '</div>';
|
||||
$s .= '<label id="gnot-label" for="gnot">' . t('Enable this plugin/addon?') . '</label>';
|
||||
$s .= '<div id="gnot-desc">' . L10n::t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") . '</div>';
|
||||
$s .= '<label id="gnot-label" for="gnot">' . L10n::t('Enable this addon?') . '</label>';
|
||||
$s .= '<input id="gnot-input" type="checkbox" name="gnot" value="1"'. $gnot_checked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
/* provide a submit button */
|
||||
|
||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="gnot-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
|
||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="gnot-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
|
||||
|
||||
}
|
||||
|
||||
|
@ -94,6 +96,5 @@ function gnot_enotify_mail(&$a,&$b) {
|
|||
if((! $b['uid']) || (! intval(get_pconfig($b['uid'], 'gnot','enable'))))
|
||||
return;
|
||||
if($b['type'] == NOTIFY_COMMENT)
|
||||
$b['subject'] = sprintf( t('[Friendica:Notify] Comment to conversation #%d'), $b['parent']);
|
||||
$b['subject'] = L10n::t('[Friendica:Notify] Comment to conversation #%d', $b['parent']);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue