define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+
require_once('mod/share.php');
require_once('mod/parse_url.php');
+require_once('include/text.php');
function fromgplus_install() {
register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
if (count($result) > 0)
return;
- $enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
- $account = get_pconfig(local_user(),'fromgplus','account');
+ $enable_checked = (intval(PConfig::get(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
+ $keywords_checked = (intval(PConfig::get(local_user(), 'fromgplus', 'keywords')) ? ' checked="checked"' : '');
+ $account = PConfig::get(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 .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. t('Google+ Mirror').'</h3>';
$s .= '<label id="fromgplus-label" for="fromgplus-account">'.t('Google Account ID').' </label>';
$s .= '<input id="fromgplus-account" type="text" name="fromgplus-account" value="'.$account.'" />';
$s .= '</div><div class="clear"></div>';
+ $s .= '<label id="fromgplus-keywords-label" for="fromgplus-keywords">'.t('Add keywords to post').'</label>';
+ $s .= '<input id="fromgplus-keywords" type="checkbox" name="fromgplus-keywords" value="1"'.$keywords_checked.' />';
+ $s .= '<div class="clear"></div>';
- $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fromgplus-submit" name="fromgplus-submit"
+ $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fromgplus-submit" name="fromgplus-submit"
class="settings-submit" value="' . t('Save Settings') . '" /></div>';
$s .= '</div>';
return;
if($_POST['fromgplus-submit']) {
- set_pconfig(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
+ PConfig::set(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);
+ PConfig::set(local_user(),'fromgplus','enable', $enable);
+ $keywords = ((x($_POST, 'fromgplus-keywords')) ? intval($_POST['fromgplus-keywords']) : 0);
+ PConfig::set(local_user(),'fromgplus', 'keywords', $keywords);
if (!$enable)
del_pconfig(local_user(),'fromgplus','lastdate');
$o = replace_macros($t, array(
'$submit' => t('Save Settings'),
- '$key' => array('key', t('Key'), trim(get_config('fromgplus', 'key')), t('')),
+ '$key' => array('key', t('Key'), trim(Config::get('fromgplus', 'key')), t('')),
));
}
function fromgplus_plugin_admin_post(&$a){
$key = ((x($_POST,'key')) ? trim($_POST['key']) : '');
- set_config('fromgplus','key',$key);
+ Config::set('fromgplus','key',$key);
info( t('Settings updated.'). EOL );
}
function fromgplus_cron($a,$b) {
- $last = get_config('fromgplus','last_poll');
+ $last = Config::get('fromgplus','last_poll');
- $poll_interval = intval(get_config('fromgplus','poll_interval'));
+ $poll_interval = intval(Config::get('fromgplus','poll_interval'));
if(! $poll_interval)
$poll_interval = FROMGPLUS_DEFAULT_POLL_INTERVAL;
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'fromgplus' AND `k` = 'enable' AND `v` = '1' ORDER BY RAND() ");
if(count($r)) {
foreach($r as $rr) {
- $account = get_pconfig($rr['uid'],'fromgplus','account');
+ $account = PConfig::get($rr['uid'],'fromgplus','account');
if ($account) {
logger('fromgplus: fetching for user '.$rr['uid']);
fromgplus_fetch($a, $rr['uid']);
logger('fromgplus: cron_end');
- set_config('fromgplus','last_poll', time());
+ Config::set('fromgplus','last_poll', time());
}
-function fromgplus_post($a, $uid, $source, $body, $location, $coord) {
+function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
//$uid = 2;
$_REQUEST['source'] = $source;
$_REQUEST['extid'] = NETWORK_GPLUS;
+ if (isset($id)) {
+ $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_GPLUS.':'.$id);
+ }
+
// $_REQUEST['verb']
// $_REQUEST['parent']
// $_REQUEST['parent_uri']
$_REQUEST['location'] = $location;
$_REQUEST['coord'] = $coord;
- if (($_REQUEST['title'] == "") AND ($_REQUEST['body'] == "")) {
+ if (($_REQUEST['title'] == "") && ($_REQUEST['body'] == "")) {
logger('fromgplus: empty post for user '.$uid." ".print_r($_REQUEST, true));
return;
}
else
$infoFull = array("0" => 0, "1" => 0);
- if (($infoPreview[0] >= $infoFull[0]) AND ($infoPreview[1] >= $infoFull[1])) {
+ if (($infoPreview[0] >= $infoFull[0]) && ($infoPreview[1] >= $infoFull[1])) {
$temp = $cleaned["full"];
$cleaned["full"] = $cleaned["preview"];
$cleaned["preview"] = $temp;
}
- if (($cleaned["full"] == $cleaned["preview"]) OR (($infoPreview[0] == $infoFull[0]) AND ($infoPreview[1] == $infoFull[1])))
+ if (($cleaned["full"] == $cleaned["preview"]) || (($infoPreview[0] == $infoFull[0]) && ($infoPreview[1] == $infoFull[1])))
$cleaned["preview"] = "";
if ($cleaned["full"] == "")
// Add Keywords to page link
$data = parseurl_getsiteinfo_cached($pagedata["url"], true);
- if (isset($data["keywords"]))
+ if (isset($data["keywords"]) && PConfig::get($uid, 'fromgplus', 'keywords')) {
$pagedata["keywords"] = $data["keywords"];
-
+ }
break;
case "photo":
$pagedata["images"][1]["src"] = $images["preview"];
}
- if (($attachment->displayName != "") AND (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext))) {
+ if (($attachment->displayName != "") && (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext))) {
$post .= fromgplus_html2bbcode($attachment->displayName)."\n";
$pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
}
// Special blank to identify postings from the googleplus connector
$blank = html_entity_decode(" ", ENT_QUOTES, 'UTF-8');
- $account = get_pconfig($uid,'fromgplus','account');
- $key = get_config('fromgplus','key');
+ $account = PConfig::get($uid,'fromgplus','account');
+ $key = Config::get('fromgplus','key');
$result = fetch_url("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
//$result = file_get_contents("google.txt");
$activities = json_decode($result);
- $initiallastdate = get_pconfig($uid,'fromgplus','lastdate');
+ $initiallastdate = PConfig::get($uid,'fromgplus','lastdate');
$first_time = ($initiallastdate == "");
if ($lastdate < strtotime($item->published))
$lastdate = strtotime($item->published);
+ PConfig::set($uid,'fromgplus','lastdate', $lastdate);
+
if ($first_time)
continue;
if (isset($item->location->displayName))
$location = $item->location->displayName;
- if (isset($item->location->position->latitude) AND
+ if (isset($item->location->position->latitude) &&
isset($item->location->position->longitude))
$coord = $item->location->position->latitude." ".$item->location->position->longitude;
} elseif (isset($item->address))
$location = $item->address;
- fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord);
+ fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord, $item->id);
break;
case "activity":
$post = fromgplus_html2bbcode($item->annotation)."\n";
- if (!intval(get_config('system','old_share'))) {
+ if (!intval(Config::get('system','old_share'))) {
if (function_exists("share_header"))
$post .= share_header($item->object->actor->displayName, $item->object->actor->url,
if (isset($item->location->displayName))
$location = $item->location->displayName;
- if (isset($item->location->position->latitude) AND
+ if (isset($item->location->position->latitude) &&
isset($item->location->position->longitude))
$coord = $item->location->position->latitude." ".$item->location->position->longitude;
} elseif (isset($item->address))
$location = $item->address;
- fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord);
+ fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord, $item->id);
break;
}
}
}
if ($lastdate != 0)
- set_pconfig($uid,'fromgplus','lastdate', $lastdate);
+ PConfig::set($uid,'fromgplus','lastdate', $lastdate);
}
projects / friendica-addons.git / blobdiff