aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boot.php2
-rw-r--r--images/icons.pngbin11879 -> 11885 bytes
-rw-r--r--include/conversation.php9
-rw-r--r--include/main.js15
-rw-r--r--mod/network.php42
-rw-r--r--mod/starred.php35
-rw-r--r--view/theme/duepuntozero/style.css15
-rw-r--r--view/theme/loozah/style.css17
-rw-r--r--view/wall_item.tpl1
-rw-r--r--view/wallwall_item.tpl1
10 files changed, 123 insertions, 14 deletions
diff --git a/boot.php b/boot.php
index 459bec217..855a67dfd 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
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 ( 'DB_UPDATE_VERSION', 1073 );
diff --git a/images/icons.png b/images/icons.png
index c70b66474..494555aa6 100644
--- a/images/icons.png
+++ b/images/icons.png
Binary files differ
diff --git a/include/conversation.php b/include/conversation.php
index ff0a7612b..40981d5f4 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -177,6 +177,7 @@ function conversation(&$a, $items, $mode, $update) {
$drop = replace_macros($droptpl,array('$id' => $item['id']));
$lock = '<div class="wall-item-lock"></div>';
+ $star = '';
$body = prepare_body($item,true);
@@ -197,6 +198,7 @@ function conversation(&$a, $items, $mode, $update) {
'$owner_url' => $owner_url,
'$owner_photo' => $owner_photo,
'$owner_name' => $owner_name,
+ '$star' => $star,
'$drop' => $drop,
'$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'))
- ? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id']
- . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
+ ? '<a class="editpost icon pencil" href="' . $a->get_baseurl() . '/editpost/' . $item['id']
+ . '" 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')));
+ $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'];
$thumb = $item['thumb'];
@@ -473,6 +477,7 @@ function conversation(&$a, $items, $mode, $update) {
'$owner_name' => $owner_name,
'$plink' => get_plink($item),
'$edpost' => $edpost,
+ '$star' => $star,
'$drop' => $drop,
'$vote' => $likebuttons,
'$like' => $like,
diff --git a/include/main.js b/include/main.js
index c2772000d..26c78b277 100644
--- a/include/main.js
+++ b/include/main.js
@@ -174,6 +174,21 @@
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) {
var cursor = {x:0, y:0};
if ( e.pageX || e.pageY ) {
diff --git a/mod/network.php b/mod/network.php
index 6169b5083..e5e3d34a7 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -14,7 +14,7 @@ function network_init(&$a) {
$a->page['aside'] = '';
$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);
@@ -22,11 +22,29 @@ function network_init(&$a) {
$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'))
- $a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('Normal View') . '</a>';
- 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() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('Normal View') . '</a></div>';
+ else {
+ $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>';
@@ -51,6 +69,7 @@ function network_content(&$a, $update = 0) {
require_once('include/acl_selectors.php');
$cid = ((x($_GET['cid'])) ? intval($_GET['cid']) : 0);
+ $star = ((x($_GET['star'])) ? intval($_GET['star']) : 0);
if(($a->argc > 2) && $a->argv[2] === 'new')
$nouveau = true;
@@ -109,6 +128,7 @@ function network_content(&$a, $update = 0) {
. "; var netargs = '" . substr($a->cmd,8)
. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '')
. ((x($_GET,'search')) ? '?search=' . $_GET['search'] : '')
+ . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
. "'; 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
// at the top level network page just mark everything seen.
- if((! $group) && (! $cid)) {
+ if((! $group) && (! $cid) && (! $star)) {
$r = q("UPDATE `item` SET `unseen` = 0
WHERE `unseen` = 1 AND `uid` = %d",
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
// 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) {
$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'));
}
- $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;
}
elseif($cid) {
@@ -162,7 +185,7 @@ function network_content(&$a, $update = 0) {
intval($cid)
);
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;
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);
@@ -184,6 +207,7 @@ function network_content(&$a, $update = 0) {
if(x($_GET,'search'))
$sql_extra .= " AND `item`.`body` REGEXP '" . dbesc(escape_tags($_GET['search'])) . "' ";
+
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
diff --git a/mod/starred.php b/mod/starred.php
new file mode 100644
index 000000000..035b81e76
--- /dev/null
+++ b/mod/starred.php
@@ -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();
+}
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index e18cc3236..3a6c94a30 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -897,6 +897,14 @@ input#dfrn-url {
margin-bottom: 15px;
}
+#network-star-link{
+ margin-top: 10px;
+}
+.network-star {
+ float: left;
+ margin-right: 5px;
+}
+
.wall-item-content-wrapper {
margin-top: 10px;
border: 1px solid #CCC;
@@ -1037,7 +1045,12 @@ input#dfrn-url {
}
.editpost {
- margin-left: 15px;
+ margin-left: 10px;
+ float: left;
+}
+.star-item {
+ margin-left: 10px;
+ float: left;
}
.wall-item-links-wrapper {
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 8f64e4cf8..04a680017 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -1096,8 +1096,23 @@ input#dfrn-url {
}
.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 {
width: 285px;
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index a95097be1..1c5e82b17 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -34,6 +34,7 @@
$vote
$plink
$edpost
+ $star
$drop
</div>
</div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 39c14cf4f..fd686f0f4 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -38,6 +38,7 @@
$vote
$plink
$edpost
+ $star
$drop
</div>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 13:34:14 +0000