harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup channel management

Browse Source
This commit is contained in:
friendica 2012-11-01 15:45:02 -07:00
parent b400e4dfad
commit 9bf4508ffb
4 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/identity.php
View File

@ -55,7 +55,10 @@ function create_identity($arr) {
$sig = base64url_encode(rsa_sign($guid,$key['prvkey'])); $sig = base64url_encode(rsa_sign($guid,$key['prvkey']));
$hash = base64url_encode(hash('whirlpool',$guid . $sig,true)); $hash = base64url_encode(hash('whirlpool',$guid . $sig,true));
$primary = true; $r = q("select channel_id from channel where channel_account_id = %d and channel_primary = 1 limit 1",
intval($arr['account_id'])
);
$primary = (! $r) ? true : false;
$r = q("insert into channel ( channel_account_id, channel_primary, $r = q("insert into channel ( channel_account_id, channel_primary,
channel_name, channel_address, channel_guid, channel_guid_sig, channel_name, channel_address, channel_guid, channel_guid_sig,

21
mod/manage.php
View File

@ -11,6 +11,17 @@ function manage_content(&$a) {
$change_channel = ((argc() > 1) ? intval(argv(1)) : 0); $change_channel = ((argc() > 1) ? intval(argv(1)) : 0);
if((argc() > 2) && (argv(2) === 'primary')) {
q("update channel set channel_primary = 0 where channel_account_id = %d",
intval(get_account_id())
);
q("update channel set channel_primary = 1 where channel_id = %d and channel_account_id = %d limit 1",
intval($change_channel),
intval(get_account_id())
);
goaway(z_root() . '/manage');
}
if($change_channel) { if($change_channel) {
$r = change_channel($change_channel); $r = change_channel($change_channel);
@ -39,10 +50,12 @@ function manage_content(&$a) {
$o = replace_macros(get_markup_template('channels.tpl'), array( $o = replace_macros(get_markup_template('channels.tpl'), array(
'$header' => t('Channel Manager'), '$header' => t('Channel Manager'),
'$desc' => t('Attach to one of your channels by selecting it.'), '$desc' => t('Attach to one of your channels by selecting it.'),
'$links' => $links, '$msg_primary' => t('Default Channel'),
'$all_channels' => $channels, '$msg_make_primary' => t('Make Default'),
'$links' => $links,
'$all_channels' => $channels,
)); ));

14
view/css/mod_manage.css Normal file
View File

@ -0,0 +1,14 @@
#channels-desc {
margin-top: 15px;
margin-bottom: 20px;
}
.channel-selection {
width: 120px;
float: left;
}
.channels-end {
clear: both;
}

5
view/tpl/channel.tpl
View File

@ -1,4 +1,9 @@
<div class="channel-selection"> <div class="channel-selection">
{{ if $channel.channel_primary }}
<div class="channel-selection-primary primary">$msg_primary</div>
{{ else }}
<div class="channel-selection-primary"><a href="manage/$channel.channel_id/primary">$msg_make_primary</a></div>
{{ endif }}
<a href="$channel.link" class="channel-selection-photo-link" title="$channel.channel_name"><img class="channel-photo" src="$channel.xchan_photo_m" alt="$channel.channel_name" /></a> <a href="$channel.link" class="channel-selection-photo-link" title="$channel.channel_name"><img class="channel-photo" src="$channel.xchan_photo_m" alt="$channel.channel_name" /></a>
<a href="$channel.link" class="channel-selection-name-link" title="$channel.channel_name"><div class="channel-name">$channel.channel_name</div></a> <a href="$channel.link" class="channel-selection-name-link" title="$channel.channel_name"><div class="channel-name">$channel.channel_name</div></a>
</div> </div>