X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ljpost%2Fljpost.php;h=be831fa50c991758b0cd7beb3f011a4bbe9a8f16;hb=dbde5358c69d9204c6453e7375a1cccbb7dca86a;hp=2a14172f1cedbbec88279ccb79e40990d88dce1e;hpb=1900da6c421a939b9a98994e974f2ab01d6ded74;p=friendica-addons.git

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 2a14172f..be831fa5 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -8,40 +8,39 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
-use Friendica\Util\Network;
-use Friendica\Util\Temporal;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\DI;
+use Friendica\Model\Post;
+use Friendica\Model\Tag;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\XML;
 
 function ljpost_install() {
-    Addon::registerHook('post_local',           'addon/ljpost/ljpost.php', 'ljpost_post_local');
-    Addon::registerHook('notifier_normal',      'addon/ljpost/ljpost.php', 'ljpost_send');
-    Addon::registerHook('jot_networks',         'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
-    Addon::registerHook('connector_settings',      'addon/ljpost/ljpost.php', 'ljpost_settings');
-    Addon::registerHook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
+    Hook::register('post_local',           'addon/ljpost/ljpost.php', 'ljpost_post_local');
+    Hook::register('notifier_normal',      'addon/ljpost/ljpost.php', 'ljpost_send');
+    Hook::register('jot_networks',         'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
+    Hook::register('connector_settings',      'addon/ljpost/ljpost.php', 'ljpost_settings');
+    Hook::register('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
 
 }
-function ljpost_uninstall() {
-    Addon::unregisterHook('post_local',       'addon/ljpost/ljpost.php', 'ljpost_post_local');
-    Addon::unregisterHook('notifier_normal',  'addon/ljpost/ljpost.php', 'ljpost_send');
-    Addon::unregisterHook('jot_networks',     'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
-    Addon::unregisterHook('connector_settings',      'addon/ljpost/ljpost.php', 'ljpost_settings');
-    Addon::unregisterHook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
 
-}
-
-
-function ljpost_jot_nets(&$a,&$b) {
-    if(! local_user())
+function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
+{
+    if(! local_user()) {
         return;
+    }
 
-    $lj_post = PConfig::get(local_user(),'ljpost','post');
-    if(intval($lj_post) == 1) {
-        $lj_defpost = PConfig::get(local_user(),'ljpost','post_by_default');
-        $selected = ((intval($lj_defpost) == 1) ? ' checked="checked" ' : '');
-        $b .= '<div class="profile-jot-net"><input type="checkbox" name="ljpost_enable" ' . $selected . ' value="1" /> '
-            . L10n::t('Post to LiveJournal') . '</div>';
+    if (DI::pConfig()->get(local_user(),'ljpost','post')) {
+	    $jotnets_fields[] = [
+		    'type' => 'checkbox',
+		    'field' => [
+			    'ljpost_enable',
+			    DI::l10n()->t('Post to LiveJournal'),
+			    DI::pConfig()->get(local_user(),'ljpost','post_by_default')
+		    ]
+	    ];
     }
 }
 
@@ -53,61 +52,61 @@ function ljpost_settings(&$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->get_baseurl() . '/addon/ljpost/ljpost.css' . '" media="all" />' . "\r\n";
+    DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/ljpost/ljpost.css' . '" media="all" />' . "\r\n";
 
     /* Get the current state of our config variables */
 
-    $enabled = PConfig::get(local_user(),'ljpost','post');
+    $enabled = DI::pConfig()->get(local_user(),'ljpost','post');
 
     $checked = (($enabled) ? ' checked="checked" ' : '');
 
-    $def_enabled = PConfig::get(local_user(),'ljpost','post_by_default');
+    $def_enabled = DI::pConfig()->get(local_user(),'ljpost','post_by_default');
 
     $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
-	$lj_username = PConfig::get(local_user(), 'ljpost', 'lj_username');
-	$lj_password = PConfig::get(local_user(), 'ljpost', 'lj_password');
+	$lj_username = DI::pConfig()->get(local_user(), 'ljpost', 'lj_username');
+	$lj_password = DI::pConfig()->get(local_user(), 'ljpost', 'lj_password');
 
 
     /* Add some HTML to the existing form */
 
     $s .= '<div class="settings-block">';
-    $s .= '<h3>' . L10n::t('LiveJournal Post Settings') . '</h3>';
+    $s .= '<h3>' . DI::l10n()->t('LiveJournal Post Settings') . '</h3>';
     $s .= '<div id="ljpost-enable-wrapper">';
-    $s .= '<label id="ljpost-enable-label" for="ljpost-checkbox">' . L10n::t('Enable LiveJournal Post Addon') . '</label>';
+    $s .= '<label id="ljpost-enable-label" for="ljpost-checkbox">' . DI::l10n()->t('Enable LiveJournal Post Addon') . '</label>';
     $s .= '<input id="ljpost-checkbox" type="checkbox" name="ljpost" value="1" ' . $checked . '/>';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="ljpost-username-wrapper">';
-    $s .= '<label id="ljpost-username-label" for="ljpost-username">' . L10n::t('LiveJournal username') . '</label>';
+    $s .= '<label id="ljpost-username-label" for="ljpost-username">' . DI::l10n()->t('LiveJournal username') . '</label>';
     $s .= '<input id="ljpost-username" type="text" name="lj_username" value="' . $lj_username . '" />';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="ljpost-password-wrapper">';
-    $s .= '<label id="ljpost-password-label" for="ljpost-password">' . L10n::t('LiveJournal password') . '</label>';
+    $s .= '<label id="ljpost-password-label" for="ljpost-password">' . DI::l10n()->t('LiveJournal password') . '</label>';
     $s .= '<input id="ljpost-password" type="password" name="lj_password" value="' . $lj_password . '" />';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="ljpost-bydefault-wrapper">';
-    $s .= '<label id="ljpost-bydefault-label" for="ljpost-bydefault">' . L10n::t('Post to LiveJournal by default') . '</label>';
+    $s .= '<label id="ljpost-bydefault-label" for="ljpost-bydefault">' . DI::l10n()->t('Post to LiveJournal by default') . '</label>';
     $s .= '<input id="ljpost-bydefault" type="checkbox" name="lj_bydefault" value="1" ' . $def_checked . '/>';
     $s .= '</div><div class="clear"></div>';
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ljpost-submit" name="ljpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ljpost-submit" name="ljpost-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
 
 }
 
 
 function ljpost_settings_post(&$a,&$b) {
 
-	if(x($_POST,'ljpost-submit')) {
+	if(!empty($_POST['ljpost-submit'])) {
 
-		PConfig::set(local_user(),'ljpost','post',intval($_POST['ljpost']));
-		PConfig::set(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
-		PConfig::set(local_user(),'ljpost','lj_username',trim($_POST['lj_username']));
-		PConfig::set(local_user(),'ljpost','lj_password',trim($_POST['lj_password']));
+		DI::pConfig()->set(local_user(),'ljpost','post',intval($_POST['ljpost']));
+		DI::pConfig()->set(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
+		DI::pConfig()->set(local_user(),'ljpost','lj_username',trim($_POST['lj_username']));
+		DI::pConfig()->set(local_user(),'ljpost','lj_password',trim($_POST['lj_password']));
 
 	}
 
@@ -126,11 +125,11 @@ function ljpost_post_local(&$a,&$b) {
 	if($b['private'] || $b['parent'])
 		return;
 
-    $lj_post   = intval(PConfig::get(local_user(),'ljpost','post'));
+    $lj_post   = intval(DI::pConfig()->get(local_user(),'ljpost','post'));
 
-	$lj_enable = (($lj_post && x($_REQUEST,'ljpost_enable')) ? intval($_REQUEST['ljpost_enable']) : 0);
+	$lj_enable = (($lj_post && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0);
 
-	if($_REQUEST['api_source'] && intval(PConfig::get(local_user(),'ljpost','post_by_default')))
+	if($b['api_source'] && intval(DI::pConfig()->get(local_user(),'ljpost','post_by_default')))
 		$lj_enable = 1;
 
     if(! $lj_enable)
@@ -155,6 +154,8 @@ function ljpost_send(&$a,&$b) {
     if($b['parent'] != $b['id'])
         return;
 
+	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], $b['body']);
+
 	// LiveJournal post in the LJ user's timezone.
 	// Hopefully the person's Friendica account
 	// will be set to the same thing.
@@ -167,25 +168,21 @@ function ljpost_send(&$a,&$b) {
 	if($x && strlen($x[0]['timezone']))
 		$tz = $x[0]['timezone'];
 
-	$lj_username = xmlify(PConfig::get($b['uid'],'ljpost','lj_username'));
-	$lj_password = xmlify(PConfig::get($b['uid'],'ljpost','lj_password'));
-	$lj_journal = xmlify(PConfig::get($b['uid'],'ljpost','lj_journal'));
+	$lj_username = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_username'));
+	$lj_password = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_password'));
+	$lj_journal = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_journal'));
 //	if(! $lj_journal)
 //		$lj_journal = $lj_username;
 
-	$lj_blog = xmlify(PConfig::get($b['uid'],'ljpost','lj_blog'));
+	$lj_blog = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_blog'));
 	if(! strlen($lj_blog))
-		$lj_blog = xmlify('http://www.livejournal.com/interface/xmlrpc');
+		$lj_blog = XML::escape('http://www.livejournal.com/interface/xmlrpc');
 
 	if($lj_username && $lj_password && $lj_blog) {
-
-		require_once('include/bbcode.php');
-		require_once('include/datetime.php');
-
-		$title = xmlify($b['title']);
-		$post = bbcode($b['body']);
-		$post = xmlify($post);
-		$tags = ljpost_get_tags($b['tag']);
+		$title = XML::escape($b['title']);
+		$post = BBCode::convert($b['body']);
+		$post = XML::escape($post);
+		$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
 
 		$date = DateTimeFormat::convert($b['created'], $tz);
 		$year = intval(substr($date,0,4));
@@ -234,18 +231,11 @@ function ljpost_send(&$a,&$b) {
 
 EOT;
 
-		logger('ljpost: data: ' . $xml, LOGGER_DATA);
+		Logger::log('ljpost: data: ' . $xml, Logger::DATA);
 
 		if ($lj_blog !== 'test') {
-			$x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"]);
+			$x = DI::httpRequest()->post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody();
 		}
-		logger('posted to livejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
+		Logger::log('posted to livejournal: ' . ($x) ? $x : '', Logger::DEBUG);
 	}
 }
-
-function ljpost_get_tags($post)
-{
-	preg_match_all("/\]([^\[#]+)\[/",$post,$matches);
-	$tags = implode(', ',$matches[1]);
-	return $tags;
-}