X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=dwpost%2Fdwpost.php;h=42b1770e56d05ef72203a4f9f68d73aa40595912;hb=f1514063559930de791c0bff18a3f6ae4b455f7c;hp=0c2e699ae75a3a20d6385c079e94f5e284294cf2;hpb=72f23f7b5236bdfc1d8c1b878ca22261ae8e55dd;p=friendica-addons.git

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 0c2e699a..42b1770e 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Name: Dreamwidth Post Connector
  * Description: Post to dreamwidth
@@ -8,21 +7,25 @@
  * Author: Michael Johnston
  * 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;
 
 function dwpost_install() {
-    register_hook('post_local',           'addon/dwpost/dwpost.php', 'dwpost_post_local');
-    register_hook('notifier_normal',      'addon/dwpost/dwpost.php', 'dwpost_send');
-    register_hook('jot_networks',         'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
-    register_hook('connector_settings',      'addon/dwpost/dwpost.php', 'dwpost_settings');
-    register_hook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
+	Addon::registerHook('post_local',           'addon/dwpost/dwpost.php', 'dwpost_post_local');
+	Addon::registerHook('notifier_normal',      'addon/dwpost/dwpost.php', 'dwpost_send');
+	Addon::registerHook('jot_networks',         'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
+	Addon::registerHook('connector_settings',      'addon/dwpost/dwpost.php', 'dwpost_settings');
+	Addon::registerHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
 
 }
 function dwpost_uninstall() {
-    unregister_hook('post_local',       'addon/dwpost/dwpost.php', 'dwpost_post_local');
-    unregister_hook('notifier_normal',  'addon/dwpost/dwpost.php', 'dwpost_send');
-    unregister_hook('jot_networks',     'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
-    unregister_hook('connector_settings',      'addon/dwpost/dwpost.php', 'dwpost_settings');
-    unregister_hook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
+	Addon::unregisterHook('post_local',       'addon/dwpost/dwpost.php', 'dwpost_post_local');
+	Addon::unregisterHook('notifier_normal',  'addon/dwpost/dwpost.php', 'dwpost_send');
+	Addon::unregisterHook('jot_networks',     'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
+	Addon::unregisterHook('connector_settings',      'addon/dwpost/dwpost.php', 'dwpost_settings');
+	Addon::unregisterHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
 
 }
 
@@ -31,12 +34,12 @@ function dwpost_jot_nets(&$a,&$b) {
     if(! local_user())
         return;
 
-    $dw_post = get_pconfig(local_user(),'dwpost','post');
+    $dw_post = PConfig::get(local_user(),'dwpost','post');
     if(intval($dw_post) == 1) {
-        $dw_defpost = get_pconfig(local_user(),'dwpost','post_by_default');
+        $dw_defpost = PConfig::get(local_user(),'dwpost','post_by_default');
         $selected = ((intval($dw_defpost) == 1) ? ' checked="checked" ' : '');
         $b .= '<div class="profile-jot-net"><input type="checkbox" name="dwpost_enable" ' . $selected . ' value="1" /> '
-            . t('Post to Dreamwidth') . '</div>';
+            . L10n::t('Post to Dreamwidth') . '</div>';
     }
 }
 
@@ -52,45 +55,51 @@ function dwpost_settings(&$a,&$s) {
 
     /* Get the current state of our config variables */
 
-    $enabled = get_pconfig(local_user(),'dwpost','post');
+    $enabled = PConfig::get(local_user(),'dwpost','post');
 
     $checked = (($enabled) ? ' checked="checked" ' : '');
 
-    $def_enabled = get_pconfig(local_user(),'dwpost','post_by_default');
+    $def_enabled = PConfig::get(local_user(),'dwpost','post_by_default');
 
     $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
-	$dw_username = get_pconfig(local_user(), 'dwpost', 'dw_username');
-	$dw_password = get_pconfig(local_user(), 'dwpost', 'dw_password');
+	$dw_username = PConfig::get(local_user(), 'dwpost', 'dw_username');
+	$dw_password = PConfig::get(local_user(), 'dwpost', 'dw_password');
 
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('Dreamwidth Post Settings') . '</h3>';
+    $s .= '<span id="settings_dwpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
+    $s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. L10n::t("Dreamwidth Export").'</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_dwpost_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
+    $s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. L10n::t("Dreamwidth Export").'</h3>';
+    $s .= '</span>';
+
     $s .= '<div id="dwpost-enable-wrapper">';
-    $s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . t('Enable dreamwidth Post Plugin') . '</label>';
+    $s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . L10n::t('Enable dreamwidth Post Addon') . '</label>';
     $s .= '<input id="dwpost-checkbox" type="checkbox" name="dwpost" value="1" ' . $checked . '/>';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="dwpost-username-wrapper">';
-    $s .= '<label id="dwpost-username-label" for="dwpost-username">' . t('dreamwidth username') . '</label>';
+    $s .= '<label id="dwpost-username-label" for="dwpost-username">' . L10n::t('dreamwidth username') . '</label>';
     $s .= '<input id="dwpost-username" type="text" name="dw_username" value="' . $dw_username . '" />';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="dwpost-password-wrapper">';
-    $s .= '<label id="dwpost-password-label" for="dwpost-password">' . t('dreamwidth password') . '</label>';
+    $s .= '<label id="dwpost-password-label" for="dwpost-password">' . L10n::t('dreamwidth password') . '</label>';
     $s .= '<input id="dwpost-password" type="password" name="dw_password" value="' . $dw_password . '" />';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="dwpost-bydefault-wrapper">';
-    $s .= '<label id="dwpost-bydefault-label" for="dwpost-bydefault">' . t('Post to dreamwidth by default') . '</label>';
+    $s .= '<label id="dwpost-bydefault-label" for="dwpost-bydefault">' . L10n::t('Post to dreamwidth by default') . '</label>';
     $s .= '<input id="dwpost-bydefault" type="checkbox" name="dw_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="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
 }
 
@@ -99,10 +108,10 @@ function dwpost_settings_post(&$a,&$b) {
 
 	if(x($_POST,'dwpost-submit')) {
 
-		set_pconfig(local_user(),'dwpost','post',intval($_POST['dwpost']));
-		set_pconfig(local_user(),'dwpost','post_by_default',intval($_POST['dw_bydefault']));
-		set_pconfig(local_user(),'dwpost','dw_username',trim($_POST['dw_username']));
-		set_pconfig(local_user(),'dwpost','dw_password',trim($_POST['dw_password']));
+		PConfig::set(local_user(),'dwpost','post',intval($_POST['dwpost']));
+		PConfig::set(local_user(),'dwpost','post_by_default',intval($_POST['dw_bydefault']));
+		PConfig::set(local_user(),'dwpost','dw_username',trim($_POST['dw_username']));
+		PConfig::set(local_user(),'dwpost','dw_password',trim($_POST['dw_password']));
 
 	}
 
@@ -121,11 +130,11 @@ function dwpost_post_local(&$a,&$b) {
 	if($b['private'] || $b['parent'])
 		return;
 
-    $dw_post   = intval(get_pconfig(local_user(),'dwpost','post'));
+    $dw_post   = intval(PConfig::get(local_user(),'dwpost','post'));
 
 	$dw_enable = (($dw_post && x($_REQUEST,'dwpost_enable')) ? intval($_REQUEST['dwpost_enable']) : 0);
 
-	if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'dwpost','post_by_default')))
+	if($_REQUEST['api_source'] && intval(PConfig::get(local_user(),'dwpost','post_by_default')))
 		$dw_enable = 1;
 
     if(! $dw_enable)
@@ -150,7 +159,7 @@ function dwpost_send(&$a,&$b) {
     if($b['parent'] != $b['id'])
         return;
 
-	// dreamwidth post in the LJ user's timezone. 
+	// dreamwidth post in the LJ user's timezone.
 	// Hopefully the person's Friendica account
 	// will be set to the same thing.
 
@@ -160,10 +169,10 @@ function dwpost_send(&$a,&$b) {
 		intval($b['uid'])
 	);
 	if($x && strlen($x[0]['timezone']))
-		$tz = $x[0]['timezone'];	
+		$tz = $x[0]['timezone'];
 
-	$dw_username = get_pconfig($b['uid'],'dwpost','dw_username');
-	$dw_password = get_pconfig($b['uid'],'dwpost','dw_password');
+	$dw_username = PConfig::get($b['uid'],'dwpost','dw_username');
+	$dw_password = PConfig::get($b['uid'],'dwpost','dw_password');
 	$dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc';
 
 	if($dw_username && $dw_password && $dw_blog) {
@@ -212,10 +221,10 @@ EOT;
 
 		logger('dwpost: data: ' . $xml, LOGGER_DATA);
 
-		if($dw_blog !== 'test')
-			$x = post_url($dw_blog,$xml,array("Content-Type: text/xml"));
+		if($dw_blog !== 'test') {
+			$x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"]);
+		}
 		logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);
-
 	}
 }