CSR changes, split dbclean in separate processes if worker is active
This commit is contained in:
Michael Vogel
parent
31409e2ca1
commit
b429b85680
10 changed files with 592 additions and 589 deletions
152
mod/display.php
152
mod/display.php
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
function display_init(&$a) {
|
||||
|
||||
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
|
||||
if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ function display_init(&$a) {
|
|||
$r = qu("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
|
||||
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
|
||||
AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user());
|
||||
if (count($r)) {
|
||||
if (dbm::isresult($r)) {
|
||||
$nick = $a->user["nickname"];
|
||||
$itemuid = local_user();
|
||||
}
|
||||
|
|
@ -35,7 +35,7 @@ function display_init(&$a) {
|
|||
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
|
||||
AND NOT `item`.`private` AND NOT `user`.`hidewall`
|
||||
AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
|
||||
if (count($r)) {
|
||||
if (dbm::isresult($r)) {
|
||||
$nick = $r[0]["nickname"];
|
||||
$itemuid = $r[0]["uid"];
|
||||
}
|
||||
|
|
@ -51,12 +51,12 @@ function display_init(&$a) {
|
|||
AND NOT `item`.`private` AND `item`.`uid` = 0
|
||||
AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
|
||||
}
|
||||
if (count($r)) {
|
||||
if ($r[0]["id"] != $r[0]["parent"])
|
||||
if (dbm::isresult($r)) {
|
||||
if ($r[0]["id"] != $r[0]["parent"]) {
|
||||
$r = qu("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
|
||||
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
|
||||
AND `id` = %d", $r[0]["parent"]);
|
||||
|
||||
}
|
||||
if (($itemuid != local_user()) AND local_user()) {
|
||||
// Do we know this contact but we haven't got this item?
|
||||
// Copy the wohle thread to our local storage so that we can interact.
|
||||
|
|
@ -66,9 +66,9 @@ function display_init(&$a) {
|
|||
$items = qu("SELECT * FROM `item` WHERE `parent` = %d ORDER BY `id`", intval($r[0]["id"]));
|
||||
foreach ($items AS $item) {
|
||||
$itemcontactid = get_contact($item['owner-link'], local_user());
|
||||
if (!$itemcontactid)
|
||||
if (!$itemcontactid) {
|
||||
$itemcontactid = $contactid;
|
||||
|
||||
}
|
||||
unset($item['id']);
|
||||
$item['uid'] = local_user();
|
||||
$item['origin'] = 0;
|
||||
|
|
@ -90,16 +90,17 @@ function display_init(&$a) {
|
|||
WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
|
||||
dbesc($nickname)
|
||||
);
|
||||
if (count($r))
|
||||
if (dbm::isresult($r)) {
|
||||
$profiledata = $r[0];
|
||||
|
||||
}
|
||||
$profiledata["network"] = NETWORK_DFRN;
|
||||
} else
|
||||
} else {
|
||||
$profiledata = array();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$a->error = 404;
|
||||
notice( t('Item not found.') . EOL);
|
||||
notice(t('Item not found.') . EOL);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -127,48 +128,49 @@ function display_fetchauthor($a, $item) {
|
|||
|
||||
// Skip if it isn't a pure repeated messages
|
||||
// Does it start with a share?
|
||||
if (!$skip AND strpos($body, "[share") > 0)
|
||||
if (!$skip AND strpos($body, "[share") > 0) }
|
||||
$skip = true;
|
||||
|
||||
}
|
||||
// Does it end with a share?
|
||||
if (!$skip AND (strlen($body) > (strrpos($body, "[/share]") + 8)))
|
||||
if (!$skip AND (strlen($body) > (strrpos($body, "[/share]") + 8))) {
|
||||
$skip = true;
|
||||
|
||||
}
|
||||
if (!$skip) {
|
||||
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
|
||||
// Skip if there is no shared message in there
|
||||
if ($body == $attributes)
|
||||
if ($body == $attributes) {
|
||||
$skip = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$skip) {
|
||||
$author = "";
|
||||
preg_match("/author='(.*?)'/ism", $attributes, $matches);
|
||||
if ($matches[1] != "")
|
||||
if ($matches[1] != "") {
|
||||
$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
|
||||
|
||||
}
|
||||
preg_match('/author="(.*?)"/ism', $attributes, $matches);
|
||||
if ($matches[1] != "")
|
||||
if ($matches[1] != "") {
|
||||
$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
|
||||
|
||||
}
|
||||
$profile = "";
|
||||
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
|
||||
if ($matches[1] != "")
|
||||
if ($matches[1] != "") {
|
||||
$profiledata["url"] = $matches[1];
|
||||
|
||||
}
|
||||
preg_match('/profile="(.*?)"/ism', $attributes, $matches);
|
||||
if ($matches[1] != "")
|
||||
if ($matches[1] != "") {
|
||||
$profiledata["url"] = $matches[1];
|
||||
|
||||
}
|
||||
$avatar = "";
|
||||
preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
|
||||
if ($matches[1] != "")
|
||||
if ($matches[1] != "") {
|
||||
$profiledata["photo"] = $matches[1];
|
||||
|
||||
}
|
||||
preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
|
||||
if ($matches[1] != "")
|
||||
if ($matches[1] != "") {
|
||||
$profiledata["photo"] = $matches[1];
|
||||
|
||||
}
|
||||
$profiledata["nickname"] = $profiledata["name"];
|
||||
$profiledata["network"] = GetProfileUsername($profiledata["url"], "", false, true);
|
||||
|
||||
|
|
@ -181,8 +183,9 @@ function display_fetchauthor($a, $item) {
|
|||
$profiledata["photo"] = App::remove_baseurl($profiledata["photo"]);
|
||||
|
||||
if (local_user()) {
|
||||
if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
|
||||
if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
|
||||
$profiledata["remoteconnect"] = $a->get_baseurl()."/follow?url=".urlencode($profiledata["url"]);
|
||||
}
|
||||
} elseif ($profiledata["network"] == NETWORK_DFRN) {
|
||||
$connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
|
||||
$profiledata["remoteconnect"] = $connect;
|
||||
|
|
@ -193,8 +196,8 @@ function display_fetchauthor($a, $item) {
|
|||
|
||||
function display_content(&$a, $update = 0) {
|
||||
|
||||
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
|
||||
notice( t('Public access denied.') . EOL);
|
||||
if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
|
||||
notice(t('Public access denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -208,18 +211,16 @@ function display_content(&$a, $update = 0) {
|
|||
$a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array());
|
||||
|
||||
|
||||
if($update) {
|
||||
if ($update) {
|
||||
$nick = $_REQUEST['nick'];
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$nick = (($a->argc > 1) ? $a->argv[1] : '');
|
||||
}
|
||||
|
||||
if($update) {
|
||||
if ($update) {
|
||||
$item_id = $_REQUEST['item_id'];
|
||||
$a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$item_id = (($a->argc > 2) ? $a->argv[2] : 0);
|
||||
|
||||
if ($a->argc == 2) {
|
||||
|
|
@ -229,7 +230,7 @@ function display_content(&$a, $update = 0) {
|
|||
$r = qu("SELECT `id` FROM `item`
|
||||
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
|
||||
AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user());
|
||||
if (count($r)) {
|
||||
if (dbm::isresult($r)) {
|
||||
$item_id = $r[0]["id"];
|
||||
$nick = $a->user["nickname"];
|
||||
}
|
||||
|
|
@ -243,7 +244,7 @@ function display_content(&$a, $update = 0) {
|
|||
AND NOT `item`.`private` AND NOT `user`.`hidewall`
|
||||
AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
|
||||
// AND NOT `item`.`private` AND `item`.`wall`
|
||||
if (count($r)) {
|
||||
if (dbm::isresult($r)) {
|
||||
$item_id = $r[0]["id"];
|
||||
$nick = $r[0]["nickname"];
|
||||
}
|
||||
|
|
@ -256,7 +257,7 @@ function display_content(&$a, $update = 0) {
|
|||
AND NOT `item`.`private` AND `item`.`uid` = 0
|
||||
AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
|
||||
// AND NOT `item`.`private` AND `item`.`wall`
|
||||
if (count($r)) {
|
||||
if (dbm::isresult($r)) {
|
||||
$item_id = $r[0]["id"];
|
||||
}
|
||||
}
|
||||
|
|
@ -266,10 +267,11 @@ function display_content(&$a, $update = 0) {
|
|||
if ($item_id AND !is_numeric($item_id)) {
|
||||
$r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
||||
dbesc($item_id), intval($a->profile['uid']));
|
||||
if ($r)
|
||||
if (dbm::is_result($r)) {
|
||||
$item_id = $r[0]["id"];
|
||||
else
|
||||
} else {
|
||||
$item_id = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$item_id) {
|
||||
|
|
@ -286,29 +288,29 @@ function display_content(&$a, $update = 0) {
|
|||
|
||||
$contact_id = 0;
|
||||
|
||||
if(is_array($_SESSION['remote'])) {
|
||||
foreach($_SESSION['remote'] as $v) {
|
||||
if($v['uid'] == $a->profile['uid']) {
|
||||
if (is_array($_SESSION['remote'])) {
|
||||
foreach ($_SESSION['remote'] as $v) {
|
||||
if ($v['uid'] == $a->profile['uid']) {
|
||||
$contact_id = $v['cid'];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if($contact_id) {
|
||||
if ($contact_id) {
|
||||
$groups = init_groups_visitor($contact_id);
|
||||
$r = qu("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($contact_id),
|
||||
intval($a->profile['uid'])
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::isresult($r)) {
|
||||
$contact = $r[0];
|
||||
$remote_contact = true;
|
||||
}
|
||||
}
|
||||
|
||||
if(! $remote_contact) {
|
||||
if(local_user()) {
|
||||
if (!$remote_contact) {
|
||||
if (local_user()) {
|
||||
$contact_id = $_SESSION['cid'];
|
||||
$contact = $a->contact;
|
||||
}
|
||||
|
|
@ -317,13 +319,13 @@ function display_content(&$a, $update = 0) {
|
|||
$r = qu("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
|
||||
intval($a->profile['uid'])
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::isresult($r)) {
|
||||
$a->page_contact = $r[0];
|
||||
|
||||
}
|
||||
$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
|
||||
|
||||
if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
|
||||
notice( t('Access to this profile has been restricted.') . EOL);
|
||||
if ($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
|
||||
notice(t('Access to this profile has been restricted.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -347,7 +349,7 @@ function display_content(&$a, $update = 0) {
|
|||
|
||||
$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
|
||||
|
||||
if($update) {
|
||||
if ($update) {
|
||||
|
||||
$r = qu("SELECT `id` FROM `item` WHERE `item`.`uid` = %d
|
||||
AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d)
|
||||
|
|
@ -356,8 +358,9 @@ function display_content(&$a, $update = 0) {
|
|||
intval($item_id)
|
||||
);
|
||||
|
||||
if(!$r)
|
||||
if (!$r) {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
$r = qu(item_query()." AND `item`.`uid` = %d
|
||||
|
|
@ -369,7 +372,7 @@ function display_content(&$a, $update = 0) {
|
|||
);
|
||||
|
||||
|
||||
if(!$r && local_user()) {
|
||||
if (!$r && local_user()) {
|
||||
// Check if this is another person's link to a post that we have
|
||||
$r = qu("SELECT `item`.uri FROM `item`
|
||||
WHERE (`item`.`id` = %d OR `item`.`uri` = '%s')
|
||||
|
|
@ -377,7 +380,7 @@ function display_content(&$a, $update = 0) {
|
|||
intval($item_id),
|
||||
dbesc($item_id)
|
||||
);
|
||||
if($r) {
|
||||
if (dbm::is_result($r)) {
|
||||
$item_uri = $r[0]['uri'];
|
||||
|
||||
$r = qu(item_query()." AND `item`.`uid` = %d
|
||||
|
|
@ -390,23 +393,24 @@ function display_content(&$a, $update = 0) {
|
|||
}
|
||||
}
|
||||
|
||||
if($r) {
|
||||
if ($r) {
|
||||
|
||||
if((local_user()) && (local_user() == $a->profile['uid'])) {
|
||||
if ((local_user()) && (local_user() == $a->profile['uid'])) {
|
||||
$unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `parent` = %d",
|
||||
intval($r[0]['parent']));
|
||||
|
||||
if ($unseen)
|
||||
q("UPDATE `item` SET `unseen` = 0
|
||||
WHERE `parent` = %d AND `unseen`",
|
||||
if ($unseen) {
|
||||
q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d AND `unseen`",
|
||||
intval($r[0]['parent'])
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
$items = conv_sort($r,"`commented`");
|
||||
|
||||
if(!$update)
|
||||
if (!$update) {
|
||||
$o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>";
|
||||
}
|
||||
$o .= conversation($a,$items,'display', $update);
|
||||
|
||||
// Preparing the meta header
|
||||
|
|
@ -418,9 +422,9 @@ function display_content(&$a, $update = 0) {
|
|||
|
||||
$image = $a->remove_baseurl($r[0]["thumb"]);
|
||||
|
||||
if ($title == "")
|
||||
if ($title == "") {
|
||||
$title = $author_name;
|
||||
|
||||
}
|
||||
$description = htmlspecialchars($description, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
|
||||
$title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
|
||||
$author_name = htmlspecialchars($author_name, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
|
||||
|
|
@ -464,16 +468,14 @@ function display_content(&$a, $update = 0) {
|
|||
dbesc($item_id),
|
||||
dbesc($item_id)
|
||||
);
|
||||
if($r) {
|
||||
if($r[0]['deleted']) {
|
||||
notice( t('Item has been removed.') . EOL );
|
||||
if ($r) {
|
||||
if ($r[0]['deleted']) {
|
||||
notice(t('Item has been removed.') . EOL );
|
||||
} else {
|
||||
notice(t('Permission denied.') . EOL );
|
||||
}
|
||||
else {
|
||||
notice( t('Permission denied.') . EOL );
|
||||
}
|
||||
}
|
||||
else {
|
||||
notice( t('Item not found.') . EOL );
|
||||
} else {
|
||||
notice(t('Item not found.') . EOL );
|
||||
}
|
||||
|
||||
return $o;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue