diff --git a/view/theme/vier/templates/theme_admin_settings.tpl b/view/theme/vier/templates/theme_admin_settings.tpl
new file mode 100644
index 000000000..21b8867e2
--- /dev/null
+++ b/view/theme/vier/templates/theme_admin_settings.tpl
@@ -0,0 +1 @@
+{{include file="field_input.tpl" field=$helperlist}}
diff --git a/view/theme/vier/templates/theme_settings.tpl b/view/theme/vier/templates/theme_settings.tpl
index 412978ea2..3e957e39c 100644
--- a/view/theme/vier/templates/theme_settings.tpl
+++ b/view/theme/vier/templates/theme_settings.tpl
@@ -1,5 +1,11 @@
{{include file="field_select.tpl" field=$style}}
+{{include file="field_select.tpl" field=$show_pages}}
+{{include file="field_select.tpl" field=$show_profiles}}
+{{include file="field_select.tpl" field=$show_helpers}}
+{{include file="field_select.tpl" field=$show_services}}
+{{include file="field_select.tpl" field=$show_friends}}
+{{include file="field_select.tpl" field=$show_lastusers}}
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 0b01b3db8..df28c0689 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -9,6 +9,10 @@
* Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
*/
+require_once("mod/nodeinfo.php");
+require_once("mod/proxy.php");
+require_once("include/socgraph.php");
+
function vier_init(&$a) {
$a->theme_events_in_profile = false;
@@ -84,8 +88,8 @@ EOT;
$a->page['htmlhead'] .= "
";
}
-function get_vier_config($key, $default = false) {
- if (local_user()) {
+function get_vier_config($key, $default = false, $admin = false) {
+ if (local_user() AND !$admin) {
$result = get_pconfig(local_user(), "vier", $key);
if ($result !== false)
return $result;
@@ -100,40 +104,34 @@ function get_vier_config($key, $default = false) {
function vier_community_info() {
$a = get_app();
-/*
- $close_pages = get_vier_config("close_pages", 1);
- $close_profiles = get_vier_config("close_profiles", 0);
- $close_helpers = get_vier_config("close_helpers", 0);
- $close_services = get_vier_config("close_services", 0);
- $close_friends = get_vier_config("close_friends", 0);
- $close_lastusers = get_vier_config("close_lastusers", 0);
- $close_lastphotos = get_vier_config("close_lastphotos", 0);
- $close_lastlikes = get_vier_config("close_lastlikes", 0);
-*/
- $close_pages = false;
- $close_profiles = true;
- $close_helpers = false;
- $close_services = false;
- $close_friends = false;
- $close_lastusers = true;
- $close_lastphotos = true;
- $close_lastlikes = true;
+
+ $show_pages = get_vier_config("show_pages", 1);
+ $show_profiles = get_vier_config("show_profiles", 1);
+ $show_helpers = get_vier_config("show_helpers", 1);
+ $show_services = get_vier_config("show_services", 1);
+ $show_friends = get_vier_config("show_friends", 1);
+ $show_lastusers = get_vier_config("show_lastusers", 1);
+
+ //get_baseurl
+ $url = $a->get_baseurl($ssl_state);
+ $aside['$url'] = $url;
// comunity_profiles
- if(!$close_profiles) {
- $aside['$comunity_profiles_title'] = t('Community Profiles');
- $aside['$comunity_profiles_items'] = array();
- $r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id
- where glink.cid = 0 and glink.uid = 0 order by rand() limit 9");
+ if($show_profiles) {
+
+ $r = suggestion_query(local_user(), 0, 9);
+
$tpl = get_markup_template('ch_directory_item.tpl');
if(count($r)) {
- $photo = 'photo';
+
+ $aside['$comunity_profiles_title'] = t('Community Profiles');
+ $aside['$comunity_profiles_items'] = array();
+
foreach($r as $rr) {
- $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
$entry = replace_macros($tpl,array(
'$id' => $rr['id'],
'$profile_link' => zrl($rr['url']),
- '$photo' => $rr[$photo],
+ '$photo' => proxy_url($rr['photo']),
'$alt_text' => $rr['name'],
));
$aside['$comunity_profiles_items'][] = $entry;
@@ -141,126 +139,45 @@ function vier_community_info() {
}
}
- // last 12 users
- if(!$close_lastusers) {
- $aside['$lastusers_title'] = t('Last users');
- $aside['$lastusers_items'] = array();
- $sql_extra = "";
+ // last 9 users
+ if($show_lastusers) {
$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 ");
$order = " ORDER BY `register_date` DESC ";
$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
- WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
+ WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
0, 9);
$tpl = get_markup_template('ch_directory_item.tpl');
if(count($r)) {
- $photo = 'thumb';
+
+ $aside['$lastusers_title'] = t('Last users');
+ $aside['$lastusers_items'] = array();
+
foreach($r as $rr) {
$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
$entry = replace_macros($tpl,array(
'$id' => $rr['id'],
'$profile_link' => $profile_link,
- '$photo' => $a->get_cached_avatar_image($rr[$photo]),
+ '$photo' => $a->get_cached_avatar_image($rr['thumb']),
'$alt_text' => $rr['name']));
$aside['$lastusers_items'][] = $entry;
}
}
}
- // last 10 liked items
-/*
- if(!$close_lastlikes) {
- $aside['$like_title'] = t('Last likes');
- $aside['$like_items'] = array();
- $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM
- (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link`
- FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
- INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri`
- WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
- GROUP BY `uri`
- ORDER BY `T1`.`created` DESC
- LIMIT 0,5",
- $a->get_baseurl(),$a->get_baseurl());
-
- foreach ($r as $rr) {
- $author = '
' . $rr['liker'] . '';
- $objauthor = '
' . $rr['author-name'] . '';
-
- //var_dump($rr['verb'],$rr['object-type']); killme();
- switch($rr['verb']){
- case 'http://activitystrea.ms/schema/1.0/post':
- switch ($rr['object-type']){
- case 'http://activitystrea.ms/schema/1.0/event':
- $post_type = t('event');
- break;
- default:
- $post_type = t('status');
- }
- break;
- default:
- if ($rr['resource-id']){
- $post_type = t('photo');
- $m=array();
- preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
- $rr['plink'] = $m[1];
- } else
- $post_type = t('status');
- }
- $plink = '
' . $post_type . '';
-
- $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-
- }
- }
-
- // last 12 photos
- if(!$close_lastphotos) {
- $aside['$photos_title'] = t('Last photos');
- $aside['$photos_items'] = array();
- $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM
- (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo`
- WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
- AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
- INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
- `user`
- WHERE `user`.`uid` = `photo`.`uid`
- AND `user`.`blockwall`=0
- AND `user`.`hidewall`=0
- ORDER BY `photo`.`edited` DESC
- LIMIT 0, 9",
- dbesc(t('Contact Photos')),
- dbesc(t('Profile Photos'))
- );
- if(count($r)) {
- $tpl = get_markup_template('ch_directory_item.tpl');
- foreach($r as $rr) {
- $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
- $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-
- $entry = replace_macros($tpl,array(
- '$id' => $rr['id'],
- '$profile_link' => $photo_page,
- '$photo' => $photo_url,
- '$alt_text' => $rr['username']." : ".$rr['desc']));
-
- $aside['$photos_items'][] = $entry;
- }
- }
- }
-*/
//right_aside FIND FRIENDS
- if (!$close_friends AND local_user()) {
+ if ($show_friends AND local_user()) {
$nv = array();
$nv['title'] = Array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
- $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
+ $nv['global_directory'] = Array(get_server(), t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
- $nv['search'] = '
-
-
-
-
-
-
-
+