tabs have now an ID

diff --git a/mod/contacts.php b/mod/contacts.php
index c562c9822da0f0664476ab42567e11b222666986..0ecc5a76dbbefe0f04a6f68bcf36447565498f6c 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -550,6 +550,7 @@ function contacts_content(&$a) {
                                'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
                                'sel'   => '',
                                'title' => t('Toggle Blocked status'),
+                               'id'    => 'toggle-block-tab',
                                'accesskey' => 'b',
                        ),
                        array(
@@ -557,6 +558,7 @@ function contacts_content(&$a) {
                                'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
                                'sel'   => '',
                                'title' => t('Toggle Ignored status'),
+                               'id'    => 'toggle-ignore-tab',
                                'accesskey' => 'i',
                        ),
 
@@ -565,6 +567,7 @@ function contacts_content(&$a) {
                                'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
                                'sel'   => '',
                                'title' => t('Toggle Archive status'),
+                               'id'    => 'toggle-archive-tab',
                                'accesskey' => 'v',
                        ),
                        array(
@@ -572,6 +575,7 @@ function contacts_content(&$a) {
                                'url'   => $a->get_baseurl(true) . '/crepair/' . $contact_id,
                                'sel'   => '',
                                'title' => t('Advanced Contact Settings'),
+                               'id'    => 'repair-tab',
                                'accesskey' => 'r',
                        )
                );
@@ -693,6 +697,7 @@ function contacts_content(&$a) {
                        'url'   => $a->get_baseurl(true) . '/suggest',
                        'sel'   => '',
                        'title' => t('Suggest potential friends'),
+                       'id'    => 'suggestions-tab',
                        'accesskey' => 'g',
                ),
                array(
@@ -700,6 +705,7 @@ function contacts_content(&$a) {
                        'url'   => $a->get_baseurl(true) . '/contacts/all',
                        'sel'   => ($all) ? 'active' : '',
                        'title' => t('Show all contacts'),
+                       'id'    => 'showall-tab',
                        'accesskey' => 'l',
                ),
                array(
@@ -707,6 +713,7 @@ function contacts_content(&$a) {
                        'url'   => $a->get_baseurl(true) . '/contacts',
                        'sel'   => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '',
                        'title' => t('Only show unblocked contacts'),
+                       'id'    => 'showunblocked-tab',
                        'accesskey' => 'o',
                ),
 
@@ -715,6 +722,7 @@ function contacts_content(&$a) {
                        'url'   => $a->get_baseurl(true) . '/contacts/blocked',
                        'sel'   => ($blocked) ? 'active' : '',
                        'title' => t('Only show blocked contacts'),
+                       'id'    => 'showblocked-tab',
                        'accesskey' => 'b',
                ),
 
@@ -723,6 +731,7 @@ function contacts_content(&$a) {
                        'url'   => $a->get_baseurl(true) . '/contacts/ignored',
                        'sel'   => ($ignored) ? 'active' : '',
                        'title' => t('Only show ignored contacts'),
+                       'id'    => 'showignored-tab',
                        'accesskey' => 'i',
                ),
 
@@ -731,6 +740,7 @@ function contacts_content(&$a) {
                        'url'   => $a->get_baseurl(true) . '/contacts/archived',
                        'sel'   => ($archived) ? 'active' : '',
                        'title' => t('Only show archived contacts'),
+                       'id'    => 'showarchived-tab',
                        'accesskey' => 'y',
                ),
 
@@ -739,6 +749,7 @@ function contacts_content(&$a) {
                        'url'   => $a->get_baseurl(true) . '/contacts/hidden',
                        'sel'   => ($hidden) ? 'active' : '',
                        'title' => t('Only show hidden contacts'),
+                       'id'    => 'showhidden-tab',
                        'accesskey' => 'h',
                ),
 

diff --git a/mod/network.php b/mod/network.php
index dfd7c013007fbdb39618ee681764652df3252f29..639d868fa2a720bdb2ee35c3af307504bf50c48f 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -119,19 +119,19 @@ function network_init(&$a) {
        $search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
 
        if(x($_GET,'save')) {
-               $r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1",
+               $r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
                        intval(local_user()),
                        dbesc($search)
                );
                if(! count($r)) {
-                       q("insert into `search` ( `uid`,`term` ) values ( %d, '%s') ",
+                       q("INSERT INTO `search` ( `uid`,`term` ) VALUES ( %d, '%s') ",
                                intval(local_user()),
                                dbesc($search)
                        );
                }
        }
        if(x($_GET,'remove')) {
-               q("delete from `search` where `uid` = %d and `term` = '%s'",
+               q("DELETE FROM `search` WHERE `uid` = %d AND `term` = '%s'",
                        intval(local_user()),
                        dbesc($search)
                );
@@ -172,7 +172,7 @@ function saved_searches($search) {
 
        $o = '';
 
-       $r = q("select `id`,`term` from `search` WHERE `uid` = %d",
+       $r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
                intval(local_user())
        );
 
@@ -355,57 +355,63 @@ function network_content(&$a, $update = 0) {
        // tabs
        $tabs = array(
                array(
-                       'label' => t('Commented Order'),
-                       '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'),
+                       'label' => t('Commented Order'),
+                       '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'),
+                       'id'    => 'commented-order-tab',
                        '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'),
+                       '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'),
+                       'id'    => 'posted-order-tab',
                        'accesskey' => "t",
                ),
        );
 
        if(feature_enabled(local_user(),'personal_tab')) {
                $tabs[] = array(
-                       'label' => t('Personal'),
-                       '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'),
+                       'label' => t('Personal'),
+                       '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'),
+                       'id'    => 'personal-tab',
                        'accesskey' => "r",
                );
        }
 
        if(feature_enabled(local_user(),'new_tab')) {
                $tabs[] = array(
-                       'label' => t('New'),
-                       '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'),
+                       'label' => t('New'),
+                       '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'),
+                       'id'    => 'activitiy-by-date-tab',
                        'accesskey' => "w",
                );
        }
 
        if(feature_enabled(local_user(),'link_tab')) {
                $tabs[] = array(
-                       'label' => t('Shared Links'),
-                       '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'),
+                       'label' => t('Shared Links'),
+                       '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'),
+                       'id'    => 'shared-links-tab',
                        'accesskey' => "b",
                );
        }
 
        if(feature_enabled(local_user(),'star_posts')) {
                $tabs[] = array(
-                       'label' => t('Starred'),
-                       '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'),
+                       'label' => t('Starred'),
+                       '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'),
+                       'id'    => 'starred-posts-tab',
                        'accesskey' => "m",
                );
        }
@@ -446,7 +452,7 @@ function network_content(&$a, $update = 0) {
                $def_acl = array('allow_cid' => '<' . intval($cid) . '>');
 
        if($nets) {
-               $r = q("select id from contact where uid = %d and network = '%s' and self = 0",
+               $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND network = '%s' AND `self` = 0",
                        intval(local_user()),
                        dbesc($nets)
                );
@@ -475,7 +481,10 @@ function network_content(&$a, $update = 0) {
                $content = "";
 
                if ($cid) {
-                       $contact = q("SELECT `nick` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `forum`", intval($cid), intval(local_user()));
+                       $contact = q("SELECT `nick` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `forum`",
+                               intval($cid),
+                               intval(local_user())
+                       );
                        if ($contact)
                                $content = "@".$contact[0]["nick"]."+".$cid;
                }
@@ -569,7 +578,7 @@ function network_content(&$a, $update = 0) {
                );
                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
+                                           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 = "";