X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=widgets%2Fwidgets.php;h=927d67463ca3e2a0481ebd1be9cfbcbab235ed58;hb=cbb915d9ad5924785fc29fa946fb3e14aabddcf3;hp=1c7489f1ca6503f05c142721048db92e277cd900;hpb=7ab24791667ab0ab1a04d01802e0a3ff47110c24;p=friendica-addons.git

diff --git a/widgets/widgets.php b/widgets/widgets.php
index 1c7489f1..927d6746 100644
--- 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\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");
+	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');
 }
 
-
 function widgets_settings_post(){
 	if(! local_user())
 		return;
@@ -54,10 +59,10 @@ 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(),
+		'$baseurl' => $a->getBaseURL(),
 		'$title' => "Widgets",
 		'$label' => L10n::t('Widgets key'),
 		'$key' => $key,
@@ -73,7 +78,7 @@ 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);
+	return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1".$a->getBaseURL()."/\$2", $s);
 }
 
 function _randomAlphaNum($length){
@@ -89,7 +94,7 @@ function widgets_content(&$a) {
 	}
 
 	$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();}
@@ -123,7 +128,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 +143,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 +165,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>";