Merge pull request #160 from fabrixxm/master
work on diabook theme and settings
This commit is contained in:
tomtom84
commit
ce8cfb7b05
19
js/main.js
19
js/main.js
|
|
@ -28,13 +28,15 @@
|
||||||
var in_progress = false;
|
var in_progress = false;
|
||||||
var langSelect = false;
|
var langSelect = false;
|
||||||
var commentBusy = false;
|
var commentBusy = false;
|
||||||
|
var last_popup_menu = null;
|
||||||
|
var last_popup_button = null;
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
$.ajaxSetup({cache: false});
|
$.ajaxSetup({cache: false});
|
||||||
|
|
||||||
msie = $.browser.msie ;
|
msie = $.browser.msie ;
|
||||||
|
|
||||||
/* setup tooltips */
|
/* setup tooltips *//*
|
||||||
$("a,.tt").each(function(){
|
$("a,.tt").each(function(){
|
||||||
var e = $(this);
|
var e = $(this);
|
||||||
var pos="bottom";
|
var pos="bottom";
|
||||||
|
|
@ -43,7 +45,7 @@
|
||||||
if (e.hasClass("ttleft")) pos="left";
|
if (e.hasClass("ttleft")) pos="left";
|
||||||
if (e.hasClass("ttright")) pos="right";
|
if (e.hasClass("ttright")) pos="right";
|
||||||
e.tipTip({defaultPosition: pos, edgeOffset: 8});
|
e.tipTip({defaultPosition: pos, edgeOffset: 8});
|
||||||
});
|
});*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -76,8 +78,21 @@
|
||||||
if (menu.attr('popup')=="false") return false;
|
if (menu.attr('popup')=="false") return false;
|
||||||
$(this).parent().toggleClass("selected");
|
$(this).parent().toggleClass("selected");
|
||||||
menu.toggle();
|
menu.toggle();
|
||||||
|
if (menu.css("display") == "none") {
|
||||||
|
last_popup_menu = null;
|
||||||
|
last_popup_button = null;
|
||||||
|
} else {
|
||||||
|
last_popup_menu = menu;
|
||||||
|
last_popup_button = $(this).parent();
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
$('html').click(function() {
|
||||||
|
last_popup_menu.hide();
|
||||||
|
last_popup_button.removeClass("selected");
|
||||||
|
last_popup_menu = null;
|
||||||
|
last_popup_button = null;
|
||||||
|
});
|
||||||
|
|
||||||
// fancyboxes
|
// fancyboxes
|
||||||
$("a.popupbox").fancybox({
|
$("a.popupbox").fancybox({
|
||||||
|
|
|
||||||
|
|
@ -263,7 +263,7 @@ function settings_post(&$a) {
|
||||||
$suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0);
|
$suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0);
|
||||||
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
|
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
|
||||||
$hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
|
$hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
|
||||||
|
$nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0);
|
||||||
|
|
||||||
$notify = 0;
|
$notify = 0;
|
||||||
|
|
||||||
|
|
@ -347,6 +347,7 @@ function settings_post(&$a) {
|
||||||
set_pconfig(local_user(),'system','suggestme', $suggestme);
|
set_pconfig(local_user(),'system','suggestme', $suggestme);
|
||||||
set_pconfig(local_user(),'system','update_interval', $browser_update);
|
set_pconfig(local_user(),'system','update_interval', $browser_update);
|
||||||
set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
|
set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
|
||||||
|
set_pconfig(local_user(),'system','no_smilies',$nosmile);
|
||||||
|
|
||||||
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d WHERE `uid` = %d LIMIT 1",
|
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d WHERE `uid` = %d LIMIT 1",
|
||||||
dbesc($username),
|
dbesc($username),
|
||||||
|
|
@ -674,6 +675,9 @@ function settings_content(&$a) {
|
||||||
$itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network'));
|
$itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network'));
|
||||||
$itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
|
$itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
|
||||||
|
|
||||||
|
$nosmile = get_pconfig(local_user(),'system','no_smilies');
|
||||||
|
$nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0
|
||||||
|
|
||||||
if(! strlen($a->user['timezone']))
|
if(! strlen($a->user['timezone']))
|
||||||
$timezone = date_default_timezone_get();
|
$timezone = date_default_timezone_get();
|
||||||
|
|
||||||
|
|
@ -841,6 +845,7 @@ function settings_content(&$a) {
|
||||||
'$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes),
|
'$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes),
|
||||||
'$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
|
'$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
|
||||||
'$itemspage_network' => array('itemspage_network', t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')),
|
'$itemspage_network' => array('itemspage_network', t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')),
|
||||||
|
'$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''),
|
||||||
|
|
||||||
'$h_prv' => t('Security and Privacy Settings'),
|
'$h_prv' => t('Security and Privacy Settings'),
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ $nickname_block
|
||||||
{{inc field_select.tpl with $field=$theme }}{{endinc}}
|
{{inc field_select.tpl with $field=$theme }}{{endinc}}
|
||||||
{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
|
{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
|
||||||
{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
|
{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
|
||||||
|
{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
|
||||||
|
|
||||||
<div class="settings-submit-wrapper" >
|
<div class="settings-submit-wrapper" >
|
||||||
<input type="submit" name="submit" class="settings-submit" value="$submit" />
|
<input type="submit" name="submit" class="settings-submit" value="$submit" />
|
||||||
|
|
|
||||||
|
|
@ -11,10 +11,10 @@
|
||||||
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
|
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
|
||||||
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
|
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
|
||||||
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
|
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
|
||||||
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
|
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
|
||||||
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
|
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,352 +11,195 @@ $a->theme_info = array(
|
||||||
'extends' => 'diabook',
|
'extends' => 'diabook',
|
||||||
);
|
);
|
||||||
|
|
||||||
//profile_side at networkpages
|
|
||||||
|
|
||||||
if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
|
|
||||||
//
|
|
||||||
|
|
||||||
$nav['usermenu']=array();
|
|
||||||
$userinfo = null;
|
|
||||||
|
|
||||||
if(local_user()) {
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
|
|
||||||
|
|
||||||
$userinfo = array(
|
|
||||||
'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
|
|
||||||
'name' => $a->user['username'],
|
|
||||||
);
|
|
||||||
|
|
||||||
$ps['usermenu'][status] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
|
|
||||||
$ps['usermenu'][profile] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
|
|
||||||
$ps['usermenu'][photos] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
|
|
||||||
$ps['usermenu'][events] = Array('events/', t('Events'), "", t('Your events'));
|
|
||||||
$ps['usermenu'][notes] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
|
|
||||||
$ps['usermenu'][community] = Array('community/', t('Community'), "", "");
|
|
||||||
|
|
||||||
|
|
||||||
$tpl = get_markup_template('profile_side.tpl');
|
|
||||||
|
|
||||||
$a->page['aside'] .= replace_macros($tpl, array(
|
|
||||||
'$userinfo' => $userinfo,
|
|
||||||
'$ps' => $ps,
|
|
||||||
));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
//right_aside at networkpages
|
|
||||||
|
|
||||||
// last 12 users
|
|
||||||
$aside['$lastusers_title'] = t('Last users');
|
|
||||||
$aside['$lastusers_items'] = array();
|
|
||||||
$sql_extra = "";
|
|
||||||
$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 ",
|
|
||||||
0,
|
|
||||||
12
|
|
||||||
);
|
|
||||||
$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
|
|
||||||
if(count($r)) {
|
|
||||||
$photo = 'thumb';
|
|
||||||
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' => $rr[$photo],
|
|
||||||
'$alt-text' => $rr['name'],
|
|
||||||
));
|
|
||||||
$aside['$lastusers_items'][] = $entry;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// last 10 liked items
|
|
||||||
$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,10",
|
|
||||||
$a->get_baseurl(),$a->get_baseurl()
|
|
||||||
);
|
|
||||||
|
|
||||||
foreach ($r as $rr) {
|
|
||||||
$author = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
|
|
||||||
$objauthor = '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
|
|
||||||
|
|
||||||
//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 = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
|
|
||||||
|
|
||||||
$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
|
|
||||||
|
|
||||||
}
|
|
||||||
// last 12 photos
|
|
||||||
$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
|
|
||||||
ORDER BY `photo`.`edited` DESC
|
|
||||||
LIMIT 0, 12",
|
|
||||||
dbesc(t('Contact Photos')),
|
|
||||||
dbesc(t('Profile Photos'))
|
|
||||||
);
|
|
||||||
if(count($r)) {
|
|
||||||
$tpl = file_get_contents( dirname(__file__).'/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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
|
|
||||||
$a->page['right_aside'] = replace_macros($tpl, $aside);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
//right_aside at profile pages
|
|
||||||
|
|
||||||
if($is_url = preg_match ("/\bprofile\b/i", $_SERVER['REQUEST_URI'])) {
|
|
||||||
//right_aside
|
|
||||||
|
|
||||||
// last 12 users
|
|
||||||
$aside['$lastusers_title'] = t('Last users');
|
|
||||||
$aside['$lastusers_items'] = array();
|
|
||||||
$sql_extra = "";
|
|
||||||
$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 ",
|
|
||||||
0,
|
|
||||||
12
|
|
||||||
);
|
|
||||||
$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
|
|
||||||
if(count($r)) {
|
|
||||||
$photo = 'thumb';
|
|
||||||
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' => $rr[$photo],
|
|
||||||
'$alt-text' => $rr['name'],
|
|
||||||
));
|
|
||||||
$aside['$lastusers_items'][] = $entry;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// last 10 liked items
|
|
||||||
$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,10",
|
|
||||||
$a->get_baseurl(),$a->get_baseurl()
|
|
||||||
);
|
|
||||||
|
|
||||||
foreach ($r as $rr) {
|
|
||||||
$author = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
|
|
||||||
$objauthor = '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
|
|
||||||
|
|
||||||
//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 = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
|
|
||||||
|
|
||||||
$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
|
|
||||||
|
|
||||||
}
|
|
||||||
// last 12 photos
|
|
||||||
$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
|
|
||||||
ORDER BY `photo`.`edited` DESC
|
|
||||||
LIMIT 0, 12",
|
|
||||||
dbesc(t('Contact Photos')),
|
|
||||||
dbesc(t('Profile Photos'))
|
|
||||||
);
|
|
||||||
if(count($r)) {
|
|
||||||
$tpl = file_get_contents( dirname(__file__).'/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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
|
|
||||||
$a->page['right_aside'] = replace_macros($tpl, $aside);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
//change css on network and profilepages
|
//change css on network and profilepages
|
||||||
$cssFile = null;
|
$cssFile = null;
|
||||||
|
|
||||||
if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
|
|
||||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css";
|
/**
|
||||||
|
* prints last community activity
|
||||||
|
*/
|
||||||
|
function diabook_community_info(){
|
||||||
|
$a = get_app();
|
||||||
|
//right_aside at networkpages
|
||||||
|
|
||||||
|
// last 12 users
|
||||||
|
$aside['$lastusers_title'] = t('Last users');
|
||||||
|
$aside['$lastusers_items'] = array();
|
||||||
|
$sql_extra = "";
|
||||||
|
$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 ",
|
||||||
|
0,
|
||||||
|
12
|
||||||
|
);
|
||||||
|
$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
|
||||||
|
if(count($r)) {
|
||||||
|
$photo = 'thumb';
|
||||||
|
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' => $rr[$photo],
|
||||||
|
'$alt-text' => $rr['name'],
|
||||||
|
));
|
||||||
|
$aside['$lastusers_items'][] = $entry;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($is_url = preg_match ("/\bprofile\b/i", $_SERVER['REQUEST_URI'])) {
|
|
||||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";
|
// last 10 liked items
|
||||||
}
|
$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,10",
|
||||||
|
$a->get_baseurl(),$a->get_baseurl()
|
||||||
|
);
|
||||||
|
|
||||||
|
foreach ($r as $rr) {
|
||||||
|
$author = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
|
||||||
|
$objauthor = '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
|
||||||
|
|
||||||
|
//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 = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
|
||||||
|
|
||||||
|
$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// last 12 photos
|
||||||
|
$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, 12",
|
||||||
|
dbesc(t('Contact Photos')),
|
||||||
|
dbesc(t('Profile Photos'))
|
||||||
|
);
|
||||||
|
if(count($r)) {
|
||||||
|
$tpl = file_get_contents( dirname(__file__).'/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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
|
||||||
|
$a->page['right_aside'] = replace_macros($tpl, $aside);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//profile_side at networkpages
|
||||||
|
if ($a->argv[0] === "network"){
|
||||||
|
|
||||||
|
// USER MENU
|
||||||
|
if(local_user()) {
|
||||||
|
|
||||||
|
$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
|
||||||
|
|
||||||
|
$userinfo = array(
|
||||||
|
'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
|
||||||
|
'name' => $a->user['username'],
|
||||||
|
);
|
||||||
|
$ps = array('usermenu'=>array());
|
||||||
|
$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
|
||||||
|
$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
|
||||||
|
$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
|
||||||
|
$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
|
||||||
|
$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
|
||||||
|
$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
|
||||||
|
$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Public Groups'), "", "");
|
||||||
|
|
||||||
|
$tpl = get_markup_template('profile_side.tpl');
|
||||||
|
|
||||||
|
$a->page['aside'] .= replace_macros($tpl, array(
|
||||||
|
'$userinfo' => $userinfo,
|
||||||
|
'$ps' => $ps,
|
||||||
|
));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// COMMUNITY
|
||||||
|
diabook_community_info();
|
||||||
|
|
||||||
|
// CUSTOM CSS
|
||||||
|
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css";
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//right_aside at profile pages
|
||||||
|
if ($a->argv[0] === "profile"){
|
||||||
|
|
||||||
|
// COMMUNITY
|
||||||
|
diabook_community_info();
|
||||||
|
|
||||||
|
// CUSTOM CSS
|
||||||
|
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// custom css
|
||||||
|
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
|
||||||
|
|
||||||
//js scripts
|
//js scripts
|
||||||
|
|
||||||
$a->page['htmlhead'] .= <<< EOT
|
$a->page['htmlhead'] .= <<< EOT
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="$cssFile" />
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
//contacts
|
|
||||||
$('html').click(function() {
|
|
||||||
$('#nav-contacts-linkmenu').removeClass('selected');
|
|
||||||
document.getElementById( "nav-contacts-menu" ).style.display = "none";
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#nav-contacts-linkmenu').click(function(event){
|
|
||||||
event.stopPropagation();
|
|
||||||
});
|
|
||||||
|
|
||||||
//messages
|
|
||||||
$('html').click(function() {
|
|
||||||
$('#nav-messages-linkmenu').removeClass('selected');
|
|
||||||
document.getElementById( "nav-messages-menu" ).style.display = "none";
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#nav-messages-linkmenu').click(function(event){
|
|
||||||
event.stopPropagation();
|
|
||||||
});
|
|
||||||
|
|
||||||
//notifications
|
|
||||||
$('html').click(function() {
|
|
||||||
$('#nav-notifications-linkmenu').removeClass('selected');
|
|
||||||
document.getElementById( "nav-notifications-menu" ).style.display = "none";
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#nav-notifications-linkmenu').click(function(event){
|
|
||||||
event.stopPropagation();
|
|
||||||
});
|
|
||||||
|
|
||||||
//usermenu
|
|
||||||
$('html').click(function() {
|
|
||||||
$('#nav-user-linkmenu').removeClass('selected');
|
|
||||||
document.getElementById( "nav-user-menu" ).style.display = "none";
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#nav-user-linkmenu').click(function(event){
|
|
||||||
event.stopPropagation();
|
|
||||||
});
|
|
||||||
|
|
||||||
//settingsmenu
|
|
||||||
$('html').click(function() {
|
|
||||||
$('#nav-site-linkmenu').removeClass('selected');
|
|
||||||
document.getElementById( "nav-site-menu" ).style.display = "none";
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#nav-site-linkmenu').click(function(event){
|
|
||||||
event.stopPropagation();
|
|
||||||
});
|
|
||||||
//appsmenu
|
|
||||||
$('html').click(function() {
|
|
||||||
$('#nav-apps-link').removeClass('selected');
|
|
||||||
document.getElementById( "nav-apps-menu" ).style.display = "none";
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#nav-apps-link').click(function(event){
|
|
||||||
event.stopPropagation();
|
|
||||||
});
|
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
$('a.lightbox').fancybox(); // Select all links with lightbox class
|
$('a.lightbox').fancybox(); // Select all links with lightbox class
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
EOT;
|
EOT;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user