a couple more comanche conversions

This commit is contained in:
friendica 2013-12-14 13:26:40 -08:00
parent a4624d2979
commit c00f0d4b28
7 changed files with 142 additions and 86 deletions

View File

@ -362,4 +362,136 @@ function widget_affinity($arr) {
return $arr['html'];
}
return '';
}
function widget_settings_menu($arr) {
if(! local_user())
return;
$a = get_app();
$channel = $a->get_channel();
$abook_self_id = 0;
// Retrieve the 'self' address book entry for use in the auto-permissions link
$abk = q("select abook_id from abook where abook_channel = %d and ( abook_flags & %d ) limit 1",
intval(local_user()),
intval(ABOOK_FLAG_SELF)
);
if($abk)
$abook_self_id = $abk[0]['abook_id'];
$tabs = array(
array(
'label' => t('Account settings'),
'url' => $a->get_baseurl(true).'/settings/account',
'selected' => ((argv(1) === 'account') ? 'active' : ''),
),
array(
'label' => t('Channel settings'),
'url' => $a->get_baseurl(true).'/settings/channel',
'selected' => ((argv(1) === 'channel') ? 'active' : ''),
),
array(
'label' => t('Additional features'),
'url' => $a->get_baseurl(true).'/settings/features',
'selected' => ((argv(1) === 'features') ? 'active' : ''),
),
array(
'label' => t('Feature settings'),
'url' => $a->get_baseurl(true).'/settings/featured',
'selected' => ((argv(1) === 'featured') ? 'active' : ''),
),
array(
'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display',
'selected' => ((argv(1) === 'display') ? 'active' : ''),
),
array(
'label' => t('Connected apps'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
),
array(
'label' => t('Export channel'),
'url' => $a->get_baseurl(true) . '/uexport/basic',
'selected' => ''
),
// array(
// 'label' => t('Export account'),
// 'url' => $a->get_baseurl(true) . '/uexport/complete',
// 'selected' => ''
// ),
array(
'label' => t('Automatic Permissions (Advanced)'),
'url' => $a->get_baseurl(true) . '/connections/' . $abook_self_id,
'selected' => ''
),
);
if(feature_enabled(local_user(),'premium_channel')) {
$tabs[] = array(
'label' => t('Premium Channel Settings'),
'url' => $a->get_baseurl(true) . '/connect/' . $channel['channel_address'],
'selected' => ''
);
}
if(feature_enabled(local_user(),'channel_sources')) {
$tabs[] = array(
'label' => t('Channel Sources'),
'url' => $a->get_baseurl(true) . '/sources',
'selected' => ''
);
}
$tabtpl = get_markup_template("generic_links_widget.tpl");
return replace_macros($tabtpl, array(
'$title' => t('Settings'),
'$class' => 'settings-widget',
'$items' => $tabs,
));
}
function widget_mailmenu($arr) {
if (! local_user())
return;
$a = get_app();
return replace_macros(get_markup_template('message_side.tpl'), array(
'$tabs'=> array(),
'$check'=>array(
'label' => t('Check Mail'),
'url' => $a->get_baseurl(true) . '/message',
'sel' => (argv(1) == ''),
),
'$new'=>array(
'label' => t('New Message'),
'url' => $a->get_baseurl(true) . '/message/new',
'sel'=> (argv(1) == 'new'),
)
));
}

View File

@ -1,60 +0,0 @@
<?php
require_once('include/socgraph.php');
function allfriends_content(&$a) {
$o = '';
if(! local_user()) {
notice( t('Permission denied.') . EOL);
return;
}
if(argc() > 1)
$cid = intval(argv(1));
if(! $cid)
return;
$c = q("select name, url, photo from contact where id = %d and uid = %d limit 1",
intval($cid),
intval(local_user())
);
$a->page['aside'] .= '<div class="vcard">'
. '<div class="fn label">' . $c[0]['name'] . '</div>'
. '<div id="profile-photo-wrapper">'
. '<a href="/contacts/' . $cid . '"><img class="photo" width="175" height="175"
src="' . $c[0]['photo'] . '" alt="' . $c[0]['name'] . '" /></div>'
. '</div>';
if(! count($c))
return;
$o .= '<h2>' . sprintf( t('Friends of %s'), $c[0]['name']) . '</h2>';
$r = all_friends(local_user(),$cid);
if(! count($r)) {
$o .= t('No friends to display.');
return $o;
}
$tpl = get_markup_template('common_friends.tpl');
foreach($r as $rr) {
$o .= replace_macros($tpl,array(
'$url' => $rr['url'],
'$name' => $rr['name'],
'$photo' => $rr['photo'],
'$tags' => ''
));
}
$o .= cleardiv();
// $o .= paginate($a);
return $o;
}

View File

@ -7,29 +7,6 @@ require_once("include/bbcode.php");
require_once('include/Contact.php');
function message_aside(&$a) {
if (! local_user())
return;
$a->set_widget('msgaside',replace_macros(get_markup_template('message_side.tpl'), array(
'$tabs'=> array(),
'$check'=>array(
'label' => t('Check Mail'),
'url' => $a->get_baseurl(true) . '/message',
'sel' => (argv(1) == ''),
),
'$new'=>array(
'label' => t('New Message'),
'url' => $a->get_baseurl(true) . '/message/new',
'sel'=> (argv(1) == 'new'),
)
)));
}
function message_post(&$a) {
if(! local_user())

View File

@ -32,7 +32,7 @@ if (! local_user())
$a->argc = 2;
$a->argv[] = 'channel';
}
/*
$channel = $a->get_channel();
$abook_self_id = 0;
@ -132,7 +132,7 @@ if (! local_user())
'$class' => 'settings-widget',
'$items' => $tabs,
));
*/
}

View File

@ -1 +1 @@
2013-12-13.526
2013-12-14.527

3
view/pdl/mod_message.pdl Normal file
View File

@ -0,0 +1,3 @@
[region=aside]
[widget=mailmenu][/widget]
[/region]

View File

@ -0,0 +1,4 @@
[region=aside]
[widget=settings_menu][/widget]
[/region]