oldkid/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request #580 from tobiasd/20180410-mathjax

Browse source 
fixing mathjax addon
This commit is contained in:
Hypolite Petovan 2018-04-10 13:31:16 -04:00 committed by GitHub
parent c2b6d20f54 108894f196
commit 62eab3efc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
mathjax/mathjax.php
View file

@ -2,10 +2,11 @@
/** /**
* Name: MathJax * Name: MathJax
* Description: Addon for Friendika to include MathJax (LaTeX math syntax) * Description: Addon for Friendika to include MathJax (LaTeX math syntax)
* Version: 1.0 * Version: 1.1
* Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias> * Author: Tobias Diekershoff <https://social.diekershoff.de/profile/tobias>
* License: 3-clause BSD license * License: 3-clause BSD license
*/ */
use Friendica\App;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
@ -25,7 +26,6 @@ function mathjax_uninstall() {
function mathjax_settings_post ($a, $post) { function mathjax_settings_post ($a, $post) {
if (! local_user()) if (! local_user())
return; return;
// don't check statusnet settings if statusnet submit button is not clicked
if (!x($_POST,'mathjax-submit')) if (!x($_POST,'mathjax-submit'))
return; return;
PConfig::set(local_user(),'mathjax','use',intval($_POST['mathjax_use'])); PConfig::set(local_user(),'mathjax','use',intval($_POST['mathjax_use']));
@ -57,30 +57,32 @@ function mathjax_page_header($a, &$b) {
// if the visitor of the page is not a local_user, use MathJax // if the visitor of the page is not a local_user, use MathJax
// otherwise check the users settings. // otherwise check the users settings.
$url = Config::get ('mathjax','baseurl'); $url = Config::get ('mathjax','baseurl');
if(! $url) if(! $url) {
$url = 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'; $url = 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-MML-AM_CHTML';
}
if (! local_user()) { if (! local_user()) {
$b .= '<script type="text/javascript" src="'.$url.'"></script>'; $b .= '<script type="text/javascript" src="'.$url.'" async></script>';
} else { } else {
$use = PConfig::get(local_user(),'mathjax','use'); $use = PConfig::get(local_user(),'mathjax','use');
if ($use) { if ($use) {
$b .= '<script type="text/javascript" src="'.$url.'"></script>'; $b .= '<script type="text/javascript" src="'.$url.'" async></script>';
} }
} }
} }
function mathjax_addon_admin_post (&$a) { function mathjax_addon_admin_post (&$a) {
$baseurl = ((x($_POST, 'baseurl')) ? trim($_POST['baseurl']) : 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'); $baseurl = ((x($_POST, 'mjbaseurl')) ? trim($_POST['mjbaseurl']) : 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-MML-AM_CHTML');
Config::set('mathjax','baseurl',$baseurl); Config::set('mathjax','baseurl',$baseurl);
info(L10n::t('Settings updated.'). EOL); info(L10n::t('Settings updated.'). EOL);
} }
function mathjax_addon_admin (&$a, &$o) { function mathjax_addon_admin (App $a, &$o) {
$t = get_markup_template( "admin.tpl", "addon/mathjax/" ); $t = get_markup_template( "admin.tpl", "addon/mathjax/" );
if (Config::get('mathjax','baseurl','') == '') { if (Config::get('mathjax','baseurl','') == '') {
Config::set('mathjax','baseurl','http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'); Config::set('mathjax','baseurl','https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-MML-AM_CHTML');
} }
$o = replace_macros( $t, [ $o = replace_macros( $t, [
'$submit' => L10n::t('Save Settings'), '$submit' => L10n::t('Save Settings'),
'$baseurl' => ['baseurl', L10n::t('MathJax Base URL'), Config::get('mathjax','baseurl' ), L10n::t('The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax.')], '$mjbaseurl' => ['mjbaseurl', L10n::t('MathJax Base URL'), Config::get('mathjax','baseurl' ), L10n::t('The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax.'), 'required']
]); ]);
} }

2
mathjax/templates/admin.tpl
View file

@ -1,2 +1,2 @@
{{include file="field_input.tpl" field=$baseurl}} {{include file="field_input.tpl" field=$mjbaseurl}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>