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

diff --git a/widgets/widgets.php b/widgets/widgets.php
index 927d6746..319a8a78 100644
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -7,29 +7,24 @@
  * 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;
+use Friendica\DI;
 
 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');
+	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');
-}
-
 function widgets_settings_post(){
 	if(! local_user())
 		return;
 	if (isset($_POST['widgets-submit'])){
-		PConfig::delete(local_user(), 'widgets', 'key');
+		DI::pConfig()->delete(local_user(), 'widgets', 'key');
 
 	}
 }
@@ -39,8 +34,8 @@ function widgets_settings(&$a,&$o) {
 		return;
 
 
-	$key = PConfig::get(local_user(), 'widgets', 'key' );
-	if ($key=='') { $key = mt_rand(); PConfig::set(local_user(), 'widgets', 'key', $key); }
+	$key = DI::pConfig()->get(local_user(), 'widgets', 'key' );
+	if ($key=='') { $key = mt_rand(); DI::pConfig()->set(local_user(), 'widgets', 'key', $key); }
 
 	$widgets = [];
 	$d = dir(dirname(__file__));
@@ -61,12 +56,11 @@ function widgets_settings(&$a,&$o) {
 #	$t = file_get_contents( dirname(__file__). "/settings.tpl" );
 	$t = Renderer::getMarkupTemplate("settings.tpl", "addon/widgets/");
 	$o .= Renderer::replaceMacros($t, [
-		'$submit' => L10n::t('Generate new key'),
-		'$baseurl' => $a->getBaseURL(),
+		'$submit' => DI::l10n()->t('Generate new key'),
 		'$title' => "Widgets",
-		'$label' => L10n::t('Widgets key'),
+		'$label' => DI::l10n()->t('Widgets key'),
 		'$key' => $key,
-		'$widgets_h' => L10n::t('Widgets available'),
+		'$widgets_h' => DI::l10n()->t('Widgets available'),
 		'$widgets' => $widgets,
 	]);
 
@@ -77,8 +71,7 @@ function widgets_module() {
 }
 
 function _abs_url($s){
-	$a = get_app();
-	return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1".$a->getBaseURL()."/\$2", $s);
+	return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1" . DI::baseUrl()->get() . "/\$2", $s);
 }
 
 function _randomAlphaNum($length){
@@ -89,7 +82,7 @@ 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;
 	}
 
@@ -97,7 +90,7 @@ function widgets_content(&$a) {
 			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 = [];
@@ -110,7 +103,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;
 	}
 
@@ -128,7 +121,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->getBaseURL().'/settings/addon">'. L10n::t("Addon Settings") .'</a>';
+			$o .= '<a href="'.DI::baseUrl()->get().'/settings/addon">'. DI::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');
@@ -144,10 +137,10 @@ function widgets_content(&$a) {
 
 		$script = file_get_contents(dirname(__file__)."/widgets.js");
 		$o .= Renderer::replaceMacros($script, [
-			'$entrypoint' => $a->getBaseURL()."/widgets/".$a->argv[1]."/cb/",
+			'$entrypoint' => DI::baseUrl()->get()."/widgets/".$a->argv[1]."/cb/",
 			'$key' => $conf['key'],
 			'$widget_id' => 'f9a_'.$a->argv[1]."_"._randomAlphaNum(6),
-			'$loader' => $a->getBaseURL()."/images/rotator.gif",
+			'$loader' => DI::baseUrl()->get()."/images/rotator.gif",
 			'$args' => (isset($_GET['a'])?$_GET['a']:''),
 			'$width' => $widget_size[0],
 			'$height' => $widget_size[1],
@@ -165,7 +158,7 @@ function widgets_content(&$a) {
 			<h4>Copy and paste this code</h4>
 			<code>"
 
-			.htmlspecialchars('<script src="'.$a->getBaseURL().'/widgets/'.$a->argv[1].'?k='.$conf['key'])
+			.htmlspecialchars('<script src="'.DI::baseUrl()->get().'/widgets/'.$a->argv[1].'?k='.$conf['key'])
 			.$jsargs
 			.htmlspecialchars('"></script>')
 			."</code>";
@@ -176,5 +169,5 @@ function widgets_content(&$a) {
 	}
 
 	echo $o;
-	killme();
+	exit();
 }