Fixes #3138 using 'all' for group listing urls

git-svn-id: http://code.elgg.org/elgg/trunk@9133 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/blog/actions/blog/delete.php b/mod/blog/actions/blog/delete.php
index 6028480ffbe29f2c78f446e256e1dcc278908889..ca4eb8a7fbfebd510ba8f7365fa3acd7776c0ff5 100644 (file)
--- a/mod/blog/actions/blog/delete.php
+++ b/mod/blog/actions/blog/delete.php
@@ -13,7 +13,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
        if ($blog->delete()) {
                system_message(elgg_echo('blog:message:deleted_post'));
                if (elgg_instanceof($container, 'group')) {
-                       forward("blog/group/$container->guid/owner");
+                       forward("blog/group/$container->guid/all");
                } else {
                        forward("blog/owner/$container->username");
                }

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 2c53c0f0f3f22912f073b89283430929ea3f440d..8964d5b5328976e7f997b0f5a484e5ba68b83e25 100644 (file)
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -32,7 +32,7 @@ function blog_get_page_content_read($guid = NULL) {
        $container = $blog->getContainerEntity();
        $crumbs_title = $container->name;
        if (elgg_instanceof($container, 'group')) {
-               elgg_push_breadcrumb($crumbs_title, "blog/group/$container->guid/owner");
+               elgg_push_breadcrumb($crumbs_title, "blog/group/$container->guid/all");
        } else {
                elgg_push_breadcrumb($crumbs_title, "blog/owner/$container->username");
        }
@@ -396,7 +396,7 @@ function blog_url_forwarder($page) {
                $guid = $matches[1];
                $entity = get_entity($guid);
                if ($entity) {
-                       $url = "{$CONFIG->wwwroot}blog/group/$guid/owner";
+                       $url = "{$CONFIG->wwwroot}blog/group/$guid/all";
                        register_error(elgg_echo("changebookmark"));
                        forward($url);
                }

diff --git a/mod/blog/start.php b/mod/blog/start.php
index 33c6ee20db39f11c1f6d04b65c15b7ea76a23064..b9911aa74fd2589e678a94c73ac0d5916a013171 100644 (file)
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -85,7 +85,7 @@ function blog_init() {
  *  New post:        blog/add/<guid>
  *  Edit post:       blog/edit/<guid>/<revision>
  *  Preview post:    blog/preview/<guid>
- *  Group blog:      blog/group/<guid>/owner
+ *  Group blog:      blog/group/<guid>/all
  *
  * Title is ignored
  *
@@ -178,7 +178,7 @@ function blog_owner_block_menu($hook, $type, $return, $params) {
                $return[] = $item;
        } else {
                if ($params['entity']->blog_enable != "no") {
-                       $url = "blog/group/{$params['entity']->guid}/owner";
+                       $url = "blog/group/{$params['entity']->guid}/all";
                        $item = new ElggMenuItem('blog', elgg_echo('blog:group'), $url);
                        $return[] = $item;
                }

diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php
index 9a1515585d3179cc2bf8dd9102f8e0c07e6fb96a..6cfe6c98ebc6f2c93aecd6ab7c354f5b59e1b18c 100644 (file)
--- a/mod/blog/views/default/blog/group_module.php
+++ b/mod/blog/views/default/blog/group_module.php
@@ -10,7 +10,7 @@ if ($group->blog_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-       'href' => "blog/group/$group->guid/owner",
+       'href' => "blog/group/$group->guid/all",
        'text' => elgg_echo('link:view:all'),
 ));
 

diff --git a/mod/bookmarks/actions/bookmarks/delete.php b/mod/bookmarks/actions/bookmarks/delete.php
index 410a67bb766e979ada3a962dbb4593f029b6abb3..2e9f41438634e40dd27017e3d05d8e6c48fa44c1 100644 (file)
--- a/mod/bookmarks/actions/bookmarks/delete.php
+++ b/mod/bookmarks/actions/bookmarks/delete.php
@@ -13,7 +13,7 @@ if (elgg_instanceof($bookmark, 'object', 'bookmarks') && $bookmark->canEdit()) {
        if ($bookmark->delete()) {
                system_message(elgg_echo("bookmarks:delete:success"));
                if (elgg_instanceof($container, 'group')) {
-                       forward("bookmarks/group/$container->guid/owner");
+                       forward("bookmarks/group/$container->guid/all");
                } else {
                        forward("bookmarks/owner/$container->username");
                }

diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
index 142e0b2461adba0aef3f52b1af5504e8711212b9..d0a9c630a3dbbfad535b3b44f279d831a9fb741e 100644 (file)
--- a/mod/bookmarks/pages/bookmarks/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -12,7 +12,7 @@ $page_owner = elgg_get_page_owner_entity();
 $crumbs_title = $page_owner->name;
 
 if (elgg_instanceof($page_owner, 'group')) {
-       elgg_push_breadcrumb($crumbs_title, "bookmarks/group/$page_owner->guid/owner");
+       elgg_push_breadcrumb($crumbs_title, "bookmarks/group/$page_owner->guid/all");
 } else {
        elgg_push_breadcrumb($crumbs_title, "bookmarks/owner/$page_owner->username");
 }

diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 2dc86bc1a8ec2931f63ad6339389abfa5ffddfbf..1fb79deb6a300fb41887a83079a1e75b5d7b653a 100644 (file)
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -77,7 +77,7 @@ function bookmarks_init() {
  *  View bookmark:        bookmarks/view/<guid>/<title>
  *  New bookmark:         bookmarks/add/<guid> (container: user, group, parent)
  *  Edit bookmark:        bookmarks/edit/<guid>
- *  Group bookmarks:      bookmarks/group/<guid>/owner
+ *  Group bookmarks:      bookmarks/group/<guid>/all
  *  Bookmarklet:          bookmarks/bookmarklet/<guid> (user)
  *
  * Title is ignored
@@ -222,7 +222,7 @@ function bookmarks_owner_block_menu($hook, $type, $return, $params) {
                $return[] = $item;
        } else {
                if ($params['entity']->bookmarks_enable != 'no') {
-                       $url = "bookmarks/group/{$params['entity']->guid}/owner";
+                       $url = "bookmarks/group/{$params['entity']->guid}/all";
                        $item = new ElggMenuItem('bookmarks', elgg_echo('bookmarks:group'), $url);
                        $return[] = $item;
                }

diff --git a/mod/bookmarks/views/default/bookmarks/group_module.php b/mod/bookmarks/views/default/bookmarks/group_module.php
index ff85c23ffebce447da673b81d73733033222c421..3166fc0f0cbd3cf349093908f27afa4c6e41c4f7 100644 (file)
--- a/mod/bookmarks/views/default/bookmarks/group_module.php
+++ b/mod/bookmarks/views/default/bookmarks/group_module.php
@@ -12,7 +12,7 @@ if ($group->bookmarks_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-       'href' => "bookmarks/group/$group->guid/owner",
+       'href' => "bookmarks/group/$group->guid/all",
        'text' => elgg_echo('link:view:all'),
 ));
 

diff --git a/mod/file/actions/file/delete.php b/mod/file/actions/file/delete.php
index 622d02277a8007f29af8982ff63d9be0f8414e02..72585aa360fa5912b8c1533103940910d8f7d1fb 100644 (file)
--- a/mod/file/actions/file/delete.php
+++ b/mod/file/actions/file/delete.php
@@ -27,7 +27,7 @@ if (!$file->delete()) {
 }
 
 if (elgg_instanceof($container, 'group')) {
-       forward("file/group/$container->guid/owner");
+       forward("file/group/$container->guid/all");
 } else {
        forward("file/owner/$container->username");
 }

diff --git a/mod/file/actions/file/upload.php b/mod/file/actions/file/upload.php
index e04203f67a732ae072c6b07939968b51c9fb9740..5d5c28bee53d2c0000d061b072ea6c63dea7b8d8 100644 (file)
--- a/mod/file/actions/file/upload.php
+++ b/mod/file/actions/file/upload.php
@@ -192,7 +192,7 @@ if ($new_file) {
        if (!$ajax) {
                $container = get_entity($container_guid);
                if (elgg_instanceof($container, 'group')) {
-                       forward("file/group/$container->guid/owner");
+                       forward("file/group/$container->guid/all");
                } else {
                        forward("file/owner/$container->username");
                }

diff --git a/mod/file/pages/file/search.php b/mod/file/pages/file/search.php
index 2fa1ea60f0b9944bb3d7356749cca7ba015e1bd9..77c92f444c65842ef2f01adc2712543341e61276 100644 (file)
--- a/mod/file/pages/file/search.php
+++ b/mod/file/pages/file/search.php
@@ -26,7 +26,7 @@ if ($owner) {
        if (elgg_instanceof($owner, 'user')) {
                elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
        } else {
-               elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/owner");
+               elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/all");
        }
 }
 if ($friends && $owner) {

diff --git a/mod/file/pages/file/upload.php b/mod/file/pages/file/upload.php
index c195225303edd6a51d6b2701dbf44b624fc127b0..d97cc038d3f7ad1ad7db731891c1741e9399f4da 100644 (file)
--- a/mod/file/pages/file/upload.php
+++ b/mod/file/pages/file/upload.php
@@ -19,7 +19,7 @@ elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 if (elgg_instanceof($owner, 'user')) {
        elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
 } else {
-       elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/owner");
+       elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/all");
 }
 elgg_push_breadcrumb($title);
 

diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index 1d7c27337a47db2d9360ba5e56a87fe0a9818641..daa2a400e3307df97f8e9a4c433fd6beeafa34a3 100644 (file)
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -13,7 +13,7 @@ elgg_push_breadcrumb(elgg_echo('file'), 'file/all');
 
 $crumbs_title = $owner->name;
 if (elgg_instanceof($owner, 'group')) {
-       elgg_push_breadcrumb($crumbs_title, "file/group/$owner->guid/owner");
+       elgg_push_breadcrumb($crumbs_title, "file/group/$owner->guid/all");
 } else {
        elgg_push_breadcrumb($crumbs_title, "file/owner/$owner->username");
 }

diff --git a/mod/file/start.php b/mod/file/start.php
index d4f12e903d03f469d44b520f3735d8899b8ef7f7..b94dc309a69c8b31627e59cf676f3bd48b79b324 100644 (file)
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -73,7 +73,7 @@ function file_init() {
  *  View file:       file/view/<guid>/<title>
  *  New file:        file/add/<guid>
  *  Edit file:       file/edit/<guid>
- *  Group files:     file/group/<guid>/owner
+ *  Group files:     file/group/<guid>/all
  *
  * Title is ignored
  *
@@ -152,7 +152,7 @@ function file_owner_block_menu($hook, $type, $return, $params) {
                $return[] = $item;
        } else {
                if ($params['entity']->file_enable != "no") {
-                       $url = "file/group/{$params['entity']->guid}/owner";
+                       $url = "file/group/{$params['entity']->guid}/all";
                        $item = new ElggMenuItem('file', elgg_echo('file:group'), $url);
                        $return[] = $item;
                }

diff --git a/mod/file/views/default/file/group_module.php b/mod/file/views/default/file/group_module.php
index de8c62098d5f02b4b5ae7a89d8451c7c80124bfa..830b1096c8b723180a56e60c2474d40d0c16555a 100644 (file)
--- a/mod/file/views/default/file/group_module.php
+++ b/mod/file/views/default/file/group_module.php
@@ -10,7 +10,7 @@ if ($group->file_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-       'href' => "file/group/$group->guid/owner",
+       'href' => "file/group/$group->guid/all",
        'text' => elgg_echo('link:view:all'),
 ));
 

diff --git a/mod/messageboard/pages/messageboard/owner.php b/mod/messageboard/pages/messageboard/owner.php
index 7fd88a9d418dc9dfe4fc1101c0888568808c5265..58021c29ef249373a65f322ec7ed29b2733fb14e 100644 (file)
--- a/mod/messageboard/pages/messageboard/owner.php
+++ b/mod/messageboard/pages/messageboard/owner.php
@@ -24,7 +24,7 @@ if ($history_user) {
        $title = elgg_echo('messageboard:owner_history', array($history_user->name, $page_owner->name));
 
        if ($page_owner instanceof ElggGroup) {
-               $mb_url = "messageboard/group/$page_owner->guid/owner";
+               $mb_url = "messageboard/group/$page_owner->guid/all";
        } else {
                $mb_url = "messageboard/owner/$page_owner->username";
        }

diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php
index 899df19c301f84340f639caa1dacc7bf19816cb2..efe453286bfa2dbeaeb03f275218d82524a8055b 100644 (file)
--- a/mod/messageboard/start.php
+++ b/mod/messageboard/start.php
@@ -36,7 +36,7 @@ function messageboard_init() {
  *  User's messageboard:               messageboard/owner/<username>
  *  Y's history of posts on X's board: messageboard/owner/<X>/history/<Y>
  *  New post:                          messageboard/add/<guid> (container: user or group)
- *  Group messageboard:                messageboard/group/<guid>/owner
+ *  Group messageboard:                messageboard/group/<guid>/all (not implemented)
  *
  * @param array $page Array of page elements
  * @return bool

diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php
index 55b12f29bdef6a8a01d1e639373fe8b13c30811f..63f389e6a8dfda5efbb38fa196ffc954bc59ae7d 100644 (file)
--- a/mod/messageboard/views/default/widgets/messageboard/content.php
+++ b/mod/messageboard/views/default/widgets/messageboard/content.php
@@ -23,7 +23,7 @@ $options = array(
 echo elgg_list_annotations($options);
 
 if ($owner instanceof ElggGroup) {
-       $url = "messageboard/group/$owner->guid/owner";
+       $url = "messageboard/group/$owner->guid/all";
 } else {
        $url = "messageboard/owner/$owner->username";
 }

diff --git a/mod/pages/actions/pages/delete.php b/mod/pages/actions/pages/delete.php
index 077561b1e76c6f68febaa18e10d27dfdc9832ad9..dfa0de98df4fad653f2b989e9d207caeef11d996 100644 (file)
--- a/mod/pages/actions/pages/delete.php
+++ b/mod/pages/actions/pages/delete.php
@@ -33,7 +33,7 @@ if ($page) {
                                }
                        }
                        if (elgg_instanceof($container, 'group')) {
-                               forward("pages/group/$container->guid/owner");
+                               forward("pages/group/$container->guid/all");
                        } else {
                                forward("pages/owner/$container->username");
                        }

diff --git a/mod/pages/pages/pages/history.php b/mod/pages/pages/pages/history.php
index 7ed5ad7f7ec7b5a462e16a024d77050ae1f888f7..a7ef57b6ba6e37627b00b336a971dbec0b05e151 100644 (file)
--- a/mod/pages/pages/pages/history.php
+++ b/mod/pages/pages/pages/history.php
@@ -20,7 +20,7 @@ if (!$container) {
 elgg_set_page_owner_guid($container->getGUID());
 
 if (elgg_instanceof($container, 'group')) {
-       elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner");
+       elgg_push_breadcrumb($container->name, "pages/group/$container->guid/all");
 } else {
        elgg_push_breadcrumb($container->name, "pages/owner/$container->username");
 }

diff --git a/mod/pages/pages/pages/revision.php b/mod/pages/pages/pages/revision.php
index f542f5201e40a2c667fcb132ac04e83c900e3fd3..83d72286c27f18c743b1559b85395ab533913b7c 100644 (file)
--- a/mod/pages/pages/pages/revision.php
+++ b/mod/pages/pages/pages/revision.php
@@ -27,7 +27,7 @@ if (!$container) {
 $title = $page->title . ": " . elgg_echo('pages:revision');
 
 if (elgg_instanceof($container, 'group')) {
-       elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner");
+       elgg_push_breadcrumb($container->name, "pages/group/$container->guid/all");
 } else {
        elgg_push_breadcrumb($container->name, "pages/owner/$container->username");
 }

diff --git a/mod/pages/pages/pages/view.php b/mod/pages/pages/pages/view.php
index d3503709d8d466e5b72ab3ddb63682237f11fafe..b9f1fde8343e69af1a56c1fb645c227c79682e0c 100644 (file)
--- a/mod/pages/pages/pages/view.php
+++ b/mod/pages/pages/pages/view.php
@@ -22,7 +22,7 @@ if (!$container) {
 $title = $page->title;
 
 if (elgg_instanceof($container, 'group')) {
-       elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner");
+       elgg_push_breadcrumb($container->name, "pages/group/$container->guid/all");
 } else {
        elgg_push_breadcrumb($container->name, "pages/owner/$container->username");
 }

diff --git a/mod/pages/start.php b/mod/pages/start.php
index 772fa2de9090653186bb82d1013dba510690294c..2e2bc1ed603f1f100e74332b5a411826775d388b 100644 (file)
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -95,7 +95,7 @@ function pages_init() {
  *  Edit page:        pages/edit/<guid>
  *  History of page:  pages/history/<guid>
  *  Revision of page: pages/revision/<id>
- *  Group pages:      pages/group/<guid>/owner
+ *  Group pages:      pages/group/<guid>/all
  *
  * Title is ignored
  *
@@ -208,7 +208,7 @@ function pages_owner_block_menu($hook, $type, $return, $params) {
                $return[] = $item;
        } else {
                if ($params['entity']->pages_enable != "no") {
-                       $url = "pages/group/{$params['entity']->guid}/owner";
+                       $url = "pages/group/{$params['entity']->guid}/all";
                        $item = new ElggMenuItem('pages', elgg_echo('pages:group'), $url);
                        $return[] = $item;
                }

diff --git a/mod/pages/views/default/pages/group_module.php b/mod/pages/views/default/pages/group_module.php
index 6befb1c65333a1bd3219e6c41ac200d7cbe15b99..1d3437e18b0cda6411f488b9a34f885a3c746687 100644 (file)
--- a/mod/pages/views/default/pages/group_module.php
+++ b/mod/pages/views/default/pages/group_module.php
@@ -13,7 +13,7 @@ if ($group->pages_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-       'href' => "pages/group/$group->guid/owner",
+       'href' => "pages/group/$group->guid/all",
        'text' => elgg_echo('link:view:all'),
 ));