starred items
This commit is contained in:
parent
bef68a8c7f
commit
5ceeb6752d
2
boot.php
2
boot.php
|
@ -4,7 +4,7 @@ set_time_limit(0);
|
||||||
ini_set('pcre.backtrack_limit', 250000);
|
ini_set('pcre.backtrack_limit', 250000);
|
||||||
|
|
||||||
|
|
||||||
define ( 'FRIENDIKA_VERSION', '2.2.1029' );
|
define ( 'FRIENDIKA_VERSION', '2.2.1030' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1073 );
|
define ( 'DB_UPDATE_VERSION', 1073 );
|
||||||
|
|
||||||
|
|
BIN
images/icons.png
BIN
images/icons.png
Binary file not shown.
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
@ -177,6 +177,7 @@ function conversation(&$a, $items, $mode, $update) {
|
||||||
|
|
||||||
$drop = replace_macros($droptpl,array('$id' => $item['id']));
|
$drop = replace_macros($droptpl,array('$id' => $item['id']));
|
||||||
$lock = '<div class="wall-item-lock"></div>';
|
$lock = '<div class="wall-item-lock"></div>';
|
||||||
|
$star = '';
|
||||||
|
|
||||||
$body = prepare_body($item,true);
|
$body = prepare_body($item,true);
|
||||||
|
|
||||||
|
@ -197,6 +198,7 @@ function conversation(&$a, $items, $mode, $update) {
|
||||||
'$owner_url' => $owner_url,
|
'$owner_url' => $owner_url,
|
||||||
'$owner_photo' => $owner_photo,
|
'$owner_photo' => $owner_photo,
|
||||||
'$owner_name' => $owner_name,
|
'$owner_name' => $owner_name,
|
||||||
|
'$star' => $star,
|
||||||
'$drop' => $drop,
|
'$drop' => $drop,
|
||||||
'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'] . '">' . t('View in context') . '</a>'
|
'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'] . '">' . t('View in context') . '</a>'
|
||||||
));
|
));
|
||||||
|
@ -381,8 +383,8 @@ function conversation(&$a, $items, $mode, $update) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
|
$edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
|
||||||
? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id']
|
? '<a class="editpost icon pencil" href="' . $a->get_baseurl() . '/editpost/' . $item['id']
|
||||||
. '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
|
. '" title="' . t('Edit') . '"></a>'
|
||||||
: '');
|
: '');
|
||||||
|
|
||||||
|
|
||||||
|
@ -394,6 +396,8 @@ function conversation(&$a, $items, $mode, $update) {
|
||||||
|
|
||||||
$drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$select' => t('Select'), '$delete' => t('Delete')));
|
$drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$select' => t('Select'), '$delete' => t('Delete')));
|
||||||
|
|
||||||
|
$star = (($profile_owner == local_user() && $toplevelpost) ? '<a href="#" id="starred-' . $item['id'] . '" onclick="dostar(' . $item['id'] . '); return false;" class="star-item icon ' . (($item['starred']) ? 'starred' : 'unstarred') . '" title="' . t('toggle star status') . '"></a>' : '');
|
||||||
|
|
||||||
|
|
||||||
$photo = $item['photo'];
|
$photo = $item['photo'];
|
||||||
$thumb = $item['thumb'];
|
$thumb = $item['thumb'];
|
||||||
|
@ -473,6 +477,7 @@ function conversation(&$a, $items, $mode, $update) {
|
||||||
'$owner_name' => $owner_name,
|
'$owner_name' => $owner_name,
|
||||||
'$plink' => get_plink($item),
|
'$plink' => get_plink($item),
|
||||||
'$edpost' => $edpost,
|
'$edpost' => $edpost,
|
||||||
|
'$star' => $star,
|
||||||
'$drop' => $drop,
|
'$drop' => $drop,
|
||||||
'$vote' => $likebuttons,
|
'$vote' => $likebuttons,
|
||||||
'$like' => $like,
|
'$like' => $like,
|
||||||
|
|
|
@ -174,6 +174,21 @@
|
||||||
liking = 1;
|
liking = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function dostar(ident) {
|
||||||
|
$('#like-rotator-' + ident.toString()).show();
|
||||||
|
$.get('starred/' + ident.toString(), function(data) {
|
||||||
|
if(data.match(/1/)) {
|
||||||
|
$('#starred-' + ident.toString()).addClass('starred');
|
||||||
|
$('#starred-' + ident.toString()).removeClass('unstarred');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$('#starred-' + ident.toString()).addClass('unstarred');
|
||||||
|
$('#starred-' + ident.toString()).removeClass('starred');
|
||||||
|
}
|
||||||
|
$('#like-rotator-' + ident.toString()).hide();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function getPosition(e) {
|
function getPosition(e) {
|
||||||
var cursor = {x:0, y:0};
|
var cursor = {x:0, y:0};
|
||||||
if ( e.pageX || e.pageY ) {
|
if ( e.pageX || e.pageY ) {
|
||||||
|
|
|
@ -14,7 +14,7 @@ function network_init(&$a) {
|
||||||
$a->page['aside'] = '';
|
$a->page['aside'] = '';
|
||||||
|
|
||||||
$search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
|
$search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
|
||||||
$srchurl = '/network' . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '');
|
$srchurl = '/network' . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '');
|
||||||
|
|
||||||
|
|
||||||
$a->page['aside'] .= search($search,'netsearch-box',$srchurl);
|
$a->page['aside'] .= search($search,'netsearch-box',$srchurl);
|
||||||
|
@ -22,11 +22,29 @@ function network_init(&$a) {
|
||||||
$a->page['aside'] .= '<div id="network-new-link">';
|
$a->page['aside'] .= '<div id="network-new-link">';
|
||||||
|
|
||||||
|
|
||||||
|
$a->page['aside'] .= '<div id="network-view-link">';
|
||||||
if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new') || x($_GET,'search'))
|
if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new') || x($_GET,'search'))
|
||||||
$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('Normal View') . '</a>';
|
$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('Normal View') . '</a></div>';
|
||||||
else
|
else {
|
||||||
$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . $a->cmd . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' . t('New Item View') . '</a>';
|
$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . $a->cmd . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' . t('New Item View') . '</a></div>';
|
||||||
|
|
||||||
|
if(x($_GET,'star'))
|
||||||
|
$a->page['aside'] .= '<div id="network-star-link">'
|
||||||
|
. '<a class="network-star" href="' . $a->get_baseurl() . '/' . $a->cmd
|
||||||
|
. ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">'
|
||||||
|
. t('View Any Items') . '</a>'
|
||||||
|
. '<span class="network-star icon starred"></span>'
|
||||||
|
. '<span class="network-star icon unstarred"></span>'
|
||||||
|
. '<div class="clear"></div></div>';
|
||||||
|
else
|
||||||
|
$a->page['aside'] .= '<div id="network-star-link">'
|
||||||
|
. '<a class="network-star" href="' . $a->get_baseurl() . '/' . $a->cmd
|
||||||
|
. ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1" >'
|
||||||
|
. t('View Starred Items') . '</a>'
|
||||||
|
. '<span class="network-star icon starred"></span>'
|
||||||
|
. '<div class="clear"></div></div>';
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
$a->page['aside'] .= '</div>';
|
$a->page['aside'] .= '</div>';
|
||||||
|
|
||||||
|
@ -51,6 +69,7 @@ function network_content(&$a, $update = 0) {
|
||||||
require_once('include/acl_selectors.php');
|
require_once('include/acl_selectors.php');
|
||||||
|
|
||||||
$cid = ((x($_GET['cid'])) ? intval($_GET['cid']) : 0);
|
$cid = ((x($_GET['cid'])) ? intval($_GET['cid']) : 0);
|
||||||
|
$star = ((x($_GET['star'])) ? intval($_GET['star']) : 0);
|
||||||
|
|
||||||
if(($a->argc > 2) && $a->argv[2] === 'new')
|
if(($a->argc > 2) && $a->argv[2] === 'new')
|
||||||
$nouveau = true;
|
$nouveau = true;
|
||||||
|
@ -109,6 +128,7 @@ function network_content(&$a, $update = 0) {
|
||||||
. "; var netargs = '" . substr($a->cmd,8)
|
. "; var netargs = '" . substr($a->cmd,8)
|
||||||
. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '')
|
. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '')
|
||||||
. ((x($_GET,'search')) ? '?search=' . $_GET['search'] : '')
|
. ((x($_GET,'search')) ? '?search=' . $_GET['search'] : '')
|
||||||
|
. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
|
||||||
. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
|
. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -117,7 +137,7 @@ function network_content(&$a, $update = 0) {
|
||||||
// level which items you've seen and which you haven't. If you're looking
|
// level which items you've seen and which you haven't. If you're looking
|
||||||
// at the top level network page just mark everything seen.
|
// at the top level network page just mark everything seen.
|
||||||
|
|
||||||
if((! $group) && (! $cid)) {
|
if((! $group) && (! $cid) && (! $star)) {
|
||||||
$r = q("UPDATE `item` SET `unseen` = 0
|
$r = q("UPDATE `item` SET `unseen` = 0
|
||||||
WHERE `unseen` = 1 AND `uid` = %d",
|
WHERE `unseen` = 1 AND `uid` = %d",
|
||||||
intval($_SESSION['uid'])
|
intval($_SESSION['uid'])
|
||||||
|
@ -128,7 +148,9 @@ function network_content(&$a, $update = 0) {
|
||||||
// that belongs to you, hence you can see all of it. We will filter by group if
|
// that belongs to you, hence you can see all of it. We will filter by group if
|
||||||
// desired.
|
// desired.
|
||||||
|
|
||||||
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
|
$star_sql = (($star) ? " AND `starred` = 1 " : '');
|
||||||
|
|
||||||
|
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql ) ";
|
||||||
|
|
||||||
if($group) {
|
if($group) {
|
||||||
$r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
$r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||||
|
@ -152,7 +174,8 @@ function network_content(&$a, $update = 0) {
|
||||||
info( t('Group is empty'));
|
info( t('Group is empty'));
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
|
|
||||||
|
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
|
||||||
$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
|
$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
|
||||||
}
|
}
|
||||||
elseif($cid) {
|
elseif($cid) {
|
||||||
|
@ -162,7 +185,7 @@ function network_content(&$a, $update = 0) {
|
||||||
intval($cid)
|
intval($cid)
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( " . intval($cid) . " )) ";
|
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql AND `contact-id` IN ( " . intval($cid) . " )) ";
|
||||||
$o = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o;
|
$o = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o;
|
||||||
if($r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_FACEBOOK && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
|
if($r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_FACEBOOK && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
|
||||||
notice( t('Private messages to this person are at risk of public disclosure.') . EOL);
|
notice( t('Private messages to this person are at risk of public disclosure.') . EOL);
|
||||||
|
@ -184,6 +207,7 @@ function network_content(&$a, $update = 0) {
|
||||||
if(x($_GET,'search'))
|
if(x($_GET,'search'))
|
||||||
$sql_extra .= " AND `item`.`body` REGEXP '" . dbesc(escape_tags($_GET['search'])) . "' ";
|
$sql_extra .= " AND `item`.`body` REGEXP '" . dbesc(escape_tags($_GET['search'])) . "' ";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$r = q("SELECT COUNT(*) AS `total`
|
$r = q("SELECT COUNT(*) AS `total`
|
||||||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
|
|
35
mod/starred.php
Normal file
35
mod/starred.php
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
|
||||||
|
function starred_init(&$a) {
|
||||||
|
|
||||||
|
$starred = 0;
|
||||||
|
|
||||||
|
if(! local_user())
|
||||||
|
killme();
|
||||||
|
if($a->argc > 1)
|
||||||
|
$message_id = intval($a->argv[1]);
|
||||||
|
if(! $message_id)
|
||||||
|
killme();
|
||||||
|
|
||||||
|
$r = q("SELECT starred FROM item WHERE uid = %d AND id = %d LIMIT 1",
|
||||||
|
intval(local_user()),
|
||||||
|
intval($message_id)
|
||||||
|
);
|
||||||
|
if(! count($r))
|
||||||
|
killme();
|
||||||
|
|
||||||
|
if(! intval($r[0]['starred']))
|
||||||
|
$starred = 1;
|
||||||
|
|
||||||
|
$r = q("UPDATE item SET starred = %d WHERE uid = %d and id = %d LIMIT 1",
|
||||||
|
intval($starred),
|
||||||
|
intval(local_user()),
|
||||||
|
intval($message_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
// the json doesn't really matter, it will either be 0 or 1
|
||||||
|
|
||||||
|
echo json_encode($starred);
|
||||||
|
killme();
|
||||||
|
}
|
|
@ -897,6 +897,14 @@ input#dfrn-url {
|
||||||
margin-bottom: 15px;
|
margin-bottom: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#network-star-link{
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
.network-star {
|
||||||
|
float: left;
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
.wall-item-content-wrapper {
|
.wall-item-content-wrapper {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
border: 1px solid #CCC;
|
border: 1px solid #CCC;
|
||||||
|
@ -1037,7 +1045,12 @@ input#dfrn-url {
|
||||||
}
|
}
|
||||||
|
|
||||||
.editpost {
|
.editpost {
|
||||||
margin-left: 15px;
|
margin-left: 10px;
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
.star-item {
|
||||||
|
margin-left: 10px;
|
||||||
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wall-item-links-wrapper {
|
.wall-item-links-wrapper {
|
||||||
|
|
|
@ -1096,8 +1096,23 @@ input#dfrn-url {
|
||||||
}
|
}
|
||||||
|
|
||||||
.editpost {
|
.editpost {
|
||||||
margin-left: 15px;
|
margin-left: 10px;
|
||||||
|
float: left;
|
||||||
}
|
}
|
||||||
|
.star-item {
|
||||||
|
margin-left: 10px;
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#network-star-link{
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
.network-star {
|
||||||
|
float: left;
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.wall-item-info.wallwall {
|
.wall-item-info.wallwall {
|
||||||
width: 285px;
|
width: 285px;
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
$vote
|
$vote
|
||||||
$plink
|
$plink
|
||||||
$edpost
|
$edpost
|
||||||
|
$star
|
||||||
$drop
|
$drop
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
$vote
|
$vote
|
||||||
$plink
|
$plink
|
||||||
$edpost
|
$edpost
|
||||||
|
$star
|
||||||
$drop
|
$drop
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue