Merge pull request #8652 from annando/annando/issue8582

Issue 8582: "cid" in "network" is now "contactid"

diff --git a/include/conversation.php b/include/conversation.php
index 5b7ccbd8a152615b5c3d8b22139ebf626b4eb8ad..0eb94181f019fa5ad5c69d313a9b57291ac0f1f8 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -376,17 +376,17 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                . "<script> var profile_uid = " . $_SESSION['uid']
                                . "; var netargs = '" . substr(DI::args()->getCommand(), 8)
                                . '?f='
-                               . (!empty($_GET['cid'])    ? '&cid='    . rawurlencode($_GET['cid'])    : '')
-                               . (!empty($_GET['search']) ? '&search=' . rawurlencode($_GET['search']) : '')
-                               . (!empty($_GET['star'])   ? '&star='   . rawurlencode($_GET['star'])   : '')
-                               . (!empty($_GET['order'])  ? '&order='  . rawurlencode($_GET['order'])  : '')
-                               . (!empty($_GET['bmark'])  ? '&bmark='  . rawurlencode($_GET['bmark'])  : '')
-                               . (!empty($_GET['liked'])  ? '&liked='  . rawurlencode($_GET['liked'])  : '')
-                               . (!empty($_GET['conv'])   ? '&conv='   . rawurlencode($_GET['conv'])   : '')
-                               . (!empty($_GET['nets'])   ? '&nets='   . rawurlencode($_GET['nets'])   : '')
-                               . (!empty($_GET['cmin'])   ? '&cmin='   . rawurlencode($_GET['cmin'])   : '')
-                               . (!empty($_GET['cmax'])   ? '&cmax='   . rawurlencode($_GET['cmax'])   : '')
-                               . (!empty($_GET['file'])   ? '&file='   . rawurlencode($_GET['file'])   : '')
+                               . (!empty($_GET['contactid']) ? '&contactid=' . rawurlencode($_GET['contactid']) : '')
+                               . (!empty($_GET['search'])    ? '&search='    . rawurlencode($_GET['search'])    : '')
+                               . (!empty($_GET['star'])      ? '&star='      . rawurlencode($_GET['star'])      : '')
+                               . (!empty($_GET['order'])     ? '&order='     . rawurlencode($_GET['order'])     : '')
+                               . (!empty($_GET['bmark'])     ? '&bmark='     . rawurlencode($_GET['bmark'])     : '')
+                               . (!empty($_GET['liked'])     ? '&liked='     . rawurlencode($_GET['liked'])     : '')
+                               . (!empty($_GET['conv'])      ? '&conv='      . rawurlencode($_GET['conv'])      : '')
+                               . (!empty($_GET['nets'])      ? '&nets='      . rawurlencode($_GET['nets'])      : '')
+                               . (!empty($_GET['cmin'])      ? '&cmin='      . rawurlencode($_GET['cmin'])      : '')
+                               . (!empty($_GET['cmax'])      ? '&cmax='      . rawurlencode($_GET['cmax'])      : '')
+                               . (!empty($_GET['file'])      ? '&file='      . rawurlencode($_GET['file'])      : '')
 
                                . "'; </script>\r\n";
                }

diff --git a/mod/network.php b/mod/network.php
index 1506c707377fa196842c007aa462779a5ffe2741..1ef7c67f4c4ccdaa9ca0d0167d300070a9f1a174 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -58,8 +58,8 @@ function network_init(App $a)
        $group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
 
        $cid = 0;
-       if (!empty($_GET['cid'])) {
-               $cid = $_GET['cid'];
+       if (!empty($_GET['contactid'])) {
+               $cid = $_GET['contactid'];
                $_GET['nets'] = '';
                $group_id = 0;
        }
@@ -466,12 +466,12 @@ function networkThreadedView(App $a, $update, $parent)
 
        $o = '';
 
-       $cid   = intval($_GET['cid']   ?? 0);
-       $star  = intval($_GET['star']  ?? 0);
-       $bmark = intval($_GET['bmark'] ?? 0);
-       $conv  = intval($_GET['conv']  ?? 0);
+       $cid   = intval($_GET['contactid'] ?? 0);
+       $star  = intval($_GET['star']      ?? 0);
+       $bmark = intval($_GET['bmark']     ?? 0);
+       $conv  = intval($_GET['conv']      ?? 0);
        $order = Strings::escapeTags(($_GET['order'] ?? '') ?: 'activity');
-       $nets  =        $_GET['nets']  ?? '';
+       $nets  =        $_GET['nets']      ?? '';
 
        $allowedCids = [];
        if ($cid) {
@@ -891,8 +891,8 @@ function network_tabs(App $a)
        $cmd = DI::args()->getCommand();
 
        $def_param = [];
-       if (!empty($_GET['cid'])) {
-               $def_param['cid'] = $_GET['cid'];
+       if (!empty($_GET['contactid'])) {
+               $def_param['contactid'] = $_GET['contactid'];
        }
 
        // tabs

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 7d3cb89a714ac477746835a90f3be954ae13d0b7..9441e9dbb003bc08ce7c776383b52dac4af8c657 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -126,7 +126,7 @@ class ForumManager
                                $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
                                $entry = [
-                                       'url' => 'network?cid=' . $contact['id'],
+                                       'url' => 'network?contactid=' . $contact['id'],
                                        'external_url' => Contact::magicLink($contact['url']),
                                        'name' => $contact['name'],
                                        'cid' => $contact['id'],

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index cc3a668e6a8cd2f317de5c0815b2b4a41701e213..cec5e5ba635878fc7e5b8facce2b3ede3f9fd3a2 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -202,7 +202,7 @@ function vier_community_info()
                                $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
                                $entry = [
-                                       'url'          => 'network?cid=' . $contact['id'],
+                                       'url'          => 'network?contactid=' . $contact['id'],
                                        'external_url' => Contact::magicLink($contact['url']),
                                        'name'         => $contact['name'],
                                        'cid'          => $contact['id'],