mirror of
https://github.com/friendica/friendica
synced 2024-11-09 23:42:53 +00:00
item deletion and hover images
This commit is contained in:
parent
17808daf5e
commit
7a6665b5cf
9 changed files with 92 additions and 45 deletions
Binary file not shown.
Before Width: | Height: | Size: 111 B After Width: | Height: | Size: 111 B |
BIN
images/b_dropshow.gif
Normal file
BIN
images/b_dropshow.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 138 B |
94
mod/item.php
94
mod/item.php
|
@ -13,36 +13,6 @@ function item_post(&$a) {
|
|||
|
||||
$uid = $_SESSION['uid'];
|
||||
|
||||
if(($a->argc == 3) && ($a->argv[1] == 'drop') && intval($a->argv[2])) {
|
||||
$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
|
||||
intval($argv[2])
|
||||
);
|
||||
if(! count($r)) {
|
||||
notice("Permission denied." . EOL);
|
||||
goway($a->get_baseurl() . $_SESSION['return_url']);
|
||||
}
|
||||
$item = $r[0];
|
||||
if(($_SESSION['visitor_id'] == $item['contact-id']) || ($_SESSION['uid'] == $item['uid'])) {
|
||||
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s' WHERE `id` = %d LIMIT 1",
|
||||
dbesc(datetime_convert()),
|
||||
intval($item['id'])
|
||||
);
|
||||
if($item['uri'] == $item['parent-uri']) {
|
||||
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s' WHERE `parent-uri` = '%s',
|
||||
dbesc(datetime_convert()),
|
||||
dbesc($item['parent-uri'])
|
||||
);
|
||||
}
|
||||
|
||||
$url = $a->get_baseurl();
|
||||
$drop_id = intval($item['id'])l
|
||||
|
||||
proc_close(proc_open("php include/notifier.php \"$url\" \"$drop" \"$drop_id\" > notify.log &",
|
||||
array(),$foo));
|
||||
|
||||
goway($a->get_baseurl() . $_SESSION['return_url']);
|
||||
|
||||
}
|
||||
|
||||
$parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0);
|
||||
|
||||
|
@ -211,3 +181,67 @@ function item_post(&$a) {
|
|||
goaway($a->get_baseurl() . "/" . $_POST['return'] );
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
function item_content(&$a) {
|
||||
|
||||
if((! local_user()) && (! remote_user()))
|
||||
return;
|
||||
|
||||
require_once('include/security.php');
|
||||
|
||||
$uid = $_SESSION['uid'];
|
||||
|
||||
if(($a->argc == 3) && ($a->argv[1] == 'drop') && intval($a->argv[2])) {
|
||||
|
||||
// locate item to be deleted
|
||||
|
||||
$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
|
||||
intval($a->argv[2])
|
||||
);
|
||||
|
||||
if(! count($r)) {
|
||||
notice("Item not found." . EOL);
|
||||
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
|
||||
}
|
||||
$item = $r[0];
|
||||
|
||||
// check if logged in user is either the author or owner of this item
|
||||
|
||||
if(($_SESSION['visitor_id'] == $item['contact-id']) || ($_SESSION['uid'] == $item['uid'])) {
|
||||
|
||||
// delete the item
|
||||
|
||||
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s' WHERE `id` = %d LIMIT 1",
|
||||
dbesc(datetime_convert()),
|
||||
intval($item['id'])
|
||||
);
|
||||
|
||||
// If it's the parent of a comment thread, kill all the kids
|
||||
|
||||
if($item['uri'] == $item['parent-uri']) {
|
||||
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s'
|
||||
WHERE `parent-uri` = '%s' AND `uid` = %d ",
|
||||
dbesc(datetime_convert()),
|
||||
dbesc($item['parent-uri']),
|
||||
intval($item['uid'])
|
||||
);
|
||||
}
|
||||
|
||||
$url = $a->get_baseurl();
|
||||
$drop_id = intval($item['id']);
|
||||
|
||||
// send the notification upstream/downstream as the case may be
|
||||
|
||||
proc_close(proc_open("php include/notifier.php \"$url\" \"drop\" \"$drop_id\" > notify.log &",
|
||||
array(),$foo));
|
||||
|
||||
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
|
||||
return; //NOTREACHED
|
||||
}
|
||||
else {
|
||||
notice("Permission denied." . EOL);
|
||||
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
|
||||
return; //NOTREACHED
|
||||
}
|
||||
}
|
||||
}
|
|
@ -219,6 +219,10 @@ function profile_content(&$a, $update = false) {
|
|||
|
||||
$tpl = file_get_contents('view/wall_item.tpl');
|
||||
|
||||
if($update)
|
||||
$return_url = $_SESSION['return_url'];
|
||||
else
|
||||
$return_url = $_SESSION['return_url'] = $a->cmd;
|
||||
|
||||
if(count($r)) {
|
||||
foreach($r as $item) {
|
||||
|
@ -227,10 +231,6 @@ function profile_content(&$a, $update = false) {
|
|||
|
||||
$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
|
||||
|
||||
if($update)
|
||||
$return_url = $_SESSION['return_url'];
|
||||
else
|
||||
$return_url = $_SESSION['return_url'] = $a->cmd;
|
||||
|
||||
|
||||
if(can_write_wall($a,$a->profile['uid'])) {
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
<div id="contact-edit-links" >
|
||||
<a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="Block/Unblock contact" title="$block_text"/></a>
|
||||
<a href="contacts/$contact_id/drop" id="contact-edit-drop-link"><img src="images/b_drop.gif" alt="Delete contact" title="Delete contact"/></a>
|
||||
<a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="Delete contact" title="Delete contact" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
|
||||
</div>
|
||||
<div id="contact-edit-nav-end"></div>
|
||||
</div>
|
||||
|
|
|
@ -20,11 +20,6 @@
|
|||
msie = $.browser.msie ;
|
||||
NavUpdate();
|
||||
|
||||
// $('.wall-item-delete-icon').hover(function() {
|
||||
// $(this).attr("src",$(this).attr("src").replace('hide',''));
|
||||
// },function() {
|
||||
// $(this).attr("src",$(this).attr("src").replace('','hide'));
|
||||
// });
|
||||
|
||||
|
||||
});
|
||||
|
@ -79,5 +74,18 @@
|
|||
return confirm("Delete this item?");
|
||||
}
|
||||
|
||||
function imgbright(node) {
|
||||
$(node).attr("src",$(node).attr("src").replace('hide','show'));
|
||||
}
|
||||
|
||||
function imgdull(node) {
|
||||
$(node).attr("src",$(node).attr("src").replace('show','hide'));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
|
|
|
@ -483,9 +483,13 @@ input#dfrn-url {
|
|||
}
|
||||
|
||||
.wall-item-delete-wrapper {
|
||||
float: left;
|
||||
margin-top: 10px;
|
||||
margin-left: 50px;
|
||||
float: right;
|
||||
margin-top: 20px;
|
||||
margin-right: 50px;
|
||||
}
|
||||
|
||||
.wall-item-delete-end {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.wall-item-delete-icon {
|
||||
|
@ -506,6 +510,7 @@ input#dfrn-url {
|
|||
}
|
||||
.wall-item-body {
|
||||
float: left;
|
||||
width: 450px;
|
||||
margin-top: 30px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
|
||||
<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a>
|
||||
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
|
||||
$drop
|
||||
</div>
|
||||
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
|
||||
$drop
|
||||
<div class="wall-item-wrapper-end"></div>
|
||||
<div class="wall-item-comment-separator"></div>
|
||||
$comment
|
||||
|
|
|
@ -1 +1 @@
|
|||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a href="item/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drop.gif" alt="Delete" title="Delete" id="wall-item-delete-icon-$id" class="wall-item-delete-icon"></a></div>
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a href="item/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="Delete" title="Delete" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="wall-item-delete-end"></div>
|
||||
|
|
Loading…
Reference in a new issue