X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=buffer%2Fbuffer.php;h=9bbdf21e529850b09f0524494abd1eac4c6d1eb6;hb=3927985b8fd1011453ed8c77bd0ab04f14966143;hp=13b5309d6475a7381e5e1b1b34d219b77395335b;hpb=cfe921ac758d65205ecfb28a1fd04a2b431cc5f0;p=friendica-addons.git

diff --git a/buffer/buffer.php b/buffer/buffer.php
index 13b5309d..9bbdf21e 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -9,14 +9,12 @@
 require 'addon/buffer/bufferapp.php';
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\ItemContent;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
@@ -31,16 +29,6 @@ function buffer_install()
 	Hook::register('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post');
 }
 
-function buffer_uninstall()
-{
-	Hook::unregister('hook_fork',               'addon/buffer/buffer.php', 'buffer_hook_fork');
-	Hook::unregister('post_local',              'addon/buffer/buffer.php', 'buffer_post_local');
-	Hook::unregister('notifier_normal',         'addon/buffer/buffer.php', 'buffer_send');
-	Hook::unregister('jot_networks',            'addon/buffer/buffer.php', 'buffer_jot_nets');
-	Hook::unregister('connector_settings',      'addon/buffer/buffer.php', 'buffer_settings');
-	Hook::unregister('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post');
-}
-
 function buffer_module()
 {
 }
@@ -48,7 +36,7 @@ function buffer_module()
 function buffer_content(App $a)
 {
 	if (! local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.') . EOL);
 		return '';
 	}
 
@@ -77,10 +65,10 @@ function buffer_addon_admin(App $a, &$o)
 	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/buffer/");
 
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => L10n::t('Save Settings'),
+		'$submit' => DI::l10n()->t('Save Settings'),
 		// name, label, value, help, [extra values]
-		'$client_id' => ['client_id', L10n::t('Client ID'), Config::get('buffer', 'client_id'), ''],
-		'$client_secret' => ['client_secret', L10n::t('Client Secret'), Config::get('buffer', 'client_secret'), ''],
+		'$client_id' => ['client_id', DI::l10n()->t('Client ID'), DI::config()->get('buffer', 'client_id'), ''],
+		'$client_secret' => ['client_secret', DI::l10n()->t('Client Secret'), DI::config()->get('buffer', 'client_secret'), ''],
 	]);
 }
 
@@ -89,16 +77,14 @@ function buffer_addon_admin_post(App $a)
 	$client_id     = (!empty($_POST['client_id'])     ? Strings::escapeTags(trim($_POST['client_id']))     : '');
 	$client_secret = (!empty($_POST['client_secret']) ? Strings::escapeTags(trim($_POST['client_secret'])) : '');
 
-	Config::set('buffer', 'client_id'    , $client_id);
-	Config::set('buffer', 'client_secret', $client_secret);
-
-	info(L10n::t('Settings updated.'). EOL);
+	DI::config()->set('buffer', 'client_id'    , $client_id);
+	DI::config()->set('buffer', 'client_secret', $client_secret);
 }
 
 function buffer_connect(App $a)
 {
 	if (isset($_REQUEST["error"])) {
-		$o = L10n::t('Error when registering buffer connection:')." ".$_REQUEST["error"];
+		$o = DI::l10n()->t('Error when registering buffer connection:')." ".$_REQUEST["error"];
 		return $o;
 	}
 
@@ -106,11 +92,11 @@ function buffer_connect(App $a)
 	session_start();
 
 	// Define the needed keys
-	$client_id = Config::get('buffer','client_id');
-	$client_secret = Config::get('buffer','client_secret');
+	$client_id = DI::config()->get('buffer','client_id');
+	$client_secret = DI::config()->get('buffer','client_secret');
 
 	// The callback URL is the script that gets called after the user authenticates with buffer
-	$callback_url = $a->getBaseURL()."/buffer/connect";
+	$callback_url = DI::baseUrl()->get()."/buffer/connect";
 
 	$buffer = new BufferApp($client_id, $client_secret, $callback_url);
 
@@ -118,9 +104,9 @@ function buffer_connect(App $a)
 		$o = '<a href="' . $buffer->get_login_url() . '">Connect to Buffer!</a>';
 	} else {
 		Logger::log("buffer_connect: authenticated");
-		$o = L10n::t("You are now authenticated to buffer. ");
-		$o .= '<br /><a href="' . $a->getBaseURL() . '/settings/connectors">' . L10n::t("return to the connector page") . '</a>';
-		PConfig::set(local_user(), 'buffer','access_token', $buffer->access_token);
+		$o = DI::l10n()->t("You are now authenticated to buffer. ");
+		$o .= '<br /><a href="' . DI::baseUrl()->get() . '/settings/connectors">' . DI::l10n()->t("return to the connector page") . '</a>';
+		DI::pConfig()->set(local_user(), 'buffer','access_token', $buffer->access_token);
 	}
 
 	return $o;
@@ -132,13 +118,13 @@ function buffer_jot_nets(App $a, array &$jotnets_fields)
 		return;
 	}
 
-	if (PConfig::get(local_user(), 'buffer', 'post')) {
+	if (DI::pConfig()->get(local_user(), 'buffer', 'post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'buffer_enable',
-				L10n::t('Post to Buffer'),
-				PConfig::get(local_user(), 'buffer', 'post_by_default')
+				DI::l10n()->t('Post to Buffer'),
+				DI::pConfig()->get(local_user(), 'buffer', 'post_by_default')
 			]
 		];
 	}
@@ -152,62 +138,62 @@ function buffer_settings(App $a, &$s)
 
 	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/buffer/buffer.css' . '" media="all" />' . "\r\n";
+	DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/buffer/buffer.css' . '" media="all" />' . "\r\n";
 
 	/* Get the current state of our config variables */
 
-	$enabled = PConfig::get(local_user(),'buffer','post');
+	$enabled = DI::pConfig()->get(local_user(),'buffer','post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
 	$css = (($enabled) ? '' : '-disabled');
 
-	$def_enabled = PConfig::get(local_user(),'buffer','post_by_default');
+	$def_enabled = DI::pConfig()->get(local_user(),'buffer','post_by_default');
 	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
 	/* Add some HTML to the existing form */
 
 	$s .= '<span id="settings_buffer_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_buffer_expanded\'); openClose(\'settings_buffer_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/buffer.png" /><h3 class="connector">'. L10n::t('Buffer Export').'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/buffer.png" /><h3 class="connector">'. DI::l10n()->t('Buffer Export').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_buffer_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_buffer_expanded\'); openClose(\'settings_buffer_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/buffer.png" /><h3 class="connector">'. L10n::t('Buffer Export').'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/buffer.png" /><h3 class="connector">'. DI::l10n()->t('Buffer Export').'</h3>';
 	$s .= '</span>';
 
-	$client_id = Config::get("buffer", "client_id");
-	$client_secret = Config::get("buffer", "client_secret");
-	$access_token = PConfig::get(local_user(), "buffer", "access_token");
+	$client_id = DI::config()->get("buffer", "client_id");
+	$client_secret = DI::config()->get("buffer", "client_secret");
+	$access_token = DI::pConfig()->get(local_user(), "buffer", "access_token");
 
 	$s .= '<div id="buffer-password-wrapper">';
 
 	if ($access_token == "") {
 		$s .= '<div id="buffer-authenticate-wrapper">';
-		$s .= '<a href="'.$a->getBaseURL().'/buffer/connect">'.L10n::t("Authenticate your Buffer connection").'</a>';
+		$s .= '<a href="'.DI::baseUrl()->get().'/buffer/connect">'.DI::l10n()->t("Authenticate your Buffer connection").'</a>';
 		$s .= '</div><div class="clear"></div>';
 	} else {
 		$s .= '<div id="buffer-enable-wrapper">';
-		$s .= '<label id="buffer-enable-label" for="buffer-checkbox">' . L10n::t('Enable Buffer Post Addon') . '</label>';
+		$s .= '<label id="buffer-enable-label" for="buffer-checkbox">' . DI::l10n()->t('Enable Buffer Post Addon') . '</label>';
 		$s .= '<input id="buffer-checkbox" type="checkbox" name="buffer" value="1" ' . $checked . '/>';
 		$s .= '</div><div class="clear"></div>';
 
 		$s .= '<div id="buffer-bydefault-wrapper">';
-		$s .= '<label id="buffer-bydefault-label" for="buffer-bydefault">' . L10n::t('Post to Buffer by default') . '</label>';
+		$s .= '<label id="buffer-bydefault-label" for="buffer-bydefault">' . DI::l10n()->t('Post to Buffer by default') . '</label>';
 		$s .= '<input id="buffer-bydefault" type="checkbox" name="buffer_bydefault" value="1" ' . $def_checked . '/>';
 		$s .= '</div><div class="clear"></div>';
 
 		$s .= '<div id="buffer-delete-wrapper">';
-		$s .= '<label id="buffer-delete-label" for="buffer-delete">' . L10n::t('Check to delete this preset') . '</label>';
+		$s .= '<label id="buffer-delete-label" for="buffer-delete">' . DI::l10n()->t('Check to delete this preset') . '</label>';
 		$s .= '<input id="buffer-delete" type="checkbox" name="buffer_delete" value="1" />';
 		$s .= '</div><div class="clear"></div>';
 
 		// The callback URL is the script that gets called after the user authenticates with buffer
-		$callback_url = $a->getBaseURL() . '/buffer/connect';
+		$callback_url = DI::baseUrl()->get() . '/buffer/connect';
 
 		$buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token);
 
 		$profiles = $buffer->go('/profiles');
 		if (is_array($profiles)) {
 			$s .= '<div id="buffer-accounts-wrapper">';
-			$s .= L10n::t("Posts are going to all accounts that are enabled by default:");
+			$s .= DI::l10n()->t("Posts are going to all accounts that are enabled by default:");
 			$s .= "<ul>";
 			foreach ($profiles as $profile) {
 				if (!$profile->default)
@@ -227,7 +213,7 @@ function buffer_settings(App $a, &$s)
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="buffer-submit" name="buffer-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="buffer-submit" name="buffer-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
 }
 
 
@@ -235,12 +221,12 @@ function buffer_settings_post(App $a, array &$b)
 {
 	if (!empty($_POST['buffer-submit'])) {
 		if (!empty($_POST['buffer_delete'])) {
-			PConfig::set(local_user(), 'buffer', 'access_token'   , '');
-			PConfig::set(local_user(), 'buffer', 'post'           , false);
-			PConfig::set(local_user(), 'buffer', 'post_by_default', false);
+			DI::pConfig()->set(local_user(), 'buffer', 'access_token'   , '');
+			DI::pConfig()->set(local_user(), 'buffer', 'post'           , false);
+			DI::pConfig()->set(local_user(), 'buffer', 'post_by_default', false);
 		} else {
-			PConfig::set(local_user(), 'buffer', 'post'           , intval($_POST['buffer'] ?? false));
-			PConfig::set(local_user(), 'buffer', 'post_by_default', intval($_POST['buffer_bydefault'] ?? false));
+			DI::pConfig()->set(local_user(), 'buffer', 'post'           , intval($_POST['buffer'] ?? false));
+			DI::pConfig()->set(local_user(), 'buffer', 'post_by_default', intval($_POST['buffer_bydefault'] ?? false));
 		}
 	}
 }
@@ -251,11 +237,11 @@ function buffer_post_local(App $a, array &$b)
 		return;
 	}
 
-	$buffer_post   = intval(PConfig::get(local_user(),'buffer','post'));
+	$buffer_post   = intval(DI::pConfig()->get(local_user(),'buffer','post'));
 
 	$buffer_enable = (($buffer_post && !empty($_REQUEST['buffer_enable'])) ? intval($_REQUEST['buffer_enable']) : 0);
 
-	if ($b['api_source'] && intval(PConfig::get(local_user(),'buffer','post_by_default'))) {
+	if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'buffer','post_by_default'))) {
 		$buffer_enable = 1;
 	}
 
@@ -310,9 +296,9 @@ function buffer_send(App $a, array &$b)
 	//if($b['app'] == "Buffer")
 	//	return;
 
-	$client_id = Config::get("buffer", "client_id");
-	$client_secret = Config::get("buffer", "client_secret");
-	$access_token = PConfig::get($b['uid'], "buffer","access_token");
+	$client_id = DI::config()->get("buffer", "client_id");
+	$client_secret = DI::config()->get("buffer", "client_secret");
+	$access_token = DI::pConfig()->get($b['uid'], "buffer","access_token");
 	$callback_url = "";
 
 	if ($access_token) {