From 5ceeb6752d645036b832077d88b71a8825952322 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 3 Jul 2011 19:41:04 -0700 Subject: [PATCH] starred items --- boot.php | 2 +- images/icons.png | Bin 11879 -> 11885 bytes include/conversation.php | 9 +++++-- include/main.js | 15 +++++++++++ mod/network.php | 42 +++++++++++++++++++++++------- mod/starred.php | 35 +++++++++++++++++++++++++ view/theme/duepuntozero/style.css | 15 ++++++++++- view/theme/loozah/style.css | 17 +++++++++++- view/wall_item.tpl | 1 + view/wallwall_item.tpl | 1 + 10 files changed, 123 insertions(+), 14 deletions(-) create mode 100644 mod/starred.php diff --git a/boot.php b/boot.php index 459bec217e..855a67dfd2 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 c70b6647443afaff3b5bbfb3f7c48b47cc10d967..494555aa69a9f3aec25a566b1bb6bedad46e2e05 100644 GIT binary patch literal 11885 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 diff --git a/include/conversation.php b/include/conversation.php index ff0a7612b1..40981d5f4d 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 = '
'; + $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' => '' . t('View in context') . '' )); @@ -381,8 +383,8 @@ function conversation(&$a, $items, $mode, $update) { } $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes')) - ? '' + ? '' : ''); @@ -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) ? '' : ''); + $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 c2772000d7..26c78b2773 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 6169b50834..e5e3d34a73 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'] .= ''; + + if(x($_GET,'star')) + $a->page['aside'] .= ''; + else + $a->page['aside'] .= ''; + + } $a->page['aside'] .= ''; @@ -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'] . "; \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 = '

' . t('Group: ') . $r[0]['name'] . '

' . $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 = '

' . t('Contact: ') . $r[0]['name'] . '

' . $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 0000000000..035b81e764 --- /dev/null +++ b/mod/starred.php @@ -0,0 +1,35 @@ +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 e18cc32367..3a6c94a306 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 8f64e4cf88..04a680017c 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 a95097be16..1c5e82b17b 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -34,6 +34,7 @@ $vote $plink $edpost + $star $drop diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index 39c14cf4fa..fd686f0f4b 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -38,6 +38,7 @@ $vote $plink $edpost + $star $drop