[widgets] Remove superfluous $baseurl template variable

[friendica-addons.git/.git] / widgets / widgets.php

diff --git a/widgets/widgets.php b/widgets/widgets.php
index 1c7489f..5c07596 100644 (file)
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -4,22 +4,27 @@
  * Description: Allow to embed info from friendica into another site
  * Version: 1.0
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrix/>
+ * Status: Unsupported
  */
-use Friendica\Core\Addon;
+
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
 
 function widgets_install() {
-       Addon::registerHook('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings');
-       Addon::registerHook('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
-       logger("installed widgets");
+       Hook::register('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings');
+       Hook::register('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
+       Logger::log("installed widgets");
 }
+
 function widgets_uninstall() {
-       Addon::unregisterHook('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings');
-       Addon::unregisterHook('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
+       Hook::unregister('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings');
+       Hook::unregister('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
 }
 
-
 function widgets_settings_post(){
        if(! local_user())
                return;
@@ -54,10 +59,9 @@ function widgets_settings(&$a,&$o) {
 
 
 #      $t = file_get_contents( dirname(__file__). "/settings.tpl" );
-       $t = get_markup_template("settings.tpl", "addon/widgets/");
-       $o .= replace_macros($t, [
+       $t = Renderer::getMarkupTemplate("settings.tpl", "addon/widgets/");
+       $o .= Renderer::replaceMacros($t, [
                '$submit' => L10n::t('Generate new key'),
-               '$baseurl' => $a->get_baseurl(),
                '$title' => "Widgets",
                '$label' => L10n::t('Widgets key'),
                '$key' => $key,
@@ -72,8 +76,8 @@ function widgets_module() {
 }
 
 function _abs_url($s){
-       $a = get_app();
-       return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1".$a->get_baseurl()."/\$2", $s);
+       $a = \get_app();
+       return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1".$a->getBaseURL()."/\$2", $s);
 }
 
 function _randomAlphaNum($length){
@@ -84,15 +88,15 @@ function _randomAlphaNum($length){
 function widgets_content(&$a) {
 
        if (!isset($_GET['k'])) {
-               if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); killme();}
+               if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
                return;
        }
 
        $r = q("SELECT * FROM pconfig WHERE uid IN (SELECT uid FROM pconfig  WHERE v='%s')AND  cat='widgets'",
-                       dbesc($_GET['k'])
+                       DBA::escape($_GET['k'])
                 );
        if (!count($r)){
-               if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); killme();}
+               if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
                return;
        }
        $conf = [];
@@ -105,7 +109,7 @@ function widgets_content(&$a) {
        if (file_exists($widgetfile)){
                require_once($widgetfile);
        } else {
-               if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); killme();}
+               if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
                return;
        }
 
@@ -123,7 +127,7 @@ function widgets_content(&$a) {
                if (isset($_GET['p']) && local_user()==$conf['uid'] ) {
                        $o .= "<style>.f9k_widget { float: left;border:1px solid black; }</style>";
                        $o .= "<h1>Preview Widget</h1>";
-                       $o .= '<a href="'.$a->get_baseurl().'/settings/addon">'. L10n::t("Addon Settings") .'</a>';
+                       $o .= '<a href="'.$a->getBaseURL().'/settings/addon">'. L10n::t("Addon Settings") .'</a>';
 
                        $o .=  "<h4>".call_user_func($a->argv[1].'_widget_name')."</h4>";
                        $o .=  call_user_func($a->argv[1].'_widget_help');
@@ -138,11 +142,11 @@ function widgets_content(&$a) {
                $widget_size = call_user_func($a->argv[1].'_widget_size');
 
                $script = file_get_contents(dirname(__file__)."/widgets.js");
-               $o .= replace_macros($script, [
-                       '$entrypoint' => $a->get_baseurl()."/widgets/".$a->argv[1]."/cb/",
+               $o .= Renderer::replaceMacros($script, [
+                       '$entrypoint' => $a->getBaseURL()."/widgets/".$a->argv[1]."/cb/",
                        '$key' => $conf['key'],
                        '$widget_id' => 'f9a_'.$a->argv[1]."_"._randomAlphaNum(6),
-                       '$loader' => $a->get_baseurl()."/images/rotator.gif",
+                       '$loader' => $a->getBaseURL()."/images/rotator.gif",
                        '$args' => (isset($_GET['a'])?$_GET['a']:''),
                        '$width' => $widget_size[0],
                        '$height' => $widget_size[1],
@@ -160,7 +164,7 @@ function widgets_content(&$a) {
                        <h4>Copy and paste this code</h4>
                        <code>"
 
-                       .htmlspecialchars('<script src="'.$a->get_baseurl().'/widgets/'.$a->argv[1].'?k='.$conf['key'])
+                       .htmlspecialchars('<script src="'.$a->getBaseURL().'/widgets/'.$a->argv[1].'?k='.$conf['key'])
                        .$jsargs
                        .htmlspecialchars('"></script>')
                        ."</code>";
@@ -171,5 +175,5 @@ function widgets_content(&$a) {
        }
 
        echo $o;
-       killme();
+       exit();
 }