Refs #3158 namespace file plugin's page scripts

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

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

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

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

diff --git a/mod/file/search.php b/mod/file/pages/file/search.php
similarity index 94%
rename from mod/file/search.php
rename to mod/file/pages/file/search.php
index bcaa2cad96ee65a27eb7a6df696e20edb21ac5d8..2fa1ea60f0b9944bb3d7356749cca7ba015e1bd9 100644 (file)
--- a/mod/file/search.php
+++ b/mod/file/pages/file/search.php
@@ -3,10 +3,7 @@
  * List files by type
  *
  * @package ElggFile
-
  */
-// Load Elgg engine
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 $page_owner_guid = get_input('page_owner', null);
 if ($page_owner_guid) {

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

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

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

diff --git a/mod/file/start.php b/mod/file/start.php
index f7642c166b52cc1a94305d972371184e5e8b92b9..f49c6fc917ec25c13a66f99f541165726b554902 100644 (file)
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -86,7 +86,7 @@ function file_page_handler($page) {
                $page[0] = 'all';
        }
 
-       $file_dir = elgg_get_plugins_path() . 'file';
+       $file_dir = elgg_get_plugins_path() . 'file/pages/file';
 
        $page_type = $page[0];
        switch ($page_type) {
@@ -107,6 +107,9 @@ function file_page_handler($page) {
                        set_input('guid', $page[1]);
                        include "$file_dir/edit.php";
                        break;
+               case 'search':
+                       include "$file_dir/search.php";
+                       break;
                case 'group':
                        include "$file_dir/index.php";
                        break;

diff --git a/mod/file/views/default/file/typecloud.php b/mod/file/views/default/file/typecloud.php
index c0db7932b784e0cddebe00ea2b95fd93b61902cb..ce4d6c127dba713c8ac23af39ed21448545ef78a 100644 (file)
--- a/mod/file/views/default/file/typecloud.php
+++ b/mod/file/views/default/file/typecloud.php
@@ -4,7 +4,7 @@
  */
 
 function file_type_cloud_get_url($type, $friends) {
-       $url = elgg_get_site_url() . "mod/file/search.php?subtype=file";
+       $url = elgg_get_site_url() . 'file/search?subtype=file';
 
        if ($type->tag != "all") {
                $url .= "&md_type=simpletype&tag=" . urlencode($type->tag);