Refs #3158 namespaced pages for bookmarks and thewire

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

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

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

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

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

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

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

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

diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index bf7e372a382f948c6b1ffe78932f3a3833dbe022..9d0aa362e6afb01c953b4f56b54453b5516bf3b2 100644 (file)
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -107,7 +107,7 @@ function bookmarks_page_handler($page) {
                bookmarks_url_forwarder($page);
        }
 
-       $pages = dirname(__FILE__) . '/pages';
+       $pages = dirname(__FILE__) . '/pages/bookmarks';
 
        switch ($page[0]) {
                case "all":

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

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

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

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

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

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

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

diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index c2006ddb01e96f0da958c9a57f86b030dd6ad261..26a1adbeca0d1bf8dfa2c717e49ae93eda8986d2 100644 (file)
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -85,44 +85,44 @@ function thewire_page_handler($page) {
 \r
                switch ($page[0]) {\r
                        case "all":\r
-                               include dirname(__FILE__) . "/pages/everyone.php";\r
+                               include dirname(__FILE__) . "/pages/thewire/everyone.php";\r
                                break;\r
 \r
                        case "friends":\r
-                               include dirname(__FILE__) . "/pages/friends.php";\r
+                               include dirname(__FILE__) . "/pages/thewire/friends.php";\r
                                break;\r
 \r
                        case "owner":\r
-                               include dirname(__FILE__) . "/pages/user.php";\r
+                               include dirname(__FILE__) . "/pages/thewire/user.php";\r
                                break;\r
 \r
                        case "thread":\r
                                if (isset($page[1])) {\r
                                        set_input('thread_id', $page[1]);\r
                                }\r
-                               include dirname(__FILE__) . "/pages/thread.php";\r
+                               include dirname(__FILE__) . "/pages/thewire/thread.php";\r
                                break;\r
                        case "reply":\r
                                if (isset($page[1])) {\r
                                        set_input('guid', $page[1]);\r
                                }\r
-                               include dirname(__FILE__) . "/pages/reply.php";\r
+                               include dirname(__FILE__) . "/pages/thewire/reply.php";\r
                                break;\r
                        case "tag":\r
                                if (isset($page[1])) {\r
                                        set_input('tag', $page[1]);\r
                                }\r
-                               include dirname(__FILE__) . "/pages/tag.php";\r
+                               include dirname(__FILE__) . "/pages/thewire/tag.php";\r
                                break;\r
                        case "previous":\r
                                if (isset($page[1])) {\r
                                        set_input('guid', $page[1]);\r
                                }\r
-                               include dirname(__FILE__) . "/pages/previous.php";\r
+                               include dirname(__FILE__) . "/pages/thewire/previous.php";\r
                                break;\r
                }\r
        } else {\r
-               include dirname(__FILE__) . "/pages/everyone.php";\r
+               include dirname(__FILE__) . "/pages/thewire/everyone.php";\r
        }\r
 \r
        return true;\r