X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ifttt%2Fifttt.php;h=14add12a28a4adadf18ec7a589bd5120ab018b28;hb=8a700150cc8c0d430ca2b245618cc3aa4df375c7;hp=8a457df37aad16708a3b2e1790a2aae1e4a198ee;hpb=27b60e003f92dd9f3aebbeddb34ebb905488ca82;p=friendica-addons.git

diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 8a457df3..14add12a 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -11,19 +11,22 @@ require_once 'include/items.php';
 require_once 'include/text.php';
 
 use Friendica\App;
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
 
 function ifttt_install()
 {
-	register_hook('connector_settings', 'addon/ifttt/ifttt.php', 'ifttt_settings');
-	register_hook('connector_settings_post', 'addon/ifttt/ifttt.php', 'ifttt_settings_post');
+	Addon::registerHook('connector_settings', 'addon/ifttt/ifttt.php', 'ifttt_settings');
+	Addon::registerHook('connector_settings_post', 'addon/ifttt/ifttt.php', 'ifttt_settings_post');
 }
 
 function ifttt_uninstall()
 {
-	unregister_hook('connector_settings', 'addon/ifttt/ifttt.php', 'ifttt_settings');
-	unregister_hook('connector_settings_post', 'addon/ifttt/ifttt.php', 'ifttt_settings_post');
+	Addon::unregisterHook('connector_settings', 'addon/ifttt/ifttt.php', 'ifttt_settings');
+	Addon::unregisterHook('connector_settings_post', 'addon/ifttt/ifttt.php', 'ifttt_settings_post');
 }
 
 function ifttt_module()
@@ -50,35 +53,35 @@ function ifttt_settings(App $a, &$s)
 	}
 
 	$s .= '<span id="settings_ifttt_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ifttt_expanded\'); openClose(\'settings_ifttt_inflated\');">';
-	$s .= '<img class="connector" src="addon/ifttt/ifttt.png" /><h3 class="connector">' . t('IFTTT Mirror') . '</h3>';
+	$s .= '<img class="connector" src="addon/ifttt/ifttt.png" /><h3 class="connector">' . L10n::t('IFTTT Mirror') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_ifttt_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_ifttt_expanded\'); openClose(\'settings_ifttt_inflated\');">';
-	$s .= '<img class="connector" src="addon/ifttt/ifttt.png" /><h3 class="connector">' . t('IFTTT Mirror') . '</h3>';
+	$s .= '<img class="connector" src="addon/ifttt/ifttt.png" /><h3 class="connector">' . L10n::t('IFTTT Mirror') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="ifttt-configuration-wrapper">';
-	$s .= '<p>' . t('Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:') . '</p>';
+	$s .= '<p>' . L10n::t('Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:') . '</p>';
 	$s .= '<h4>URL</h4>';
 	$s .= '<p>' . $a->get_baseurl() . '/ifttt/' . $a->user['nickname'] . '</p>';
 	$s .= '<h4>Method</h4>';
 	$s .= '<p>POST</p>';
 	$s .= '<h4>Content Type</h4>';
 	$s .= '<p>application/x-www-form-urlencoded</p>';
-	$s .= '<h4>' . t('Body for "new status message"') . '</h4>';
+	$s .= '<h4>' . L10n::t('Body for "new status message"') . '</h4>';
 	$s .= '<p><code>' . htmlentities('key=' . $key . '&type=status&msg=<<<{{Message}}>>>&date=<<<{{UpdatedAt}}>>>&url=<<<{{PageUrl}}>>>') . '</code></p>';
-	$s .= '<h4>' . t('Body for "new photo upload"') . '</h4>';
+	$s .= '<h4>' . L10n::t('Body for "new photo upload"') . '</h4>';
 	$s .= '<p><code>' . htmlentities('key=' . $key . '&type=photo&link=<<<{{Link}}>>>&image=<<<{{ImageSource}}>>>&msg=<<<{{Caption}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>') . '</code></p>';
-	$s .= '<h4>' . t('Body for "new link post"') . '</h4>';
+	$s .= '<h4>' . L10n::t('Body for "new link post"') . '</h4>';
 	$s .= '<p><code>' . htmlentities('key=' . $key . '&type=link&link=<<<{{Link}}>>>&title=<<<{{Title}}>>>&msg=<<<{{Message}}>>>&description=<<<{{Description}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>') . '</code></p>';
 	$s .= '</div><div class="clear"></div>';
 
 	$s .= '<div id="ifttt-rekey-wrapper">';
-	$s .= '<label id="ifttt-rekey-label" for="ifttt-checkbox">' . t('Generate new key') . '</label>';
+	$s .= '<label id="ifttt-rekey-label" for="ifttt-checkbox">' . L10n::t('Generate new key') . '</label>';
 	$s .= '<input id="ifttt-checkbox" type="checkbox" name="ifttt-rekey" value="1" />';
 	$s .= '</div><div class="clear"></div>';
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="ifttt-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="ifttt-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
 	$s .= '</div>';
 }
 
@@ -97,8 +100,8 @@ function ifttt_post(App $a)
 
 	$nickname = $a->argv[1];
 
-	$user = dba::selectFirst('user', ['uid'], ['nickname' => $nickname]);
-	if (!DBM::is_result($user)) {
+	$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname]);
+	if (!DBA::isResult($user)) {
 		logger('User ' . $nickname . ' not found.', LOGGER_DEBUG);
 		return;
 	}
@@ -168,7 +171,6 @@ function ifttt_message($uid, $item)
 	$_SESSION['uid'] = $uid;
 
 	unset($_REQUEST);
-	$_REQUEST['type'] = 'wall';
 	$_REQUEST['api_source'] = true;
 	$_REQUEST['profile_uid'] = $uid;
 	$_REQUEST['source'] = 'IFTTT';
@@ -180,7 +182,7 @@ function ifttt_message($uid, $item)
 	if (strstr($item['url'], 'facebook.com')) {
 		$hash = hash('ripemd128', item['url']);
 		$_REQUEST['extid'] = NETWORK_FACEBOOK;
-		$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_FACEBOOK . ':' . $hash);
+		$_REQUEST['message_id'] = Item::newURI($uid, NETWORK_FACEBOOK . ':' . $hash);
 	}
 
 	if ($item['type'] == 'link') {