Merge pull request #187 from annando/master
Google+/Facebook: Merged settings, added icons for the settings of the other connectors
This commit is contained in:
fabrixxm
commit
2ca92ed594
|
|
@ -53,11 +53,11 @@ function appnetpost_settings(&$a,&$s) {
|
|||
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
|
||||
|
||||
$s .= '<span id="settings_appnetpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
|
||||
$s .= '<h3>' . t('App.net Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/appnet.png" /><h3 class="connector">'. t('App.net Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_appnetpost_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
|
||||
$s .= '<h3>' . t('App.net Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/appnet.png" /><h3 class="connector">'. t('App.net Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
$s .= '<div id="appnetpost-enable-wrapper">';
|
||||
|
|
|
|||
|
|
@ -71,11 +71,11 @@ function blogger_settings(&$a,&$s) {
|
|||
/* Add some HTML to the existing form */
|
||||
|
||||
$s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
|
||||
$s .= '<h3>' . t('Blogger Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/blogger.png" /><h3 class="connector">'. t('Blogger Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_blogger_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
|
||||
$s .= '<h3>' . t('Blogger Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/blogger.png" /><h3 class="connector">'. t('Blogger Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
$s .= '<div id="blogger-enable-wrapper">';
|
||||
|
|
|
|||
|
|
@ -146,11 +146,11 @@ function diaspora_settings(&$a,&$s) {
|
|||
/* Add some HTML to the existing form */
|
||||
|
||||
$s .= '<span id="settings_diaspora_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
|
||||
$s .= '<h3>' . t('Diaspora Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/diaspora-logo.png" /><h3 class="connector">'. t('Diaspora Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_diaspora_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
|
||||
$s .= '<h3>' . t('Diaspora Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/diaspora-logo.png" /><h3 class="connector">'. t('Diaspora Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
if ($status) {
|
||||
|
|
|
|||
|
|
@ -152,6 +152,12 @@ function fbpost_post(&$a) {
|
|||
set_pconfig($uid,'facebook','post_to_page', $values[0]);
|
||||
set_pconfig($uid,'facebook','page_access_token', $values[1]);
|
||||
|
||||
$result = q("SELECT `installed` FROM `addon` WHERE `name` = 'fbsync' AND `installed`");
|
||||
if (count($result) > 0) {
|
||||
set_pconfig(local_user(),'fbsync','sync',intval($_POST['fbsync']));
|
||||
set_pconfig(local_user(),'fbsync','create_user',intval($_POST['create_user']));
|
||||
}
|
||||
|
||||
info( t('Settings updated.') . EOL);
|
||||
}
|
||||
|
||||
|
|
@ -207,7 +213,15 @@ function fbpost_content(&$a) {
|
|||
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'
|
||||
. $a->get_baseurl() . '/addon/fbpost/fbpost.css' . '" media="all" />' . "\r\n";
|
||||
|
||||
$o .= '<h3>' . t('Facebook Export/Mirror') . '</h3>';
|
||||
$result = q("SELECT `installed` FROM `addon` WHERE `name` = 'fbsync' AND `installed`");
|
||||
$fbsync = (count($result) > 0);
|
||||
|
||||
if($fbsync)
|
||||
$title = t('Facebook Import/Export/Mirror');
|
||||
else
|
||||
$title = t('Facebook Export/Mirror');
|
||||
|
||||
$o .= '<img class="connector" src="images/facebook.png" /><h3 class="connector">'.$title.'</h3>';
|
||||
|
||||
if(! $fb_installed) {
|
||||
$o .= '<div id="fbpost-enable-wrapper">';
|
||||
|
|
@ -279,8 +293,20 @@ function fbpost_content(&$a) {
|
|||
|
||||
$o .= "</select>";
|
||||
|
||||
$o .= '<p><input type="submit" name="submit" value="' . t('Save Settings') . '" /></form></div>';
|
||||
if ($fbsync) {
|
||||
|
||||
$o .= '<div class="clear"></div>';
|
||||
|
||||
$sync_enabled = get_pconfig(local_user(),'fbsync','sync');
|
||||
$checked = (($sync_enabled) ? ' checked="checked" ' : '');
|
||||
$o .= '<input type="checkbox" name="fbsync" value="1"' . $checked . '/>' . ' ' . t('Import Facebook newsfeed.') . EOL;
|
||||
|
||||
$create_user = get_pconfig(local_user(),'fbsync','create_user');
|
||||
$checked = (($create_user) ? ' checked="checked" ' : '');
|
||||
$o .= '<input type="checkbox" name="create_user" value="1"' . $checked . '/>' . ' ' . t('Automatically create contacts.') . EOL;
|
||||
|
||||
}
|
||||
$o .= '<p><input type="submit" name="submit" value="' . t('Save Settings') . '" /></form></div>';
|
||||
}
|
||||
|
||||
return $o;
|
||||
|
|
@ -291,11 +317,15 @@ function fbpost_content(&$a) {
|
|||
* @param null|object $b
|
||||
*/
|
||||
function fbpost_plugin_settings(&$a,&$b) {
|
||||
$result = q("SELECT `installed` FROM `addon` WHERE `name` = 'fbsync' AND `installed`");
|
||||
if(count($result) > 0)
|
||||
$title = t('Facebook Import/Export/Mirror');
|
||||
else
|
||||
$title = t('Facebook Export/Mirror');
|
||||
|
||||
$b .= '<div class="settings-block">';
|
||||
$b .= '<a href="fbpost"><h3>' . t('Facebook Export/Mirror') . '</a></h3>';
|
||||
$b .= '<a href="fbpost"><img class="connector" src="images/facebook.png" /><h3 class="connector">'.$title.'</h3></a>';
|
||||
$b .= '</div>';
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -100,6 +100,9 @@ function fbsync_follow($a, &$contact) {
|
|||
|
||||
function fbsync_settings(&$a,&$s) {
|
||||
|
||||
// Settings are done inside the fbpost addon
|
||||
return;
|
||||
|
||||
if(! local_user())
|
||||
return;
|
||||
|
||||
|
|
@ -120,11 +123,11 @@ function fbsync_settings(&$a,&$s) {
|
|||
/* Add some HTML to the existing form */
|
||||
|
||||
$s .= '<span id="settings_fbsync_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">';
|
||||
$s .= '<h3>' . t('Facebook Import') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/facebook.png" /><h3 class="connector">'. t('Facebook Import').'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_fbsync_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">';
|
||||
$s .= '<h3>' . t('Facebook Import') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/facebook.png" /><h3 class="connector">'. t('Facebook Import').'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
$s .= '<div id="fbsync-enable-wrapper">';
|
||||
|
|
|
|||
|
|
@ -30,15 +30,20 @@ function fromgplus_addon_settings(&$a,&$s) {
|
|||
if(! local_user())
|
||||
return;
|
||||
|
||||
// If "gpluspost" is installed as well, then the settings are displayed there
|
||||
$result = q("SELECT `installed` FROM `addon` WHERE `name` = 'gpluspost' AND `installed`");
|
||||
if (count($result) > 0)
|
||||
return;
|
||||
|
||||
$enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
|
||||
$account = get_pconfig(local_user(),'fromgplus','account');
|
||||
|
||||
$s .= '<span id="settings_fromgplus_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
|
||||
$s .= '<h3>' . t('Google+ Mirror').'</h3>';
|
||||
$s .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. t('Google+ Mirror').'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_fromgplus_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
|
||||
$s .= '<h3>' . t('Google+ Mirror').'</h3>';
|
||||
$s .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. t('Google+ Mirror').'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
$s .= '<div id="fromgplus-wrapper">';
|
||||
|
|
|
|||
|
|
@ -1,11 +1,15 @@
|
|||
|
||||
#gpluspost-enable-label, #gpluspost-bydefault-label, #gpluspost-noloopprevention-label, #gpluspost-skipwithoutlink-label {
|
||||
#gpluspost-enable-label, #gpluspost-bydefault-label, #gpluspost-noloopprevention-label,
|
||||
#gpluspost-skipwithoutlink-label, #gpluspost-mirror-label, #gpluspost-account-label,
|
||||
#gpluspost-username-label, #gpluspost-password-label, #gpluspost-page-label {
|
||||
float: left;
|
||||
width: 200px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
#gpluspost-checkbox, #gpluspost-bydefault, #gpluspost-noloopprevention, #gpluspost-skipwithoutlink {
|
||||
#gpluspost-checkbox, #gpluspost-bydefault, #gpluspost-noloopprevention,
|
||||
#gpluspost-skipwithoutlink, #gpluspost-mirror, #gpluspost-account,
|
||||
#gpluspost-username, #gpluspost-password, #gpluspost-page {
|
||||
float: left;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ function gpluspost_install() {
|
|||
register_hook('jot_networks', 'addon/gpluspost/gpluspost.php', 'gpluspost_jot_nets');
|
||||
register_hook('connector_settings', 'addon/gpluspost/gpluspost.php', 'gpluspost_settings');
|
||||
register_hook('connector_settings_post', 'addon/gpluspost/gpluspost.php', 'gpluspost_settings_post');
|
||||
register_hook('queue_predeliver', 'addon/gpluspost/gpluspost.php', 'gpluspost_queue_hook');
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -22,6 +23,7 @@ function gpluspost_uninstall() {
|
|||
unregister_hook('jot_networks', 'addon/gpluspost/gpluspost.php', 'gpluspost_jot_nets');
|
||||
unregister_hook('connector_settings', 'addon/gpluspost/gpluspost.php', 'gpluspost_settings');
|
||||
unregister_hook('connector_settings_post', 'addon/gpluspost/gpluspost.php', 'gpluspost_settings_post');
|
||||
unregister_hook('queue_predeliver', 'addon/gpluspost/gpluspost.php', 'gpluspost_queue_hook');
|
||||
}
|
||||
|
||||
function gpluspost_jot_nets(&$a,&$b) {
|
||||
|
|
@ -37,11 +39,19 @@ function gpluspost_jot_nets(&$a,&$b) {
|
|||
}
|
||||
}
|
||||
|
||||
function gpluspost_nextscripts() {
|
||||
$a = get_app();
|
||||
return file_exists($a->get_basepath()."/addon/gpluspost/postToGooglePlus.php");
|
||||
}
|
||||
|
||||
function gpluspost_settings(&$a,&$s) {
|
||||
|
||||
if(! local_user())
|
||||
return;
|
||||
|
||||
$result = q("SELECT `installed` FROM `addon` WHERE `name` = 'fromgplus' AND `installed`");
|
||||
$fromgplus_enabled = count($result) > 0;
|
||||
|
||||
/* 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/gpluspost/gpluspost.css' . '" media="all" />' . "\r\n";
|
||||
|
|
@ -58,19 +68,57 @@ function gpluspost_settings(&$a,&$s) {
|
|||
$skip_enabled = get_pconfig(local_user(),'gpluspost','skip_without_link');
|
||||
$skip_checked = (($skip_enabled) ? ' checked="checked" ' : '');
|
||||
|
||||
$mirror_enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
|
||||
$mirror_account = get_pconfig(local_user(),'fromgplus','account');
|
||||
|
||||
$username = get_pconfig(local_user(), 'gpluspost', 'username');
|
||||
$password = get_pconfig(local_user(), 'gpluspost', 'password');
|
||||
$page = get_pconfig(local_user(), 'gpluspost', 'page');
|
||||
|
||||
if ($fromgplus_enabled)
|
||||
$title = "Google+ Export/Mirror";
|
||||
else
|
||||
$title = "Google+ Export";
|
||||
|
||||
$s .= '<span id="settings_gpluspost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">';
|
||||
$s .= '<h3>' . t('Google+ Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. t($title).'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_gpluspost_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">';
|
||||
$s .= '<h3>' . t('Google+ Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. t($title).'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
$s .= '<div id="gpluspost-enable-wrapper">';
|
||||
|
||||
$s .= '<label id="gpluspost-enable-label" for="gpluspost-checkbox">' . t('Enable Google+ Post Plugin') . '</label>';
|
||||
$s .= '<input id="gpluspost-checkbox" type="checkbox" name="gpluspost" value="1" ' . $checked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
if (gpluspost_nextscripts()) {
|
||||
/*
|
||||
// To-Do: Option to check the credentials if requested
|
||||
if (($username != "") AND ($password != "")) {
|
||||
require_once("addon/googleplus/postToGooglePlus.php");
|
||||
$loginError = doConnectToGooglePlus2($username, $password);
|
||||
if ($loginError)
|
||||
$s .= '<p>Login Error. Please enter the correct credentials.</p>';
|
||||
}*/
|
||||
|
||||
$s .= '<div id="gpluspost-username-wrapper">';
|
||||
$s .= '<label id="gpluspost-username-label" for="gpluspost-username">' . t('Google+ username') . '</label>';
|
||||
$s .= '<input id="gpluspost-username" type="text" name="username" value="' . $username . '" />';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
$s .= '<div id="gpluspost-password-wrapper">';
|
||||
$s .= '<label id="gpluspost-password-label" for="gpluspost-password">' . t('Google+ password') . '</label>';
|
||||
$s .= '<input id="gpluspost-password" type="password" name="password" value="' . $password . '" />';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
$s .= '<div id="gpluspost-page-wrapper">';
|
||||
$s .= '<label id="gpluspost-page-label" for="gpluspost-page">' . t('Google+ page number') . '</label>';
|
||||
$s .= '<input id="gpluspost-page" type="text" name="page" value="' . $page . '" />';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
}
|
||||
|
||||
$s .= '<div id="gpluspost-bydefault-wrapper">';
|
||||
$s .= '<label id="gpluspost-bydefault-label" for="gpluspost-bydefault">' . t('Post to Google+ by default') . '</label>';
|
||||
$s .= '<input id="gpluspost-bydefault" type="checkbox" name="gpluspost_bydefault" value="1" ' . $def_checked . '/>';
|
||||
|
|
@ -81,16 +129,36 @@ function gpluspost_settings(&$a,&$s) {
|
|||
$s .= '<input id="gpluspost-noloopprevention" type="checkbox" name="gpluspost_noloopprevention" value="1" ' . $noloop_checked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
$s .= '<div id="gpluspost-skipwithoutlink-wrapper">';
|
||||
$s .= '<label id="gpluspost-skipwithoutlink-label" for="gpluspost-skipwithoutlink">' . t('Skip messages without links') . '</label>';
|
||||
$s .= '<input id="gpluspost-skipwithoutlink" type="checkbox" name="gpluspost_skipwithoutlink" value="1" ' . $skip_checked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
if (!gpluspost_nextscripts()) {
|
||||
$s .= '<div id="gpluspost-skipwithoutlink-wrapper">';
|
||||
$s .= '<label id="gpluspost-skipwithoutlink-label" for="gpluspost-skipwithoutlink">' . t('Skip messages without links') . '</label>';
|
||||
$s .= '<input id="gpluspost-skipwithoutlink" type="checkbox" name="gpluspost_skipwithoutlink" value="1" ' . $skip_checked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
}
|
||||
|
||||
if ($fromgplus_enabled) {
|
||||
$s .= '<div id="gpluspost-mirror-wrapper">';
|
||||
$s .= '<label id="gpluspost-mirror-label" for="gpluspost-mirror">'.t('Mirror all public posts').'</label>';
|
||||
$s .= '<input id="gpluspost-mirror" type="checkbox" name="fromgplus-enable" value="1"'.$mirror_enable_checked.' />';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
$s .= '<div id="gpluspost-mirroraccount-wrapper">';
|
||||
$s .= '<label id="gpluspost-account-label" for="gpluspost-account">'.t('Mirror Google Account ID').' </label>';
|
||||
$s .= '<input id="gpluspost-account" type="text" name="fromgplus-account" value="'.$mirror_account.'" />';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
}
|
||||
|
||||
/* provide a submit button */
|
||||
|
||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="gpluspost-submit" name="gpluspost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
||||
$s .= '<p>Register an account at <a href="https://hootsuite.com">Hootsuite</a>, add your G+ page and add the feed-url there.<br />';
|
||||
$s .= 'Feed-url: '.$a->get_baseurl().'/gpluspost/'.urlencode($a->user["nickname"]).'</p></div>';
|
||||
|
||||
if (gpluspost_nextscripts()) {
|
||||
$s .= "<p>If the plugin doesn't work or if it stopped, please login to Google+, then unlock your account by following this <a href='https://www.google.com/accounts/UnlockCaptcha'>link</a>. ";
|
||||
$s .= 'At this page please click on "Continue". Then your posts should arrive in several minutes.</p>';
|
||||
} else {
|
||||
$s .= '<p>Register an account at <a href="https://hootsuite.com">Hootsuite</a>, add your G+ page and add the feed-url there.<br />';
|
||||
$s .= 'Feed-url: '.$a->get_baseurl().'/gpluspost/'.urlencode($a->user["nickname"]).'</p>';
|
||||
}
|
||||
$s .= '</div>';
|
||||
}
|
||||
|
||||
function gpluspost_settings_post(&$a,&$b) {
|
||||
|
|
@ -99,7 +167,21 @@ function gpluspost_settings_post(&$a,&$b) {
|
|||
set_pconfig(local_user(),'gpluspost','post',intval($_POST['gpluspost']));
|
||||
set_pconfig(local_user(),'gpluspost','post_by_default',intval($_POST['gpluspost_bydefault']));
|
||||
set_pconfig(local_user(),'gpluspost','no_loop_prevention',intval($_POST['gpluspost_noloopprevention']));
|
||||
set_pconfig(local_user(),'gpluspost','skip_without_link',intval($_POST['gpluspost_skipwithoutlink']));
|
||||
|
||||
if (!gpluspost_nextscripts()) {
|
||||
set_pconfig(local_user(),'gpluspost','skip_without_link',intval($_POST['gpluspost_skipwithoutlink']));
|
||||
} else {
|
||||
set_pconfig(local_user(),'gpluspost','username',trim($_POST['username']));
|
||||
set_pconfig(local_user(),'gpluspost','password',trim($_POST['password']));
|
||||
set_pconfig(local_user(),'gpluspost','page',trim($_POST['page']));
|
||||
}
|
||||
|
||||
$result = q("SELECT `installed` FROM `addon` WHERE `name` = 'fromgplus' AND `installed`");
|
||||
if (count($result) > 0) {
|
||||
set_pconfig(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
|
||||
$enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
|
||||
set_pconfig(local_user(),'fromgplus','enable', $enable);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -145,8 +227,9 @@ function gpluspost_send(&$a,&$b) {
|
|||
|
||||
// if post comes from Google+ don't send it back
|
||||
if (!get_pconfig($b["uid"],'gpluspost','no_loop_prevention') and ($b['app'] == "Google+"))
|
||||
return;
|
||||
return;
|
||||
|
||||
// Always do the export via RSS-Feed (even if NextScripts is enabled), since it doesn't hurt
|
||||
$itemlist = get_pconfig($b["uid"],'gpluspost','itemlist');
|
||||
$items = explode(",", $itemlist);
|
||||
|
||||
|
|
@ -161,6 +244,263 @@ function gpluspost_send(&$a,&$b) {
|
|||
logger('gpluspost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
|
||||
|
||||
set_pconfig($b["uid"],'gpluspost','itemlist', $itemlist);
|
||||
|
||||
// Posting via NextScripts
|
||||
if (gpluspost_nextscripts()) {
|
||||
$username = get_pconfig($b['uid'],'gpluspost','username');
|
||||
$password = get_pconfig($b['uid'],'gpluspost','password');
|
||||
$page = get_pconfig($b['uid'],'gpluspost','page');
|
||||
|
||||
$success = false;
|
||||
|
||||
if($username && $password) {
|
||||
require_once("addon/gpluspost/postToGooglePlus.php");
|
||||
|
||||
$data = gpluspost_createmsg($b);
|
||||
|
||||
logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DEBUG);
|
||||
|
||||
$loginError = doConnectToGooglePlus2($username, $password);
|
||||
if (!$loginError) {
|
||||
if ($data["link"] != "")
|
||||
$lnk = doGetGoogleUrlInfo2($data["link"]);
|
||||
elseif ($data["image"] != "")
|
||||
$lnk = array('img'=>$data["image"]);
|
||||
else
|
||||
$lnk = "";
|
||||
|
||||
// Send a special blank to identify the post through the "fromgplus" addon
|
||||
$blank = html_entity_decode(" ", ENT_QUOTES, 'UTF-8');
|
||||
|
||||
doPostToGooglePlus2($data["msg"].$blank, $lnk, $page);
|
||||
|
||||
$success = true;
|
||||
|
||||
logger('gpluspost_send: '.$b['uid'].' success', LOGGER_DEBUG);
|
||||
} else
|
||||
logger('gpluspost_send: '.$b['uid'].' failed '.$loginError, LOGGER_DEBUG);
|
||||
|
||||
if (!$success) {
|
||||
logger('gpluspost_send: requeueing '.$b['uid'], LOGGER_DEBUG);
|
||||
|
||||
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
|
||||
if (count($r))
|
||||
$a->contact = $r[0]["id"];
|
||||
|
||||
$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $data));
|
||||
require_once('include/queue_fn.php');
|
||||
add_to_queue($a->contact,NETWORK_GPLUS,$s);
|
||||
notice(t('Google+ post failed. Queued for retry.').EOL);
|
||||
}
|
||||
} else
|
||||
logger('gpluspost_send: '.$b['uid'].' missing username or password', LOGGER_DEBUG);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function gpluspost_createmsg($b) {
|
||||
require_once("include/bbcode.php");
|
||||
require_once("include/html2plain.php");
|
||||
|
||||
$b['body'] = bb_CleanPictureLinks($b['body']);
|
||||
|
||||
// Looking for the first image
|
||||
$image = '';
|
||||
if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$b['body'],$matches))
|
||||
$image = $matches[3];
|
||||
|
||||
if ($image == '')
|
||||
if(preg_match("/\[img\](.*?)\[\/img\]/is",$b['body'],$matches))
|
||||
$image = $matches[1];
|
||||
|
||||
$multipleimages = (strpos($b['body'], "[img") != strrpos($b['body'], "[img"));
|
||||
|
||||
// When saved into the database the content is sent through htmlspecialchars
|
||||
// That means that we have to decode all image-urls
|
||||
$image = htmlspecialchars_decode($image);
|
||||
|
||||
$body = $b["body"];
|
||||
if ($b["title"] != "")
|
||||
$body = "*".$b["title"]."*\n\n".$body;
|
||||
|
||||
if (strpos($body, "[bookmark") !== false) {
|
||||
// splitting the text in two parts:
|
||||
// before and after the bookmark
|
||||
$pos = strpos($body, "[bookmark");
|
||||
$body1 = substr($body, 0, $pos);
|
||||
$body2 = substr($body, $pos);
|
||||
|
||||
// Removing all quotes after the bookmark
|
||||
// they are mostly only the content after the bookmark.
|
||||
$body2 = preg_replace("/\[quote\=([^\]]*)\](.*?)\[\/quote\]/ism",'',$body2);
|
||||
$body2 = preg_replace("/\[quote\](.*?)\[\/quote\]/ism",'',$body2);
|
||||
|
||||
$pos2 = strpos($body2, "[/bookmark]");
|
||||
if ($pos2)
|
||||
$body2 = substr($body2, $pos2 + 11);
|
||||
|
||||
$body = $body1.$body2;
|
||||
}
|
||||
|
||||
// Add some newlines so that the message could be cut better
|
||||
$body = str_replace(array("[quote", "[bookmark", "[/bookmark]", "[/quote]"),
|
||||
array("\n[quote", "\n[bookmark", "[/bookmark]\n", "[/quote]\n"), $body);
|
||||
|
||||
// remove the recycle signs and the names since they aren't helpful on twitter
|
||||
// recycle 1
|
||||
$recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
|
||||
$body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body);
|
||||
|
||||
// remove the share element
|
||||
//$body = preg_replace("/\[share(.*?)\](.*?)\[\/share\]/ism","\n\n$2\n\n",$body);
|
||||
|
||||
$body = preg_replace("(\[b\](.*?)\[\/b\])ism",'*$1*',$body);
|
||||
$body = preg_replace("(\[i\](.*?)\[\/i\])ism",'_$1_',$body);
|
||||
$body = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$body);
|
||||
|
||||
// At first convert the text to html
|
||||
$html = bbcode($body, false, false, 2);
|
||||
|
||||
// Then convert it to plain text
|
||||
//$msg = trim($b['title']." \n\n".html2plain($html, 0, true));
|
||||
$msg = trim(html2plain($html, 0, true));
|
||||
$msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
|
||||
|
||||
// Removing multiple newlines
|
||||
while (strpos($msg, "\n\n\n") !== false)
|
||||
$msg = str_replace("\n\n\n", "\n\n", $msg);
|
||||
|
||||
// Removing multiple spaces
|
||||
while (strpos($msg, " ") !== false)
|
||||
$msg = str_replace(" ", " ", $msg);
|
||||
|
||||
// Removing URLs
|
||||
$msg = preg_replace('/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', "", $msg);
|
||||
|
||||
$msg = trim($msg);
|
||||
|
||||
$link = '';
|
||||
// look for bookmark-bbcode and handle it with priority
|
||||
if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
|
||||
$link = $matches[1];
|
||||
|
||||
$multiplelinks = (strpos($b['body'], "[bookmark") != strrpos($b['body'], "[bookmark"));
|
||||
|
||||
// If there is no bookmark element then take the first link
|
||||
if ($link == '') {
|
||||
$links = collecturls($html);
|
||||
if (sizeof($links) > 0) {
|
||||
reset($links);
|
||||
$link = current($links);
|
||||
}
|
||||
$multiplelinks = (sizeof($links) > 1);
|
||||
}
|
||||
|
||||
$msglink = "";
|
||||
if ($multiplelinks)
|
||||
$msglink = $b["plink"];
|
||||
else if ($link != "")
|
||||
$msglink = $link;
|
||||
else if ($multipleimages)
|
||||
$msglink = $b["plink"];
|
||||
else if ($image != "")
|
||||
$msglink = $image;
|
||||
|
||||
// Removing multiple spaces - again
|
||||
while (strpos($msg, " ") !== false)
|
||||
$msg = str_replace(" ", " ", $msg);
|
||||
|
||||
if ($msglink != "") {
|
||||
// Looking if the link points to an image
|
||||
$img_str = fetch_url($msglink);
|
||||
|
||||
$tempfile = tempnam(get_config("system","temppath"), "cache");
|
||||
file_put_contents($tempfile, $img_str);
|
||||
$mime = image_type_to_mime_type(exif_imagetype($tempfile));
|
||||
unlink($tempfile);
|
||||
} else
|
||||
$mime = "";
|
||||
|
||||
if (($image == $msglink) OR (substr($mime, 0, 6) == "image/"))
|
||||
return(array("msg"=>trim($msg), "link"=>"", "image"=>$msglink));
|
||||
else
|
||||
return(array("msg"=>trim($msg), "link"=>$msglink, "image"=>""));
|
||||
}
|
||||
|
||||
function gpluspost_queue_hook(&$a,&$b) {
|
||||
|
||||
$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
|
||||
dbesc(NETWORK_GPLUS)
|
||||
);
|
||||
if(! count($qi))
|
||||
return;
|
||||
|
||||
require_once('include/queue_fn.php');
|
||||
|
||||
foreach($qi as $x) {
|
||||
if($x['network'] !== NETWORK_GPLUS)
|
||||
continue;
|
||||
|
||||
logger('gpluspost_queue: run');
|
||||
|
||||
$r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
|
||||
WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
|
||||
intval($x['cid'])
|
||||
);
|
||||
if(! count($r))
|
||||
continue;
|
||||
|
||||
$userdata = $r[0];
|
||||
|
||||
//logger('gpluspost_queue: fetching userdata '.print_r($userdata, true));
|
||||
|
||||
$username = get_pconfig($userdata['uid'],'gpluspost','username');
|
||||
$password = get_pconfig($userdata['uid'],'gpluspost','password');
|
||||
$page = get_pconfig($userdata['uid'],'gpluspost','page');
|
||||
|
||||
$success = false;
|
||||
|
||||
if($username && $password) {
|
||||
require_once("addon/googleplus/postToGooglePlus.php");
|
||||
|
||||
logger('gpluspost_queue: able to post for user '.$username);
|
||||
|
||||
$z = unserialize($x['content']);
|
||||
|
||||
$data = $z['post'];
|
||||
// $z['url']
|
||||
|
||||
logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DATA);
|
||||
|
||||
$loginError = doConnectToGooglePlus2($username, $password);
|
||||
if (!$loginError) {
|
||||
if ($data["link"] != "")
|
||||
$lnk = doGetGoogleUrlInfo2($data["link"]);
|
||||
elseif ($data["image"] != "")
|
||||
$lnk = array('img'=>$data["image"]);
|
||||
else
|
||||
$lnk = "";
|
||||
|
||||
// Send a special blank to identify the post through the "fromgplus" addon
|
||||
$blank = html_entity_decode(" ", ENT_QUOTES, 'UTF-8');
|
||||
|
||||
doPostToGooglePlus2($data["msg"].$blank, $lnk, $page);
|
||||
|
||||
logger('gpluspost_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
|
||||
|
||||
$success = true;
|
||||
|
||||
remove_queue_item($x['id']);
|
||||
} else
|
||||
logger('gpluspost_queue: send '.$userdata['uid'].' failed '.$loginError, LOGGER_DEBUG);
|
||||
} else
|
||||
logger('gpluspost_queue: send '.$userdata['uid'].' missing username or password', LOGGER_DEBUG);
|
||||
|
||||
if (!$success) {
|
||||
logger('gpluspost_queue: delayed');
|
||||
update_queue_time($x['id']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function gpluspost_module() {}
|
||||
|
|
|
|||
|
|
@ -64,11 +64,11 @@ function libertree_settings(&$a,&$s) {
|
|||
/* Add some HTML to the existing form */
|
||||
|
||||
$s .= '<span id="settings_libertree_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
|
||||
$s .= '<h3>' . t('libertree Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/libertree.png" /><h3 class="connector">'. t('libertree Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_libertree_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
|
||||
$s .= '<h3>' . t('libertree Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/libertree.png" /><h3 class="connector">'. t('libertree Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
$s .= '<div id="libertree-enable-wrapper">';
|
||||
|
|
|
|||
|
|
@ -219,11 +219,11 @@ function pumpio_settings(&$a,&$s) {
|
|||
/* Add some HTML to the existing form */
|
||||
|
||||
$s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
|
||||
$s .= '<h3>' . t('Pump.io Import/Export/Mirror') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/pumpio.png" /><h3 class="connector">'. t('Pump.io Import/Export/Mirror').'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
|
||||
$s .= '<h3>' . t('Pump.io Import/Export/Mirror') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/pumpio.png" /><h3 class="connector">'. t('Pump.io Import/Export/Mirror').'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
$s .= '<div id="pumpio-username-wrapper">';
|
||||
|
|
|
|||
|
|
@ -291,11 +291,11 @@ function statusnet_settings(&$a,&$s) {
|
|||
|
||||
|
||||
$s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
|
||||
$s .= '<h3>'. t('StatusNet Import/Export/Mirror').'</h3>';
|
||||
$s .= '<img class="connector" src="images/gnusocial.png" /><h3 class="connector">'. t('StatusNet Import/Export/Mirror').'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
|
||||
$s .= '<h3>'. t('StatusNet Import/Export/Mirror').'</h3>';
|
||||
$s .= '<img class="connector" src="images/gnusocial.png" /><h3 class="connector">'. t('StatusNet Import/Export/Mirror').'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
if ( (!$ckey) && (!$csecret) ) {
|
||||
|
|
|
|||
|
|
@ -182,11 +182,11 @@ function tumblr_settings(&$a,&$s) {
|
|||
/* Add some HTML to the existing form */
|
||||
|
||||
$s .= '<span id="settings_tumblr_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
|
||||
$s .= '<h3>' . t('Tumblr Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/tumblr.png" /><h3 class="connector">'. t('Tumblr Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_tumblr_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
|
||||
$s .= '<h3>' . t('Tumblr Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/tumblr.png" /><h3 class="connector">'. t('Tumblr Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
$s .= '<div id="tumblr-username-wrapper">';
|
||||
|
|
|
|||
|
|
@ -233,11 +233,11 @@ function twitter_settings(&$a,&$s) {
|
|||
$globalshortening = get_config('twitter','intelligent_shortening');
|
||||
|
||||
$s .= '<span id="settings_twitter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
|
||||
$s .= '<h3>'. t('Twitter Import/Export/Mirror') .'</h3>';
|
||||
$s .= '<img class="connector" src="images/twitter.png" /><h3 class="connector">'. t('Twitter Import/Export/Mirror').'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_twitter_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
|
||||
$s .= '<h3>'. t('Twitter Import/Export/Mirror') .'</h3>';
|
||||
$s .= '<img class="connector" src="images/twitter.png" /><h3 class="connector">'. t('Twitter Import/Export/Mirror').'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
if ( (!$ckey) && (!$csecret) ) {
|
||||
|
|
@ -955,6 +955,7 @@ function twitter_fetchtimeline($a, $uid) {
|
|||
$has_picture = false;
|
||||
|
||||
require_once('mod/item.php');
|
||||
require_once('include/items.php');
|
||||
|
||||
require_once('library/twitteroauth.php');
|
||||
$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
|
||||
|
|
|
|||
|
|
@ -73,11 +73,11 @@ function wppost_settings(&$a,&$s) {
|
|||
/* Add some HTML to the existing form */
|
||||
|
||||
$s .= '<span id="settings_wppost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
|
||||
$s .= '<h3>' . t('WordPress Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/wordpress.png" /><h3 class="connector">'. t('Wordpress Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_wppost_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
|
||||
$s .= '<h3>' . t('WordPress Export') . '</h3>';
|
||||
$s .= '<img class="connector" src="images/wordpress.png" /><h3 class="connector">'. t('Wordpress Export').'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="wppost-enable-wrapper">';
|
||||
$s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . t('Enable WordPress Post Plugin') . '</label>';
|
||||
|
|
|
|||
Loading…
Reference in New Issue