]> git.mxchange.org Git - friendica.git/blobdiff - view/theme/diabook/theme.php
Merge pull request #2544 from annando/issue-1769
[friendica.git] / view / theme / diabook / theme.php
old mode 100755 (executable)
new mode 100644 (file)
index a169043..972ad2e
@@ -2,35 +2,89 @@
 
 /*
  * 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.025)
- * Author: 
+ * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or http://bugs.friendica.com/view_all_bug_page.php
+ * Version: (Version: 1.028)
+ * Author:
  */
 
-$a = get_app();
-$a->theme_info = array(
-    'family' => 'diabook',
-       'version' => '1.025'
-);
+function get_diabook_config($key, $default = false) {
+       if (local_user()) {
+               $result = get_pconfig(local_user(), "diabook", $key);
+               if ($result !== false)
+                       return $result;
+       }
+
+       $result = get_config("diabook", $key);
+       if ($result !== false)
+               return $result;
+
+       return $default;
+}
 
 function diabook_init(&$a) {
-       
+
+set_template_engine($a, 'smarty3');
+
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.025)";
-$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
+$diabook_version = "Diabook (Version: 1.028)";
+$a->page['htmlhead'] .= sprintf('<META NAME=generator CONTENT="%s"/>', $diabook_version);
 
-//change css on network and profilepages
+//init css on network and profilepages
 $cssFile = null;
 
+// Preload config
+load_config("diabook");
+load_pconfig(local_user(), "diabook");
+
+
+// adjust nav-bar, depending state of user
+if (local_user() ) {
+       $a->page['htmlhead'] .= '
+       <script>
+        $(document).ready(function() {
+               $("li#nav-site-linkmenu.nav-menu-icon").attr("style","display: block;");
+               $("li#nav-directory-link.nav-menu").attr("style","margin-right: 0px;");
+               $("li#nav-home-link.nav-menu").attr("style","display: block;margin-right: 8px;");
+       });
+       </script>';
+       }
+
+if ($a->argv[0] == "profile" && $a->argv[1] != $a->user['nickname'] ) {
+       $a->page['htmlhead'] .= '
+       <script>
+        $(document).ready(function() {
+               $("li#nav-site-linkmenu.nav-menu-icon").attr("style","display: block;");
+               $("li#nav-directory-link.nav-menu").attr("style","margin-right: 0px;");
+               $("li#nav-home-link.nav-menu").attr("style","display: block;margin-right: 8px;");
+       });
+       </script>';
+       }
+
+
+//get statuses of boxes at right-hand-column
+$close_pages      = get_diabook_config( "close_pages", 1 );
+$close_profiles   = get_diabook_config( "close_profiles", 0 );
+$close_helpers    = get_diabook_config( "close_helpers", 0 );
+$close_services   = get_diabook_config( "close_services", 0 );
+$close_friends    = get_diabook_config( "close_friends", 0 );
+$close_lastusers  = get_diabook_config( "close_lastusers", 0 );
+$close_lastphotos = get_diabook_config( "close_lastphotos", 0 );
+$close_lastlikes  = get_diabook_config( "close_lastlikes", 0 );
+$close_mapquery   = get_diabook_config( "close_mapquery", 1 );
+
+//get resolution (wide/normal)
 $resolution=false;
 $resolution = get_pconfig(local_user(), "diabook", "resolution");
 if ($resolution===false) $resolution="normal";
 
-$color = false;
-$site_color = get_config("diabook", "color" );
-if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");}
-if ($color===false) $color=$site_color;
-if ($color===false) $color="diabook";
+//Add META viewport tag respecting the resolution to header for tablets
+if ($resolution=="wide") {
+  $a->page['htmlhead'] .= '<meta name="viewport" content="width=1200" />';
+} else {
+  $a->page['htmlhead'] .= '<meta name="viewport" content="width=980" />';
+}
+//get colour-scheme
+$color = get_diabook_config( "color", "diabook" );
 
 if ($color=="diabook") $color_path = "/";
 if ($color=="aerith") $color_path = "/diabook-aerith/";
@@ -40,23 +94,35 @@ if ($color=="pink") $color_path = "/diabook-pink/";
 if ($color=="green") $color_path = "/diabook-green/";
 if ($color=="dark") $color_path = "/diabook-dark/";
 
+       // remove doubled checkboxes at contacts-edit-page
+       if ($a->argv[0] === "contacts" && $a->argv[1] != NULL && local_user()){
+       $a->page['htmlhead'] .= '
+       <script>
+        $(document).ready(function() {
+               $("span.group_unselected").attr("style","display: none;");
+               $("span.group_selected").attr("style","display: none;");
+               $("input.unticked.action").attr("style","float: left; margin-top: 5px;-moz-appearance: none;");
+               $("li.menu-profile-list").attr("style","min-height: 22px;");
+       });
+       </script>';
+       }
 
-       //profile_side at networkpages
+       //build personal menue at lefthand-col (id="profile_side") and boxes at right-hand-col 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']['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'));
@@ -71,9 +137,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
                        )).$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'];
-       
+
+       $ccCookie = $close_pages + $close_mapquery + $close_profiles + $close_helpers + $close_services + $close_friends + $close_lastusers + $close_lastphotos + $close_lastlikes;
+       //if all boxes closed, dont build right-hand-col and dont use special css
        if($ccCookie != "9") {
        // COMMUNITY
        diabook_community_info();
@@ -86,76 +152,133 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 
 
 
-       //right_aside at profile pages
+       //build boxes at 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
+
+       //write js-scripts to the head-section:
        //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);
-       
+       $a->page['htmlhead'] .= sprintf('<script type="text/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);
+       $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.min.js";
+       $a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $imageresizeJS);
+       //load jquery.ui.js
+       if($ccCookie != "9") {
+       $jqueryuiJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery-ui.min.js";
+       $a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $jqueryuiJS);
+       $jqueryuicssJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/jquery-ui.min.css";
+       $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $jqueryuicssJS);
        }
        
+       //load jquery.mapquery.js
+       if($close_mapquery != "1") {
+       $mqtmplJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.tmpl.js";
+       $a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $mqtmplJS);
+       $mapqueryJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.core.js";
+       $a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $mapqueryJS);
+       $openlayersJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/OpenLayers.js";
+       $a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $openlayersJS);
+       $mqmouseposJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.mqMousePosition.js";
+       $a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $mqmouseposJS);
+       $mousewheelJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mousewheel.js";
+       $a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $mousewheelJS);
+   $mqlegendJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.legend.js";
+       $a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $mqlegendJS);
+       $mqlayermanagerJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.mqLayerManager.js";
+       $a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $mqlayermanagerJS);
+       }
+
        $a->page['htmlhead'] .= '
        <script>
-       
         $(function() {
-               $("a.lightbox").fancybox(); // Select all links with lightbox class
+               $("a.lightbox").colorbox({maxHeight:"90%"}); // Select all links with lightbox class
+               $("a#mapcontrol-link").colorbox({inline:true,onClosed: function() { $("#mapcontrol").attr("style","display: none;");}} );
+               $("a#closeicon").colorbox({inline:true,onClosed: function() { $("#boxsettings").attr("style","display: none;");}} );
                });
-          
+
         $(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") {
+
+       //check if mapquerybox is active and print
+       if($close_mapquery != "1") {
+               $ELZoom = get_diabook_config( "ELZoom", 0 );
+               $ELPosX = get_diabook_config( "ELPosX", 0);
+               $ELPosY = get_diabook_config( "ELPosY", 0);
                $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
+
+    $(function() {
+    $("#map").mapQuery({
+        layers:[{         //add layers to your map; you need to define at least one to be able to see anything on the map
+            type:"osm"  //add a layer of the type osm (OpenStreetMap)
+            }],
+        center:({zoom:'.$ELZoom.',position:['.$ELPosX.','.$ELPosY.']}),
+       });
+
+    });
+
+    function open_mapcontrol() {
+               $("div#mapcontrol").attr("style","display: block;width:900px;height:900px;");
+               $("#map2").mapQuery({
+                       layers:[{type:"osm", label:"OpenStreetMap" },
+                                         {type:"wms", label:"Population density 2010", legend:{url:"http://mapserver.edugis.nl/cgi-bin/mapserv?map=maps/edugis/cache/population.map&version=1.1.1&service=WMS&request=GetLegendGraphic&layer=Bevolkingsdichtheid_2010&format=image/png"}, url:"http://t1.edugis.nl/tiles/tilecache.py?map=maps/edugis/cache/population.map",
+                                         layers:"Bevolkingsdichtheid_2010" },
+                                         {type:"wms",
+                                                 label:"OpenLayers WMS",
+                                                 url:"http://labs.metacarta.com/wms/vmap0",
+                                                 layers:"basic" }],
+                       center:({zoom:'.$ELZoom.',position:['.$ELPosX.','.$ELPosY.']})});
+
+               $("#mouseposition").mqMousePosition({
+        map: "#map2",
+        x:"",
+        y:"",
+        precision:4
+               });
+
+       $("#layermanager").mqLayerManager({map:"#map2"});
+       $( "div#layermanager" ).accordion({header: ".mq-layermanager-element-header"});
+      $(".mq-layermanager-element-content").attr("style", "");
+
+       map = $("#map2").mapQuery().data("mapQuery");
+       textarea = document.getElementById("id_diabook_ELZoom");
+       textarea.value = "'.$ELZoom.'";
+               $("#map2").bind("mousewheel", function(event, delta) {
+               if (delta > 0 && textarea.value < 18){
+                        textarea.value = textarea.value - delta*-1; }
+               if (delta < 0 && textarea.value > "0"){
+                        textarea.value = textarea.value - delta*-1; }
+                       });
+               };
+               </script>';
+       }
+       
+       //check if community_home-plugin is activated and change css.. we need this, that the submit-wrapper doesn't overlay the login-panel if communityhome-plugin is active
        $nametocheck = "communityhome";
        $r = q("select id from addon where name = '%s' and installed = 1", dbesc($nametocheck));
-       if(count($r) == "1") {
-       
+       if(count($r) == "1" && $a->argv[0] === "home" ) {
+
        $a->page['htmlhead'] .= '
        <script>
-       $(document).ready(function() {
+       $(function() {
        $("div#login-submit-wrapper").attr("style","padding-top: 120px;");
        });
-       </script>';     
+       </script>';
        }
-       //comment-edit-wrapper on photo_view
+       //comment-edit-wrapper on photo_view... we need this to workaround a global bug in photoview, where the comment-box is between the last comment the the comment before the last
        if ($a->argv[0].$a->argv[2] === "photos"."image"){
        $a->page['htmlhead'] .= '
        <script>
@@ -164,129 +287,76 @@ if ($color=="dark") $color_path = "/diabook-dark/";
                        });
     </script>';
        }
-       //restore right hand col at settingspage
+       //restore (only) the order right hand col at settingspage
        if($a->argv[0] === "settings" && local_user()) {
-       $a->page['htmlhead'] .= ' 
+       $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");
+       $.cookie("Boxorder",null, { expires: 365, path: "/" });
+       alert("Boxorder at 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") 
+
+       if('.$close_pages.')
                {
                document.getElementById( "close_pages" ).style.display = "none";
                        };
-                       
-       if($.cookie("close_profiles") == "1") 
+
+       if('.$close_mapquery.')
+               {
+               document.getElementById( "close_mapquery" ).style.display = "none";
+                       };
+
+       if('.$close_profiles.')
                {
                document.getElementById( "close_profiles" ).style.display = "none";
                        };
-       
-       if($.cookie("close_helpers") == "1") 
+
+       if('.$close_helpers.')
                {
                document.getElementById( "close_helpers" ).style.display = "none";
                        };
-                       
-       if($.cookie("close_services") == "1") 
+
+       if('.$close_services.')
                {
                document.getElementById( "close_services" ).style.display = "none";
                        };
-                       
-       if($.cookie("close_friends") == "1") 
+
+       if('.$close_friends.')
                {
                document.getElementById( "close_friends" ).style.display = "none";
                        };
-       
-       if($.cookie("close_twitter") == "1") 
-               {
-               document.getElementById( "twitter" ).style.display = "none";
-                       };      
-                       
-       if($.cookie("close_lastusers") == "1") 
+
+       if('.$close_lastusers.')
                {
                document.getElementById( "close_lastusers" ).style.display = "none";
                        };
-                       
-       if($.cookie("close_lastphotos") == "1") 
+
+       if('.$close_lastphotos.')
                {
                document.getElementById( "close_lastphotos" ).style.display = "none";
                        };
-                       
-       if($.cookie("close_lastlikes") == "1") 
+
+       if('.$close_lastlikes.')
                {
                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>';}
        }
        //end js scripts
@@ -297,37 +367,48 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        //footer
        $tpl = get_markup_template('footer.tpl');
        $a->page['footer'] .= replace_macros($tpl, array());
-       
+
        //
-       js_in_foot();
+       js_diabook_footer();
 }
 
 
  function diabook_community_info() {
        $a = get_app();
+
+       $close_pages      = get_diabook_config( "close_pages", 1 );
+       $close_profiles   = get_diabook_config( "close_profiles", 0 );
+       $close_helpers    = get_diabook_config( "close_helpers", 0 );
+       $close_services   = get_diabook_config( "close_services", 0 );
+       $close_friends    = get_diabook_config( "close_friends", 0 );
+       $close_lastusers  = get_diabook_config( "close_lastusers", 0 );
+       $close_lastphotos = get_diabook_config( "close_lastphotos", 0 );
+       $close_lastlikes  = get_diabook_config( "close_lastlikes", 0 );
+       $close_mapquery   = get_diabook_config( "close_mapquery", 1 );
+
        // comunity_profiles
-       if($_COOKIE['close_profiles'] != "1") {
-       $aside['$comunity_profilest_title'] = t('Community Profiles');
+       if($close_profiles != "1") {
+       $aside['$comunity_profiles_title'] = t('Community Profiles');
        $aside['$comunity_profiles_items'] = array();
-       $r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id 
+       $r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id
                          where glink.cid = 0 and glink.uid = 0 order by rand() limit 9");
-       $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
+       $tpl = get_markup_template('ch_directory_item.tpl');
        if(count($r)) {
                $photo = 'photo';
                foreach($r as $rr) {
                        $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
                        $entry = replace_macros($tpl,array(
                                '$id' => $rr['id'],
-                               '$profile-link' => zrl($rr['url']),
+                               '$profile_link' => zrl($rr['url']),
                                '$photo' => $rr[$photo],
-                               '$alt-text' => $rr['name'],
+                               '$alt_text' => $rr['name'],
                        ));
                        $aside['$comunity_profiles_items'][] = $entry;
                }
        }}
-       
+
        // last 12 users
-       if($_COOKIE['close_lastusers'] != "1") {
+       if(($close_lastusers != "1") AND !get_config('diabook','disable_features')) {
        $aside['$lastusers_title'] = t('Last users');
        $aside['$lastusers_items'] = array();
        $sql_extra = "";
@@ -335,34 +416,34 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        $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` 
+                       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__).'/ch_directory_item.tpl');
+       $tpl = get_markup_template('ch_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'],
+                               '$profile_link' => $profile_link,
+                               '$photo' => $a->get_cached_avatar_image($rr[$photo]),
+                               '$alt_text' => $rr['name'],
                        ));
                        $aside['$lastusers_items'][] = $entry;
                }
        }}
-       
+
        // last 10 liked items
-       if($_COOKIE['close_lastlikes'] != "1") {
+       if(($close_lastlikes != "1") AND !get_config('diabook','disable_features')) {
        $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` 
+       $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` 
+                       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
@@ -373,7 +454,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        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':
@@ -397,19 +478,19 @@ if ($color=="dark") $color_path = "/diabook-dark/";
                $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
-       if($_COOKIE['close_photos'] != "1") {
+       if(($close_lastphotos != "1")  AND !get_config('diabook','disable_features')) {
        $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` 
+       $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` 
+                               `user`
                                WHERE `user`.`uid` = `photo`.`uid`
                                AND `user`.`blockwall`=0
                                AND `user`.`hidewall`=0
@@ -419,24 +500,24 @@ if ($color=="dark") $color_path = "/diabook-dark/";
                                dbesc(t('Profile Photos'))
                                );
                if(count($r)) {
-               $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
+               $tpl = get_markup_template('ch_directory_item.tpl');
                foreach($r as $rr) {
                        $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
                        $photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-               
+
                        $entry = replace_macros($tpl,array(
                                '$id' => $rr['id'],
-                               '$profile-link' => $photo_page,
+                               '$profile_link' => $photo_page,
                                '$photo' => $photo_url,
-                               '$alt-text' => $rr['username']." : ".$rr['desc'],
+                               '$alt_text' => $rr['username']." : ".$rr['desc'],
                        ));
 
                        $aside['$photos_items'][] = $entry;
                }
        }}
-       
+
    //right_aside FIND FRIENDS
-   if($_COOKIE['close_friends'] != "1") {
+   if($close_friends != "1") {
        if(local_user()) {
        $nv = array();
        $nv['title'] = Array("", t('Find Friends'), "", "");
@@ -445,22 +526,22 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        $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">
+
+       $nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendica.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_Pages at right_aside
-   if($_COOKIE['close_pages'] != "1") {
+   if($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>
+   $page = '
+                       <h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
                        <div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
 
        $pagelist = array();
@@ -477,7 +558,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        foreach($contacts as $contact) {
                $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
        };
-       
+
 
        $contacts = $pageD;
 
@@ -485,53 +566,106 @@ if ($color=="dark") $color_path = "/diabook-dark/";
                $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; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
                                $contact["name"]."</a></li>";
        }
-       $page .= '</ul></div></div>';
+       $page .= '</ul></div>';
        //if (sizeof($contacts) > 0)
-               $aside['$page'] = $page;        
+               $aside['$page'] = $page;
        }}
-  //END Community Page 
-  
+  //END Community Page
+
+   //mapquery
+
+  if($close_mapquery != "1") {
+   $mapquery = array();
+       $mapquery['title'] = Array("", "<a id='mapcontrol-link' href='#mapcontrol' style='text-decoration:none;' onclick='open_mapcontrol(); return false;'>".t('Earth Layers')."</a>", "", "");
+       $aside['$mapquery'] = $mapquery;
+       $ELZoom = get_pconfig(local_user(), 'diabook', 'ELZoom' );
+       $ELPosX = get_pconfig(local_user(), 'diabook', 'ELPosX' );
+       $ELPosY = get_pconfig(local_user(), 'diabook', 'ELPosY' );
+       $aside['$ELZoom'] = array('diabook_ELZoom', t('Set zoomfactor for Earth Layers'), $ELZoom, '', $ELZoom);
+       $aside['$ELPosX'] = array('diabook_ELPosX', t('Set longitude (X) for Earth Layers'), $ELPosX, '', $ELPosX);
+       $aside['$ELPosY'] = array('diabook_ELPosY', t('Set latitude (Y) for Earth Layers'), $ELPosY, '', $ELPosY);
+       if (isset($_POST['diabook-settings-map-sub']) && $_POST['diabook-settings-map-sub']!=''){
+               set_pconfig(local_user(), 'diabook', 'ELZoom', $_POST['diabook_ELZoom']);
+               set_pconfig(local_user(), 'diabook', 'ELPosX', $_POST['diabook_ELPosX']);
+               set_pconfig(local_user(), 'diabook', 'ELPosY', $_POST['diabook_ELPosY']);
+               header("Location: network");
+               }
+       }
+   //end mapquery
+
   //helpers
-  if($_COOKIE['close_helpers'] != "1") {
+  if($close_helpers != "1") {
    $helpers = array();
        $helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
        $aside['$helpers'] = $helpers;
        }
    //end helpers
    //connectable services
-   if($_COOKIE['close_services'] != "1") {
+   if($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;
+   
+   if($ccCookie != "9") {
+       $close_pages      = get_diabook_config( "close_pages", 1 );
+       $close_profiles   = get_diabook_config( "close_profiles", 0 );
+       $close_helpers    = get_diabook_config( "close_helpers", 0 );
+       $close_services   = get_diabook_config( "close_services", 0 );
+       $close_friends    = get_diabook_config( "close_friends", 0 );
+       $close_lastusers  = get_diabook_config( "close_lastusers", 0 );
+       $close_lastphotos = get_diabook_config( "close_lastphotos", 0 );
+       $close_lastlikes  = get_diabook_config( "close_lastlikes", 0 );
+       $close_mapquery   = get_diabook_config( "close_mapquery", 1 );
+       $close_or_not = array('1'=>t("don't show"),     '0'=>t("show"),);
+       $boxsettings['title'] = Array("", t('Show/hide boxes at right-hand column:'), "", "");
+       $aside['$boxsettings'] = $boxsettings;
+       $aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_or_not);
+       $aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_or_not);
+       $aside['$close_profiles'] = array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_or_not);
+       $aside['$close_helpers'] = array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_or_not);
+       $aside['$close_services'] = array('diabook_close_services', t('Connect Services'), $close_services, '', $close_or_not);
+       $aside['$close_friends'] = array('diabook_close_friends', t('Find Friends'), $close_friends, '', $close_or_not);
+       $aside['$close_lastusers'] = array('diabook_close_lastusers', t('Last users'), $close_lastusers, '', $close_or_not);
+       $aside['$close_lastphotos'] = array('diabook_close_lastphotos', t('Last photos'), $close_lastphotos, '', $close_or_not);
+       $aside['$close_lastlikes'] = array('diabook_close_lastlikes', t('Last likes'), $close_lastlikes, '', $close_or_not);
+   $aside['$sub'] = t('Submit');
+   $baseurl = $a->get_baseurl($ssl_state);
+   $aside['$baseurl'] = $baseurl;
+   if (isset($_POST['diabook-settings-box-sub']) && $_POST['diabook-settings-box-sub']!=''){
+               set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']);
+               set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']);
+               set_pconfig(local_user(), 'diabook', 'close_profiles', $_POST['diabook_close_profiles']);
+               set_pconfig(local_user(), 'diabook', 'close_helpers', $_POST['diabook_close_helpers']);
+               set_pconfig(local_user(), 'diabook', 'close_services', $_POST['diabook_close_services']);
+               set_pconfig(local_user(), 'diabook', 'close_friends', $_POST['diabook_close_friends']);
+               set_pconfig(local_user(), 'diabook', 'close_lastusers', $_POST['diabook_close_lastusers']);
+               set_pconfig(local_user(), 'diabook', 'close_lastphotos', $_POST['diabook_close_lastphotos']);
+               set_pconfig(local_user(), 'diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']);
+               }
+       }
+       $close = t('Settings');
+       $aside['$close'] = $close;
+
+       //get_baseurl
+       $url = $a->get_baseurl($ssl_state);
+       $aside['$url'] = $url;
+
        //print right_aside
-       $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+       $tpl = get_markup_template('communityhome.tpl');
        $a->page['right_aside'] = replace_macros($tpl, $aside);
-       
+
  }
 
- function js_in_foot() {
+ function js_diabook_footer() {
        /** @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');
+       $tpl = get_markup_template('bottom.tpl');
        $a->page['footer'] = $a->page['footer'].replace_macros($tpl, $bottom);
  }
 
 
-
-
-
-
-
-