moved core pages to new pages structure

diff --git a/friends.php b/friends.php
deleted file mode 100644 (file)
index c9deb47..0000000
--- a/friends.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php\r
-       /**\r
-        * Tidypics Friends Albums Listing\r
-        * \r
-        */\r
-\r
-       include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
-\r
-       //if no friends were requested, see world pictures instead, or redirect to user's friends\r
-       if (is_null(get_input('username')) || get_input('username')=='') {\r
-               if (!isloggedin()) {\r
-                       forward('pg/photos/world');\r
-               } else {\r
-                       forward('pg/photos/friends/' . $_SESSION['user']->username);\r
-               }\r
-       }\r
-\r
-       if (is_null(page_owner_entity()->name) || page_owner_entity()->name == '') {\r
-               $friendname = get_input('username');\r
-       } else {\r
-               $friendname = page_owner_entity()->name;\r
-       };\r
-       \r
-       if(isloggedin() && (page_owner() == $_SESSION['guid'])) {\r
-               $area2 = elgg_view_title($title = elgg_echo('album:yours:friends'));\r
-       } else {\r
-               $area2 = elgg_view_title($title = sprintf(elgg_echo('album:friends'), $friendname));\r
-       }\r
-       \r
-       set_context('search');\r
-       set_input('search_viewtype', 'gallery');\r
-       $area2 .= list_user_friends_objects(page_owner(), 'album', 10, true, false);\r
-       \r
-       set_context('photos');\r
-       $body = elgg_view_layout('two_column_left_sidebar', '', $area2);\r
-       \r
-       // Finally draw the page\r
-       page_draw(sprintf(elgg_echo("album:friends"),$_SESSION['user']->name), $body);\r
-?>
\ No newline at end of file

diff --git a/languages/en.php b/languages/en.php
index 98cf9db53b2243e0543fff5e563040b16e884f40..82305d2aa1c6f6e8b0763fb744985abae26622d1 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -17,7 +17,7 @@
                        'albums' => "Photo Albums",\r
                        'album:slideshow' => "View Slideshow",\r
                        'album:yours' => "Your photo albums",\r
-                       'album:yours:friends' => "Friends' photo albums",\r
+                       'album:yours:friends' => "Your friends' photo albums",\r
                        'album:user' => "%s's photo albums",\r
                        'album:friends' => "%s's friends' photo albums",\r
                        'album:all' => "All site photo albums",\r

diff --git a/edit.php b/pages/edit.php
similarity index 85%
rename from edit.php
rename to pages/edit.php
index b61f6ba0f6b13c4abdd3fa3aa9a5149ae8ca4295..3f13abae941684a69e3ee01083fb744820a1094c 100644 (file)
--- a/edit.php
+++ b/pages/edit.php
@@ -4,9 +4,10 @@
         * \r
         */\r
 \r
-       include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
+       include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";\r
 \r
-       gatekeeper(); // make sure the user is logged_in\r
+       // make sure the user is logged_in\r
+       gatekeeper(); \r
        \r
        set_context('photos');\r
        $guid = (int) get_input('guid');\r

diff --git a/pages/friends.php b/pages/friends.php
new file mode 100644 (file)
index 0000000..8ac1e21
--- /dev/null
+++ b/pages/friends.php
@@ -0,0 +1,38 @@
+<?php\r
+       /**\r
+        * Tidypics Friends Albums Listing\r
+        * \r
+        * List all the albums of someone's friends\r
+        */\r
+\r
+       include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";\r
+\r
+       $username = get_input('username');\r
+\r
+       // if no username, redirect to world photo albums\r
+       if (!$username) {\r
+               forward('pg/photos/world');\r
+       }\r
+\r
+       // setup title\r
+       $user = get_user_by_username($username);\r
+       if (!$user) {\r
+               forward('pg/photos/world');\r
+       }\r
+       if ($user->guid == get_loggedin_userid())\r
+               $title = elgg_echo('album:yours:friends');\r
+       else\r
+               $title = sprintf(elgg_echo('album:friends'), $user->name);\r
+       \r
+       $area2 = elgg_view_title($title);\r
+       \r
+       // get html for viewing list of photo albums\r
+       set_context('search');\r
+       set_input('search_viewtype', 'gallery'); // need to force gallery view\r
+       $area2 .= list_user_friends_objects($user->guid, 'album', 10, true, false);\r
+       \r
+       \r
+       $body = elgg_view_layout('two_column_left_sidebar', '', $area2);\r
+       \r
+       page_draw($title, $body);\r
+?>
\ No newline at end of file

diff --git a/newalbum.php b/pages/newalbum.php
similarity index 81%
rename from newalbum.php
rename to pages/newalbum.php
index 44e0e07a7677284800228da95538470a9b5cacab..006c61b54bea4e8508b419afd19baeca3397e794 100644 (file)
--- a/newalbum.php
+++ b/pages/newalbum.php
@@ -6,7 +6,9 @@
         */\r
 \r
        // Load Elgg engine\r
-       require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
+       include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";\r
+       \r
+       // must be logged in to create a new album\r
        gatekeeper();\r
        \r
        // Get the current page's owner \r

diff --git a/index.php b/pages/ownedalbums.php
similarity index 73%
rename from index.php
rename to pages/ownedalbums.php
index 17aa70f3b633379a693af1fd4b91e5e859b824c9..a2802021610b947e49f3eef305766529b08b4fe3 100644 (file)
--- a/index.php
+++ b/pages/ownedalbums.php
@@ -1,11 +1,11 @@
 <?php\r
        /**\r
-        * tidypics photo gallery main page\r
-        * \r
+        * tidypics photo gallery album listing page for a person/group\r
         * \r
+        * Shows all the albums that belong to that person or group\r
         */\r
 \r
-       include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
+       include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";\r
        \r
        // if this page belongs to a closed group, prevent anyone outside group from seeing\r
        if (is_callable('group_gatekeeper')) group_gatekeeper();\r
@@ -14,14 +14,11 @@
        $owner = page_owner_entity();\r
        \r
        \r
-       //if page owner cannot be found, forward to user's pictures instead (or world if not logged in)\r
+       //if page owner cannot be found, forward to world album list\r
        if (is_null($owner->username) || empty($owner->username))  {\r
-               //if not logged in, see world pictures instead\r
-               if (!isloggedin()) \r
-                       forward('pg/photos/world');\r
-\r
-               forward('pg/photos/owned/' . $_SESSION['user']->username);\r
+               forward('pg/photos/world');\r
        }\r
+\r
        \r
        // setup group menu for album index\r
        if ($owner instanceof ElggGroup) {\r

diff --git a/search.php b/pages/tagged.php
similarity index 72%
rename from search.php
rename to pages/tagged.php
index b7b67295d1a7b0ae13c7a759170eb05ba3ddc9cc..0bc562f5b609c51294e954381612a525b97fbb3a 100644 (file)
--- a/search.php
+++ b/pages/tagged.php
@@ -1,8 +1,12 @@
 <?php\r
+       /**\r
+        * Tidypics Tagged Listing\r
+        * \r
+        * List all photos tagged with a user\r
+        */\r
 \r
-       include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
+       include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";\r
        \r
-       set_context('search');\r
        \r
        // Get user guid\r
        $guid = get_input('guid');\r
@@ -17,7 +21,10 @@
        \r
        \r
        // create main column\r
-       $body = elgg_view_title($title); \r
+       $body = elgg_view_title($title);\r
+       \r
+       set_context('search');\r
+       set_input('search_viewtype', 'gallery'); // need to force gallery view\r
        $body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image'); \r
 \r
        // Set up submenus\r

diff --git a/upload.php b/pages/upload.php
similarity index 86%
rename from upload.php
rename to pages/upload.php
index 71beb8752b78e715014950fb4e341d380459c79a..3550d5620741032e9ebfdad15d776ca58efaf384 100644 (file)
--- a/upload.php
+++ b/pages/upload.php
@@ -4,9 +4,10 @@
         * \r
         */\r
 \r
-       include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
+       include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";\r
+       \r
+       // must be logged in to upload images\r
        gatekeeper();\r
-       global $CONFIG;\r
        \r
        $album_guid = (int) get_input('container_guid');\r
        if (!$album_guid)\r

diff --git a/viewalbum.php b/pages/viewalbum.php
similarity index 87%
rename from viewalbum.php
rename to pages/viewalbum.php
index 9342db1e6a037f5d4d2ac0fb1eac622eeb637643..b451b69933d05d2f2301ab40aea5a477f64b55d1 100644 (file)
--- a/viewalbum.php
+++ b/pages/viewalbum.php
@@ -2,9 +2,14 @@
 \r
        /**\r
         * Tidypics Album View Page\r
+        *\r
+        * This displays a listing of all the photos that belong to an album\r
         */\r
 \r
-       include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
+       include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";\r
+\r
+       // if this page belongs to a closed group, prevent anyone outside group from seeing\r
+       if (is_callable('group_gatekeeper')) group_gatekeeper();\r
 \r
        // get the album entity\r
        $album_guid = (int) get_input('guid');\r
@@ -19,9 +24,6 @@
        else\r
                set_page_owner($album->owner_guid);\r
 \r
-       // if this page belongs to a closed group, prevent anyone outside group from seeing\r
-       if (is_callable('group_gatekeeper')) group_gatekeeper();\r
-\r
        $owner = page_owner_entity();\r
 \r
        // setup group menu\r

diff --git a/viewimage.php b/pages/viewimage.php
similarity index 85%
rename from viewimage.php
rename to pages/viewimage.php
index 05efff6dfed05f7066bff4d93d22b16dbf544e7d..5caccdf060474697e36314d7b6769e9d0c2abbf1 100644 (file)
--- a/viewimage.php
+++ b/pages/viewimage.php
@@ -1,13 +1,16 @@
 <?php\r
 \r
        /**\r
-        * Tidypics full view of an image\r
-        * Given a GUID, this page will try and display any entity\r
+        * Tidypics image view\r
         * \r
+        * Display a view of a single image\r
         */\r
 \r
        // Load Elgg engine\r
-       include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
+       include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";\r
+\r
+       // if this page belongs to a closed group, prevent anyone outside group from seeing\r
+       if (is_callable('group_gatekeeper')) group_gatekeeper();\r
 \r
        // get the album entity\r
        $photo_guid = (int) get_input('guid');\r
@@ -25,9 +28,6 @@
                        set_page_owner($owner_guid);\r
        }\r
 \r
-       // if this page belongs to a closed group, prevent anyone outside group from seeing\r
-       if (is_callable('group_gatekeeper')) group_gatekeeper();\r
-\r
        \r
        $page_owner = page_owner_entity();\r
        if ($page_owner instanceof ElggGroup) {\r

diff --git a/world.php b/pages/world.php
similarity index 86%
rename from world.php
rename to pages/world.php
index d5dbf1f2ad32670c1adbc3d26951c892e7cc7ea5..1ed712ac92e771ab9245a5b45b52361ca3856ce9 100644 (file)
--- a/world.php
+++ b/pages/world.php
@@ -4,7 +4,7 @@
         * \r
         */\r
 \r
-       include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
+       include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";\r
        \r
        $limit = get_input("limit", 10);\r
        $offset = get_input("offset", 0);\r
@@ -25,7 +25,7 @@
        $area2 .= list_entities('object','album', 0, 28);               \r
 \r
        set_context('photos');\r
-               \r
+       \r
        $body = elgg_view_layout('two_column_left_sidebar', '', $area2);\r
 \r
        // Finally draw the page\r

diff --git a/start.php b/start.php
index 0f73694d31f6064aa487ea0dbeb89d9f17692373..07dc9392fdd00e96ceb77440f11f069c9e08b463 100644 (file)
--- a/start.php
+++ b/start.php
@@ -227,32 +227,32 @@
                        {\r
                                case "owned":  //view list of albums owned by container\r
                                        if (isset($page[1])) set_input('username',$page[1]);\r
-                                       include($CONFIG->pluginspath . "tidypics/index.php");\r
+                                       include($CONFIG->pluginspath . "tidypics/pages/ownedalbums.php");\r
                                break;\r
 \r
                                case "view": //view an image individually\r
                                        if (isset($page[1])) set_input('guid',$page[1]);\r
-                                       include($CONFIG->pluginspath . "tidypics/viewimage.php");\r
+                                       include($CONFIG->pluginspath . "tidypics/pages/viewimage.php");\r
                                break;\r
 \r
                                case "album": //view an album individually\r
                                        if (isset($page[1])) set_input('guid',$page[1]);\r
-                                       include($CONFIG->pluginspath . "tidypics/viewalbum.php");\r
+                                       include($CONFIG->pluginspath . "tidypics/pages/viewalbum.php");\r
                                break;\r
 \r
                                case "new":  //create new album\r
                                        if (isset($page[1])) set_input('username',$page[1]); \r
-                                       include($CONFIG->pluginspath . "tidypics/newalbum.php");\r
+                                       include($CONFIG->pluginspath . "tidypics/pages/newalbum.php");\r
                                break;\r
 \r
                                case "upload": //upload images to album\r
                                        if (isset($page[1])) set_input('container_guid',$page[1]);\r
-                                       include($CONFIG->pluginspath . "tidypics/upload.php");\r
+                                       include($CONFIG->pluginspath . "tidypics/pages/upload.php");\r
                                break;\r
 \r
                                case "edit": //edit image or album\r
                                        if (isset($page[1])) set_input('guid',$page[1]);\r
-                                       include($CONFIG->pluginspath . "tidypics/edit.php");\r
+                                       include($CONFIG->pluginspath . "tidypics/pages/edit.php");\r
                                break;\r
 \r
                                case "delete": //edit image or album\r
@@ -260,18 +260,18 @@
                                        include($CONFIG->pluginspath . "tidypics/actions/delete.php");\r
                                break;\r
 \r
-                               case "friends": \r
+                               case "friends": // albums of friends\r
                                        if (isset($page[1])) set_input('username',$page[1]);\r
-                                       include($CONFIG->pluginspath . "tidypics/friends.php");\r
+                                       include($CONFIG->pluginspath . "tidypics/pages/friends.php");\r
                                break;\r
 \r
-                               case "world":  \r
-                                       include($CONFIG->pluginspath . "tidypics/world.php");\r
+                               case "world": // all site albums\r
+                                       include($CONFIG->pluginspath . "tidypics/pages/world.php");\r
                                break;\r
                                \r
-                               case "search": //view an image individually\r
+                               case "tagged": // all photos tagged with user \r
                                        if (isset($page[1])) set_input('guid',$page[1]);\r
-                                       include($CONFIG->pluginspath . "tidypics/search.php");\r
+                                       include($CONFIG->pluginspath . "tidypics/pages/tagged.php");\r
                                break;\r
 \r
                                case "rate": //rate image\r
@@ -327,8 +327,8 @@
                }\r
                else\r
                {\r
-                       // going to the index because something is wrong with the page handler \r
-                       include($CONFIG->pluginspath . "tidypics/index.php");\r
+                       // going to all site albums if something goes wrong with the page handler \r
+                       include($CONFIG->pluginspath . "tidypics/pages/world.php");\r
                }\r
                \r
        }\r

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 8ca20e75a87c21339fc670397537bd7bebf4a4a7..852fea8db6bca8d38d316a740958d13b48315059 100644 (file)
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -38,7 +38,7 @@ if ($photo_tags) {
                        else
                                $phototag_text = "unknown user";
                        
-                       $phototag_link = $vars['url'] . "pg/photos/search/" . $photo_tag->value;
+                       $phototag_link = $vars['url'] . "pg/photos/tagged/" . $photo_tag->value;
                }
 
                // hack to handle format of Pedro Prez's tags - ugh