acl: acl_selector.tpl and some styling to the acl

[friendica.git] / theme.php

diff --git a/theme.php b/theme.php
index f9d15e9c9d41bb50bc7eaedae67fd45b75354dca..d2526ed55392e8231a9649476e8ace2d784d0216 100644 (file)
--- a/theme.php
+++ b/theme.php
@@ -32,6 +32,7 @@ function frio_init(&$a) {
 function frio_install() {
        register_hook('prepare_body_final', 'view/theme/frio/theme.php', 'frio_item_photo_links');
        register_hook('item_photo_menu', 'view/theme/frio/theme.php', 'frio_item_photo_menu');
+       register_hook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu');
        register_hook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav');
 
        logger("installed theme frio");
@@ -40,6 +41,7 @@ function frio_install() {
 function frio_uninstall() {
        unregister_hook('prepare_body_final', 'view/theme/frio/theme.php', 'frio_item_photo_links');
        unregister_hook('item_photo_menu', 'view/theme/frio/theme.php', 'frio_item_photo_menu');
+       unregister_hook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav');
 
        logger("uninstalled theme frio");
 }
@@ -100,12 +102,61 @@ function frio_item_photo_menu($a, &$arr){
                if(strpos($v,'poke/?f=&c=') === 0 || strpos($v,'message/new/') === 0) {
                        $v = "javascript:addToModal('" . $v . "'); return false;";
                        $arr["menu"][$k] = $v;
-                       $testvariable = $testvariable+1;
                }
        }
        $args = array('item' => $item, 'menu' => $menu);
 }
 
+/**
+ * @brief Replace links of the contact_photo_menu
+ * 
+ *  This function replaces the original poke and the message links
+ *  to call the addToModal javascript function so this pages can
+ *  be loaded in a bootstrap modal
+ *  Additionally the profile, status and photo page links  will be changed
+ *  to don't open in a new tab if the contact is a friendica contact.
+ * 
+ * @param app $a The app data
+ * @param array $args Contains contact data and the original photo_menu
+ */
+function frio_contact_photo_menu($a, &$args){
+
+       $pokelink = "";
+       $pmlink = "";
+       $cid = "";
+
+       $cid = $args["contact"]["id"];
+       $pokelink = $args["menu"]["poke"][1];
+       $pmlink = $args["menu"]["pm"][1];
+
+       // Set the the indicator for opening the status, profile and photo pages
+       // in a new tab to false if the contact a dfrn (friendica) contact
+       // We do this because we can go back on foreign friendica pages throuhg
+       // friendicas "magic-link" which indicates a friendica user on froreign
+       // friendica servers as remote user or visitor
+       //
+       // The value for opening in a new tab is e.g. when 
+       // $args["menu"]["status"][2] is true. If the value of the [2] key is true
+       // and if it's a friendica contact we set it to false
+       foreach($args["menu"] as $k =>$v) {
+               if($k === "status" || $k === "profile" || $k === "photos") {
+                       $v[2] = (($args["contact"]["network"] === "dfrn") ? false : true);
+                       $args["menu"][$k][2] = $v[2];
+               }
+       }
+
+       // Add to pm and poke links a new key with the value 'modal'.
+       // Later we can make conditions in the corresponing templates (e.g.
+       // contact_template.tpl)
+       if(strpos($pokelink,'poke/?f=&c='. $cid) !== false)
+               $args["menu"]["poke"][3] = "modal";
+
+       if(strpos($pmlink,'message/new/' . $cid) !== false)
+               $args["menu"]["pm"][3] = "modal";
+
+       $args = array('contact' => $contact, 'menu' => &$menu);
+}
+
 /**
  * @brief Construct remote nav menu
  * 
@@ -158,19 +209,19 @@ function frio_remote_nav($a,&$nav) {
 
        } elseif(!local_user() && remote_user()) {
                $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
-               $nav['remote'] = 1;
+               $nav['remote'] = t("Remote");
 
        } elseif(get_my_url ()) {
                $r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
                                WHERE `addr` = '%s' AND `network` = 'dfrn'",
                        dbesc($webbie));
-               $nav['remote'] = 1;
+               $nav['remote'] = t("Visitor");
        }
 
        if(count($r)){
                        $nav['userinfo'] = array(
                                'icon' => (count($r) ? $r[0]['photo'] : "images/person-48.jpg"),
-                               'name' => $r['name'],
+                               'name' => $r[0]['name'],
                        );
                }
 
@@ -190,5 +241,6 @@ function frio_remote_nav($a,&$nav) {
                $nav['messages'] = array($server_url . '/message', t('Messages'), "", t('Private mail'));
                $nav['settings'] = array($server_url . '/settings', t('Settings'),"", t('Account settings'));
                $nav['contacts'] = array($server_url . '/contacts', t('Contacts'),"", t('Manage/edit friends and contacts'));
+               $nav['sitename'] = $a->config['sitename'];
        }
 }