This commit is contained in:
friendica 2013-03-21 02:21:44 -07:00
parent 9d6a4093ba
commit 4b22c6e531
3 changed files with 35 additions and 12 deletions

View File

@ -1923,37 +1923,45 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
$tabs = array( $tabs = array(
array( array(
'label'=>t('Status'), 'label' => t('Channel'),
'url' => $url, 'url' => $url,
'sel' => ((argv(0)=='channel')?'active':''), 'sel' => ((argv(0) == 'channel') ? 'active' : ''),
'title' => t('Status Messages and Posts'), 'title' => t('Status Messages and Posts'),
'id' => 'status-tab', 'id' => 'status-tab',
), ),
array( array(
'label' => t('Profile'), 'label' => t('About'),
'url' => $pr, 'url' => $pr,
'sel' => ((argv(0)=='profile')?'active':''), 'sel' => ((argv(0) == 'profile') ? 'active' : ''),
'title' => t('Profile Details'), 'title' => t('Profile Details'),
'id' => 'profile-tab', 'id' => 'profile-tab',
), ),
array( array(
'label' => t('Photos'), 'label' => t('Photos'),
'url' => $a->get_baseurl() . '/photos/' . $nickname, 'url' => $a->get_baseurl() . '/photos/' . $nickname,
'sel' => ((argv(0)=='photos')?'active':''), 'sel' => ((argv(0) == 'photos') ? 'active' : ''),
'title' => t('Photo Albums'), 'title' => t('Photo Albums'),
'id' => 'photo-tab', 'id' => 'photo-tab',
), ),
); );
if ($is_owner){ if ($is_owner){
$tabs[] = array( $tabs[] = array(
'label' => t('Events'), 'label' => t('Events'),
'url' => $a->get_baseurl() . '/events', 'url' => $a->get_baseurl() . '/events',
'sel' =>((argv(0)=='events')?'active':''), 'sel' => ((argv(0) == 'events') ? 'active' : ''),
'title' => t('Events and Calendar'), 'title' => t('Events and Calendar'),
'id' => 'events-tab', 'id' => 'events-tab',
); );
} }
else {
// FIXME
// we probably need a listing of events that were created by
// this channel and are visible to the observer
}
$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs); $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);

View File

@ -417,6 +417,7 @@ function zot_register_hub($arr) {
function import_xchan($arr) { function import_xchan($arr) {
$ret = array('success' => false); $ret = array('success' => false);
$changed = false;
$xchan_hash = base64url_encode(hash('whirlpool',$arr['guid'] . $arr['guid_sig'], true)); $xchan_hash = base64url_encode(hash('whirlpool',$arr['guid'] . $arr['guid_sig'], true));
$import_photos = false; $import_photos = false;
@ -470,6 +471,7 @@ function import_xchan($arr) {
dbesc($xchan_hash) dbesc($xchan_hash)
); );
update_modtime($xchan_hash); update_modtime($xchan_hash);
$changed = true;
} }
} }
else { else {
@ -492,6 +494,7 @@ function import_xchan($arr) {
dbesc($arr['name_updated']) dbesc($arr['name_updated'])
); );
update_modtime($xchan_hash); update_modtime($xchan_hash);
$changed = true;
} }
@ -510,6 +513,9 @@ function import_xchan($arr) {
dbesc($photos[3]), dbesc($photos[3]),
dbesc($xchan_hash) dbesc($xchan_hash)
); );
update_modtime($xchan_hash);
$changed = true;
} }
// what we are missing for true hub independence is for any changes in the primary hub to // what we are missing for true hub independence is for any changes in the primary hub to
@ -547,6 +553,7 @@ function import_xchan($arr) {
); );
} }
update_modtime($xchan_hash); update_modtime($xchan_hash);
$changed = true;
continue; continue;
} }
@ -574,6 +581,7 @@ function import_xchan($arr) {
dbesc($location['sitekey']) dbesc($location['sitekey'])
); );
update_modtime($xchan_hash); update_modtime($xchan_hash);
$changed = true;
} }
// get rid of any hubs we have for this channel which weren't reported. // get rid of any hubs we have for this channel which weren't reported.
@ -585,12 +593,19 @@ function import_xchan($arr) {
intval($x['hubloc_id']) intval($x['hubloc_id'])
); );
update_modtime($xchan_hash); update_modtime($xchan_hash);
$changed = true;
} }
} }
} }
} }
if($changed) {
// send out a directory mirror update packet if we're a directory server or some kind
}
if(! x($ret,'message')) { if(! x($ret,'message')) {
$ret['success'] = true; $ret['success'] = true;
$ret['hash'] = $xchan_hash; $ret['hash'] = $xchan_hash;

View File

@ -1 +1 @@
2013-03-18.256 2013-03-21.259