Closes #2344 - moves friends pages into pages directory

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

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 5d16decb7a3613b1a0244ccaf029782741be0f73..05311ab9d16d59f3378c109828d24c8160d0c249 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1133,7 +1133,7 @@ function friends_page_handler($page_elements) {
        if (get_loggedin_userid() == page_owner()) {
                // collections_submenu_items(); disabled for now as we no longer use friends collections (replaced by shared access)
        }
-       require_once(dirname(dirname(dirname(__FILE__))) . "/friends/index.php");
+       require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/index.php");
 }
 
 /**
@@ -1147,7 +1147,7 @@ function friends_of_page_handler($page_elements) {
        if (get_loggedin_userid() == page_owner()) {
                // collections_submenu_items(); disabled for now as we no longer use friends collections (replaced by shared access)
        }
-       require_once(dirname(dirname(dirname(__FILE__))) . "/friends/of.php");
+       require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/of.php");
 }
 
 /**
@@ -1159,14 +1159,14 @@ function collections_page_handler($page_elements) {
                if ($page_elements[0] == "add") {
                        set_page_owner(get_loggedin_userid());
                        collections_submenu_items();
-                       require_once(dirname(dirname(dirname(__FILE__))) . "/friends/add.php");
+                       require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/add.php");
                } else {
                        if ($user = get_user_by_username($page_elements[0])) {
                                set_page_owner($user->getGUID());
                                if (get_loggedin_userid() == page_owner()) {
                                        collections_submenu_items();
                                }
-                               require_once(dirname(dirname(dirname(__FILE__))) . "/friends/collections.php");
+                               require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/collections.php");
                        }
                }
        }

diff --git a/friends/add.php b/pages/friends/add.php
similarity index 100%
rename from friends/add.php
rename to pages/friends/add.php

diff --git a/friends/collections.php b/pages/friends/collections.php
similarity index 100%
rename from friends/collections.php
rename to pages/friends/collections.php

diff --git a/friends/edit.php b/pages/friends/edit.php
similarity index 100%
rename from friends/edit.php
rename to pages/friends/edit.php

diff --git a/friends/index.php b/pages/friends/index.php
similarity index 100%
rename from friends/index.php
rename to pages/friends/index.php

diff --git a/friends/of.php b/pages/friends/of.php
similarity index 100%
rename from friends/of.php
rename to pages/friends/of.php

diff --git a/friends/pickercallback.php b/pages/friends/pickercallback.php
similarity index 94%
rename from friends/pickercallback.php
rename to pages/friends/pickercallback.php
index 4fe08b5051022c98e4fbd75e93dd4e464ad9d0ab..006ca20e5ccb5b66ecaf6d3788f1e9936689c46e 100644 (file)
--- a/friends/pickercallback.php
+++ b/pages/friends/pickercallback.php
@@ -9,7 +9,7 @@
  */
 
 // Load Elgg engine
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 global $CONFIG;
 
 // Get callback type (list or picker)

diff --git a/views/default/friends/collection.php b/views/default/friends/collection.php
index ddd0a0ed0217938b58837e4496ccc69389301a6e..5683d59821c702e3cbf7a555edd7fa13a0aea6b0 100644 (file)
--- a/views/default/friends/collection.php
+++ b/views/default/friends/collection.php
@@ -45,7 +45,7 @@ if ($friends = $vars['collection']->entities) {
        <script type="text/javascript">
        $(document).ready(function () {
 
-                       $('#friends_picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
+                       $('#friends_picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo $vars['url']; ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
 
        });
        </script>

diff --git a/views/default/friends/collectiontabs.php b/views/default/friends/collectiontabs.php
index 9a6577671e778898dde824285d97a766c885e489..43a8aef46ef80ba6d58965ef53f5b841f3af9444 100644 (file)
--- a/views/default/friends/collectiontabs.php
+++ b/views/default/friends/collectiontabs.php
@@ -32,7 +32,7 @@ $(document).ready(function () {
 
        $('a.collectionmembers<?php echo $friendspicker; ?>').click(function () {
                // load collection members pane
-               $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
+               $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
 
                // remove selected state from previous tab
                $(this).parent().parent().find("li.selected").removeClass("selected");
@@ -44,7 +44,7 @@ $(document).ready(function () {
 
        $('a.editmembers<?php echo $friendspicker; ?>').click(function () {
                // load friends picker pane
-               $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
+               $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
 
                // remove selected state from previous tab
                $(this).parent().parent().find("li.selected").removeClass("selected");