X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=ijpost%2Fijpost.php;h=9d9f9112087f80fd37272a9f008f68219e0b7127;hb=f1514063559930de791c0bff18a3f6ae4b455f7c;hp=a166e319d877c871acb301b9e1335aa0389a6684;hpb=f26c87aaeaf4f6e11034729f6e642104a107cfb9;p=friendica-addons.git

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index a166e319..9d9f9112 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -1,28 +1,31 @@
 <?php
-
 /**
  * Name: Insanejournal Post Connector
- * Description: Post to insanejournal
+ * Description: Post to Insanejournal
  * Version: 1.0
  * Author: Tony Baldwin <https://free-haven.org/profile/tony>
  * 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 ijpost_install() {
-    register_hook('post_local',           'addon/ijpost/ijpost.php', 'ijpost_post_local');
-    register_hook('notifier_normal',      'addon/ijpost/ijpost.php', 'ijpost_send');
-    register_hook('jot_networks',         'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
-    register_hook('connector_settings',      'addon/ijpost/ijpost.php', 'ijpost_settings');
-    register_hook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
+    Addon::registerHook('post_local',           'addon/ijpost/ijpost.php', 'ijpost_post_local');
+    Addon::registerHook('notifier_normal',      'addon/ijpost/ijpost.php', 'ijpost_send');
+    Addon::registerHook('jot_networks',         'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
+    Addon::registerHook('connector_settings',      'addon/ijpost/ijpost.php', 'ijpost_settings');
+    Addon::registerHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
 
 }
 function ijpost_uninstall() {
-    unregister_hook('post_local',       'addon/ijpost/ijpost.php', 'ijpost_post_local');
-    unregister_hook('notifier_normal',  'addon/ijpost/ijpost.php', 'ijpost_send');
-    unregister_hook('jot_networks',     'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
-    unregister_hook('connector_settings',      'addon/ijpost/ijpost.php', 'ijpost_settings');
-    unregister_hook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
+    Addon::unregisterHook('post_local',       'addon/ijpost/ijpost.php', 'ijpost_post_local');
+    Addon::unregisterHook('notifier_normal',  'addon/ijpost/ijpost.php', 'ijpost_send');
+    Addon::unregisterHook('jot_networks',     'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
+    Addon::unregisterHook('connector_settings',      'addon/ijpost/ijpost.php', 'ijpost_settings');
+    Addon::unregisterHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
 
 }
 
@@ -31,12 +34,12 @@ function ijpost_jot_nets(&$a,&$b) {
     if(! local_user())
         return;
 
-    $ij_post = get_pconfig(local_user(),'ijpost','post');
+    $ij_post = PConfig::get(local_user(),'ijpost','post');
     if(intval($ij_post) == 1) {
-        $ij_defpost = get_pconfig(local_user(),'ijpost','post_by_default');
+        $ij_defpost = PConfig::get(local_user(),'ijpost','post_by_default');
         $selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : '');
         $b .= '<div class="profile-jot-net"><input type="checkbox" name="ijpost_enable" ' . $selected . ' value="1" /> '
-            . t('Post to insanejournal') . '</div>';
+            . L10n::t('Post to Insanejournal') . '</div>';
     }
 }
 
@@ -52,45 +55,50 @@ function ijpost_settings(&$a,&$s) {
 
     /* Get the current state of our config variables */
 
-    $enabled = get_pconfig(local_user(),'ijpost','post');
+    $enabled = PConfig::get(local_user(),'ijpost','post');
 
     $checked = (($enabled) ? ' checked="checked" ' : '');
 
-    $def_enabled = get_pconfig(local_user(),'ijpost','post_by_default');
+    $def_enabled = PConfig::get(local_user(),'ijpost','post_by_default');
 
     $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
-	$ij_username = get_pconfig(local_user(), 'ijpost', 'ij_username');
-	$ij_password = get_pconfig(local_user(), 'ijpost', 'ij_password');
+	$ij_username = PConfig::get(local_user(), 'ijpost', 'ij_username');
+	$ij_password = PConfig::get(local_user(), 'ijpost', 'ij_password');
 
 
     /* Add some HTML to the existing form */
+    $s .= '<span id="settings_ijpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
+    $s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. L10n::t("InsaneJournal Export").'</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_ijpost_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
+    $s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. L10n::t("InsaneJournal Export").'</h3>';
+    $s .= '</span>';
 
-    $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('insanejournal Post Settings') . '</h3>';
     $s .= '<div id="ijpost-enable-wrapper">';
-    $s .= '<label id="ijpost-enable-label" for="ijpost-checkbox">' . t('Enable insanejournal Post Plugin') . '</label>';
+    $s .= '<label id="ijpost-enable-label" for="ijpost-checkbox">' . L10n::t('Enable InsaneJournal Post Addon') . '</label>';
     $s .= '<input id="ijpost-checkbox" type="checkbox" name="ijpost" value="1" ' . $checked . '/>';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="ijpost-username-wrapper">';
-    $s .= '<label id="ijpost-username-label" for="ijpost-username">' . t('insanejournal username') . '</label>';
+    $s .= '<label id="ijpost-username-label" for="ijpost-username">' . L10n::t('InsaneJournal username') . '</label>';
     $s .= '<input id="ijpost-username" type="text" name="ij_username" value="' . $ij_username . '" />';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="ijpost-password-wrapper">';
-    $s .= '<label id="ijpost-password-label" for="ijpost-password">' . t('insanejournal password') . '</label>';
+    $s .= '<label id="ijpost-password-label" for="ijpost-password">' . L10n::t('InsaneJournal password') . '</label>';
     $s .= '<input id="ijpost-password" type="password" name="ij_password" value="' . $ij_password . '" />';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="ijpost-bydefault-wrapper">';
-    $s .= '<label id="ijpost-bydefault-label" for="ijpost-bydefault">' . t('Post to insanejournal by default') . '</label>';
+    $s .= '<label id="ijpost-bydefault-label" for="ijpost-bydefault">' . L10n::t('Post to InsaneJournal by default') . '</label>';
     $s .= '<input id="ijpost-bydefault" type="checkbox" name="ij_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="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
 }
 
@@ -99,10 +107,10 @@ function ijpost_settings_post(&$a,&$b) {
 
 	if(x($_POST,'ijpost-submit')) {
 
-		set_pconfig(local_user(),'ijpost','post',intval($_POST['ijpost']));
-		set_pconfig(local_user(),'ijpost','post_by_default',intval($_POST['ij_bydefault']));
-		set_pconfig(local_user(),'ijpost','ij_username',trim($_POST['ij_username']));
-		set_pconfig(local_user(),'ijpost','ij_password',trim($_POST['ij_password']));
+		PConfig::set(local_user(),'ijpost','post',intval($_POST['ijpost']));
+		PConfig::set(local_user(),'ijpost','post_by_default',intval($_POST['ij_bydefault']));
+		PConfig::set(local_user(),'ijpost','ij_username',trim($_POST['ij_username']));
+		PConfig::set(local_user(),'ijpost','ij_password',trim($_POST['ij_password']));
 
 	}
 
@@ -121,11 +129,11 @@ function ijpost_post_local(&$a,&$b) {
 	if($b['private'] || $b['parent'])
 		return;
 
-    $ij_post   = intval(get_pconfig(local_user(),'ijpost','post'));
+    $ij_post   = intval(PConfig::get(local_user(),'ijpost','post'));
 
 	$ij_enable = (($ij_post && x($_REQUEST,'ijpost_enable')) ? intval($_REQUEST['ijpost_enable']) : 0);
 
-	if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'ijpost','post_by_default')))
+	if($_REQUEST['api_source'] && intval(PConfig::get(local_user(),'ijpost','post_by_default')))
 		$ij_enable = 1;
 
     if(! $ij_enable)
@@ -150,7 +158,7 @@ function ijpost_send(&$a,&$b) {
     if($b['parent'] != $b['id'])
         return;
 
-	// insanejournal post in the LJ user's timezone. 
+	// insanejournal post in the LJ user's timezone.
 	// Hopefully the person's Friendica account
 	// will be set to the same thing.
 
@@ -160,22 +168,18 @@ function ijpost_send(&$a,&$b) {
 		intval($b['uid'])
 	);
 	if($x && strlen($x[0]['timezone']))
-		$tz = $x[0]['timezone'];	
-
-	$ij_username = xmlify(get_pconfig($b['uid'],'ijpost','ij_username'));
-	$ij_password = xmlify(get_pconfig($b['uid'],'ijpost','ij_password'));
-	$ij_journal = xmlify(get_pconfig($b['uid'],'ijpost','ij_journal'));
+		$tz = $x[0]['timezone'];
 
-	$ij_blog = xmlify(get_pconfig($b['uid'],'ijpost','ij_blog'));
-	if(! strlen($ij_blog))
-		$ij_blog = xmlify('http://www.insanejournal.com/interface/xmlrpc');
+	$ij_username = PConfig::get($b['uid'],'ijpost','ij_username');
+	$ij_password = PConfig::get($b['uid'],'ijpost','ij_password');
+	$ij_blog = 'http://www.insanejournal.com/interface/xmlrpc';
 
 	if($ij_username && $ij_password && $ij_blog) {
 
 		require_once('include/bbcode.php');
 		require_once('include/datetime.php');
 
-		$title = xmlify($b['title']);
+		$title = $b['title'];
 		$post = bbcode($b['body']);
 		$post = xmlify($post);
 		$tags = ijpost_get_tags($b['tag']);
@@ -189,48 +193,36 @@ function ijpost_send(&$a,&$b) {
 
 		$xml = <<< EOT
 <?xml version="1.0" encoding="utf-8"?>
-<methodCall>
-  <methodName>LJ.XMLRPC.postevent</methodName>
-  <params>
-    <param><value>
-        <struct>
-        <member><name>username</name><value><string>$ij_username</string></value></member>
-        <member><name>password</name><value><string>$ij_password</string></value></member>
-        <member><name>event</name><value><string>$post</string></value></member>
-        <member><name>subject</name><value><string>$title</string></value></member>
-        <member><name>lineendings</name><value><string>unix</string></value></member>
-        <member><name>year</name><value><int>$year</int></value></member>
-        <member><name>mon</name><value><int>$mon</int></value></member>
-        <member><name>day</name><value><int>$day</int></value></member>
-        <member><name>hour</name><value><int>$hour</int></value></member>
-        <member><name>min</name><value><int>$min</int></value></member>
-		<member><name>usejournal</name><value><string>$ij_username</string></value></member>
-		<member>
-			<name>props</name>
-			<value>
-				<struct>
-					<member>
-						<name>useragent</name>
-						<value><string>Friendica</string></value>
-					</member>
-					<member>
-						<name>taglist</name>
-						<value><string>$tags</string></value>
-					</member>
-				</struct>
-			</value>
-		</member>
-        </struct>
-    </value></param>
-  </params>
+<methodCall><methodName>LJ.XMLRPC.postevent</methodName>
+<params><param>
+<value><struct>
+<member><name>year</name><value><int>$year</int></value></member>
+<member><name>mon</name><value><int>$mon</int></value></member>
+<member><name>day</name><value><int>$day</int></value></member>
+<member><name>hour</name><value><int>$hour</int></value></member>
+<member><name>min</name><value><int>$min</int></value></member>
+<member><name>event</name><value><string>$post</string></value></member>
+<member><name>username</name><value><string>$ij_username</string></value></member>
+<member><name>password</name><value><string>$ij_password</string></value></member>
+<member><name>subject</name><value><string>$title</string></value></member>
+<member><name>lineendings</name><value><string>unix</string></value></member>
+<member><name>ver</name><value><int>1</int></value></member>
+<member><name>props</name>
+<value><struct>
+<member><name>useragent</name><value><string>Friendica</string></value></member>
+<member><name>taglist</name><value><string>$tags</string></value></member>
+</struct></value></member>
+</struct></value>
+</param></params>
 </methodCall>
 
 EOT;
 
 		logger('ijpost: data: ' . $xml, LOGGER_DATA);
 
-		if($ij_blog !== 'test')
-			$x = post_url($ij_blog,$xml);
+		if($ij_blog !== 'test') {
+			$x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"]);
+		}
 		logger('posted to insanejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
 
 	}