]> git.mxchange.org Git - friendica.git/blobdiff - mod/network.php
Contact names with ">" and "<" are a problem ...
[friendica.git] / mod / network.php
index fafee97c072f9c5cf90b42326afb461ede0c1c30..3d14455cdf634c8ba3c96da1429a3b31f1114705 100644 (file)
@@ -45,7 +45,7 @@ function network_init(&$a) {
                else if($sel_groups !== false) {
                        $net_baseurl .= '/' . $sel_groups;
                }
-               
+
                if($remember_tab) {
                        // redirect if current selected tab is '/network' and
                        // last selected tab is _not_ '/network?f=&order=comment'.
@@ -55,19 +55,19 @@ function network_init(&$a) {
                                '',             //all
                                '',             //postord
                                '',             //conv
-                               '/new', //new
+                               '/new',         //new
                                '',             //starred
                                '',             //bookmarked
                                '',             //spam
                        );
                        $tab_args = array(
                                'f=&order=comment',     //all
-                               'f=&order=post',                //postord
-                               'f=&conv=1',                    //conv
-                               '',                                     //new
-                               'f=&star=1',                    //starred
-                               'f=&bmark=1',                   //bookmarked
-                               'f=&spam=1',                    //spam
+                               'f=&order=post',        //postord
+                               'f=&conv=1',            //conv
+                               '',                     //new
+                               'f=&star=1',            //starred
+                               'f=&bmark=1',           //bookmarked
+                               'f=&spam=1',            //spam
                        );
 
                        $k = array_search('active', $last_sel_tabs);
@@ -91,17 +91,17 @@ function network_init(&$a) {
                else if($sel_nets!==false) {
                        $net_args['nets'] = $sel_nets;
                }
-               
+
                if($remember_tab || $remember_net || $remember_group) {
                        $net_args = array_merge($query_array, $net_args);
                        $net_queries = build_querystring($net_args);
-                       
+
                        $redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl);
-                       
+
                        goaway($a->get_baseurl() . $redir_url);
                }
        }
-       
+
        if(x($_GET['nets']) && $_GET['nets'] === 'all')
                unset($_GET['nets']);
 
@@ -139,7 +139,9 @@ function network_init(&$a) {
 
        // search terms header
        if(x($_GET,'search')) {
-               $a->page['content'] .= '<h2>' . t('Search Results For:') . ' '  . $search . '</h2>';
+               $a->page['content'] .= replace_macros(get_markup_template("section_title.tpl"),array(
+                       '$title' => sprintf( t('Search Results For: %s'), $search)
+               ));
        }
 
        $a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network',true,$group_id) : '');
@@ -179,11 +181,11 @@ function saved_searches($search) {
        if(count($r)) {
                foreach($r as $rr) {
                        $saved[] = array(
-                               'id'            => $rr['id'],
-                               'term'                  => $rr['term'],
+                               'id'            => $rr['id'],
+                               'term'          => $rr['term'],
                                'encodedterm'   => urlencode($rr['term']),
-                               'delete'                => t('Remove term'),
-                               'selected'              => ($search==$rr['term']),
+                               'delete'        => t('Remove term'),
+                               'selected'      => ($search==$rr['term']),
                        );
                }
        }
@@ -191,10 +193,10 @@ function saved_searches($search) {
 
        $tpl = get_markup_template("saved_searches_aside.tpl");
        $o = replace_macros($tpl, array(
-               '$title'         => t('Saved Searches'),
-               '$add'           => t('add'),
-               '$searchbox' => search($search,'netsearch-box',$srchurl,true),
-               '$saved'         => $saved,
+               '$title'        => t('Saved Searches'),
+               '$add'          => t('add'),
+               '$searchbox'    => search($search,'netsearch-box',$srchurl,true),
+               '$saved'        => $saved,
        ));
 
        return $o;
@@ -357,12 +359,14 @@ function network_content(&$a, $update = 0) {
                        'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
                        'sel'=>$all_active,
                        'title'=> t('Sort by Comment Date'),
+                       'accesskey' => "e",
                ),
                array(
                        'label' => t('Posted Order'),
                        'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
                        'sel'=>$postord_active,
                        'title' => t('Sort by Post Date'),
+                       'accesskey' => "t",
                ),
        );
 
@@ -372,6 +376,7 @@ function network_content(&$a, $update = 0) {
                        'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
                        'sel' => $conv_active,
                        'title' => t('Posts that mention or involve you'),
+                       'accesskey' => "r",
                );
        }
 
@@ -381,6 +386,7 @@ function network_content(&$a, $update = 0) {
                        'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
                        'sel' => $new_active,
                        'title' => t('Activity Stream - by date'),
+                       'accesskey' => "w",
                );
        }
 
@@ -390,6 +396,7 @@ function network_content(&$a, $update = 0) {
                        'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
                        'sel'=>$bookmarked_active,
                        'title'=> t('Interesting Links'),
+                       'accesskey' => "b",
                );
        }
 
@@ -399,6 +406,7 @@ function network_content(&$a, $update = 0) {
                        'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1',
                        'sel'=>$starred_active,
                        'title' => t('Favourite Posts'),
+                       'accesskey' => "m",
                );
        }
 
@@ -464,8 +472,6 @@ function network_content(&$a, $update = 0) {
 
                nav_set_selected('network');
 
-               $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
-
                $content = "";
 
                if ($cid) {
@@ -479,10 +485,12 @@ function network_content(&$a, $update = 0) {
                        'allow_location' => $a->user['allow_location'],
                        'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
-                       'lockstate' => ((($group) || ($cid) || ($nets) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-                       'default_perms' => get_acl_permissions($a->user),
-                       'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
-                       'bang' => (($group || $cid || $nets) ? '!' : ''),
+                       'lockstate'=> ((($group) || ($cid) || ($nets) || (is_array($a->user) &&
+                                       ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) ||
+                                       (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+                       'default_perms' => get_acl_permissions($a->user),
+                       'acl'   => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), true),
+                       'bang'  => (($group || $cid || $nets) ? '!' : ''),
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
                        'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
@@ -537,25 +545,39 @@ function network_content(&$a, $update = 0) {
                                $contact_str_self = ",".$self[0]["id"];
                }
                else {
-                               $contact_str = ' 0 ';
-                               info( t('Group is empty'));
+                       $contact_str = ' 0 ';
+                       info( t('Group is empty'));
                }
 
                //$sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` WHERE (`contact-id` IN ($contact_str) OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0 ORDER BY `created` DESC) AS `temp1` ON $sql_table.$sql_parent = `temp1`.`parent` ";
 
                $sql_extra3 .= " AND `contact-id` IN ($contact_str$contact_str_self) ";
-               $sql_extra3 .= " AND EXISTS (SELECT id FROM `item` WHERE (`contact-id` IN ($contact_str)  OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0 AND parent = $sql_table.$sql_parent) ";
-               $o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
-       } elseif($cid) {
+               $sql_extra3 .= " AND EXISTS (SELECT id FROM `item` WHERE (`contact-id` IN ($contact_str)
+                               OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0
+                               AND parent = $sql_table.$sql_parent) ";
+
+               $o = replace_macros(get_markup_template("section_title.tpl"),array(
+                       '$title' => sprintf( t('Group: %s'), $r[0]['name'])
+               )) . $o;
+
+       }
+       elseif($cid) {
 
                $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl` FROM `contact` WHERE `id` = %d
                                AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
                        intval($cid)
                );
                if(count($r)) {
-                       $sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = ".intval($cid)." and deleted = 0 ORDER BY `item`.`received` DESC) AS `temp1` ON $sql_table.$sql_parent = `temp1`.`parent` ";
+                       $sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item`
+                                           WHERE 1 $sql_options AND `contact-id` = ".intval($cid)." and deleted = 0
+                                           ORDER BY `item`.`received` DESC) AS `temp1`
+                                           ON $sql_table.$sql_parent = `temp1`.`parent` ";
                        $sql_extra = "";
-                       $o = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o;
+
+                       $o = replace_macros(get_markup_template("section_title.tpl"),array(
+                               '$title' => sprintf( t('Contact: %s'), htmlentities($r[0]['name']))
+                       )) . $o;
+
                        if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
                                notice( t('Private messages to this person are at risk of public disclosure.') . EOL);
                        }