X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ljpost%2Fljpost.php;h=382832c5ec44a09d199fad666cc88f6b1d424275;hb=1357817fc38de7be7dc8ebffc1fa0961796fd32d;hp=8bc33fc7736637061c84d136505e512f319143e2;hpb=745e1675a202f4e35f8fbffd302aede199ef38ba;p=friendica-addons.git

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 8bc33fc7..382832c5 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -10,9 +10,8 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
+use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
@@ -41,13 +40,13 @@ function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
         return;
     }
 
-    if (PConfig::get(local_user(),'ljpost','post')) {
+    if (DI::pConfig()->get(local_user(),'ljpost','post')) {
 	    $jotnets_fields[] = [
 		    'type' => 'checkbox',
 		    'field' => [
 			    'ljpost_enable',
-			    L10n::t('Post to LiveJournal'),
-			    PConfig::get(local_user(),'ljpost','post_by_default')
+			    DI::l10n()->t('Post to LiveJournal'),
+			    DI::pConfig()->get(local_user(),'ljpost','post_by_default')
 		    ]
 	    ];
     }
@@ -61,49 +60,49 @@ 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->getBaseURL() . '/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>';
 
 }
 
@@ -112,10 +111,10 @@ function ljpost_settings_post(&$a,&$b) {
 
 	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']));
 
 	}
 
@@ -134,11 +133,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 && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0);
 
-	if($b['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)
@@ -175,13 +174,13 @@ function ljpost_send(&$a,&$b) {
 	if($x && strlen($x[0]['timezone']))
 		$tz = $x[0]['timezone'];
 
-	$lj_username = XML::escape(PConfig::get($b['uid'],'ljpost','lj_username'));
-	$lj_password = XML::escape(PConfig::get($b['uid'],'ljpost','lj_password'));
-	$lj_journal = XML::escape(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 = XML::escape(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 = XML::escape('http://www.livejournal.com/interface/xmlrpc');