Merge pull request #1065 from annando/master
Refreshing of the network page only when the page is at the beginning
This commit is contained in:
commit
cf0ebd952f
11 changed files with 89 additions and 72 deletions
32
mod/item.php
32
mod/item.php
|
|
@ -77,9 +77,12 @@ function item_post(&$a) {
|
|||
$thr_parent = '';
|
||||
$parid = 0;
|
||||
$r = false;
|
||||
$objecttype = null;
|
||||
|
||||
if($parent || $parent_uri) {
|
||||
|
||||
$objecttype = ACTIVITY_OBJ_COMMENT;
|
||||
|
||||
if(! x($_REQUEST,'type'))
|
||||
$_REQUEST['type'] = 'net-comment';
|
||||
|
||||
|
|
@ -195,6 +198,7 @@ function item_post(&$a) {
|
|||
$location = $orig_post['location'];
|
||||
$coord = $orig_post['coord'];
|
||||
$verb = $orig_post['verb'];
|
||||
$objecttype = $orig_post['object-type'];
|
||||
$emailcc = $orig_post['emailcc'];
|
||||
$app = $orig_post['app'];
|
||||
$categories = $orig_post['file'];
|
||||
|
|
@ -425,6 +429,9 @@ function item_post(&$a) {
|
|||
if((! $preview) && preg_match_all("/\[img([\=0-9x]*?)\](.*?)\[\/img\]/",$body,$match)) {
|
||||
$images = $match[2];
|
||||
if(count($images)) {
|
||||
|
||||
$objecttype = ACTIVITY_OBJ_IMAGE;
|
||||
|
||||
foreach($images as $image) {
|
||||
if(! stristr($image,$a->get_baseurl() . '/photo/'))
|
||||
continue;
|
||||
|
|
@ -494,6 +501,7 @@ function item_post(&$a) {
|
|||
|
||||
$bookmark = 0;
|
||||
if(preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$body,$match,PREG_SET_ORDER)) {
|
||||
$objecttype = ACTIVITY_OBJ_BOOKMARK;
|
||||
$bookmark = 1;
|
||||
}
|
||||
|
||||
|
|
@ -509,6 +517,20 @@ function item_post(&$a) {
|
|||
$body = scale_external_images($body,false);
|
||||
|
||||
|
||||
// Setting the object type if not defined before
|
||||
if (!$objecttype) {
|
||||
$objecttype = ACTIVITY_OBJ_NOTE; // Default value
|
||||
require_once("include/plaintext.php");
|
||||
$objectdata = get_attached_data($body);
|
||||
|
||||
if ($post["type"] == "link")
|
||||
$objecttype = ACTIVITY_OBJ_BOOKMARK;
|
||||
elseif ($post["type"] == "video")
|
||||
$objecttype = ACTIVITY_OBJ_VIDEO;
|
||||
elseif ($post["type"] == "photo")
|
||||
$objecttype = ACTIVITY_OBJ_IMAGE;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Look for any tags and linkify them
|
||||
|
|
@ -641,6 +663,7 @@ function item_post(&$a) {
|
|||
$datarray['file'] = $categories;
|
||||
$datarray['inform'] = $inform;
|
||||
$datarray['verb'] = $verb;
|
||||
$datarray['object-type'] = $objecttype;
|
||||
$datarray['allow_cid'] = $str_contact_allow;
|
||||
$datarray['allow_gid'] = $str_group_allow;
|
||||
$datarray['deny_cid'] = $str_contact_deny;
|
||||
|
|
@ -728,8 +751,8 @@ function item_post(&$a) {
|
|||
|
||||
$r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`, `network`, `contact-id`,`owner-name`,`owner-link`,`owner-avatar`,
|
||||
`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `commented`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`,
|
||||
`tag`, `inform`, `verb`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated`, `file` )
|
||||
VALUES( '%s', %d, '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s' )",
|
||||
`tag`, `inform`, `verb`, `object-type`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated`, `file` )
|
||||
VALUES( '%s', %d, '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s' )",
|
||||
dbesc($datarray['guid']),
|
||||
intval($datarray['uid']),
|
||||
dbesc($datarray['type']),
|
||||
|
|
@ -758,6 +781,7 @@ function item_post(&$a) {
|
|||
dbesc($datarray['tag']),
|
||||
dbesc($datarray['inform']),
|
||||
dbesc($datarray['verb']),
|
||||
dbesc($datarray['object-type']),
|
||||
dbesc($datarray['postopts']),
|
||||
dbesc($datarray['allow_cid']),
|
||||
dbesc($datarray['allow_gid']),
|
||||
|
|
@ -911,10 +935,6 @@ function item_post(&$a) {
|
|||
|
||||
call_hooks('post_local_end', $datarray);
|
||||
|
||||
// if no auto update is enabled, then disable it temporarily
|
||||
if (get_pconfig($profile_uid, "system", "no_auto_update") == 1)
|
||||
set_pconfig($profile_uid, "system", "no_auto_update", -1);
|
||||
|
||||
if(strlen($emailcc) && $profile_uid == local_user()) {
|
||||
$erecips = explode(',', $emailcc);
|
||||
if(count($erecips)) {
|
||||
|
|
|
|||
|
|
@ -136,10 +136,6 @@ function like_content(&$a) {
|
|||
// Save the author information for the unlike in case we need to relay to Diaspora
|
||||
store_diaspora_like_retract_sig($activity, $item, $like_item, $contact);
|
||||
|
||||
// if no auto update is enabled, then disable it temporarily
|
||||
if (get_pconfig($owner_uid, "system", "no_auto_update") == 1)
|
||||
set_pconfig($owner_uid, "system", "no_auto_update", -1);
|
||||
|
||||
// proc_run('php',"include/notifier.php","like","$post_id"); // $post_id isn't defined here!
|
||||
$like_item_id = $like_item['id'];
|
||||
proc_run('php',"include/notifier.php","like","$like_item_id");
|
||||
|
|
@ -222,10 +218,6 @@ EOT;
|
|||
// Save the author information for the like in case we need to relay to Diaspora
|
||||
store_diaspora_like_sig($activity, $post_type, $contact, $post_id);
|
||||
|
||||
// if no auto update is enabled, then disable it temporarily
|
||||
if (get_pconfig($owner_uid, "system", "no_auto_update") == 1)
|
||||
set_pconfig($owner_uid, "system", "no_auto_update", -1);
|
||||
|
||||
$arr['id'] = $post_id;
|
||||
|
||||
call_hooks('post_local_end', $arr);
|
||||
|
|
|
|||
|
|
@ -71,8 +71,7 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
|
|||
curl_setopt($ch, CURLOPT_TIMEOUT, 3);
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
||||
//curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
|
||||
//curl_setopt($ch,CURLOPT_USERAGENT,' Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:24.0) Gecko/20100101 Firefox/24.0');
|
||||
curl_setopt($ch,CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Friendica)");
|
||||
curl_setopt($ch,CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION.")");
|
||||
|
||||
$header = curl_exec($ch);
|
||||
$curl_info = @curl_getinfo($ch);
|
||||
|
|
|
|||
|
|
@ -886,7 +886,7 @@ function settings_content(&$a) {
|
|||
'$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''),
|
||||
'$noinfo' => array('noinfo', t("Don't show notices"), $noinfo, ''),
|
||||
'$infinite_scroll' => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''),
|
||||
'$no_auto_update' => array('no_auto_update', t("Disable automatic network update"), $no_auto_update, ''),
|
||||
'$no_auto_update' => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'),
|
||||
|
||||
'$theme_config' => $theme_config,
|
||||
));
|
||||
|
|
|
|||
|
|
@ -13,12 +13,9 @@ function update_network_content(&$a) {
|
|||
echo "<!DOCTYPE html><html><body>\r\n";
|
||||
echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
|
||||
|
||||
$no_auto_update = get_pconfig($profile_uid, "system", "no_auto_update");
|
||||
if ($no_auto_update <= 0) {
|
||||
if (!get_pconfig($profile_uid, "system", "no_auto_update") OR ($_GET['force'] == 1))
|
||||
$text = network_content($a,$profile_uid);
|
||||
if ($no_auto_update < 0)
|
||||
set_pconfig($profile_uid, "system", "no_auto_update", 1);
|
||||
} else
|
||||
else
|
||||
$text = "";
|
||||
|
||||
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue