Merge remote branch 'upstream/master'

[friendica.git] / view / theme / diabook / theme.php

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index b487b8f88af96c6bca03528a1074f986a2d92495..6eb623d9536cabe87723ba7c3dcb5b72886f34f5 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -7,9 +7,6 @@
  * Author: 
  */
 
-$a->theme_info = array(
-  'extends' => 'diabook',
-);
 
 //change css on network and profilepages
 $cssFile = null;
@@ -18,6 +15,9 @@ $cssFile = null;
 /**
  * prints last community activity
  */
+
+
+ 
 function diabook_community_info(){
        $a = get_app();
        //right_aside at networkpages
@@ -33,7 +33,7 @@ function diabook_community_info(){
                        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
+               9
        );
        $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
        if(count($r)) {
@@ -61,7 +61,7 @@ function diabook_community_info(){
                        WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
                        GROUP BY `uri`
                        ORDER BY `T1`.`created` DESC
-                       LIMIT 0,10",
+                       LIMIT 0,5",
                        $a->get_baseurl(),$a->get_baseurl()
                        );
 
@@ -109,7 +109,7 @@ function diabook_community_info(){
                                AND `user`.`blockwall`=0
                                AND `user`.`hidewall`=0
                                ORDER BY `photo`.`edited` DESC
-                               LIMIT 0, 12",
+                               LIMIT 0, 9",
                                dbesc(t('Contact Photos')),
                                dbesc(t('Profile Photos'))
                                );
@@ -130,15 +130,74 @@ function diabook_community_info(){
                }
        }
        
+       $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['directory'] = Array('directory', t('Directory'), "", "");
+       $nv['match'] = Array('match', t('Similar Interests'), "", "");
+       $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
+       $nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+       
+       $aside['$nv'] = $nv;
+       };
+   
+   //Community Page
+   $page = '<div id="page-sidebar-right_aside" class="widget">
+                       <div class="title tool">
+                       <h3>'.t("Community Pages").'</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",
+                       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         
+     
+   
+   $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"){
+if ($a->argv[0] === "network" && local_user()){
 
        // USER MENU
        if(local_user()) {
@@ -152,11 +211,12 @@ if ($a->argv[0] === "network"){
                $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.friendika.com/directory/forum', t('Public Groups'), "", "");
+               $ps['usermenu']['pgroups'] = Array('http://dir.friendica.com/directory/forum', t('Public Groups'), "", "");
 
                $tpl = get_markup_template('profile_side.tpl');
 
@@ -200,6 +260,7 @@ $a->page['htmlhead'] .= <<< EOT
  $(function() {
        $('a.lightbox').fancybox(); // Select all links with lightbox class
  });
+  
  </script>
 EOT;