Merge branch 'master' of https://github.com/friendica/friendica

Conflicts:
	include/config.php
	update.php

1 files changed, 428 insertions, 83 deletions

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 39479ce52..50a7c6974 100755..100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,117 +3,462 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
+ * Version: (Version: 1.012)
  * Author: 
  */
 
-$a->theme_info = array(
-  'extends' => 'diabook',
-);
 
-//profile_side
+
+//change css on network and profilepages
+$cssFile = null;
+
+
+/**
+ * prints last community activity
+ */
 
 
+ 
+function diabook_community_info(){
+	$a = get_app();
+	//right_aside at networkpages
 
-$nav['usermenu']=array();
-$userinfo = null;
+	// 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 ";
 
-if(local_user()) {
+	$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,
+		9
+	);
+	$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,5",
+			$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>';
 
-$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
 		
-$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'), "", "");
-
-if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
-$tpl = get_markup_template('profile_side.tpl');
-
-$a->page['aside'] .= replace_macros($tpl, array(
-		'$userinfo' => $userinfo,
-		'$ps' => $ps,
-	));
+	}
+	
+	
+	// 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, 9",
+				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;
+		}
+	}
+	
+	$fostitJS = "javascript: (function() {
+    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
+    						a_funct = function() {
+        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
+    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
+    							else {a_funct()}})()" ;
+  
+   $aside['$fostitJS'] = $fostitJS;
+   
+   //right_aside FIND FRIENDS
+	if(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['match'] = Array('match', t('Similar Interests'), "", "");
+	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
+	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+	
+	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
+						<span class="sbox_l"></span>
+						<span class="sbox">
+						<input type="text" name="search" size="13" maxlength="50">
+						</span>
+						<span class="sbox_r" id="srch_clear"></span>';
+	
+	$aside['$nv'] = $nv;
+	};
+   
+   //Community Page
+   if(local_user()) {
+   $page = '<div id="page-sidebar-right_aside" class="widget">
+			<div class="title tool">
+			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
+			<div id="sidebar-page-list"><ul>';
+
+	$pagelist = array();
+
+	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
+			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			ORDER BY `name` ASC",
+			intval($a->user['uid'])
+	);
+
+	$pageD = array();
+
+	// Look if the profile is a community page
+	foreach($contacts as $contact) {
+		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
+	};
+	
+
+	$contacts = $pageD;
+
+	foreach($contacts as $contact) {
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
+				$contact["name"]."</a></li>";
+	}
+	$page .= '</ul></div></div>';
+	//if (sizeof($contacts) > 0)
+		
+		$aside['$page'] = $page;	
+	}
+  //END Community Page	
+  //helpers
+   $helpers = array();
+	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
+	
+	$aside['$helpers'] = $helpers;
+   //end helpers
+   //connectable services
+   $con_services = array();
+	$con_services['title'] = Array("", t('Connect Services'), "", "");
+	
+	$aside['$con_services'] = $con_services;
+   //end connectable services
+   //postit
+   $postit = array();
+	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
+	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
+	
+	$aside['$postit'] = $postit;
+   //end postit
+  
+   //get_baseurl
+   $url = $a->get_baseurl($ssl_state);   
+   $aside['$url'] = $url;
+
+	$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" && local_user()){
+
+	// 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']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));				
+		$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.friendica.com/directory/forum', t('Community Pages'), "", "");
+
+		$tpl = get_markup_template('profile_side.tpl');
+
+		$a->page['aside'] .= replace_macros($tpl, array(
+				'$userinfo' => $userinfo,
+				'$ps' => $ps,
+			));
+
+	}
+	
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+	
+	if($ccCookie != "8") {
+	// 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].$a->argv[1] === "profile".$a->user['nickname']){
+	if($ccCookie != "8") {
+	// COMMUNITY
+	diabook_community_info();
+	
+	// CUSTOM CSS
+	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";
+	
+	
+	}
+}
+
+//tabs at aside on settings page
+if ($a->argv[0] === "settings"){
+	
+	$tabs = array(
+		array(
+			'label'	=> t('Account settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings',
+			'sel'	=> (($a->argc == 1)?'active':''),
+		),	
+		array(
+			'label'	=> t('Display settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/display',
+			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
+		),	
+		array(
+			'label'	=> t('Edit/Manage Profiles'),
+			'url' 	=> $a->get_baseurl(true).'/profiles',
+		),	
+		array(
+			'label'	=> t('Connector settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
+			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
+		),
+		array(
+			'label'	=> t('Plugin settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/addon',
+			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
+		),
+		array(
+			'label' => t('Connections'),
+			'url' => $a->get_baseurl(true) . '/settings/oauth',
+			'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
+		),
+		array(
+			'label' => t('Export personal data'),
+			'url' => $a->get_baseurl(true) . '/uexport',
+			'sel' => ''
+		)
+	);
+	$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
+	$a->page['aside'] = replace_macros($tabtpl, array(
+		'$tabs' => $tabs,
+	));
+	
+	
+	// CUSTOM CSS
+	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-settings.css";
+	
+}
+
+// custom css
+if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
+
+//load jquery.cookie.js
+$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
+
 //js scripts
-$a->page['htmlhead'] .= <<< EOT
 
-<script>
+$a->page['htmlhead'] .= '
 
-//contacts
-$('html').click(function() {
- $('#nav-contacts-linkmenu').removeClass('selected');
- document.getElementById( "nav-contacts-menu" ).style.display = "none";
+<script>
+ $(function() {
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
  });
  
- $('#nav-contacts-linkmenu').click(function(event){
-     event.stopPropagation();
- });
+ $(document).ready(function (){
+	$("iframe").each(function(){
+		var url = $(this).attr("src");
+		$(this).attr("src",url+"?wmode=transparent"); });
+    });
+  
+ </script>';
 
-//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";
- });
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
+<script>
 
- $('#nav-notifications-linkmenu').click(function(event){
-     event.stopPropagation();
- });
+$("right_aside").ready(function(){
+	
+	if($.cookie("close_pages") == "1") 
+		{
+		document.getElementById( "close_pages" ).style.display = "none";
+			};
+	
+	if($.cookie("close_helpers") == "1") 
+		{
+		document.getElementById( "close_helpers" ).style.display = "none";
+			};
+			
+	if($.cookie("close_services") == "1") 
+		{
+		document.getElementById( "close_services" ).style.display = "none";
+			};
+			
+	if($.cookie("close_friends") == "1") 
+		{
+		document.getElementById( "close_friends" ).style.display = "none";
+			};
+	
+	if($.cookie("close_postit") == "1") 
+		{
+		document.getElementById( "close_postit" ).style.display = "none";
+			};
+			
+	if($.cookie("close_lastusers") == "1") 
+		{
+		document.getElementById( "close_lastusers" ).style.display = "none";
+			};
+			
+	if($.cookie("close_lastphotos") == "1") 
+		{
+		document.getElementById( "close_lastphotos" ).style.display = "none";
+			};
+			
+	if($.cookie("close_lastlikes") == "1") 
+		{
+		document.getElementById( "close_lastlikes" ).style.display = "none";
+			};}
 
-//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();
- });
+function close_pages(){
+ document.getElementById( "close_pages" ).style.display = "none";
+ $.cookie("close_pages","1", { expires: 365, path: "/" });
+ };
  
- //settingsmenu
- $('html').click(function() {
- $('#nav-site-linkmenu').removeClass('selected');
- document.getElementById( "nav-site-menu" ).style.display = "none";
- });
+function close_helpers(){
+ document.getElementById( "close_helpers" ).style.display = "none";
+  $.cookie("close_helpers","1", { expires: 365, path: "/" });
+ };
 
- $('#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";
- });
+function close_services(){
+ document.getElementById( "close_services" ).style.display = "none";
+ $.cookie("close_services","1", { expires: 365, path: "/" });
+ };
+ 
+function close_friends(){
+ document.getElementById( "close_friends" ).style.display = "none";
+ $.cookie("close_friends","1", { expires: 365, path: "/" });
+ };
 
- $('#nav-apps-link').click(function(event){
-     event.stopPropagation();
- });
+function close_postit(){
+ document.getElementById( "close_postit" ).style.display = "none";
+ $.cookie("close_postit","1", { expires: 365, path: "/" });
+ };
  
- $(function() {
-	$('a.lightbox').fancybox(); // Select all links with lightbox class
-});
+function close_lastusers(){
+ document.getElementById( "close_lastusers" ).style.display = "none";
+ $.cookie("close_lastusers","1", { expires: 365, path: "/" });
+ };
 
+function close_lastphotos(){
+ document.getElementById( "close_lastphotos" ).style.display = "none";
+ $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
+ };
+ 
+function close_lastlikes(){
+ document.getElementById( "close_lastlikes" ).style.display = "none";
+ $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
+ };
  
- </script>
-EOT;
+ 
+
+function restore_boxes(){
+	$.cookie("close_pages","2", { expires: 365, path: "/" });
+	$.cookie("close_helpers","2", { expires: 365, path: "/" });
+	$.cookie("close_services","2", { expires: 365, path: "/" });
+	$.cookie("close_friends","2", { expires: 365, path: "/" });
+	$.cookie("close_postit","2", { expires: 365, path: "/" });
+	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
+	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
+	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
+	alert("Right-hand column was restored. Please refresh your browser");
+  };
+</script>';}
\ No newline at end of file