]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 2 May 2012 16:49:00 +0000 (12:49 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 2 May 2012 16:49:00 +0000 (12:49 -0400)
* remotes/upstream/master:
  diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box
  diabook-theme: tryied to improve performance a bit
  diabook-theme: fix footer/impressum
  missing param
  provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc.
  delineate the new profile changes from the rest of the text
  how did that happen?
  shuffle results of remote_common_friends widget
  only validate once
  perform basic validation

* master:

boot.php
database.sql
include/contact_widgets.php
include/socgraph.php
mod/profiles.php
update.php
view/theme/diabook/bottom.tpl [new file with mode: 0644]
view/theme/diabook/comment_item.tpl
view/theme/diabook/communityhome.tpl
view/theme/diabook/js/jquery.twitter.search.js
view/theme/diabook/theme.php

index e1687030d53d155de20636cd4223de334ccf9a86..f357487b992db39b0264cb38671677a8d3b9683d 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '2.3.1329' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1142      );
+define ( 'DB_UPDATE_VERSION',      1143      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -1520,9 +1520,12 @@ function get_my_url() {
 }
 
 function zrl_init(&$a) {
-       proc_run('php','include/gprobe.php',bin2hex(get_my_url()));
-       $arr = array('zrl' => get_my_url(), 'url' => $a->cmd);
-       call_hooks('zrl_init',$arr);
+       $tmp_str = get_my_url();
+       if(validate_url($tmp_str)) {
+               proc_run('php','include/gprobe.php',bin2hex($tmp_str));
+               $arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
+               call_hooks('zrl_init',$arr);
+       }
 }
 
 function zrl($s,$force = false) {
index dc586bc2be01851a1a4eeea2912dba39bca0afd5..cf086796a66f4538b8580f4269607b7f1d203583 100644 (file)
@@ -1027,6 +1027,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `account_expired` tinyint(1) NOT NULL DEFAULT '0',
   `account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `service_class` char(32) NOT NULL,
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
@@ -1042,7 +1043,8 @@ CREATE TABLE IF NOT EXISTS `user` (
   KEY `verified` (`verified`),
   KEY `unkmail` (`unkmail`),
   KEY `cntunkmail` (`cntunkmail`),
-  KEY `account_removed` (`account_removed`)
+  KEY `account_removed` (`account_removed`),
+  KEY `service_class` (`service_class`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
index cfe27c5c9ba36997b4bb52e1583decd39360910b..bf3a8695836b38a9e59f7caa2167c78e927403df 100644 (file)
@@ -146,11 +146,19 @@ function common_friends_visitor_widget($profile_uid) {
                $cid = local_user();
        else {
                if(get_my_url()) {
-                       $r = q("select id from gcontact where nurl = '%s' limit 1",
-                               dbesc(normalise_link(get_my_url()))
+                       $r = q("select id from contact where nurl = '%s' and uid = %d limit 1",
+                               dbesc(normalise_link(get_my_url())),
+                               intval($profile_uid)
                        );
                        if(count($r))
-                               $zcid = $r[0]['id'];
+                               $cid = $r[0]['id'];
+                       else {
+                               $r = q("select id from gcontact where nurl = '%s' limit 1",
+                                       dbesc(normalise_link(get_my_url()))
+                               );
+                               if(count($r))
+                                       $zcid = $r[0]['id'];
+                       }
                }
        }
 
@@ -162,14 +170,14 @@ function common_friends_visitor_widget($profile_uid) {
        if($cid)
                $t = count_common_friends($profile_uid,$cid);
        else
-               $t = count_common_friends($profile_uid,$cid);
+               $t = count_common_friends_zcid($profile_uid,$zcid);
        if(! $t)
                return;
 
        if($cid)
-               $r = common_friends($profile_uid,$cid,5);
+               $r = common_friends($profile_uid,$cid,5,true);
        else
-               $r = common_friends_zcid($profile_uid,$zcid);
+               $r = common_friends_zcid($profile_uid,$zcid,5,true);
 
        return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
                '$desc' =>  sprintf( tt("%d friend in common", "%d friends in common", $t), $t),
index a08d58074187eead84b196a7263671c302a169ab..35d754cadcc38635b246725adcaaa48a0f8207bc 100644 (file)
@@ -182,13 +182,18 @@ function count_common_friends($uid,$cid) {
 }
 
 
-function common_friends($uid,$cid,$limit=9999) {
+function common_friends($uid,$cid,$limit=9999,$shuffle = false) {
+
+       if($shuffle)
+               $sql_extra = " order by rand() ";
+       else
+               $sql_extra = " order by `gcontact`.`name` asc "; 
 
        $r = q("SELECT `gcontact`.* 
                FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
                where `glink`.`cid` = %d and `glink`.`uid` = %d
                and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) 
-               order by `gcontact`.`name` asc limit 0, %d",
+               sql_extra limit 0, %d",
                intval($cid),
                intval($uid),
                intval($uid),
@@ -217,13 +222,18 @@ function count_common_friends_zcid($uid,$zcid) {
 
 }
 
-function common_friends_zcid($uid,$zcid,$limit = 6) {
+function common_friends_zcid($uid,$zcid,$limit = 9999,$shuffle) {
+
+       if($shuffle)
+               $sql_extra = " order by rand() ";
+       else
+               $sql_extra = " order by `gcontact`.`name` asc "; 
 
        $r = q("SELECT `gcontact`.* 
                FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
                where `glink`.`zcid` = %d
                and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) 
-               order by `gcontact`.`name` asc limit 0, %d",
+               $sql_extra limit 0, %d",
                intval($zcid),
                intval($uid),
                intval($limit)
index 3a52c8fa5ee00f9fce921b449772f3e379ce8eb9..4de9057dc8fb44924b70bab3838eb832fed8581a 100644 (file)
@@ -328,7 +328,7 @@ function profile_activity($changed, $value) {
        $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';      
 
        if($t == 1 && strlen($value)) {
-               $message = sprintf( t('%1$s changed %2$s to %3$s'), $A, $changes, $value);
+               $message = sprintf( t('%1$s changed %2$s to "%3$s"'), $A, $changes, $value);
                $message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof);
        }
        else
index cce942f27e7c77d2809f988515a403b1aee8baad..e363aa942e2157124a08f986057ad02c6cbadf76 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1142 );
+define( 'UPDATE_VERSION' , 1143 );
 
 /**
  *
@@ -1239,3 +1239,12 @@ function update_1141() {
 }
 
 
+function update_1142() {
+       $r = q("alter table user add service_class char(32) not null after expire_notification_sent, add index(service_class) ");
+       if(! $r)
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}
+
+
+
diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl
new file mode 100644 (file)
index 0000000..8eb71b7
--- /dev/null
@@ -0,0 +1,101 @@
+<script type="text/javascript" src="$baseurl/view/theme/diabook/js/jquery.autogrow.textarea.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+
+});
+function tautogrow(id){
+               $("textarea#comment-edit-text-" +id).autogrow();        
+       };
+$(document).ready(function() {
+    $("iframe").each(function(){
+        var ifr_source = $(this).attr("src");
+        var wmode = "wmode=transparent";
+        if(ifr_source.indexOf("?") != -1) {
+            var getQString = ifr_source.split("?");
+            var oldString = getQString[1];
+            var newString = getQString[0];
+            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
+        }
+        else $(this).attr("src",ifr_source+"?"+wmode);
+       
+    });
+      
+       });
+
+       function yt_iframe() {
+
+       $("iframe").load(function() { 
+       var ifr_src = $(this).contents().find("body iframe").attr("src");
+       $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
+    });
+
+       };
+
+       function scrolldown(){
+                       $("html, body").animate({scrollTop:$(document).height()}, "slow");
+                       return false;
+               };
+               
+       function scrolltop(){
+                       $("html, body").animate({scrollTop:0}, "slow");
+                       return false;
+               };
+               
+       $(window).scroll(function () { 
+               
+               var footer_top = $(document).height() - 30;
+               $("div#footerbox").css("top", footer_top);
+       
+               var scrollInfo = $(window).scrollTop();      
+               
+               if (scrollInfo <= "900"){
+      $("a#top").attr("id","down");
+      $("a#down").attr("onclick","scrolldown()");
+               $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
+               } 
+                   
+      if (scrollInfo > "900"){
+      $("a#down").attr("id","top");
+      $("a#top").attr("onclick","scrolltop()");
+               $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
+               }
+               
+    });
+  
+
+       function insertFormatting(comment,BBcode,id) {
+       
+               var tmpStr = $("#comment-edit-text-" + id).val();
+               if(tmpStr == comment) {
+                       tmpStr = "";
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+                       openMenu("comment-edit-submit-wrapper-" + id);
+                                                               }
+
+       textarea = document.getElementById("comment-edit-text-" +id);
+       if (document.selection) {
+               textarea.focus();
+               selected = document.selection.createRange();
+               if (BBcode == "url"){
+                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+                       } else                  
+               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+               var start = textarea.selectionStart;
+               var end = textarea.selectionEnd;
+               if (BBcode == "url"){
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+                       } else
+               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+       }
+       return true;
+       }
+
+       function cmtBbOpen(id) {
+       $(".comment-edit-bb-" + id).show();
+       }
+       function cmtBbClose(id) {
+       $(".comment-edit-bb-" + id).hide();
+       }
+</script>
index e10b868450028e02140a13068609fe1a900e568e..fc3594fdc9841e87072034018190344255fff171 100644 (file)
                                <div class="comment-edit-photo-end"></div>
                                <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);"  >$comment</textarea>
                                <div class="comment-edit-bb-$id" style="display:none;">                         
-                               <a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>     
-                               <a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
-                               <a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>                                                                                                         
-                               <a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
-                               <a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
-                               <a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
-                               <a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>                                                                                                                                                    
+                               <a class="icon bb-image" style="cursor: pointer;" title="$edimg" onclick="insertFormatting('$comment','img',$id);">img</a>      
+                               <a class="icon bb-url" style="cursor: pointer;" title="$edurl" onclick="insertFormatting('$comment','url',$id);">url</a>
+                               <a class="icon bb-video" style="cursor: pointer;" title="$edvideo" onclick="insertFormatting('$comment','video',$id);">video</a>                                                                                                                
+                               <a class="icon underline" style="cursor: pointer;" title="$eduline" onclick="insertFormatting('$comment','u',$id);">u</a>
+                               <a class="icon italic" style="cursor: pointer;" title="$editalic" onclick="insertFormatting('$comment','i',$id);">i</a>
+                               <a class="icon bold" style="cursor: pointer;"  title="$edbold" onclick="insertFormatting('$comment','b',$id);">b</a>
+                               <a class="icon quote" style="cursor: pointer;" title="$edquote" onclick="insertFormatting('$comment','quote',$id);">quote</a>                                                                                                                                                   
                                </div>                          
                                {{ if $qcomment }}
                                        <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
index f2f8b4d5e58f668ede586c8abe3a4a667c8fd46a..9ccba45972397560deaee5e97fc270efae83a44e 100755 (executable)
@@ -16,7 +16,7 @@
 </div>
 
 <div id="close_helpers">
-{{ if $lastusers_title }}
+{{ if $helpers }}
 <h3>$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
 <a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
 <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
@@ -26,7 +26,7 @@
 </div>
 
 <div id="close_services">
-{{ if $lastusers_title }}
+{{ if $con_services }}
 <h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
 <div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
 <a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
index 18d2e091aedb71c0afd267b52f4d38d1d4c36820..a1b4b83bdf71f11921f2e69e96057b89f8fb9af3 100644 (file)
                        // default styling
                        a:     { textDecoration: 'none', color: '#3B5998' },
                        bird:  { width: '50px', height: '20px', position: 'absolute', left: '-30px', top: '-20px', border: 'none' },
-                       container: { overflow: 'hidden', backgroundColor: '', height: '360px' },
+                       container: { overflow: 'hidden', backgroundColor: '', height: '600px' },
                        fail:  { background: '#6cc5c3 url(http://cloud.github.com/downloads/malsup/twitter/failwhale.png) no-repeat 50% 50%', height: '100%', padding: '10px' },
                        frame: { border: '0px solid #C2CFF1', borderRadius: '0px', '-moz-border-radius': '0px', '-webkit-border-radius': '0px' },
                        tweet: { padding: '5px 10px', clear: 'left' },
index 07fef7d7cc2766647deab1c1fb4f2b26afd8a467..a169043b26a5d0f17b6ba43aa052ee7705d8b7e3 100755 (executable)
@@ -3,13 +3,20 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.024)
+ * Version: (Version: 1.025)
  * Author: 
  */
 
+$a = get_app();
+$a->theme_info = array(
+    'family' => 'diabook',
+       'version' => '1.025'
+);
 
+function diabook_init(&$a) {
+       
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.024)";
+$diabook_version = "Diabook (Version: 1.025)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -34,17 +41,272 @@ if ($color=="green") $color_path = "/diabook-green/";
 if ($color=="dark") $color_path = "/diabook-dark/";
 
 
-/**
- * prints last community activity
- */
+       //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,
+                       )).$a->page['aside'];
+
+       }
+       
+       $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+       
+       if($ccCookie != "9") {
+       // COMMUNITY
+       diabook_community_info();
+
+       // CUSTOM CSS
+       if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network.css";}
+       if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network-wide.css";}
+       }
+       }
+
+
+
+       //right_aside at profile pages
+       if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
+       if($ccCookie != "9") {
+       // COMMUNITY
+       diabook_community_info();
+       
+       // CUSTOM CSS
+       if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";}
+       if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile-wide.css";}
+       
+       }
+       }
+       
+       //js scripts
+       //load jquery.cookie.js
+       $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
+       $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script>', $cookieJS);
+       
+       //load jquery.ae.image.resize.js
+       $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js";
+       $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
+       
+       //load jquery.twitter.search.js
+       if($_COOKIE['close_twitter'] != "1") {
+       $twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js";
+       $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $twitterJS);
+       }
+       
+       $a->page['htmlhead'] .= '
+       <script>
+       
+        $(function() {
+               $("a.lightbox").fancybox(); // Select all links with lightbox class
+               });
+          
+        $(window).load(function() {
+               var footer_top = $(document).height() - 30;
+               $("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;");
+        });
+       </script>';
+       
+       //check if twitterbox is active and print
+       if($_COOKIE['close_twitter'] != "1") {
+               $a->page['htmlhead'] .= '
+               <script>
+               $(function() {
+               $("#twitter").twitterSearch({               
+               term: "friendica",
+               animInSpeed: 250,
+               bird:    false, 
+               avatar:  false, 
+               colorExterior: "#fff",
+               title: "Last Tweets",
+               timeout: 10000          });
+               });
+               </script>';}
+                       
+       //check if community_home-plugin is activated and change css
+       $nametocheck = "communityhome";
+       $r = q("select id from addon where name = '%s' and installed = 1", dbesc($nametocheck));
+       if(count($r) == "1") {
+       
+       $a->page['htmlhead'] .= '
+       <script>
+       $(document).ready(function() {
+       $("div#login-submit-wrapper").attr("style","padding-top: 120px;");
+       });
+       </script>';     
+       }
+       //comment-edit-wrapper on photo_view
+       if ($a->argv[0].$a->argv[2] === "photos"."image"){
+       $a->page['htmlhead'] .= '
+       <script>
+               $(function(){
+               $(".comment-edit-form").css("display","table");
+                       });
+    </script>';
+       }
+       //restore right hand col at settingspage
+       if($a->argv[0] === "settings" && local_user()) {
+       $a->page['htmlhead'] .= ' 
+       <script>
+       function restore_boxes(){
+       $.cookie("close_pages","2", { expires: 365, path: "/" });
+       $.cookie("close_helpers","2", { expires: 365, path: "/" });
+       $.cookie("close_profiles","2", { expires: 365, path: "/" });
+       $.cookie("close_services","2", { expires: 365, path: "/" });
+       $.cookie("close_friends","2", { expires: 365, path: "/" });
+       $.cookie("close_twitter","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>';}
+       
+       if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+       $a->page['htmlhead'] .= '
+       <script>
+
+       $(function() {
+       $(".oembed.photo img").aeImageResize({height: 400, width: 400});
+       });
+       </script>';
+       
+       if($ccCookie != "9") {
+       $a->page['htmlhead'] .= '
+       <script>
+       $("right_aside").ready(function(){
+       
+       if($.cookie("close_pages") == "1") 
+               {
+               document.getElementById( "close_pages" ).style.display = "none";
+                       };
+                       
+       if($.cookie("close_profiles") == "1") 
+               {
+               document.getElementById( "close_profiles" ).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_twitter") == "1") 
+               {
+               document.getElementById( "twitter" ).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";
+                       };}
 
+       );
 
+       function close_pages(){
+        document.getElementById( "close_pages" ).style.display = "none";
+       $.cookie("close_pages","1", { expires: 365, path: "/" });
+       };
  
-function diabook_community_info(){
-       $a = get_app();
+       function close_profiles(){
+       document.getElementById( "close_profiles" ).style.display = "none";
+       $.cookie("close_profiles","1", { expires: 365, path: "/" });
+       };
+       function close_helpers(){
+       document.getElementById( "close_helpers" ).style.display = "none";
+       $.cookie("close_helpers","1", { expires: 365, path: "/" });
+       };
+
+       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: "/" });
+        };
+       function close_twitter(){
+       document.getElementById( "twitter" ).style.display = "none";
+        $.cookie("close_twitter","1", { expires: 365, path: "/" });
+       };
+       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>';}
+       }
+       //end js scripts
+
+       // custom css
+       if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
+
+       //footer
+       $tpl = get_markup_template('footer.tpl');
+       $a->page['footer'] .= replace_macros($tpl, array());
+       
+       //
+       js_in_foot();
+}
 
 
+ function diabook_community_info() {
+       $a = get_app();
        // comunity_profiles
+       if($_COOKIE['close_profiles'] != "1") {
        $aside['$comunity_profilest_title'] = t('Community Profiles');
        $aside['$comunity_profiles_items'] = array();
        $r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id 
@@ -62,9 +324,10 @@ function diabook_community_info(){
                        ));
                        $aside['$comunity_profiles_items'][] = $entry;
                }
-       }
-
+       }}
+       
        // last 12 users
+       if($_COOKIE['close_lastusers'] != "1") {
        $aside['$lastusers_title'] = t('Last users');
        $aside['$lastusers_items'] = array();
        $sql_extra = "";
@@ -90,10 +353,10 @@ function diabook_community_info(){
                        ));
                        $aside['$lastusers_items'][] = $entry;
                }
-       }
-       
+       }}
        
        // last 10 liked items
+       if($_COOKIE['close_lastlikes'] != "1") {
        $aside['$like_title'] = t('Last likes');
        $aside['$like_items'] = array();
        $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
@@ -135,10 +398,10 @@ function diabook_community_info(){
 
                $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
                
-       }
-       
+       }}
        
        // last 12 photos
+       if($_COOKIE['close_photos'] != "1") {
        $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 
@@ -170,10 +433,10 @@ function diabook_community_info(){
 
                        $aside['$photos_items'][] = $entry;
                }
-       }
+       }}
        
-   
    //right_aside FIND FRIENDS
+   if($_COOKIE['close_friends'] != "1") {
        if(local_user()) {
        $nv = array();
        $nv['title'] = Array("", t('Find Friends'), "", "");
@@ -191,9 +454,10 @@ function diabook_community_info(){
                                                <span class="sbox_r" id="srch_clear"></span>';
        
        $aside['$nv'] = $nv;
-       };
+       }}
    
-   //Community Page
+   //Community_Pages at right_aside
+   if($_COOKIE['close_pages'] != "1") {
    if(local_user()) {
    $page = '<div id="" >
                        <h3 style="margin-top:0px;">'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
@@ -223,402 +487,51 @@ function diabook_community_info(){
        }
        $page .= '</ul></div></div>';
        //if (sizeof($contacts) > 0)
-               
                $aside['$page'] = $page;        
-       }
+       }}
   //END Community Page 
+  
   //helpers
+  if($_COOKIE['close_helpers'] != "1") {
    $helpers = array();
        $helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
-       
        $aside['$helpers'] = $helpers;
+       }
    //end helpers
    //connectable services
+   if($_COOKIE['close_services'] != "1") {
    $con_services = array();
        $con_services['title'] = Array("", t('Connect Services'), "", "");
-       
        $aside['$con_services'] = $con_services;
+       }
    //end connectable services
-  
-  
    //get_baseurl
    $url = $a->get_baseurl($ssl_state);   
    $aside['$url'] = $url;
-
+       //print right_aside
        $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_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-       
-       if($ccCookie != "9") {
-       // COMMUNITY
-       diabook_community_info();
-
-       // CUSTOM CSS
-       if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network.css";}
-       if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network-wide.css";}
-       }
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-       if($ccCookie != "9") {
-       // COMMUNITY
-       diabook_community_info();
-       
-       // CUSTOM CSS
-       if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";}
-       if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile-wide.css";}
-       
-       }
-}
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//footer
-$tpl = get_markup_template('footer.tpl');
-$a->page['footer'] .= replace_macros($tpl, array());
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script>', $cookieJS);
-
-//load jquery.ae.image.resize.js
-$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
+ }
 
-//load jquery.autogrow-textarea.js
-$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.autogrow.textarea.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
+ function js_in_foot() {
+       /** @purpose insert stuff in bottom of page
+        */
+       $a = get_app();
+       $baseurl = $a->get_baseurl($ssl_state);
+       $bottom['$baseurl'] = $baseurl;
+       $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
+       $a->page['footer'] = $a->page['footer'].replace_macros($tpl, $bottom);
+ }
 
-//load jquery.twitter.search.js
-$twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $twitterJS);
 
-//js scripts
 
-//check if community_home-plugin is activated and change css
-$nametocheck = "communityhome";
-$r = q("select id from addon where name = '%s' and installed = 1", dbesc($nametocheck));
-if(count($r) == "1") {
-       
-$a->page['htmlhead'] .= '
-<script>
-$(document).ready(function() {
-       $("div#login-submit-wrapper").attr("style","padding-top: 120px;");
-       });
-</script>';    
-}
 
-//comment-edit-wrapper on photo_view
-if ($a->argv[0].$a->argv[2] === "photos"."image"){
 
-$a->page['htmlhead'] .= '
-<script>
-       $(function(){
-       
-               $(".comment-edit-form").css("display","table");
-                       
-                       });
-    </script>';
-}
 
-$a->page['htmlhead'] .= '
-
-<script>
-
- $(function() {
-       $("a.lightbox").fancybox(); // Select all links with lightbox class
-       $("#twitter").twitterSearch({               
-       term: "friendica",
-       animInSpeed: 250,
-       bird:    false, 
-       avatar:  false, 
-       colorExterior: "#fff",
-       title: "Last Tweets",
-       timeout: 10000          });
- });
-   
-$(window).load(function() {
-       var footer_top = $(document).height() - 30;
-       $("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;");
- });
- </script>';
-$a->page['htmlhead'] .= '
 
-<script type="text/javascript">
-
-function tautogrow(id){
-               $("textarea#comment-edit-text-" +id).autogrow();        
-       };
- </script>';
  
  
-$a->page['htmlhead'] .= '
- <script>
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-       
-    });
-      
-});
-
-function yt_iframe() {
-
-       $("iframe").load(function() { 
-       var ifr_src = $(this).contents().find("body iframe").attr("src");
-       $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-       };
-
-function scrolldown(){
-                       $("html, body").animate({scrollTop:$(document).height()}, "slow");
-                       return false;
-               };
-               
-function scrolltop(){
-                       $("html, body").animate({scrollTop:0}, "slow");
-                       return false;
-               };
-               
-$(window).scroll(function () { 
-               
-                               
-               var scrollInfo = $(window).scrollTop();      
-               
-               if (scrollInfo <= "900"){
-      $("a#top").attr("id","down");
-      $("a#down").attr("onclick","scrolldown()");
-               $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
-               } 
-                   
-      if (scrollInfo > "900"){
-      $("a#down").attr("id","top");
-      $("a#top").attr("onclick","scrolltop()");
-               $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
-               }
-               
-    });
-  
- </script>';
-if($a->argv[0] === "settings" && local_user()) {
-$a->page['htmlhead'] .= ' 
-<script>
-function restore_boxes(){
-       $.cookie("close_pages","2", { expires: 365, path: "/" });
-       $.cookie("close_helpers","2", { expires: 365, path: "/" });
-       $.cookie("close_profiles","2", { expires: 365, path: "/" });
-       $.cookie("close_services","2", { expires: 365, path: "/" });
-       $.cookie("close_friends","2", { expires: 365, path: "/" });
-       $.cookie("close_twitter","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>';}
-
-
-
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
-$a->page['htmlhead'] .= '
-<script>
-
- $(function() {
-       $(".oembed.photo img").aeImageResize({height: 400, width: 400});
-  });
-</script>';
-
-
-       if($ccCookie != "9") {
-$a->page['htmlhead'] .= '
-<script>
-$("right_aside").ready(function(){
-       
-       if($.cookie("close_pages") == "1") 
-               {
-               document.getElementById( "close_pages" ).style.display = "none";
-                       };
-                       
-       if($.cookie("close_profiles") == "1") 
-               {
-               document.getElementById( "close_profiles" ).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_twitter") == "1") 
-               {
-               document.getElementById( "twitter" ).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";
-                       };}
 
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie("close_pages","1", { expires: 365, path: "/" });
- };
-function close_profiles(){
- document.getElementById( "close_profiles" ).style.display = "none";
- $.cookie("close_profiles","1", { expires: 365, path: "/" });
- };
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie("close_helpers","1", { expires: 365, path: "/" });
- };
-
-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: "/" });
- };
  
-function close_twitter(){
- document.getElementById( "twitter" ).style.display = "none";
- $.cookie("close_twitter","1", { expires: 365, path: "/" });
- };
  
-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>';}}
-
-$a->page['htmlhead'] .= ' 
-
-<script>
-function insertFormatting(comment,BBcode,id) {
-       
-               var tmpStr = $("#comment-edit-text-" + id).val();
-               if(tmpStr == comment) {
-                       tmpStr = "";
-                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-                       openMenu("comment-edit-submit-wrapper-" + id);
-                                                               }
-
-       textarea = document.getElementById("comment-edit-text-" +id);
-       if (document.selection) {
-               textarea.focus();
-               selected = document.selection.createRange();
-               if (BBcode == "url"){
-                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-                       } else                  
-               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
-               var start = textarea.selectionStart;
-               var end = textarea.selectionEnd;
-               if (BBcode == "url"){
-                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-                       } else
-               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-       }
-       return true;
-}
-
-function cmtBbOpen(id) {
-       $(".comment-edit-bb-" + id).show();
-}
-function cmtBbClose(id) {
-       $(".comment-edit-bb-" + id).hide();
-}
-
-</script> ';
\ No newline at end of file