]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Fixes #2228: Major cleanup of urls -- remove leading pg/ and trailing / from most...
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Thu, 10 Mar 2011 22:05:49 +0000 (22:05 +0000)
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Thu, 10 Mar 2011 22:05:49 +0000 (22:05 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8653 36083f99-b078-4883-b0ff-0f9b5a30f544

150 files changed:
actions/admin/plugins/activate.php
actions/admin/plugins/deactivate.php
actions/admin/user/delete.php
actions/friends/collections/add.php
actions/friends/collections/delete.php
engine/classes/ElggSite.php
engine/lib/admin.php
engine/lib/cache.php
engine/lib/cron.php
engine/lib/elgglib.php
engine/lib/entities.php
engine/lib/input.php
engine/lib/navigation.php
engine/lib/output.php
engine/lib/pagehandler.php
engine/lib/pageowner.php
engine/lib/plugins.php
engine/lib/river.php
engine/lib/user_settings.php
engine/lib/users.php
engine/tests/api/helpers.php
index.php
install/ElggInstaller.php
js/lib/elgglib.js
js/lib/languages.js
js/lib/userpicker.js
js/tests/ElggLibTest.js
mod/blog/actions/blog/delete.php
mod/blog/actions/blog/save.php
mod/blog/lib/blog.php
mod/blog/start.php
mod/blog/views/default/blog/group_module.php
mod/blog/views/default/blog/sidebar/archives.php
mod/blog/views/default/blog/sidebar/revisions.php
mod/blog/views/default/object/blog.php
mod/blog/views/default/widgets/blog/content.php
mod/bookmarks/actions/bookmarks/delete.php
mod/bookmarks/actions/bookmarks/save.php
mod/bookmarks/pages/friends.php
mod/bookmarks/pages/view.php
mod/bookmarks/start.php
mod/bookmarks/views/default/bookmarks/bookmarklet.php
mod/bookmarks/views/default/bookmarks/group_module.php
mod/bookmarks/views/default/object/bookmarks.php
mod/bookmarks/views/default/widgets/bookmarks/content.php
mod/categories/start.php
mod/categories/views/default/output/categories.php
mod/developers/start.php
mod/developers/views/default/admin/developers/preview.php
mod/embed/start.php
mod/embed/views/default/embed/embed.php
mod/embed/views/default/embed/upload/content.php
mod/externalpages/start.php
mod/externalpages/views/default/expages/menu.php
mod/file/actions/file/delete.php
mod/file/actions/file/upload.php
mod/file/edit.php
mod/file/friends.php
mod/file/index.php
mod/file/search.php
mod/file/start.php
mod/file/upload.php
mod/file/view.php
mod/file/views/default/file/embed_upload.php
mod/file/views/default/file/group_module.php
mod/file/views/default/object/file.php
mod/file/views/default/widgets/filerepo/content.php
mod/groups/actions/discussion/delete.php
mod/groups/actions/groups/delete.php
mod/groups/actions/groups/membership/invite.php
mod/groups/lib/discussion.php
mod/groups/lib/groups.php
mod/groups/start.php
mod/groups/views/default/discussion/group_module.php
mod/groups/views/default/groups/group_sort_menu.php
mod/groups/views/default/groups/profile/activity_module.php
mod/groups/views/default/groups/profile/buttons.php
mod/groups/views/default/groups/side_menu.php
mod/groups/views/default/groups/sidebar/find.php
mod/groups/views/default/groups/sidebar/members.php
mod/groups/views/default/widgets/a_users_groups/content.php
mod/invitefriends/actions/invite.php
mod/invitefriends/start.php
mod/logbrowser/start.php
mod/logbrowser/views/default/logbrowser/form.php
mod/logbrowser/views/default/logbrowser/table.php
mod/messageboard/pages/owner.php
mod/messageboard/start.php
mod/messageboard/views/default/widgets/messageboard/content.php
mod/messages/actions/messages/send.php
mod/messages/read.php
mod/messages/start.php
mod/messages/views/default/object/messages.php
mod/notifications/start.php
mod/pages/actions/pages/delete.php
mod/pages/friends.php
mod/pages/history.php
mod/pages/revision.php
mod/pages/start.php
mod/pages/view.php
mod/pages/views/default/object/page_top.php
mod/pages/views/default/pages/group_module.php
mod/pages/views/default/widgets/pages/content.php
mod/profile/start.php
mod/reportedcontent/start.php
mod/search/index.php
mod/search/views/default/search/list.php
mod/search/views/default/search/search_box.php
mod/thewire/actions/add.php
mod/thewire/actions/delete.php
mod/thewire/pages/friends.php
mod/thewire/pages/reply.php
mod/thewire/pages/tag.php
mod/thewire/pages/thread.php
mod/thewire/pages/user.php
mod/thewire/start.php
mod/thewire/tests/regex.php
mod/thewire/views/default/object/thewire.php
mod/thewire/views/default/thewire/profile_status.php
mod/thewire/views/default/widgets/thewire/content.php
mod/twitterservice/start.php
mod/twitterservice/twitterservice_lib.php
mod/twitterservice/views/default/twitterservice/login.php
mod/twitterservice/views/default/usersettings/twitterservice/edit.php
mod/uservalidationbyemail/lib/functions.php
mod/uservalidationbyemail/start.php
mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
views/default/admin/appearance/default_widgets.php
views/default/admin/header.php
views/default/admin/plugins/advanced.php
views/default/core/account/login_dropdown.php
views/default/core/account/login_walled_garden.php
views/default/core/members/nav.php
views/default/core/members/sidebar.php
views/default/forms/login.php
views/default/group/search/finishblurb.php
views/default/input/autocomplete.php
views/default/object/plugin/advanced.php
views/default/object/plugin/simple.php
views/default/output/tagcloud.php
views/default/output/tags.php
views/default/page/default.php
views/default/page/layouts/content/filter.php
views/default/page/layouts/content/header.php
views/default/page/layouts/two_column_left_sidebar.php
views/default/user/search/finishblurb.php
views/default/widgets/content_stats/content.php
views/foaf/page/default.php
views/installation/page/elements/footer.php
views/rss/core/river/body.php

index 5196467b21734842d362bd8d85273893a706967c..ad588f3dba6745bb267b24a31c6c7d677aa7cf7f 100644 (file)
@@ -38,7 +38,7 @@ elgg_invalidate_simplecache();
 elgg_filepath_cache_reset();
 
 if (count($plugin_guids) == 1) {
-       forward("pg/admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]);
+       forward("admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]);
 } else {
        forward(REFERER);
 }
\ No newline at end of file
index c1dd2d1b5ea1f1156868929b3206678bf3d24d47..74c78e0fcdeef20dfbffe39f253e824bfeb9db7d 100644 (file)
@@ -38,7 +38,7 @@ elgg_invalidate_simplecache();
 elgg_filepath_cache_reset();
 
 if (count($plugin_guids) == 1) {
-       forward("pg/admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]);
+       forward("admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]);
 } else {
        forward(REFERER);
 }
index 39a0bc49cd0893ccc95578bb36ed500bc531ab76..7cfbd092564422196fabd93700e1d22ccb5a688b 100644 (file)
@@ -34,7 +34,7 @@ if (($user instanceof ElggUser) && ($user->canEdit())) {
 // forward to user administration if on a user's page as it no longer exists
 $forward = REFERER;
 if (strpos($_SERVER['HTTP_REFERER'], $username) != FALSE) {
-       $forward = "pg/admin/users/newest";
+       $forward = "admin/users/newest";
 }
 
 forward($forward);
index eac8bced8776ddf7f2eb284401cb39e6d31c04d0..8ec6a085f8189ef6f605de92224137351a29558f 100644 (file)
@@ -26,11 +26,11 @@ if ($collection_name) {
        // Success message
        system_message(elgg_echo("friends:collectionadded"));
        // Forward to the collections page
-       forward("pg/collections/" . elgg_get_logged_in_user_entity()->username);
+       forward("collections/" . elgg_get_logged_in_user_entity()->username);
 
 } else {
        register_error(elgg_echo("friends:nocollectionname"));
 
        // Forward to the add collection page
-       forward("pg/collections/add");
+       forward("collections/add");
 }
index f0ceaf023dda7d39276e4f4f08483f66e5c57439..fe719d74bf849fe9078e77bc5312e96d220157cf 100644 (file)
@@ -33,4 +33,4 @@ if ($get_collection) {
 }
 
 // Forward to the collections page
-forward("pg/collections/" . elgg_get_logged_in_user_entity()->username);
+forward("collections/" . elgg_get_logged_in_user_entity()->username);
index a6499cc97108980b6dd81bb67f3349637021df9f..d3cb0d488f0ae9ce1d36e0252babf3b1f95ab24c 100644 (file)
@@ -398,16 +398,16 @@ class ElggSite extends ElggEntity {
                // default public pages
                $defaults = array(
                        'action/login',
-                       'pg/register',
+                       'register',
                        'action/register',
                        'pages/account/forgotten_password\.php',
                        'action/user/requestnewpassword',
-                       'pg/resetpassword',
+                       'resetpassword',
                        'upgrade\.php',
                        'xml-rpc\.php',
                        'mt/mt-xmlrpc\.cgi',
-                       'pg/css/.*',
-                       'pg/js/.*'
+                       'css/.*',
+                       'js/.*'
                );
 
                // include a hook for plugin authors to include public pages
index 1459c7716c80fe80e5e5eb249c8172ccf28c0276..7774f78e0d613cf4d9c8bd604a64d9af9d88e468 100644 (file)
@@ -133,7 +133,7 @@ function elgg_register_admin_menu_item($menu_id, $parent_id = NULL, $priority =
 
        // in the admin section parents never have links
        if ($parent_id) {
-               $href = "pg/admin/$parent_id/$menu_id";
+               $href = "admin/$parent_id/$menu_id";
        } else {
                $href = NULL;
        }
@@ -209,7 +209,7 @@ function admin_init() {
        // dashboard
        elgg_register_menu_item('page', array(
                'name' => 'dashboard',
-               'href' => 'pg/admin/dashboard',
+               'href' => 'admin/dashboard',
                'text' => elgg_echo('admin:dashboard'),
                'context' => 'admin',
                'priority' => 10,
@@ -217,7 +217,7 @@ function admin_init() {
 
        elgg_register_menu_item('topbar', array(
                'name' => 'administration',
-               'href' => 'pg/admin',
+               'href' => 'admin',
                'text' => elgg_view_icon('settings') . elgg_echo('admin'),
                'priority' => 100,
                'section' => 'alt',
@@ -262,7 +262,7 @@ function elgg_admin_add_plugin_settings_menu() {
                if (elgg_view_exists("settings/$plugin_id/edit")) {
                        elgg_register_menu_item('page', array(
                                'name' => $plugin_id,
-                               'href' => "pg/admin/plugin_settings/$plugin_id",
+                               'href' => "admin/plugin_settings/$plugin_id",
                                'text' => $plugin->manifest->getName(),
                                'parent_name' => 'plugin_settings',
                                'context' => 'admin',
@@ -369,7 +369,7 @@ function admin_settings_page_handler($page) {
 
 /**
  * Serves up screenshots for plugins from
- * elgg/pg/admin_plugin_ss/<plugin_id>/<size>/<ss_name>.<ext>
+ * elgg/admin_plugin_ss/<plugin_id>/<size>/<ss_name>.<ext>
  *
  * @param array $pages The pages array
  * @return true
index 32f36ff03751b991024dac970aa711979b75034d..bc279e8eacc1829e648d64e142cb1fd6ba1570d9 100644 (file)
@@ -168,7 +168,7 @@ function elgg_get_simplecache_url($type, $view) {
                $viewtype = elgg_get_viewtype();
                $url = elgg_get_site_url() . "cache/$type/$view/$viewtype/$view.$lastcache.$type";
        } else {
-               $url = elgg_get_site_url() . "pg/$type/$view.$lastcache.$type";
+               $url = elgg_get_site_url() . "$type/$view.$lastcache.$type";
        }
        return $url;
 }
index ef0cf17b2144c6f9825fb38f49b3ebb18a0d4f04..2a0b1d665eba8bff81e03c711105b30353740c8c 100644 (file)
@@ -74,16 +74,16 @@ function cron_page_handler($page) {
  * @return array
  */
 function cron_public_pages($hook, $type, $return_value, $params) {
-       $return_value[] = 'pg/cron/minute';
-       $return_value[] = 'pg/cron/fiveminute';
-       $return_value[] = 'pg/cron/fifteenmin';
-       $return_value[] = 'pg/cron/halfhour';
-       $return_value[] = 'pg/cron/hourly';
-       $return_value[] = 'pg/cron/daily';
-       $return_value[] = 'pg/cron/weekly';
-       $return_value[] = 'pg/cron/monthly';
-       $return_value[] = 'pg/cron/yearly';
-       $return_value[] = 'pg/cron/reboot';
+       $return_value[] = 'cron/minute';
+       $return_value[] = 'cron/fiveminute';
+       $return_value[] = 'cron/fifteenmin';
+       $return_value[] = 'cron/halfhour';
+       $return_value[] = 'cron/hourly';
+       $return_value[] = 'cron/daily';
+       $return_value[] = 'cron/weekly';
+       $return_value[] = 'cron/monthly';
+       $return_value[] = 'cron/yearly';
+       $return_value[] = 'cron/reboot';
 
        return $return_value;
 }
index c97fa433cf2d019cbc39f9efa7cf9a4afaf5a404..bc272fbd7a4754e131bba859678c1a9a716ccb18 100644 (file)
@@ -1761,7 +1761,7 @@ function elgg_is_valid_options_for_batch_operation($options, $type) {
  * @return boolean
  */
 function elgg_walled_garden_index() {
-       elgg_register_css('/pg/css/walled_garden.css');
+       elgg_register_css('/css/walled_garden.css');
        $login = elgg_view('core/account/login_walled_garden');
 
        echo elgg_view_page('', $login, 'walled_garden');
index eff0330a1d53cf134c7a3e3a30909240205e69ea..3bf3259e2ff1ae8a3db2870a2cfcbc24d6e5dbc6 100644 (file)
@@ -1819,7 +1819,7 @@ function get_entity_url($entity_guid) {
                }
 
                if ($url == "") {
-                       $url = "pg/view/" . $entity_guid;
+                       $url = "view/" . $entity_guid;
                }
 
                return elgg_normalize_url($url);
index cbc1127727e18ce89f871de102e6fbc730d681cc..c3fabbe5dbab796ca870add9f2f4676fc7264b93 100644 (file)
@@ -197,7 +197,7 @@ function elgg_clear_sticky_value($form_name, $variable) {
 /**
  * Page handler for autocomplete endpoint.
  *
- * /pg/livesearch/?q=<query>
+ * /livesearch?q=<query>
  *
  * Other options include:
  *     match_on           string all|array(groups|users|friends|subtype)
index 8c71de03a196068b91e7016e394e8b472c681b1d..891527d38a8278e2714e80de6731bd26877676ff 100644 (file)
@@ -258,7 +258,7 @@ function elgg_entity_menu_setup($hook, $type, $return, $params) {
                $options = array(
                        'name' => 'edit',
                        'text' => elgg_echo('edit'),
-                       'href' => "pg/$handler/edit/{$entity->getGUID()}",
+                       'href' => "$handler/edit/{$entity->getGUID()}",
                        'priority' => 200,
                );
                $return[] = ElggMenuItem::factory($options);
index cba1ffae9f62fb4c21152b874aad9217ffbcb085..7a38e5b8cbe2929d90b43ee9efe1421c4af417e5 100644 (file)
@@ -225,7 +225,7 @@ function elgg_clean_vars(array $vars = array()) {
  *
  * @example
  * elgg_normalize_url('');                   // 'http://my.site.com/'
- * elgg_normalize_url('pg/dashboard');       // 'http://my.site.com/pg/dashboard'
+ * elgg_normalize_url('dashboard');       // 'http://my.site.com/dashboard'
  * elgg_normalize_url('http://google.com/'); // no change
  * elgg_normalize_url('//google.com/');      // no change
  *
@@ -255,7 +255,7 @@ function elgg_normalize_url($url) {
                return "http://$url";
        }
 
-       // 'pg/page/handler', 'mod/plugin/file.php'
+       // 'page/handler', 'mod/plugin/file.php'
        else {
                // trim off any leading / because the site URL is stored
                // with a trailing /
index 1fa073c1ed43ae26db5f3253a81d8a913c668507..e598d6821ce486cc26e69a0dcde2c7ddce6e83f1 100644 (file)
@@ -53,7 +53,7 @@ function page_handler($handler, $page) {
  * Registers a page handler for a particular identifier
  *
  * For example, you can register a function called 'blog_page_handler' for handler type 'blog'
- * For all URLs  http://yoururl/pg/blog/*, the blog_page_handler() function will be called.
+ * For all URLs  http://yoururl/blog/*, the blog_page_handler() function will be called.
  * The part of the URL marked with * above will be exploded on '/' characters and passed as an
  * array to that function.
  * For example, the URL http://yoururl/blog/username/friends/ would result in the call:
index c7ec0b52bb6c27c64fb846be98eebf8d1b9b9c61..065a96bc2adcbe8087337545c9f469e46b7e23cd 100644 (file)
@@ -68,12 +68,12 @@ function elgg_set_page_owner_guid($guid) {
  * parameter. The request parameters used are 'username' and 'owner_guid'. If
  * the page request is going through the page handling system, this function
  * attempts to figure out the owner if the url fits the patterns of:
- *   pg/<handler>/owner/<username>
- *   pg/<handler>/friends/<username>
- *   pg/<handler>/view/<entity guid>
- *   pg/<handler>/add/<container guid>
- *   pg/<handler>/edit/<entity guid>
- *   pg/<handler>/group/<group guid>
+ *   <handler>/owner/<username>
+ *   <handler>/friends/<username>
+ *   <handler>/view/<entity guid>
+ *   <handler>/add/<container guid>
+ *   <handler>/edit/<entity guid>
+ *   <handler>/group/<group guid>
  *
  *
  * @param string $hook        'page_owner'
@@ -113,34 +113,35 @@ function default_page_owner_handler($hook, $entity_type, $returnvalue, $params)
        }
 
        // ignore root and query
-    $uri = current_page_url();
-    $path = str_replace(elgg_get_site_url(), '', $uri);
-    $path = trim($path, "/");
-    if (strpos($path, "?")) {
-        $path = substr($path, 0, strpos($path, "?"));
-    }
-
-       if (strpos($path, 'pg') === 0) {
+       $uri = current_page_url();
+       $path = str_replace(elgg_get_site_url(), '', $uri);
+       $path = trim($path, "/");
+       if (strpos($path, "?")) {
+               $path = substr($path, 0, strpos($path, "?"));
+       }
+
+       // @todo feels hacky
+       if (get_input('page', FALSE)) {
                $segments = explode('/', $path);
-               if (isset($segments[2]) && isset($segments[3])) {
-                       switch ($segments[2]) {
+               if (isset($segments[1]) && isset($segments[2])) {
+                       switch ($segments[1]) {
                                case 'owner':
                                case 'friends':
-                                       $user = get_user_by_username($segments[3]);
+                                       $user = get_user_by_username($segments[2]);
                                        if ($user) {
                                                return $user->getGUID();
                                        }
                                        break;
                                case 'view':
                                case 'edit':
-                                       $entity = get_entity($segments[3]);
+                                       $entity = get_entity($segments[2]);
                                        if ($entity) {
                                                return $entity->getContainerGUID();
                                        }
                                        break;
                                case 'add':
                                case 'group':
-                                       $entity = get_entity($segments[3]);
+                                       $entity = get_entity($segments[2]);
                                        if ($entity) {
                                                return $entity->getGUID();
                                        }
@@ -160,8 +161,8 @@ function default_page_owner_handler($hook, $entity_type, $returnvalue, $params)
  * output could be different for those two contexts ('blog' vs 'widget').
  *
  * Pages that pass through the page handling system set the context to the
- * first string after 'pg'. Example: http://elgg.org/pg/bookmarks/ results in
- * the initial context being set to 'bookmarks'.
+ * first string after the root url. Example: http://example.org/elgg/bookmarks/ 
+ * results in the initial context being set to 'bookmarks'.
  *
  * The context is a stack so that for a widget on a profile, the context stack
  * may contain first 'profile' and then 'widget'.
@@ -261,8 +262,10 @@ function page_owner_boot() {
        elgg_register_plugin_hook_handler('page_owner', 'system', 'default_page_owner_handler');
 
        $CONFIG->context = array();
-       if (preg_match("/\/pg\/([\w\-\_]+)/", $_SERVER['REQUEST_URI'], $matches)) {
-               elgg_set_context($matches[1]);
+       // @todo Ew... hacky
+       $handler = get_input('handler', FALSE);
+       if ($handler) {
+               elgg_set_context($handler);
        }
 }
 
index e0a6f134deccc2ccd794fa1e19a9081811bdd129..981896588ad36097e50f147899717a89f2a9c798 100644 (file)
@@ -538,8 +538,9 @@ function elgg_get_calling_plugin_id($mainfilename = false) {
                        }
                }
        } else {
-               if (preg_match("/pg\/([a-zA-Z0-9\-\_]*)\//", $_SERVER['REQUEST_URI'], $matches)) {
-                       return $matches[1];
+               //@todo this is a hack -- plugins do not have to match their page handler names!
+               if ($handler = get_input('handler', FALSE)) {
+                       return $handler;
                } else {
                        $file = $_SERVER["SCRIPT_NAME"];
                        $file = str_replace("\\", "/", $file);
index 3a351805e25b73779b02a370273ede5bad615eaf..c0100bb813bc7b1c8f0b9588e08c57e52281a490 100644 (file)
@@ -532,7 +532,7 @@ function elgg_river_page_handler($page) {
  */
 function elgg_river_init() {
        elgg_register_page_handler('activity', 'elgg_river_page_handler');
-       $item = new ElggMenuItem('activity', elgg_echo('activity'), 'pg/activity');
+       $item = new ElggMenuItem('activity', elgg_echo('activity'), 'activity');
        elgg_register_menu_item('site', $item);
 }
 
index f3e5868515960960640838f3248aa86f852399a0..5c4d1fbe43a7aa2661acc75b6d8f55427edc80b0 100644 (file)
@@ -254,19 +254,19 @@ function usersettings_pagesetup() {
                $params = array(
                        'name' => '1_account',
                        'text' => elgg_echo('usersettings:user:opt:linktext'),
-                       'href' => "pg/settings/user/{$user->username}",
+                       'href' => "settings/user/{$user->username}",
                );
                elgg_register_menu_item('page', $params);
                $params = array(
                        'name' => '1_plugins',
                        'text' => elgg_echo('usersettings:plugins:opt:linktext'),
-                       'href' => "pg/settings/plugins/{$user->username}",
+                       'href' => "settings/plugins/{$user->username}",
                );
                elgg_register_menu_item('page', $params);
                $params = array(
                        'name' => '1_statistics',
                        'text' => elgg_echo('usersettings:statistics:opt:linktext'),
-                       'href' => "pg/settings/statistics/{$user->username}",
+                       'href' => "settings/statistics/{$user->username}",
                );
                elgg_register_menu_item('page', $params);
        }
index 318cd71bdebcaf4535af8afb8bb6bbece260241b..ef673cacb40e1a897fd8caabea12d10905dc4d9b 100644 (file)
@@ -689,7 +689,7 @@ function send_new_password_request($user_guid) {
 
 
                // generate link
-               $link = $CONFIG->site->url . "pg/resetpassword?u=$user_guid&c=$code";
+               $link = $CONFIG->site->url . "resetpassword?u=$user_guid&c=$code";
 
                // generate email
                $email = elgg_echo('email:resetreq:body', array($user->name, $_SERVER['REMOTE_ADDR'], $link));
@@ -1089,13 +1089,13 @@ function collections_submenu_items() {
        elgg_register_menu_item('page', array(
                'name' => 'friends:view:collections',
                'text' => elgg_echo('friends:collections'),
-               'href' => "pg/collections/$user->username",
+               'href' => "collections/$user->username",
        ));
 /*
        elgg_register_menu_item('page', array(
                'name' => 'friends:collections:add',
                'text' => elgg_echo('friends:collections:add'),
-               'href' => "pg/collections/add",
+               'href' => "collections/add",
        ));
  * 
  */
@@ -1268,7 +1268,7 @@ function user_avatar_hook($hook, $entity_type, $returnvalue, $params) {
        $size = $params['size'];
 
        if (isset($user->icontime)) {
-               return "pg/avatar/view/$user->username/$size/$user->icontime";
+               return "avatar/view/$user->username/$size/$user->icontime";
        } else {
                return "_graphics/icons/user/default{$size}.gif";
        }
@@ -1294,12 +1294,12 @@ function elgg_user_hover_menu($hook, $type, $return, $params) {
                        $item->setSection('action');
                        $return[] = $item;
                } else {
-                       $url = "pg/profile/$user->username/edit";
+                       $url = "profile/$user->username/edit";
                        $item = new ElggMenuItem('profile:edit', elgg_echo('profile:edit'), $url);
                        $item->setSection('action');
                        $return[] = $item;
 
-                       $url = "pg/avatar/edit/$user->username";
+                       $url = "avatar/edit/$user->username";
                        $item = new ElggMenuItem('avatar:edit', elgg_echo('avatar:edit'), $url);
                        $item->setSection('action');
                        $return[] = $item;
@@ -1336,7 +1336,7 @@ function elgg_user_hover_menu($hook, $type, $return, $params) {
                        $return[] = $item;
                }
 
-               $url = "pg/profile/$user->username/edit";
+               $url = "profile/$user->username/edit";
                $item = new ElggMenuItem('profile:edit', elgg_echo('profile:edit'), $url);
                $item->setSection('admin');
                $return[] = $item;
@@ -1403,8 +1403,8 @@ function elgg_profile_fields_setup() {
 /**
  * Avatar page handler
  *
- * /pg/avatar/edit/<username>
- * /pg/avatar/view/<username>/<size>/<icontime>
+ * /avatar/edit/<username>
+ * /avatar/view/<username>/<size>/<icontime>
  *
  * @param array $page
  */
@@ -1471,7 +1471,7 @@ function users_pagesetup() {
                $params = array(
                        'name' => 'friends',
                        'text' => elgg_echo('friends'),
-                       'href' => 'pg/friends/' . elgg_get_page_owner_entity()->username,
+                       'href' => 'friends/' . elgg_get_page_owner_entity()->username,
                        'contexts' => array('friends')
                );
                elgg_register_menu_item('page', $params);
@@ -1479,7 +1479,7 @@ function users_pagesetup() {
                $params = array(
                        'name' => 'friends:of',
                        'text' => elgg_echo('friends:of'),
-                       'href' => 'pg/friendsof/' . elgg_get_page_owner_entity()->username,
+                       'href' => 'friendsof/' . elgg_get_page_owner_entity()->username,
                        'contexts' => array('friends')
                );
                elgg_register_menu_item('page', $params);
@@ -1490,14 +1490,14 @@ function users_pagesetup() {
        if ($user) {
                elgg_register_menu_item('page', array(
                        'name' => 'edit_avatar',
-                       'href' => "pg/avatar/edit/{$user->username}",
+                       'href' => "avatar/edit/{$user->username}",
                        'text' => elgg_echo('avatar:edit'),
                        'contexts' => array('profile_edit'),
                ));
 
                elgg_register_menu_item('page', array(
                        'name' => 'edit_profile',
-                       'href' => "pg/profile/{$user->username}/edit",
+                       'href' => "profile/{$user->username}/edit",
                        'text' => elgg_echo('profile:edit'),
                        'contexts' => array('profile_edit'),
                ));
@@ -1512,7 +1512,7 @@ function users_pagesetup() {
 
                elgg_register_menu_item('topbar', array(
                        'name' => 'friends',
-                       'href' => "pg/friends/{$user->username}",
+                       'href' => "friends/{$user->username}",
                        'text' => elgg_view_icon('friends'),
                        'title' => elgg_echo('friends'),
                        'priority' => 300,
@@ -1520,7 +1520,7 @@ function users_pagesetup() {
 
                elgg_register_menu_item('topbar', array(
                        'name' => 'usersettings',
-                       'href' => "pg/settings/user/{$user->username}",
+                       'href' => "settings/user/{$user->username}",
                        'text' => elgg_view_icon('settings') . elgg_echo('settings'),
                        'priority' => 500,
                        'section' => 'alt',
@@ -1557,7 +1557,7 @@ function users_init() {
        elgg_register_page_handler('profile', 'elgg_profile_page_handler');
        elgg_register_page_handler('collections', 'collections_page_handler');
 
-       $item = new ElggMenuItem('members', elgg_echo('members'), 'pg/members');
+       $item = new ElggMenuItem('members', elgg_echo('members'), 'members');
        elgg_register_menu_item('site', $item);
 
        elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'elgg_user_hover_menu');
index e969eb6c8c2809cca525c3ba387db583fbf104cc..488fd8390c26d9168c65d8af86088114322ca3ef 100644 (file)
@@ -76,15 +76,15 @@ class ElggCoreHelpersTest extends ElggCoreUnitTest {
                        'example.com' => 'http://example.com',
                        'example.com/subpage' => 'http://example.com/subpage',
 
-                       'pg/page/handler' =>                elgg_get_site_url() . 'pg/page/handler',
-                       'pg/page/handler?p=v&p2=v2' =>      elgg_get_site_url() . 'pg/page/handler?p=v&p2=v2',
+                       'page/handler' =>                       elgg_get_site_url() . 'page/handler',
+                       'page/handler?p=v&p2=v2' =>             elgg_get_site_url() . 'page/handler?p=v&p2=v2',
                        'mod/plugin/file.php' =>            elgg_get_site_url() . 'mod/plugin/file.php',
                        'mod/plugin/file.php?p=v&p2=v2' =>  elgg_get_site_url() . 'mod/plugin/file.php?p=v&p2=v2',
                        'rootfile.php' =>                   elgg_get_site_url() . 'rootfile.php',
                        'rootfile.php?p=v&p2=v2' =>         elgg_get_site_url() . 'rootfile.php?p=v&p2=v2',
 
-                       '/pg/page/handler' =>               elgg_get_site_url() . 'pg/page/handler',
-                       '/pg/page/handler?p=v&p2=v2' =>     elgg_get_site_url() . 'pg/page/handler?p=v&p2=v2',
+                       '/page/handler' =>                      elgg_get_site_url() . 'page/handler',
+                       '/page/handler?p=v&p2=v2' =>            elgg_get_site_url() . 'page/handler?p=v&p2=v2',
                        '/mod/plugin/file.php' =>           elgg_get_site_url() . 'mod/plugin/file.php',
                        '/mod/plugin/file.php?p=v&p2=v2' => elgg_get_site_url() . 'mod/plugin/file.php?p=v&p2=v2',
                        '/rootfile.php' =>                  elgg_get_site_url() . 'rootfile.php',
index 72447d0991cb3f27eaabc129f982083cc1102590..4c9392016470956bde43546a036391b2177394ad 100644 (file)
--- a/index.php
+++ b/index.php
@@ -19,7 +19,7 @@ if (elgg_trigger_plugin_hook('index', 'system', null, FALSE) != FALSE) {
 }
 
 if (elgg_is_logged_in()) {
-       forward('pg/activity/');
+       forward('activity');
 }
 
 
index 6487164426228606cd723c4b0060176cdb104c64..de111c5d450e13f7c2f4793d2eef08cfcd7fccd7 100644 (file)
@@ -506,7 +506,7 @@ class ElggInstaller {
 
                $params = array();
                if ($this->autoLogin) {
-                       $params['destination'] = 'pg/admin/';
+                       $params['destination'] = 'admin';
                } else {
                        $params['destination'] = 'index.php';
                }
index 12e89392f290a5f5c4cf1381fe218ba02787f39e..3b409d1349185c341047e93b66160dae453b0e67 100644 (file)
@@ -238,7 +238,7 @@ elgg.inherit = function(Child, Parent) {
  * If the url is already absolute or protocol-relative, no change is made.
  *
  * elgg.normalize_url('');                   // 'http://my.site.com/'
- * elgg.normalize_url('pg/dashboard');       // 'http://my.site.com/pg/dashboard'
+ * elgg.normalize_url('dashboard');       // 'http://my.site.com/dashboard'
  * elgg.normalize_url('http://google.com/'); // no change
  * elgg.normalize_url('//google.com/');      // no change
  *
@@ -272,7 +272,7 @@ elgg.normalize_url = function(url) {
                return 'http://' + url;
        }
 
-       // 'pg/page/handler', 'mod/plugin/file.php'
+       // 'page/handler', 'mod/plugin/file.php'
        else {
                // trim off any leading / because the site URL is stored
                // with a trailing /
index e464fc0ff85541be37ae0a67c741eae105472cdc..10afa24b072711c2c4884f0d551f002ea049dc01 100644 (file)
@@ -25,7 +25,7 @@ elgg.add_translation = function(lang, translations) {
  */
 elgg.reload_all_translations = function(language) {
        var lang = language || elgg.get_language();
-       elgg.getJSON('pg/js/languages%252f' + lang + '.js', {
+       elgg.getJSON('js/languages%252f' + lang + '.js', {
                data: {
                        'viewtype': 'default',
                        'lastcache': elgg.config.lastcache
index 2b3d78d6bd6d11f7fe700c1111437d422697c6e4..5fc39bce3d6c215231a3df104ad2f2cab197e08b 100644 (file)
@@ -11,7 +11,7 @@ elgg.userpicker.init = function() {
                        source: function(request, response) {
                                var params = elgg.userpicker.getSearchParams(this);
                                
-                               elgg.get('pg/livesearch', {
+                               elgg.get('livesearch', {
                                        data: params,
                                        dataType: 'json',
                                        success: function(data) {
index dda1ecd40cbd69435609d420c7c37bdaaac6c10b..dd0267c5c0c2423850b486a83acf2cb22ea329be 100644 (file)
@@ -73,10 +73,10 @@ ElggLibTest.prototype.testNormalizeUrl = function() {
 
        [
            ['', elgg.config.wwwroot],
-           ['pg/test', elgg.config.wwwroot + 'pg/test'],
+           ['test', elgg.config.wwwroot + 'test'],
            ['http://google.com', 'http://google.com'],
            ['//example.com', '//example.com'],
-           ['/pg/page', elgg.config.wwwroot + 'pg/page'],
+           ['/page', elgg.config.wwwroot + 'page'],
            ['mod/plugin/index.php', elgg.config.wwwroot + 'mod/plugin/index.php'],
        ].forEach(function(args) {
                assertEquals(args[1], elgg.normalize_url(args[0]));
index 64179e09c08a5c5f95d63f96bb12e0f212357dc5..6028480ffbe29f2c78f446e256e1dcc278908889 100644 (file)
@@ -13,9 +13,9 @@ 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("pg/blog/group/$container->guid/owner");
+                       forward("blog/group/$container->guid/owner");
                } else {
-                       forward("pg/blog/owner/$container->username/");
+                       forward("blog/owner/$container->username");
                }
        } else {
                register_error(elgg_echo('blog:error:cannot_delete_post'));
index 099a89cc09a1fe04d8cc5609110dfedd5c00cba3..3f9e5e355d12ae40e35e1e96ce47851504541dc2 100644 (file)
@@ -157,7 +157,7 @@ if (!$error) {
                if ($blog->status == 'published') {
                        forward($blog->getURL());
                } else {
-                       forward("pg/blog/edit/$blog->guid");
+                       forward("blog/edit/$blog->guid");
                }
        } else {
                register_error(elgg_echo('blog:error:cannot_save'));
index 0a2c3a8ac1770112b024def80d6fb854edb43152..81d06ca0ac00abc12ded7c948302b571ff384a64 100644 (file)
@@ -32,9 +32,9 @@ 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, "pg/blog/group/$container->guid/owner");
+               elgg_push_breadcrumb($crumbs_title, "blog/group/$container->guid/owner");
        } else {
-               elgg_push_breadcrumb($crumbs_title, "pg/blog/owner/$container->username");
+               elgg_push_breadcrumb($crumbs_title, "blog/owner/$container->username");
        }
 
        elgg_push_breadcrumb($blog->title);
@@ -88,7 +88,7 @@ function blog_get_page_content_list($container_guid = NULL) {
                if (elgg_instanceof($container, 'group')) {
                        $return['filter'] = '';
                        if ($container->isMember(elgg_get_logged_in_user_entity())) {
-                               $url = "pg/blog/add/$container->guid";
+                               $url = "blog/add/$container->guid";
                                $params = array(
                                        'href' => $url,
                                        'text' => elgg_echo("blog:add"),
@@ -137,7 +137,7 @@ function blog_get_page_content_friends($user_guid) {
        $return['title'] = elgg_echo('blog:title:friends');
 
        $crumbs_title = $user->name;
-       elgg_push_breadcrumb($crumbs_title, "pg/blog/owner/{$user->username}");
+       elgg_push_breadcrumb($crumbs_title, "blog/owner/{$user->username}");
        elgg_push_breadcrumb(elgg_echo('friends'));
 
        if (!$friends = get_user_friends($user_guid, ELGG_ENTITIES_ANY_VALUE, 0)) {
@@ -193,7 +193,7 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
        elgg_set_page_owner_guid($owner_guid);
 
        $crumbs_title = $user->name;
-       elgg_push_breadcrumb($crumbs_title, "pg/blog/owner/{$user->username}");
+       elgg_push_breadcrumb($crumbs_title, "blog/owner/{$user->username}");
        elgg_push_breadcrumb(elgg_echo('blog:archives'));
 
        if ($lower) {
@@ -405,7 +405,7 @@ function blog_url_forwarder($page) {
                $guid = $matches[1];
                $entity = get_entity($guid);
                if ($entity) {
-                       $url = "{$CONFIG->wwwroot}pg/blog/group/$guid/owner";
+                       $url = "{$CONFIG->wwwroot}blog/group/$guid/owner";
                        register_error(elgg_echo("changebookmark"));
                        forward($url);
                }
@@ -423,19 +423,19 @@ function blog_url_forwarder($page) {
 
        switch ($page[1]) {
                case "read":
-                       $url = "{$CONFIG->wwwroot}pg/blog/view/{$page[2]}/{$page[3]}";
+                       $url = "{$CONFIG->wwwroot}blog/view/{$page[2]}/{$page[3]}";
                        break;
                case "archive":
-                       $url = "{$CONFIG->wwwroot}pg/blog/archive/{$page[0]}/{$page[2]}/{$page[3]}";
+                       $url = "{$CONFIG->wwwroot}blog/archive/{$page[0]}/{$page[2]}/{$page[3]}";
                        break;
                case "friends":
-                       $url = "{$CONFIG->wwwroot}pg/blog/friends/{$page[0]}";
+                       $url = "{$CONFIG->wwwroot}blog/friends/{$page[0]}";
                        break;
                case "new":
-                       $url = "{$CONFIG->wwwroot}pg/blog/add/$user->guid";
+                       $url = "{$CONFIG->wwwroot}blog/add/$user->guid";
                        break;
                case "owner":
-                       $url = "{$CONFIG->wwwroot}pg/blog/owner/{$page[0]}";
+                       $url = "{$CONFIG->wwwroot}blog/owner/{$page[0]}";
                        break;
        }
 
index 344da21d4181934c264e2a012ef43451d6bdc23d..01d78b4dd1ca991836800f96ae5c18c6e1859f97 100644 (file)
@@ -22,7 +22,7 @@ function blog_init() {
        elgg_register_library('elgg:blog', elgg_get_plugins_path() . 'blog/lib/blog.php');
 
        // add a site navigation item
-       $item = new ElggMenuItem('blog', elgg_echo('blog:blogs'), 'pg/blog/all');
+       $item = new ElggMenuItem('blog', elgg_echo('blog:blogs'), 'blog/all');
        elgg_register_menu_item('site', $item);
 
        elgg_register_event_handler('upgrade', 'upgrade', 'blog_run_upgrades');
@@ -73,15 +73,15 @@ function blog_init() {
 /**
  * Dispatches blog pages.
  * URLs take the form of
- *  All blogs:       pg/blog/all
- *  User's blogs:    pg/blog/owner/<username>
- *  Friends' blog:   pg/blog/friends/<username>
- *  User's archives: pg/blog/archives/<username>/<time_start>/<time_stop>
- *  Blog post:       pg/blog/view/<guid>/<title>
- *  New post:        pg/blog/add/<guid>
- *  Edit post:       pg/blog/edit/<guid>/<revision>
- *  Preview post:    pg/blog/preview/<guid>
- *  Group blog:      pg/blog/group/<guid>/owner
+ *  All blogs:       blog/all
+ *  User's blogs:    blog/owner/<username>
+ *  Friends' blog:   blog/friends/<username>
+ *  User's archives: blog/archives/<username>/<time_start>/<time_stop>
+ *  Blog post:       blog/view/<guid>/<title>
+ *  New post:        blog/add/<guid>
+ *  Edit post:       blog/edit/<guid>/<revision>
+ *  Preview post:    blog/preview/<guid>
+ *  Group blog:      blog/group/<guid>/owner
  *
  * Title is ignored
  *
@@ -99,7 +99,7 @@ function blog_page_handler($page) {
        blog_url_forwarder($page);
        
        // push all blogs breadcrumb
-       elgg_push_breadcrumb(elgg_echo('blog:blogs'), "pg/blog/all/");
+       elgg_push_breadcrumb(elgg_echo('blog:blogs'), "blog/all");
 
        if (!isset($page[0])) {
                $page[0] = 'all';
@@ -161,7 +161,7 @@ function blog_url_handler($entity) {
 
        $friendly_title = elgg_get_friendly_title($entity->title);
 
-       return "pg/blog/view/{$entity->guid}/$friendly_title";
+       return "blog/view/{$entity->guid}/$friendly_title";
 }
 
 /**
@@ -169,12 +169,12 @@ function blog_url_handler($entity) {
  */
 function blog_owner_block_menu($hook, $type, $return, $params) {
        if (elgg_instanceof($params['entity'], 'user')) {
-               $url = "pg/blog/owner/{$params['entity']->username}";
+               $url = "blog/owner/{$params['entity']->username}";
                $item = new ElggMenuItem('blog', elgg_echo('blog'), $url);
                $return[] = $item;
        } else {
                if ($params['entity']->blog_enable != "no") {
-                       $url = "pg/blog/group/{$params['entity']->guid}/owner";
+                       $url = "blog/group/{$params['entity']->guid}/owner";
                        $item = new ElggMenuItem('blog', elgg_echo('blog:group'), $url);
                        $return[] = $item;
                }
index 312c89c0cbcaf3c01acf2f6c486b0e10af283535..14d41f07a89527f1c6fb32d6f784c8d1d390c486 100644 (file)
@@ -10,7 +10,7 @@ if ($group->blog_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-       'href' => "pg/blog/group/$group->guid/owner",
+       'href' => "blog/group/$group->guid/owner",
        'text' => elgg_echo('link:view:all'),
 ));
 
@@ -35,7 +35,7 @@ if (!$content) {
 }
 
 $new_link = elgg_view('output/url', array(
-       'href' => "pg/blog/add/$group->guid",
+       'href' => "blog/add/$group->guid",
        'text' => elgg_echo('blog:write'),
 ));
 $content .= "<span class='elgg-widget-more'>$new_link</span>";
index 5eda64afb7efd669dd7cbb08482c3270162c8004..3aa3db44f65829f4c428337ccbde4757f7a19df2 100644 (file)
@@ -17,7 +17,7 @@ if ($page_owner && $vars['page'] != 'friends') {
                        $timestamplow = mktime(0, 0, 0, substr($date,4,2) , 1, substr($date, 0, 4));
                        $timestamphigh = mktime(0, 0, 0, ((int) substr($date, 4, 2)) + 1, 1, substr($date, 0, 4));
 
-                       $link = elgg_get_site_url() . 'pg/blog/archive/' . $page_owner->username . '/' . $timestamplow . '/' . $timestamphigh;
+                       $link = elgg_get_site_url() . 'blog/archive/' . $page_owner->username . '/' . $timestamplow . '/' . $timestamphigh;
                        $month = elgg_echo('date:month:' . substr($date, 4, 2), array(substr($date, 0, 4)));
                        $content .= "<li><a href=\"$link\" title=\"$month\">$month</a></li>";
                }
index 01eab01c4cf9f8eb84f548046662dfa11c1d8c71..e19516f71a56b242772edd1d3af04b33e6651c10 100644 (file)
@@ -33,7 +33,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
                $n = count($revisions);
                $body = '<ul class="blog-revisions">';
 
-               $load_base_url = "pg/blog/edit/{$blog->getGUID()}/";
+               $load_base_url = "blog/edit/{$blog->getGUID()}";
 
                // show the "published revision"
                if ($blog->status == 'published') {
index 9687e8f340d8434cd4800cc0970268a346b2876a..c5425056ee94a33a1872a9ef0326ffc894314882 100644 (file)
@@ -19,7 +19,7 @@ $excerpt = $blog->excerpt;
 
 $owner_icon = elgg_view_entity_icon($owner, 'tiny');
 $owner_link = elgg_view('output/url', array(
-       'href' => "pg/blog/owner/$owner->username",
+       'href' => "blog/owner/$owner->username",
        'text' => $owner->name,
 ));
 $author_text = elgg_echo('byline', array($owner_link));
index 713c0f07dfb15f0f100705e2955645bac071557d..7bbfc3c74339d6acbe259119bf11b73a791726fc 100644 (file)
@@ -18,7 +18,7 @@ $content = elgg_list_entities($options);
 echo $content;
 
 if ($content) {
-       $blog_url = "pg/blog/owner/" . elgg_get_page_owner_entity()->username;
+       $blog_url = "blog/owner/" . elgg_get_page_owner_entity()->username;
        $more_link = elgg_view('output/url', array(
                'href' => $blog_url,
                'text' => elgg_echo('blog:moreblogs'),
index ba89ec2281882a9e4a91bec17c0aa055bf03b083..410a67bb766e979ada3a962dbb4593f029b6abb3 100644 (file)
@@ -13,9 +13,9 @@ if (elgg_instanceof($bookmark, 'object', 'bookmarks') && $bookmark->canEdit()) {
        if ($bookmark->delete()) {
                system_message(elgg_echo("bookmarks:delete:success"));
                if (elgg_instanceof($container, 'group')) {
-                       forward("pg/bookmarks/group/$container->guid/owner");
+                       forward("bookmarks/group/$container->guid/owner");
                } else {
-                       forward("pg/bookmarks/owner/$container->username/");
+                       forward("bookmarks/owner/$container->username");
                }
        }
 }
index 2f4f7b685fdd9eb5f6fd84d6b77724ea5c31e163..19bb3c73ae2f8fcd08e3c983a0f1c5d290bb35c3 100644 (file)
@@ -71,5 +71,5 @@ if ($bookmark->save()) {
        forward($bookmark->getURL());
 } else {
        register_error(elgg_echo('bookmarks:save:failed'));
-       forward("pg/bookmarks");
+       forward("bookmarks");
 }
index dedeeb5e98f14cbd98b7345f795558f5de4b9231..6e3f77cf6fc945ceb311bbcea4c7cf036d796eda 100644 (file)
@@ -7,7 +7,7 @@
 
 $owner = elgg_get_page_owner_entity();
 
-elgg_push_breadcrumb($owner->name, "pg/bookmarks/owner/$owner->username");
+elgg_push_breadcrumb($owner->name, "bookmarks/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
 
 $title = elgg_echo('bookmarks:friends');
index b5a85785700c2ef965a4374d13af37355074a180..142e0b2461adba0aef3f52b1af5504e8711212b9 100644 (file)
@@ -12,9 +12,9 @@ $page_owner = elgg_get_page_owner_entity();
 $crumbs_title = $page_owner->name;
 
 if (elgg_instanceof($page_owner, 'group')) {
-       elgg_push_breadcrumb($crumbs_title, "pg/bookmarks/group/$page_owner->guid/owner");
+       elgg_push_breadcrumb($crumbs_title, "bookmarks/group/$page_owner->guid/owner");
 } else {
-       elgg_push_breadcrumb($crumbs_title, "pg/bookmarks/owner/$page_owner->username");
+       elgg_push_breadcrumb($crumbs_title, "bookmarks/owner/$page_owner->username");
 }
 
 $title = $bookmark->title;
index 0bd2e3134d3e1e3cad7e6f6337757414c9cfbda6..bf7e372a382f948c6b1ffe78932f3a3833dbe022 100644 (file)
@@ -26,7 +26,7 @@ function bookmarks_init() {
        elgg_register_menu_item('site', array(
                'name' => 'bookmarks',
                'text' => elgg_echo('bookmarks'),
-               'href' => 'pg/bookmarks/all'
+               'href' => 'bookmarks/all'
        ));
 
        elgg_register_plugin_hook_handler('register', 'menu:page', 'bookmarks_page_menu');
@@ -45,7 +45,7 @@ function bookmarks_init() {
                elgg_register_menu_item('extras', array(
                        'name' => 'bookmark',
                        'text' => elgg_view_icon('bookmark'),
-                       'href' => "pg/bookmarks/add/$user_guid?address=$address",
+                       'href' => "bookmarks/add/$user_guid?address=$address",
                        'title' => elgg_echo('bookmarks:this'),
                        'rel' => 'nofollow',
                ));
@@ -73,14 +73,14 @@ function bookmarks_init() {
  * Dispatcher for bookmarks.
  *
  * URLs take the form of
- *  All bookmarks:        pg/bookmarks/all
- *  User's bookmarks:     pg/bookmarks/owner/<username>
- *  Friends' bookmarks:   pg/bookmarks/friends/<username>
- *  View bookmark:        pg/bookmarks/view/<guid>/<title>
- *  New bookmark:         pg/bookmarks/add/<guid> (container: user, group, parent)
- *  Edit bookmark:        pg/bookmarks/edit/<guid>
- *  Group bookmarks:      pg/bookmarks/group/<guid>/owner
- *  Bookmarklet:          pg/bookmarks/bookmarklet/<guid> (user)
+ *  All bookmarks:        bookmarks/all
+ *  User's bookmarks:     bookmarks/owner/<username>
+ *  Friends' bookmarks:   bookmarks/friends/<username>
+ *  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
+ *  Bookmarklet:          bookmarks/bookmarklet/<guid> (user)
  *
  * Title is ignored
  *
@@ -89,7 +89,7 @@ function bookmarks_init() {
 function bookmarks_page_handler($page) {
        elgg_load_library('elgg:bookmarks');
 
-       elgg_push_breadcrumb(elgg_echo('bookmarks'), 'pg/bookmarks/all');
+       elgg_push_breadcrumb(elgg_echo('bookmarks'), 'bookmarks/all');
        elgg_push_context('bookmarks');
 
        // old group usernames
@@ -172,22 +172,22 @@ function bookmarks_url_forwarder($page) {
 
        switch ($page[1]) {
                case "read":
-                       $url = "{$CONFIG->wwwroot}pg/bookmarks/view/{$page[2]}/{$page[3]}";
+                       $url = "{$CONFIG->wwwroot}bookmarks/view/{$page[2]}/{$page[3]}";
                        break;
                case "inbox":
-                       $url = "{$CONFIG->wwwroot}pg/bookmarks/inbox/{$page[0]}/";
+                       $url = "{$CONFIG->wwwroot}bookmarks/inbox/{$page[0]}";
                        break;
                case "friends":
-                       $url = "{$CONFIG->wwwroot}pg/bookmarks/friends/{$page[0]}/";
+                       $url = "{$CONFIG->wwwroot}bookmarks/friends/{$page[0]}";
                        break;
                case "add":
-                       $url = "{$CONFIG->wwwroot}pg/bookmarks/add/{$page[0]}/";
+                       $url = "{$CONFIG->wwwroot}bookmarks/add/{$page[0]}";
                        break;
                case "items":
-                       $url = "{$CONFIG->wwwroot}pg/bookmarks/owner/{$page[0]}/";
+                       $url = "{$CONFIG->wwwroot}bookmarks/owner/{$page[0]}";
                        break;
                case "bookmarklet":
-                       $url = "{$CONFIG->wwwroot}pg/bookmarks/bookmarklet/{$page[0]}/";
+                       $url = "{$CONFIG->wwwroot}bookmarks/bookmarklet/{$page[0]}";
                        break;
        }
 
@@ -206,7 +206,7 @@ function bookmark_url($entity) {
 
        $title = $entity->title;
        $title = elgg_get_friendly_title($title);
-       return $CONFIG->url . "pg/bookmarks/view/" . $entity->getGUID() . "/" . $title;
+       return $CONFIG->url . "bookmarks/view/" . $entity->getGUID() . "/" . $title;
 }
 
 /**
@@ -214,12 +214,12 @@ function bookmark_url($entity) {
  */
 function bookmarks_owner_block_menu($hook, $type, $return, $params) {
        if (elgg_instanceof($params['entity'], 'user')) {
-               $url = "pg/bookmarks/owner/{$params['entity']->username}";
+               $url = "bookmarks/owner/{$params['entity']->username}";
                $item = new ElggMenuItem('bookmarks', elgg_echo('bookmarks'), $url);
                $return[] = $item;
        } else {
                if ($params['entity']->bookmarks_enable != 'no') {
-                       $url = "pg/bookmarks/group/{$params['entity']->guid}/owner";
+                       $url = "bookmarks/group/{$params['entity']->guid}/owner";
                        $item = new ElggMenuItem('bookmarks', elgg_echo('bookmarks:group'), $url);
                        $return[] = $item;
                }
@@ -244,7 +244,7 @@ function bookmarks_notify_message($hook, $entity_type, $returnvalue, $params) {
                $descr = $entity->description;
                $title = $entity->title;
                global $CONFIG;
-               $url = elgg_get_site_url() . "pg/view/" . $entity->guid;
+               $url = elgg_get_site_url() . "view/" . $entity->guid;
                if ($method == 'sms') {
                        $owner = $entity->getOwnerEntity();
                        return $owner->name . ' ' . elgg_echo("bookmarks:via") . ': ' . $url . ' (' . $title . ')';
@@ -274,7 +274,7 @@ function bookmarks_user_hover_menu($hook, $type, $return, $params) {
        $user = $params['entity'];
 
        $title = elgg_echo('bookmarks');
-       $url = "pg/bookmarks/owner/$user->username";
+       $url = "bookmarks/owner/$user->username";
        $return[] = new ElggMenuItem('bookmarks', $title, $url);
 
        return $return;
@@ -299,7 +299,7 @@ function bookmarks_page_menu($hook, $type, $return, $params) {
                                $title = elgg_echo('bookmarks:bookmarklet');
                        }
 
-                       $return[] = new ElggMenuItem('bookmarklet', $title, 'pg/bookmarks/bookmarklet/' . $page_owner->getGUID());
+                       $return[] = new ElggMenuItem('bookmarklet', $title, 'bookmarks/bookmarklet/' . $page_owner->getGUID());
                }
        }
 
index 091a159978e53fcff7f0702a367a0f855517f63a..1d0b25498c3fe437b18ddc27e0f892fce4980945 100644 (file)
@@ -21,7 +21,7 @@ if (!$name && ($user = elgg_get_logged_in_user_entity())) {
 
 $url = elgg_get_site_url();
 
-$bookmarklet = "<a href=\"javascript:location.href='{$url}pg/bookmarks/add/$guid?address='"
+$bookmarklet = "<a href=\"javascript:location.href='{$url}bookmarks/add/$guid?address='"
        . "+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">"
        . "<img src=\"{$url}mod/bookmarks/graphics/bookmarklet.gif\" alt=\"$title\" /> </a>";
 
index 202f8778362b603d20584c5d7301429a31966da4..ea1358aeba051e8fad1b34ba2c2c83bf8bb271ef 100644 (file)
@@ -12,7 +12,7 @@ if ($group->bookmarks_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-       'href' => "pg/bookmarks/group/$group->guid/owner",
+       'href' => "bookmarks/group/$group->guid/owner",
        'text' => elgg_echo('link:view:all'),
 ));
 
@@ -36,7 +36,7 @@ if (!$content) {
 }
 
 $new_link = elgg_view('output/url', array(
-       'href' => "pg/bookmarks/add/$group->guid",
+       'href' => "bookmarks/add/$group->guid",
        'text' => elgg_echo('bookmarks:add'),
 ));
 $content .= "<span class='elgg-widget-more'>$new_link</span>";
index 8a4b982e1e5c6d422d33cc50553fe13a53feb5bf..9ee5641731b9f9775c57ddda2880b8e30caeee58 100644 (file)
@@ -21,7 +21,7 @@ $link = filter_tags(elgg_view('output/url', array('href' => $bookmark->address))
 $description = elgg_view('output/longtext', array('value' => $bookmark->description, 'class' => 'pbl'));
 
 $owner_link = elgg_view('output/url', array(
-       'href' => "pg/bookmarks/owner/$owner->username",
+       'href' => "bookmarks/owner/$owner->username",
        'text' => $owner->name,
 ));
 $author_text = elgg_echo('byline', array($owner_link));
index 5f9f469d18415d72476fbcef082f55e88245d8b7..ea7816345d36b868de1c6b86af6c9d3596033e01 100644 (file)
@@ -20,7 +20,7 @@ $content = elgg_list_entities($options);
 echo $content;
 
 if ($content) {
-       $url = "pg/bookmarks/owner/" . elgg_get_page_owner_entity()->username;
+       $url = "bookmarks/owner/" . elgg_get_page_owner_entity()->username;
        $more_link = elgg_view('output/url', array(
                'href' => $url,
                'text' => elgg_echo('bookmarks:more'),
index 9ff729b251272f7b6703c76501bfbaaf1bd18154..190996d9b80fe2cae23311b6f4dc299df7bf7de6 100644 (file)
@@ -62,7 +62,7 @@ function categories_on_activate() {
        $site = elgg_get_site_entity();
        
        if (!$site->categories) {
-               $url = elgg_normalize_url('pg/admin/plugin_settings/categories');
+               $url = elgg_normalize_url('admin/plugin_settings/categories');
                $message = elgg_echo('categories:on_enable_reminder', array($url));
                elgg_add_admin_notice('categories_admin_notice_no_categories', $message);
        }
index df254da4bcf5695ba514fa1e5eb9abe2e758d612..4b3a3fb6af44a2b4a034d302287dbe4e7f0ed554 100644 (file)
@@ -14,7 +14,7 @@ if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
                        $categories = array($categories);
                }
                foreach($categories as $category) {
-                       $link = elgg_get_site_url() . 'pg/categories/list/?category=' . urlencode($category);
+                       $link = elgg_get_site_url() . 'categories/list?category=' . urlencode($category);
                        if (!empty($linkstr)) {
                                $linkstr .= ', ';
                        }
index 8f437e3172af0c013a8edee3751cfae6e4eb15f5..ff33f3e9155144d680cd46a013b62f340caec1a1 100644 (file)
@@ -31,7 +31,7 @@ function developers_setup_menu() {
  */
 function developers_theme_preview_controller($page) {
        if (!isset($page[0])) {
-               forward('pg/theme_preview/general');
+               forward('theme_preview/general');
        }
 
        $pages = array(
@@ -48,7 +48,7 @@ function developers_theme_preview_controller($page) {
                elgg_register_menu_item('page', array(
                        'name' => $page_name,
                        'text' => elgg_echo("theme_preview:$page_name"),
-                       'href' => "pg/theme_preview/$page_name",
+                       'href' => "theme_preview/$page_name",
                ));
        }
 
index 3d16e5a42c3c260e54af4c583d9c0b57356d10cf..920047d982f446db9e9d56bed5e06f11aeb177fe 100644 (file)
@@ -3,6 +3,6 @@
  * CSS Preview
  */
 
-$url = elgg_get_site_url() . 'pg/theme_preview/';
+$url = elgg_get_site_url() . 'theme_preview';
 ?>
 <iframe id="developers-iframe" src="<?php echo $url; ?>"></iframe>
\ No newline at end of file
index 1a6cfce94d90b8d2b8c0f5aa438d59557312fcc1..f5d17b18caf0d5c4062bf37ffc1b4cb73d54fd35 100644 (file)
@@ -32,7 +32,7 @@ function embed_longtext_menu($hook, $type, $items, $vars) {
        
        $items[] = ElggMenuItem::factory(array(
                'name' => 'embed',
-               'href' => "pg/embed/?{$active_section}internal_name={$vars['name']}",
+               'href' => "embed?{$active_section}internal_name={$vars['name']}",
                'text' => elgg_echo('media:insert'),
                'rel' => 'facebox',
                'class' => 'elgg-longtext-control',
index b27c53f6b89ac73e5891451ad7939439d3d6e064..e6416085253431c6761bf30c954b93bdab805bc1 100644 (file)
@@ -137,7 +137,7 @@ $(document).ready(function() {
        // tabs
        $('.embed_section').click(function() {
                var section = $(this).attr('id');
-               var url = elgg.config.wwwroot + 'pg/embed/embed?active_section=' + section + '&internal_name=' + internal_name;
+               var url = elgg.config.wwwroot + 'embed/embed?active_section=' + section + '&internal_name=' + internal_name;
                $('#facebox .body .content').load(url);
 
                return false;
index e738f85708194101190acdfdf67af41b02a66080..5eb9b31a293198d01b44bcb68ce354d8d41e0e86 100644 (file)
@@ -36,7 +36,7 @@ if ($upload_sections) {
                // change for dropdown
                $('#embed_upload').change(function() {
                        var upload_section = $(this).val();
-                       var url = elgg.get_site_url() + 'pg/embed/embed?active_section=upload&active_upload_section=' + upload_section;
+                       var url = elgg.get_site_url() + 'embed/embed?active_section=upload&active_upload_section=' + upload_section;
                        $('#facebox .body .content').load(url);
                });
 
index 4dffe93c58ca0baa62f3ad0796c4841d63269fa8..533d71104a39de08d7caa2ea989a44e3ecaa623a 100644 (file)
@@ -27,7 +27,7 @@ function expages_init() {
 function expages_setup_footer_menu() {
     $pages = array('about', 'terms', 'privacy');
     foreach ($pages as $page) {
-        $url = "pg/expages/read/$page";
+        $url = "expages/read/$page";
         $item = new ElggMenuItem($page, elgg_echo("expages:$page"), $url);
                $item->setSection('alt');
         elgg_register_menu_item('footer', $item);
index e471619b8bc701b4670f50480490eee156c495b4..caa04917e34fa92512875ab203a26b01cd61ae1f 100644 (file)
@@ -8,14 +8,14 @@
 $type = $vars['type'];
 
  //set the url
- $url = $vars['url'] . "pg/admin/site/expages?type=";
+ $url = $vars['url'] . "admin/site/expages?type=";
  
 $pages = array('about', 'terms', 'privacy');
 $tabs = array();
 foreach ($pages as $page) {
        $tabs[] = array(
                'title' => elgg_echo("expages:$page"),
-               'url' => "pg/admin/site/expages?type=$page",
+               'url' => "admin/site/expages?type=$page",
                'selected' => $page == $type,
        );
 }
index fe03e50772d25f7954bbdcf95c28b8e1b0239ccd..622d02277a8007f29af8982ff63d9be0f8414e02 100644 (file)
@@ -10,7 +10,7 @@ $guid = (int) get_input('guid');
 $file = new FilePluginFile($guid);
 if (!$file->guid) {
        register_error(elgg_echo("file:deletefailed"));
-       forward('pg/file/all');
+       forward('file/all');
 }
 
 if (!$file->canEdit()) {
@@ -27,7 +27,7 @@ if (!$file->delete()) {
 }
 
 if (elgg_instanceof($container, 'group')) {
-       forward("pg/file/group/$container->guid/owner");
+       forward("file/group/$container->guid/owner");
 } else {
-       forward("pg/file/owner/$container->username");
+       forward("file/owner/$container->username");
 }
index 2749812d543523ca71c963b3c9ddbff6f3d74794..4deaabcac19048343624bb14aa8c00007daf4fd0 100644 (file)
@@ -187,9 +187,9 @@ if ($new_file) {
        if (!$ajax) {
                $container = get_entity($container_guid);
                if (elgg_instanceof($container, 'group')) {
-                       forward("pg/file/group/$container->guid/owner");
+                       forward("file/group/$container->guid/owner");
                } else {
-                       forward("pg/file/owner/$container->username");
+                       forward("file/owner/$container->username");
                }
        }
 
index 12e910a2696a9dc9fbec9cc90b59b7bce78dcc63..66529af0b32b3594a6c71ce74c3e3138a63b12dc 100644 (file)
@@ -20,7 +20,7 @@ if (!$file->canEdit()) {
 
 $title = elgg_echo('file:edit');
 
-elgg_push_breadcrumb(elgg_echo('file'), "pg/file/all/");
+elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 elgg_push_breadcrumb($file->title, $file->getURL());
 elgg_push_breadcrumb($title);
 
index dada7494e72d6040f797fd346d59ae694c73759d..65fc66f62337a7cb4bb84f8d2273d2c765935992 100644 (file)
@@ -7,8 +7,8 @@
 
 $owner = elgg_get_page_owner_entity();
 
-elgg_push_breadcrumb(elgg_echo('file'), "pg/file/all/");
-elgg_push_breadcrumb($owner->name, "pg/file/owner/$owner->username");
+elgg_push_breadcrumb(elgg_echo('file'), "file/all");
+elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
 
 
index de2e4640847223b76d4cded890890e40b51b24a9..44382ce02ec5ab88c3d91804ef92753242af1298 100644 (file)
@@ -10,7 +10,7 @@ group_gatekeeper();
 
 $owner = elgg_get_page_owner_entity();
 
-elgg_push_breadcrumb(elgg_echo('file'), "pg/file/all/");
+elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 elgg_push_breadcrumb($owner->name);
 
 $params = array();
@@ -30,7 +30,7 @@ if ($owner->guid == elgg_get_logged_in_user_guid()) {
        $title = elgg_echo("file:user", array($owner->name));
        $params['filter'] = '';
        if ($owner->isMember(elgg_get_logged_in_user_entity())) {
-               $url = "pg/file/add/$owner->guid";
+               $url = "file/add/$owner->guid";
                $vars = array(
                        'href' => $url,
                        'text' => elgg_echo("file:add"),
index b7f82e95110eb30fd99dd7c18cc1b9278a4e4c79..bcaa2cad96ee65a27eb7a6df696e20edb21ac5d8 100644 (file)
@@ -24,16 +24,16 @@ $friends = get_input('friends', false);
 
 
 // breadcrumbs
-elgg_push_breadcrumb(elgg_echo('file'), "pg/file/all/");
+elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 if ($owner) {
        if (elgg_instanceof($owner, 'user')) {
-               elgg_push_breadcrumb($owner->name, "pg/file/owner/$owner->username");
+               elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
        } else {
-               elgg_push_breadcrumb($owner->name, "pg/file/group/$owner->guid/owner");
+               elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/owner");
        }
 }
 if ($friends && $owner) {
-       elgg_push_breadcrumb(elgg_echo('friends'), "pg/file/friends/$owner->username");
+       elgg_push_breadcrumb(elgg_echo('friends'), "file/friends/$owner->username");
 }
 if ($tag) {
        elgg_push_breadcrumb(elgg_echo("file:type:$tag"));
index c2f445d5df0ef034879c64d25af1cd5242334416..f7642c166b52cc1a94305d972371184e5e8b92b9 100644 (file)
@@ -16,7 +16,7 @@ function file_init() {
        elgg_register_library('elgg:file', elgg_get_plugins_path() . 'file/lib/file.php');
 
        // Site navigation
-       $item = new ElggMenuItem('file', elgg_echo('file'), 'pg/file/all');
+       $item = new ElggMenuItem('file', elgg_echo('file'), 'file/all');
        elgg_register_menu_item('site', $item);
 
        // Extend CSS
@@ -67,13 +67,13 @@ function file_init() {
 /**
  * Dispatches file pages.
  * URLs take the form of
- *  All files:       pg/file/all
- *  User's files:    pg/file/owner/<username>
- *  Friends' files:  pg/file/friends/<username>
- *  View file:       pg/file/view/<guid>/<title>
- *  New file:        pg/file/add/<guid>
- *  Edit file:       pg/file/edit/<guid>
- *  Group files:     pg/file/group/<guid>/owner
+ *  All files:       file/all
+ *  User's files:    file/owner/<username>
+ *  Friends' files:  file/friends/<username>
+ *  View file:       file/view/<guid>/<title>
+ *  New file:        file/add/<guid>
+ *  Edit file:       file/edit/<guid>
+ *  Group files:     file/group/<guid>/owner
  *
  * Title is ignored
  *
@@ -132,7 +132,7 @@ function file_notify_message($hook, $entity_type, $returnvalue, $params) {
        if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'file')) {
                $descr = $entity->description;
                $title = $entity->title;
-               $url = elgg_get_site_url() . "pg/view/" . $entity->guid;
+               $url = elgg_get_site_url() . "view/" . $entity->guid;
                $owner = $entity->getOwnerEntity();
                return $owner->name . ' ' . elgg_echo("file:via") . ': ' . $entity->title . "\n\n" . $descr . "\n\n" . $entity->getURL();
        }
@@ -144,12 +144,12 @@ function file_notify_message($hook, $entity_type, $returnvalue, $params) {
  */
 function file_owner_block_menu($hook, $type, $return, $params) {
        if (elgg_instanceof($params['entity'], 'user')) {
-               $url = "pg/file/owner/{$params['entity']->username}";
+               $url = "file/owner/{$params['entity']->username}";
                $item = new ElggMenuItem('file', elgg_echo('file'), $url);
                $return[] = $item;
        } else {
                if ($params['entity']->files_enable != "no") {
-                       $url = "pg/file/group/{$params['entity']->guid}/owner";
+                       $url = "file/group/{$params['entity']->guid}/owner";
                        $item = new ElggMenuItem('file', elgg_echo('file:group'), $url);
                        $return[] = $item;
                }
@@ -261,7 +261,7 @@ function get_filetype_cloud($owner_guid = "", $friends = false) {
 function file_url_override($entity) {
        $title = $entity->title;
        $title = elgg_get_friendly_title($title);
-       return "pg/file/view/" . $entity->getGUID() . "/" . $title;
+       return "file/view/" . $entity->getGUID() . "/" . $title;
 }
 
 /**
index 9f0220b95bdcf035deb87cf2b928768193644267..c195225303edd6a51d6b2701dbf44b624fc127b0 100644 (file)
@@ -15,11 +15,11 @@ group_gatekeeper();
 $title = elgg_echo('file:add');
 
 // set up breadcrumbs
-elgg_push_breadcrumb(elgg_echo('file'), "pg/file/all/");
+elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 if (elgg_instanceof($owner, 'user')) {
-       elgg_push_breadcrumb($owner->name, "pg/file/owner/$owner->username");
+       elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
 } else {
-       elgg_push_breadcrumb($owner->name, "pg/file/group/$owner->guid/owner");
+       elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/owner");
 }
 elgg_push_breadcrumb($title);
 
index 9e89fbd56ed777f77c3b9f578a69cdef7a8d4eab..1d7c27337a47db2d9360ba5e56a87fe0a9818641 100644 (file)
@@ -9,13 +9,13 @@ $file = get_entity(get_input('guid'));
 
 $owner = elgg_get_page_owner_entity();
 
-elgg_push_breadcrumb(elgg_echo('file'), 'pg/file/all');
+elgg_push_breadcrumb(elgg_echo('file'), 'file/all');
 
 $crumbs_title = $owner->name;
 if (elgg_instanceof($owner, 'group')) {
-       elgg_push_breadcrumb($crumbs_title, "pg/file/group/$owner->guid/owner");
+       elgg_push_breadcrumb($crumbs_title, "file/group/$owner->guid/owner");
 } else {
-       elgg_push_breadcrumb($crumbs_title, "pg/file/owner/$owner->username");
+       elgg_push_breadcrumb($crumbs_title, "file/owner/$owner->username");
 }
 
 $title = $file->title;
index 8536acd7713acf78539ecacad075dfa931257e03..9014809c1e224142c43503fd8ac65eff412734a6 100644 (file)
@@ -17,7 +17,7 @@ $(document).ready(function() {
                                var info = jQuery.parseJSON(data);
 
                                if (info.status == 'success') {
-                                       $('.popup .content').load('<?php echo elgg_get_site_url() . 'pg/embed/embed'; ?>?active_section=file');
+                                       $('.popup .content').load('<?php echo elgg_get_site_url() . 'embed/embed'; ?>?active_section=file');
                                } else {
                                        $('.popup .content').find('form').prepend('<p>' + info.message + '</p>');
                                }
index c3ca5cf9e2d76a029b356db047802b31170d6891..c82e499ec885a5ed0b26f020ce9971e880e06244 100644 (file)
@@ -10,7 +10,7 @@ if ($group->file_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-       'href' => "pg/file/group/$group->guid/owner",
+       'href' => "file/group/$group->guid/owner",
        'text' => elgg_echo('link:view:all'),
 ));
 
@@ -35,7 +35,7 @@ if (!$content) {
 }
 
 $new_link = elgg_view('output/url', array(
-       'href' => "pg/file/add/$group->guid",
+       'href' => "file/add/$group->guid",
        'text' => elgg_echo('file:add'),
 ));
 $content .= "<span class='elgg-widget-more'>$new_link</span>";
index 75c72e2b51763949d9cb1f2ba336f03bed78a431..2c2a5f3af3163c9ad88a984593202980e17ff5f8 100644 (file)
@@ -22,7 +22,7 @@ $base_type = substr($mime, 0, strpos($mime,'/'));
 $body = elgg_view('output/longtext', array('value' => $file->description));
 
 $owner_link = elgg_view('output/url', array(
-       'href' => "pg/file/owner/$owner->username",
+       'href' => "file/owner/$owner->username",
        'text' => $owner->name,
 ));
 $author_text = elgg_echo('byline', array($owner_link));
index d3deece5686698ab32f3a406856316eae4747378..4288b9e5620a6bdb61ed28d7152e518fb4614650 100644 (file)
@@ -21,7 +21,7 @@ $content = elgg_list_entities($options);
 echo $content;
 
 if ($content) {
-       $url = "pg/file/owner/" . elgg_get_page_owner_entity()->username;
+       $url = "file/owner/" . elgg_get_page_owner_entity()->username;
        $more_link = elgg_view('output/url', array(
                'href' => $url,
                'text' => elgg_echo('file:more'),
index c3de612d7022d69269e240c0d9c872028fb07e0a..f307aa091998a8727ea9688d879f0a33cf41717b 100644 (file)
@@ -26,4 +26,4 @@ if ($result) {
        register_error(elgg_echo('discussion:error:notdeleted'));
 }
 
-forward("pg/discussion/owner/$container->guid");
+forward("discussion/owner/$container->guid");
index 9ed7954dcfffdc6dcd694d7ad36ccd394d05de33..932d03355600333574263a37ecb4fc36f921751f 100644 (file)
@@ -34,4 +34,4 @@ if (($entity) && ($entity instanceof ElggGroup)) {
 }
 
 $url_name = elgg_get_logged_in_user_entity()->username;
-forward(elgg_get_site_url() . "pg/groups/member/{$url_name}");
+forward(elgg_get_site_url() . "groups/member/{$url_name}");
index b106e4869009a05fc130d19a2a005400248314b9..db90ecf3a692cc6a2fc5decf8db76b333560c64b 100644 (file)
@@ -26,7 +26,7 @@ if (sizeof($user_guid)) {
                                add_entity_relationship($group->guid, 'invited', $user->guid);
 
                                // Send email
-                               $url = elgg_normalize_url("pg/groups/invitations/$user->username");
+                               $url = elgg_normalize_url("groups/invitations/$user->username");
                                $result = notify_user($user->getGUID(), $group->owner_guid,
                                                elgg_echo('groups:invite:subject', array($user->name, $group->name)),
                                                elgg_echo('groups:invite:body', array(
index 2a3de783bbdff29722b1394b3a84a3fa05a814f8..fb70d6c00125040fc6fb306c760e903e5f3d5454 100644 (file)
@@ -95,7 +95,7 @@ function discussion_handle_edit_page($type, $guid) {
 
                $title = elgg_echo('groups:addtopic');
 
-               elgg_push_breadcrumb($group->name, "pg/discussion/owner/$group->guid");
+               elgg_push_breadcrumb($group->name, "discussion/owner/$group->guid");
                elgg_push_breadcrumb($title);
 
                $body_vars = discussion_prepare_form_vars();
@@ -114,7 +114,7 @@ function discussion_handle_edit_page($type, $guid) {
 
                $title = elgg_echo('groups:edittopic');
 
-               elgg_push_breadcrumb($group->name, "pg/discussion/owner/$group->guid");
+               elgg_push_breadcrumb($group->name, "discussion/owner/$group->guid");
                elgg_push_breadcrumb($topic->title, $topic->getURL());
                elgg_push_breadcrumb($title);
 
@@ -159,7 +159,7 @@ function discussion_handle_view_page($guid) {
 
        group_gatekeeper();
 
-       elgg_push_breadcrumb($group->name, "pg/discussion/owner/$group->guid");
+       elgg_push_breadcrumb($group->name, "discussion/owner/$group->guid");
        elgg_push_breadcrumb($topic->title);
 
        $content = elgg_view_entity($topic, true);
index d3b8bd26aa9ade4f4689994634d66f95fa595e4a..dbbaf43664c2c6dca736c431d82d21193591f10d 100644 (file)
@@ -189,7 +189,7 @@ function groups_handle_profile_page($guid) {
 
        $group = get_entity($guid);
        if (!$group) {
-               forward('pg/groups/all');
+               forward('groups/all');
        }
 
        elgg_push_breadcrumb($group->name);
index 9a80fd3660accc649afb4e99e297476504e83f98..8c3246660e5979c5949e3de0934da0f7a3c04cec 100644 (file)
@@ -21,7 +21,7 @@ function groups_init() {
        elgg_register_entity_type('group', '');
 
        // Set up the menu
-       $item = new ElggMenuItem('groups', elgg_echo('groups'), 'pg/groups/all');
+       $item = new ElggMenuItem('groups', elgg_echo('groups'), 'groups/all');
        elgg_register_menu_item('site', $item);
 
        // Register a page handler, so we can have nice URLs
@@ -137,16 +137,16 @@ function groups_submenus() {
        if (elgg_get_context() == 'groups') {
                if ($page_owner instanceof ElggGroup) {
                        if (elgg_is_logged_in() && $page_owner->canEdit() && !$page_owner->isPublicMembership()) {
-                               $url = elgg_get_site_url() . "pg/groups/requests/{$page_owner->getGUID()}";
+                               $url = elgg_get_site_url() . "groups/requests/{$page_owner->getGUID()}";
                                add_submenu_item(elgg_echo('groups:membershiprequests'), $url, 'groupsactions1');
                        }
                } else {
-                       add_submenu_item(elgg_echo('groups:all'), "pg/groups/all", 'groupslinks1');
+                       add_submenu_item(elgg_echo('groups:all'), "groups/all", 'groupslinks1');
 
                        if ($user = elgg_get_logged_in_user_entity()) {
-                               add_submenu_item(elgg_echo('groups:owned'), "pg/groups/owner/$user->username", 'groupslinks1');
-                               add_submenu_item(elgg_echo('groups:yours'), "pg/groups/member/$user->username", 'groupslinks1');
-                               add_submenu_item(elgg_echo('groups:invitations'), "pg/groups/invitations/$user->username", 'groupslinks1');
+                               add_submenu_item(elgg_echo('groups:owned'), "groups/owner/$user->username", 'groupslinks1');
+                               add_submenu_item(elgg_echo('groups:yours'), "groups/member/$user->username", 'groupslinks1');
+                               add_submenu_item(elgg_echo('groups:invitations'), "groups/invitations/$user->username", 'groupslinks1');
                        }
                }
        }
@@ -156,17 +156,17 @@ function groups_submenus() {
  * Groups page handler
  *
  * URLs take the form of
- *  All groups:           pg/groups/all
- *  User's owned groups:  pg/groups/owner/<username>
- *  User's member groups: pg/groups/member/<username>
- *  Group profile:        pg/groups/profile/<guid>/<title>
- *  New group:            pg/groups/add/<guid>
- *  Edit group:           pg/groups/edit/<guid>
- *  Group invitations:    pg/groups/invitations/<username>
- *  Invite to group:      pg/groups/invite/<guid>
- *  Membership requests:  pg/groups/requests/<guid>
- *  Group activity:       pg/groups/activity/<guid>
- *  Group members:        pg/groups/members/<guid>
+ *  All groups:           groups/all
+ *  User's owned groups:  groups/owner/<username>
+ *  User's member groups: groups/member/<username>
+ *  Group profile:        groups/profile/<guid>/<title>
+ *  New group:            groups/add/<guid>
+ *  Edit group:           groups/edit/<guid>
+ *  Group invitations:    groups/invitations/<username>
+ *  Invite to group:      groups/invite/<guid>
+ *  Membership requests:  groups/requests/<guid>
+ *  Group activity:       groups/activity/<guid>
+ *  Group members:        groups/members/<guid>
  *
  * @param array $page Array of url segments for routing
  */
@@ -174,7 +174,7 @@ function groups_page_handler($page) {
 
        elgg_load_library('elgg:groups');
 
-       elgg_push_breadcrumb(elgg_echo('groups'), "pg/groups/all");
+       elgg_push_breadcrumb(elgg_echo('groups'), "groups/all");
 
        switch ($page[0]) {
                case 'all':
@@ -243,7 +243,7 @@ function groups_icon_handler($page) {
 function groups_url($entity) {
        $title = elgg_get_friendly_title($entity->name);
 
-       return "pg/groups/profile/{$entity->guid}/$title";
+       return "groups/profile/{$entity->guid}/$title";
 }
 
 /**
@@ -258,7 +258,7 @@ function groups_icon_url_override($hook, $type, $returnvalue, $params) {
        if (isset($group->icontime)) {
                // return thumbnail
                $icontime = $group->icontime;
-               return "pg/groupicon/$group->guid/$size/$icontime.jpg";
+               return "groupicon/$group->guid/$size/$icontime.jpg";
        }
 
        return "mod/groups/graphics/default{$size}.gif";
@@ -270,7 +270,7 @@ function groups_icon_url_override($hook, $type, $returnvalue, $params) {
 function groups_activity_owner_block_menu($hook, $type, $return, $params) {
        if (elgg_instanceof($params['entity'], 'group')) {
                if ($params['entity']->activity_enable != "no") {
-                       $url = "pg/groups/activity/{$params['entity']->guid}";
+                       $url = "groups/activity/{$params['entity']->guid}";
                        $item = new ElggMenuItem('activity', elgg_echo('groups:activity'), $url);
                        $return[] = $item;
                }
@@ -553,7 +553,7 @@ function activity_profile_menu($hook, $entity_type, $return_value, $params) {
        if ($params['owner'] instanceof ElggGroup) {
                $return_value[] = array(
                        'text' => elgg_echo('Activity'),
-                       'href' => "pg/groups/activity/{$params['owner']->getGUID()}"
+                       'href' => "groups/activity/{$params['owner']->getGUID()}"
                );
        }
        return $return_value;
@@ -629,11 +629,11 @@ function discussion_init() {
  * Discussion page handler
  *
  * URLs take the form of
- *  All topics in site:    pg/discussion/all
- *  List topics in forum:  pg/discussion/owner/<guid>
- *  View discussion topic: pg/discussion/view/<guid>
- *  Add discussion topic:  pg/discussion/add/<guid>
- *  Edit discussion topic: pg/discussion/edit/<guid>
+ *  All topics in site:    discussion/all
+ *  List topics in forum:  discussion/owner/<guid>
+ *  View discussion topic: discussion/view/<guid>
+ *  Add discussion topic:  discussion/add/<guid>
+ *  Edit discussion topic: discussion/edit/<guid>
  *
  * @param array $page Array of url segments for routing
  */
@@ -641,7 +641,7 @@ function discussion_page_handler($page) {
 
        elgg_load_library('elgg:discussion');
 
-       elgg_push_breadcrumb(elgg_echo('discussion'), 'pg/discussion/all');
+       elgg_push_breadcrumb(elgg_echo('discussion'), 'discussion/all');
 
        switch ($page[0]) {
                case 'all':
@@ -669,7 +669,7 @@ function discussion_page_handler($page) {
  * @return string
  */
 function discussion_override_topic_url($entity) {
-       return 'pg/discussion/view/' . $entity->guid;
+       return 'discussion/view/' . $entity->guid;
 }
 
 /**
@@ -687,7 +687,7 @@ function discussion_comment_override($hook, $type, $return, $params) {
 function discussion_owner_block_menu($hook, $type, $return, $params) {
        if (elgg_instanceof($params['entity'], 'group')) {
                if ($params['entity']->forum_enable != "no") {
-                       $url = "pg/discussion/owner/{$params['entity']->guid}";
+                       $url = "discussion/owner/{$params['entity']->guid}";
                        $item = new ElggMenuItem('discussion', elgg_echo('discussion:group'), $url);
                        $return[] = $item;
                }
index b606579cb41fa6515df1b5930808c634cb50ca27..cbefe8e7cd49ff60a36d4373b4b3042a5af4c02a 100644 (file)
@@ -13,7 +13,7 @@ $group = $vars['entity'];
 
 
 $all_link = elgg_view('output/url', array(
-       'href' => "pg/discussion/owner/$group->guid",
+       'href' => "discussion/owner/$group->guid",
        'text' => elgg_echo('link:view:all'),
 ));
 
@@ -38,7 +38,7 @@ if (!$content) {
 }
 
 $new_link = elgg_view('output/url', array(
-       'href' => "pg/discussion/add/" . $group->getGUID(),
+       'href' => "discussion/add/" . $group->getGUID(),
        'text' => elgg_echo('groups:addtopic'),
 ));
 $content .= "<span class='elgg-widget-more'>$new_link</span>";
index 2ba0e5f0e42b7f3fb5efda6c026572fae768f6a9..863515a853bdef78c73e8f0285d35e1db685746c 100644 (file)
@@ -9,7 +9,7 @@ $group_count = (int)elgg_get_entities(array('types' => 'group', 'count' => true)
 
 $selected = elgg_extract('selected', $vars);
        
-$url = elgg_get_site_url() . "pg/groups/all/";
+$url = elgg_get_site_url() . "groups/all";
 
 ?>
 <div class="elgg-tabs mtm">
index 9955b598fceec335aa8191580b110c5ebce0a603..4ea97cad66ce20fdb7ccfffa125aead557424645 100644 (file)
@@ -17,7 +17,7 @@ if (!$group) {
 }
 
 $all_link = elgg_view('output/url', array(
-       'href' => "pg/groups/activity/$group->guid",
+       'href' => "groups/activity/$group->guid",
        'text' => elgg_echo('link:view:all'),
 ));
 
index 836dd298207d2f7d097b5508cdca6752c421dc54..55e99f59c0a18090dfbf7882b1363052f92a4e55 100644 (file)
@@ -17,9 +17,9 @@ $actions = array();
 // group owners
 if ($vars['entity']->canEdit()) {
        // edit and invite
-       $url = elgg_get_site_url() . "pg/groups/edit/{$vars['entity']->getGUID()}";
+       $url = elgg_get_site_url() . "groups/edit/{$vars['entity']->getGUID()}";
        $actions[$url] = elgg_echo('groups:edit');
-       $url = elgg_get_site_url() . "pg/groups/invite/{$vars['entity']->getGUID()}";
+       $url = elgg_get_site_url() . "groups/invite/{$vars['entity']->getGUID()}";
        $actions[$url] = elgg_echo('groups:invite');
 }
 
index df2314689fa652df8c80fcb22634c9d04207584d..88a56830bd3d96cc56aa33c2d3a147ccf7065f06 100644 (file)
@@ -6,8 +6,8 @@
 <ul class="submenu page_navigation">
 <?php
        if(elgg_is_logged_in()){
-               echo "<li><a href=\"".elgg_get_site_url()."pg/groups/member/{elgg_get_logged_in_user_entity()->username}\">". elgg_echo('groups:yours') ."</a></li>";
-               echo "<li><a href=\"".elgg_get_site_url()."pg/groups/invitations/{elgg_get_logged_in_user_entity()->username}\">". elgg_echo('groups:invitations') ."</a></li>";
+               echo "<li><a href=\"".elgg_get_site_url()."groups/member/{elgg_get_logged_in_user_entity()->username}\">". elgg_echo('groups:yours') ."</a></li>";
+               echo "<li><a href=\"".elgg_get_site_url()."groups/invitations/{elgg_get_logged_in_user_entity()->username}\">". elgg_echo('groups:invitations') ."</a></li>";
        }
 ?>
 </ul>
\ No newline at end of file
index 0d31ee711724324c1a24043ad25a70cbf012c69c..181f437e3f67ffb41eaac08a51a3f3104c18d5d7 100644 (file)
@@ -4,7 +4,7 @@
  *
  * @package ElggGroups
  */
-$url = elgg_get_site_url() . 'pg/groups/world';
+$url = elgg_get_site_url() . 'groups/world';
 $body = elgg_view_form('groups/search', array('action' => $url, 'method' => 'get'));
 
 echo elgg_view_module('aside', elgg_echo('groups:searchtag'), $body);
index 4fbb54456001fda07caefa614ee49334a5c799b2..c18366c1b1e67b30cebcd39cda7ab8e59b1f8f1a 100644 (file)
@@ -8,7 +8,7 @@
  */
 
 $all_link = elgg_view('output/url', array(
-       'href' => 'pg/groups/members/' . $vars['entity']->guid,
+       'href' => 'groups/members/' . $vars['entity']->guid,
        'text' => elgg_echo('groups:members:more'),
 ));
 
@@ -20,4 +20,4 @@ foreach ($members as $mem) {
 $body .= '</ul>';
 $body .= "<div class='center mts'>$all_link</div>";
 
-echo elgg_view_module('aside', elgg_echo('groups:members'), $body);
\ No newline at end of file
+echo elgg_view_module('aside', elgg_echo('groups:members'), $body);
index c15e4507efb6eead6eddcf1e052991ae29b6db47..81d3554421fb8edd869759a7ac91b33d30fc6892 100644 (file)
@@ -21,7 +21,7 @@ $content = elgg_list_entities_from_relationship($options);
 echo $content;
 
 if ($content) {
-       $url = "pg/group/member/" . elgg_get_page_owner_entity()->username;
+       $url = "group/member/" . elgg_get_page_owner_entity()->username;
        $more_link = elgg_view('output/url', array(
                'href' => $url,
                'text' => elgg_echo('groups:more'),
index 1a8956419b352b099c624858f06efa445eb7ff24..d9b6db792ec2283bafa6acb432a0ea47a097c549 100644 (file)
@@ -47,7 +47,7 @@ foreach ($emails as $email) {
                continue;
        }
 
-       $link = elgg_get_site_url() . 'pg/register?friend_guid=' . $current_user->guid . '&invitecode=' . generate_invite_code($current_user->username);
+       $link = elgg_get_site_url() . 'register?friend_guid=' . $current_user->guid . '&invitecode=' . generate_invite_code($current_user->username);
        $message = elgg_echo('invitefriends:email', array(
                                        $site->name,
                                        $current_user->name,
index 123ab7364fe749735f09c261ad0d72c7ddb9eb28..8f71314b38514e9b1b019faa3400ca9c3399aa78 100644 (file)
@@ -15,7 +15,7 @@ function invitefriends_init() {
        $params = array(
                'name' => 'invite',
                'text' => elgg_echo('friends:invite'),
-               'href' => "pg/invite/",
+               'href' => "invite",
                'contexts' => array('friends'),
        );
        elgg_register_menu_item('page', $params);
index 2bbd08980e7e38648843daf459b9ce3b66f7b1aa..5b4e0541e6d4b4abc357c2b6962614067ab4bf48 100644 (file)
@@ -23,7 +23,7 @@ function logbrowser_init() {
 function logbrowser_user_hover_menu($hook, $type, $return, $params) {
        $user = $params['entity'];
 
-       $url = "pg/admin/overview/logbrowser/?user_guid={$user->guid}";
+       $url = "admin/overview/logbrowser?user_guid={$user->guid}";
        $item = new ElggMenuItem('logbrowser', elgg_echo('logbrowser:explore'), $url);
        $item->setSection('admin');
        $return[] = $item;
index e7c2257ce764ac8b77dc297f6c5a3ac8c1c90727..b09fd79dd343350479893acf86b1ce69dcd34e22 100644 (file)
@@ -54,7 +54,7 @@
                $wrappedform = elgg_view('input/form', array(
                        'body' => $form,
                        'method' => 'get',
-                       'action' => "pg/admin/overview/logbrowser/",
+                       'action' => "admin/overview/logbrowser",
                        'disable_security' => true,
                ));
 ?>
@@ -68,6 +68,7 @@
                </div>
        </div>
        <p>
+               <?php //@todo JS 1.8: no ?>
                <a class="link" href="#" onclick="elgg_slide_toggle(this,'#logbrowser-search-area','#log-browser-search-form');">
                        <?php echo elgg_echo('logbrowser:search'); ?>
                </a>
index 5db495fae62b3c1f1d228ca50339b39cc7f62edf..8b3ed5901cbd735c8d45e23d275c43a3ac1e5ab2 100644 (file)
@@ -27,7 +27,7 @@ $log_entries = $vars['log_entries'];
                                'text' => $user->name
                        ));
                        $user_guid_link = elgg_view('output/url', array(
-                               'href' => elgg_get_site_url() . "pg/admin/overview/logbrowser/?user_guid=$user->guid",
+                               'href' => "admin/overview/logbrowser?user_guid=$user->guid",
                                'text' => $user->getGUID()
                        ));
                } else {
index 7a65ec68b3054b432da4241c29d0ec025df49e4b..7fd88a9d418dc9dfe4fc1101c0888568808c5265 100644 (file)
@@ -24,9 +24,9 @@ if ($history_user) {
        $title = elgg_echo('messageboard:owner_history', array($history_user->name, $page_owner->name));
 
        if ($page_owner instanceof ElggGroup) {
-               $mb_url = "pg/messageboard/group/$page_owner->guid/owner";
+               $mb_url = "messageboard/group/$page_owner->guid/owner";
        } else {
-               $mb_url = "pg/messageboard/owner/$page_owner->username";
+               $mb_url = "messageboard/owner/$page_owner->username";
        }
 } else {
        $title = elgg_echo('messageboard:owner', array($page_owner->name));
index f8dcd8266d9a291e7b2b1fb489cf785e29cdb75a..3498854290f9ef64a79643aedfc36d59ba9ca6f4 100644 (file)
@@ -33,10 +33,10 @@ function messageboard_init() {
  * Profile (and eventually group) widgets handle their own.
  *
  * URLs take the form of
- *  User's messageboard:               pg/messageboard/owner/<username>
- *  Y's history of posts on X's board: pg/messageboard/owner/<X>/history/<Y>
- *  New post:                          pg/messageboard/add/<guid> (container: user or group)
- *  Group messageboard:                pg/messageboard/group/<guid>/owner
+ *  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
  *
  * @param array $page Array of page elements
  * @return bool
@@ -47,7 +47,7 @@ function messageboard_page_handler($page) {
        // if the first part is a username, forward to new format
        if (isset($page[0]) && !in_array($page[0], $new_section_one) && get_user_by_username($page[0])) {
                register_error(elgg_echo("changebookmark"));
-               $url = "pg/messageboard/owner/{$page[0]}";
+               $url = "messageboard/owner/{$page[0]}";
                forward($url);
        }
 
@@ -119,7 +119,7 @@ function messageboard_add($poster, $owner, $message, $access_id = ACCESS_PUBLIC)
                $body = elgg_echo('messageboard:email:body', array(
                                                $poster->name,
                                                $message,
-                                               elgg_get_site_url() . "pg/messageboard/" . $owner->username,
+                                               elgg_get_site_url() . "messageboard/" . $owner->username,
                                                $poster->name,
                                                $poster->getURL()
                                                ));
index 04dbb00d2e19d2bb4aa2b4ea958a7b99a292e71f..55b12f29bdef6a8a01d1e639373fe8b13c30811f 100644 (file)
@@ -23,9 +23,9 @@ $options = array(
 echo elgg_list_annotations($options);
 
 if ($owner instanceof ElggGroup) {
-       $url = "pg/messageboard/group/$owner->guid/owner";
+       $url = "messageboard/group/$owner->guid/owner";
 } else {
-       $url = "pg/messageboard/owner/$owner->username";
+       $url = "messageboard/owner/$owner->username";
 }
 
 echo elgg_view('output/url', array(
index a643b44b483ece0e665af6f6c1bfb35528857b02..9d9f6c8b78157369f54b2a400233dcfaa03a88d9 100644 (file)
@@ -15,19 +15,19 @@ elgg_make_sticky_form('messages');
 
 if (!$recipient_guid) {
        register_error(elgg_echo("messages:user:blank"));
-       forward("pg/messages/compose");
+       forward("messages/compose");
 }
 
 $user = get_user($recipient_guid);
 if (!$user) {
        register_error(elgg_echo("messages:user:nonexist"));
-       forward("pg/messages/compose");
+       forward("messages/compose");
 }
 
 // Make sure the message field, send to field and title are not blank
 if (!$body || !$subject) {
        register_error(elgg_echo("messages:blank"));
-       forward("pg/messages/compose");
+       forward("messages/compose");
 }
 
 // Otherwise, 'send' the message 
@@ -36,11 +36,11 @@ $result = messages_send($subject, $body, $recipient_guid, 0, $reply);
 // Save 'send' the message
 if (!$result) {
        register_error(elgg_echo("messages:error"));
-       forward("pg/messages/compose");
+       forward("messages/compose");
 }
 
 elgg_clear_sticky_form('messages');
        
 system_message(elgg_echo("messages:posted"));
 
-forward('pg/messages/inbox/' . elgg_get_logged_in_user_entity()->username);
+forward('messages/inbox/' . elgg_get_logged_in_user_entity()->username);
index 47d9b45dcad7fde9d7e4d74cca5a3fdcef661039..c5d1d49410e3486ec4392c561b09e4d574b00ea4 100644 (file)
@@ -20,9 +20,9 @@ $title = $message->title;
 $inbox = false;
 if ($page_owner->getGUID() == $message->toId) {
        $inbox = true;
-       elgg_push_breadcrumb(elgg_echo('messages:inbox'), 'pg/messages/inbox/' . $page_owner->username);
+       elgg_push_breadcrumb(elgg_echo('messages:inbox'), 'messages/inbox/' . $page_owner->username);
 } else {
-       elgg_push_breadcrumb(elgg_echo('messages:sent'), 'pg/messages/sent/' . $page_owner->username);
+       elgg_push_breadcrumb(elgg_echo('messages:sent'), 'messages/sent/' . $page_owner->username);
 }
 elgg_push_breadcrumb($title);
 
index 76acb36a9f115c92dbf79eda6a5b342f3d214148..3e57eda7904ed0e0425f2c1c830a64c410549e4c 100644 (file)
@@ -19,14 +19,14 @@ function messages_init() {
                elgg_register_menu_item('page', array(
                        'name' => 'messages:inbox',
                        'text' => elgg_echo('messages:inbox'),
-                       'href' => "pg/messages/inbox/" . elgg_get_logged_in_user_entity()->username,
+                       'href' => "messages/inbox/" . elgg_get_logged_in_user_entity()->username,
                        'context' => 'messages',
                ));
                
                elgg_register_menu_item('page', array(
                        'name' => 'messages:sentmessages',
                        'text' => elgg_echo('messages:sentmessages'),
-                       'href' => "pg/messages/sent/" . elgg_get_logged_in_user_entity()->username,
+                       'href' => "messages/sent/" . elgg_get_logged_in_user_entity()->username,
                        'context' => 'messages',
                ));
                
@@ -41,7 +41,7 @@ function messages_init() {
                
                elgg_register_menu_item('topbar', array(
                        'name' => 'messages',
-                       'href' => 'pg/messages/inbox/' . elgg_get_logged_in_user_entity()->username,
+                       'href' => 'messages/inbox/' . elgg_get_logged_in_user_entity()->username,
                        'text' => $text,
                        'priority' => 600,
                ));
@@ -89,13 +89,13 @@ function messages_page_handler($page) {
 
        elgg_load_library('elgg:messages');
 
-       elgg_push_breadcrumb(elgg_echo('messages'), 'pg/messages/inbox/' . elgg_get_logged_in_user_entity()->username);
+       elgg_push_breadcrumb(elgg_echo('messages'), 'messages/inbox/' . elgg_get_logged_in_user_entity()->username);
 
        if (!isset($page[0])) {
                $page[0] = 'inbox';
        }
 
-       // supporting the old inbox url /pg/messages/<username>
+       // supporting the old inbox url /messages/<username>
        $user = get_user_by_username($page[0]);
        if ($user) {
                $page[1] = $page[0];
@@ -281,9 +281,9 @@ function messages_send($subject, $body, $send_to, $from = 0, $reply = 0, $notify
                $body = elgg_echo('messages:email:body', array(
                        elgg_get_logged_in_user_entity()->name,
                        $message_contents,
-                       elgg_get_site_url() . "pg/messages/inbox/" . $user->username,
+                       elgg_get_site_url() . "messages/inbox/" . $user->username,
                        elgg_get_logged_in_user_entity()->name,
-                       elgg_get_site_url() . "pg/messages/compose?send_to=" . elgg_get_logged_in_user_guid()
+                       elgg_get_site_url() . "messages/compose?send_to=" . elgg_get_logged_in_user_guid()
                ));
 
                notify_user($send_to, elgg_get_logged_in_user_guid(), $subject, $body);
@@ -300,7 +300,7 @@ function messages_send($subject, $body, $send_to, $from = 0, $reply = 0, $notify
  * @return string
  */
 function messages_url($message) {
-       $url = elgg_get_site_url() . 'pg/messages/read/' . $message->getGUID();
+       $url = elgg_get_site_url() . 'messages/read/' . $message->getGUID();
        return $url;
 }
 
@@ -363,7 +363,7 @@ function messages_user_hover_menu($hook, $type, $return, $params) {
        $user = $params['entity'];
 
        if (elgg_is_logged_in() && elgg_get_logged_in_user_guid() != $user->guid) {
-               $url = "pg/messages/compose?send_to={$user->guid}";
+               $url = "messages/compose?send_to={$user->guid}";
                $item = new ElggMenuItem('send', elgg_echo('messages:sendmessage'), $url);
                $item->setSection('action');
                $return[] = $item;
index 1c97c8e36fa9fece424d39d6fac5c19dd403579e..196d8a3ad7acf92611ad9a022a5ebaea877d7d71 100644 (file)
@@ -21,7 +21,7 @@ if ($message->toId == elgg_get_page_owner_guid()) {
        $user = get_entity($message->fromId);
        $icon = elgg_view_entity_icon($user, 'tiny');
        $user_link = elgg_view('output/url', array(
-               'href' => "pg/messages/compose?send_to=$user->guid",
+               'href' => "messages/compose?send_to=$user->guid",
                'text' => $user->name,
        ));
 
@@ -36,7 +36,7 @@ if ($message->toId == elgg_get_page_owner_guid()) {
        $user = get_entity($message->toId);
        $icon = elgg_view_entity_icon($user, 'tiny');
        $user_link = elgg_view('output/url', array(
-               'href' => "pg/messages/compose?send_to=$user->guid",
+               'href' => "messages/compose?send_to=$user->guid",
                'text' => elgg_echo('messages:to_user', array($user->name)),
        ));
 
index b8c2aae1da743614070a69093c0c14ef73249878..0f1e11a5719f9e266f7d6af753389615b398dbf9 100644 (file)
@@ -70,7 +70,7 @@ function notifications_plugin_pagesetup() {
                $params = array(
                        'name' => '2_a_user_notify',
                        'text' => elgg_echo('notifications:subscriptions:changesettings'),
-                       'href' => "pg/notifications/personal",
+                       'href' => "notifications/personal",
                );
                elgg_register_menu_item('page', $params);
                
@@ -78,7 +78,7 @@ function notifications_plugin_pagesetup() {
                        $params = array(
                                'name' => '2_group_notify',
                                'text' => elgg_echo('notifications:subscriptions:changesettings:groups'),
-                               'href' => "pg/notifications/group",
+                               'href' => "notifications/group",
                        );
                        elgg_register_menu_item('page', $params);
                }
index 927da1299f3a1d2ac9245a695c4c281adae2bf11..077561b1e76c6f68febaa18e10d27dfdc9832ad9 100644 (file)
@@ -33,9 +33,9 @@ if ($page) {
                                }
                        }
                        if (elgg_instanceof($container, 'group')) {
-                               forward("pg/pages/group/$container->guid/owner");
+                               forward("pages/group/$container->guid/owner");
                        } else {
-                               forward("pg/pages/owner/$container->username/");
+                               forward("pages/owner/$container->username");
                        }
                }
        }
index d851edea3ce67d0370dac304a83de80abcc3f532..13aa2857822f44e5b65be88a700dfaadc84dc598 100644 (file)
@@ -10,7 +10,7 @@ if (!$owner) {
 
 }
 
-elgg_push_breadcrumb($owner->name, "pg/pages/owner/$owner->username");
+elgg_push_breadcrumb($owner->name, "pages/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
 
 $title = elgg_echo('pages:friends');
index 5a31723cb4f123969ea290e819aa0cad115aef54..7ed5ad7f7ec7b5a462e16a024d77050ae1f888f7 100644 (file)
@@ -20,9 +20,9 @@ if (!$container) {
 elgg_set_page_owner_guid($container->getGUID());
 
 if (elgg_instanceof($container, 'group')) {
-       elgg_push_breadcrumb($container->name, "pg/pages/group/$container->guid/owner");
+       elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner");
 } else {
-       elgg_push_breadcrumb($container->name, "pg/pages/owner/$container->username");
+       elgg_push_breadcrumb($container->name, "pages/owner/$container->username");
 }
 pages_prepare_parent_breadcrumbs($page);
 elgg_push_breadcrumb($page->title, $page->getURL());
index 1537e035511846f80824221f77231ccc6451c90c..968c64b5850a4da9e3402eee65913c6688987dce 100644 (file)
@@ -27,9 +27,9 @@ if (!$container) {
 $title = $page->title . ": " . elgg_echo('pages:revision');
 
 if (elgg_instanceof($container, 'group')) {
-       elgg_push_breadcrumb($container->name, "pg/pages/group/$container->guid/owner");
+       elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner");
 } else {
-       elgg_push_breadcrumb($container->name, "pg/pages/owner/$container->username");
+       elgg_push_breadcrumb($container->name, "pages/owner/$container->username");
 }
 pages_prepare_parent_breadcrumbs($page);
 elgg_push_breadcrumb($page->title, $page->getURL());
index 8c2645f050f8af4ee144f56dcda3acf51ef61a12..1c655bd072115bacf393c439d44a9be8c8977786 100644 (file)
@@ -16,7 +16,7 @@ function pages_init() {
        // register a library of helper functions
        elgg_register_library('elgg:pages', elgg_get_plugins_path() . 'pages/lib/pages.php');
 
-       $item = new ElggMenuItem('pages', elgg_echo('pages'), 'pg/pages/all');
+       $item = new ElggMenuItem('pages', elgg_echo('pages'), 'pages/all');
        elgg_register_menu_item('site', $item);
 
        // Register a page handler, so we can have nice URLs
@@ -81,15 +81,15 @@ function pages_init() {
 /**
  * Dispatcher for pages.
  * URLs take the form of
- *  All pages:        pg/pages/all
- *  User's pages:     pg/pages/owner/<username>
- *  Friends' pages:   pg/pages/friends/<username>
- *  View page:        pg/pages/view/<guid>/<title>
- *  New page:         pg/pages/add/<guid> (container: user, group, parent)
- *  Edit page:        pg/pages/edit/<guid>
- *  History of page:  pg/pages/history/<guid>
- *  Revision of page: pg/pages/revision/<id>
- *  Group pages:      pg/pages/group/<guid>/owner
+ *  All pages:        pages/all
+ *  User's pages:     pages/owner/<username>
+ *  Friends' pages:   pages/friends/<username>
+ *  View page:        pages/view/<guid>/<title>
+ *  New page:         pages/add/<guid> (container: user, group, parent)
+ *  Edit page:        pages/edit/<guid>
+ *  History of page:  pages/history/<guid>
+ *  Revision of page: pages/revision/<id>
+ *  Group pages:      pages/group/<guid>/owner
  *
  * Title is ignored
  *
@@ -109,7 +109,7 @@ function pages_page_handler($page) {
                $page[0] = 'all';
        }
 
-       elgg_push_breadcrumb(elgg_echo('pages'), 'pg/pages/all');
+       elgg_push_breadcrumb(elgg_echo('pages'), 'pages/all');
 
        $base_dir = elgg_get_plugins_path() . 'pages';
 
@@ -161,7 +161,7 @@ function pages_page_handler($page) {
  */
 function pages_url($entity) {
        $title = elgg_get_friendly_title($entity->title);
-       return "pg/pages/view/$entity->guid/$title";
+       return "pages/view/$entity->guid/$title";
 }
 
 /**
@@ -171,7 +171,7 @@ function pages_url($entity) {
  * @return string
  */
 function pages_revision_url($annotation) {
-       return "pg/pages/revision/$annotation->id";
+       return "pages/revision/$annotation->id";
 }
 
 /**
@@ -199,12 +199,12 @@ function pages_icon_url_override($hook, $type, $returnvalue, $params) {
  */
 function pages_owner_block_menu($hook, $type, $return, $params) {
        if (elgg_instanceof($params['entity'], 'user')) {
-               $url = "pg/pages/owner/{$params['entity']->username}";
+               $url = "pages/owner/{$params['entity']->username}";
                $item = new ElggMenuItem('pages', elgg_echo('pages'), $url);
                $return[] = $item;
        } else {
                if ($params['entity']->pages_enable != "no") {
-                       $url = "pg/pages/group/{$params['entity']->guid}/owner";
+                       $url = "pages/group/{$params['entity']->guid}/owner";
                        $item = new ElggMenuItem('pages', elgg_echo('pages:group'), $url);
                        $return[] = $item;
                }
@@ -230,7 +230,7 @@ function pages_entity_menu_setup($hook, $type, $return, $params) {
        $options = array(
                'name' => 'history',
                'text' => elgg_echo('pages:history'),
-               'href' => "pg/pages/history/$entity->guid",
+               'href' => "pages/history/$entity->guid",
                'priority' => 150,
        );
        $return[] = ElggMenuItem::factory($options);
@@ -253,7 +253,8 @@ function page_notify_message($hook, $entity_type, $returnvalue, $params) {
        if (($entity instanceof ElggEntity) && (($entity->getSubtype() == 'page_top') || ($entity->getSubtype() == 'page'))) {
                $descr = $entity->description;
                $title = $entity->title;
-               $url = elgg_get_site_url() . "pg/view/" . $entity->guid;
+               //@todo why?
+               $url = elgg_get_site_url() . "view/" . $entity->guid;
                $owner = $entity->getOwnerEntity();
                return $owner->name . ' ' . elgg_echo("pages:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
        }
index e6189bae8f38483c45ad75d13b8ddddc95f60f89..d3503709d8d466e5b72ab3ddb63682237f11fafe 100644 (file)
@@ -22,9 +22,9 @@ if (!$container) {
 $title = $page->title;
 
 if (elgg_instanceof($container, 'group')) {
-       elgg_push_breadcrumb($container->name, "pg/pages/group/$container->guid/owner");
+       elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner");
 } else {
-       elgg_push_breadcrumb($container->name, "pg/pages/owner/$container->username");
+       elgg_push_breadcrumb($container->name, "pages/owner/$container->username");
 }
 pages_prepare_parent_breadcrumbs($page);
 elgg_push_breadcrumb($title);
@@ -34,7 +34,7 @@ $content .= elgg_view_comments($page);
 
 $buttons = '';
 if ($page->canEdit()) {
-       $url = "pg/pages/add/$page->guid";
+       $url = "pages/add/$page->guid";
        $buttons = elgg_view('output/url', array(
                        'text' => elgg_echo('pages:newchild'),
                        'href' => $url,
index 72d9720ef1003f49d51336033d38b3c57a1737f5..301ee7add43be45fa59fb4104ae57b89330b18eb 100644 (file)
@@ -31,7 +31,7 @@ $page_icon = elgg_view('pages/icon', array('annotation' => $annotation, 'size' =
 
 $editor = get_entity($annotation->owner_guid);
 $editor_link = elgg_view('output/url', array(
-       'href' => "pg/pages/owner/$editor->username",
+       'href' => "pages/owner/$editor->username",
        'text' => $editor->name,
 ));
 
index 9d2f863dd879ec5cbcba789fe5044f3187f435f3..f36e3044275f2010bfe10daf6b1726c3608a3b47 100644 (file)
@@ -13,7 +13,7 @@ if ($group->pages_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-       'href' => "pg/pages/group/$group->guid/owner",
+       'href' => "pages/group/$group->guid/owner",
        'text' => elgg_echo('link:view:all'),
 ));
 
@@ -38,7 +38,7 @@ if (!$content) {
 }
 
 $new_link = elgg_view('output/url', array(
-       'href' => "pg/pages/add/$group->guid",
+       'href' => "pages/add/$group->guid",
        'text' => elgg_echo('pages:add'),
 ));
 $content .= "<span class='elgg-widget-more'>$new_link</span>";
index eea4822731276b5f073f3ed6007ef617f2f71749..3ae0b8454a3cdf04f96cfc8e6c2c8661d45fa0c7 100644 (file)
@@ -20,7 +20,7 @@ $content = elgg_list_entities($options);
 echo $content;
 
 if ($content) {
-       $url = "pg/pages/owner/" . elgg_get_page_owner_entity()->username;
+       $url = "pages/owner/" . elgg_get_page_owner_entity()->username;
        $more_link = elgg_view('output/url', array(
                'href' => $url,
                'text' => elgg_echo('pages:more'),
index 8ef304cc20a2d1bcf395f7a515f4849d4bac3c88..9f4e37b6dd62742df2ccdea242d7f1d135e4f98f 100644 (file)
@@ -88,7 +88,7 @@ function profile_page_handler($page) {
  * @return string User URL
  */
 function profile_url($user) {
-       return elgg_get_site_url() . "pg/profile/" . $user->username;
+       return elgg_get_site_url() . "profile/" . $user->username;
 }
 
 /**
index e42d86cf8205edbd69bde701712f671a8a940798..a7e3afe197b5f7afa6f80a0b95b319c19fe84eee 100644 (file)
@@ -21,7 +21,7 @@ function reportedcontent_init() {
 
        // Extend footer with report content link
        if (elgg_is_logged_in()) {
-               $href = "javascript:elgg.forward('pg/reportedcontent/add'";
+               $href = "javascript:elgg.forward('reportedcontent/add'";
                $href .= "+'?address='+encodeURIComponent(location.href)";
                $href .= "+'&title='+encodeURIComponent(document.title));";
                
@@ -84,7 +84,7 @@ function reportedcontent_user_hover_menu($hook, $type, $return, $params) {
 
        $profile_url = urlencode($user->getURL());
        $name = urlencode($user->name);
-       $url = "pg/reportedcontent/add/?address=$profile_url&title=$name";
+       $url = "reportedcontent/add?address=$profile_url&title=$name";
 
        if (elgg_is_logged_in() && elgg_get_logged_in_user_guid() != $user->guid) {
                $item = new ElggMenuItem(
index c51b0fe0dbf598984b1571c7f983d667c740221b..4da6f95ef1c2a4eff5581b8a3bd68913723f43b6 100644 (file)
@@ -75,7 +75,7 @@ $data = htmlspecialchars(http_build_query(array(
        'search_type' => 'all',
        //'friends' => $friends
 )));
-$url = elgg_get_site_url() . "pg/search/?$data";
+$url = elgg_get_site_url() . "search?$data";
 $menu_item = new ElggMenuItem('all', elgg_echo('all'), $url);
 elgg_register_menu_item('page', $menu_item);
 
@@ -94,7 +94,7 @@ foreach ($types as $type => $subtypes) {
                                'friends' => $friends
                        )));
 
-                       $url = elgg_get_site_url()."pg/search/?$data";
+                       $url = elgg_get_site_url()."search?$data";
                        $menu_item = new ElggMenuItem($label, elgg_echo($label), $url);
                        elgg_register_menu_item('page', $menu_item);
                }
@@ -109,7 +109,7 @@ foreach ($types as $type => $subtypes) {
                        'friends' => $friends
                )));
 
-               $url = elgg_get_site_url() . "pg/search/?$data";
+               $url = elgg_get_site_url() . "search?$data";
 
                $menu_item = new ElggMenuItem($label, elgg_echo($label), $url);
                elgg_register_menu_item('page', $menu_item);
@@ -129,7 +129,7 @@ foreach ($custom_types as $type) {
                'friends' => $friends
        )));
 
-       $url = elgg_get_site_url()."pg/search/?$data";
+       $url = elgg_get_site_url()."search?$data";
 
        $menu_item = new ElggMenuItem($label, elgg_echo($label), $url);
        elgg_register_menu_item('page', $menu_item);
index c2cee5ff946978ecf8fbbb57d9cc915bc3a0171d..c5afaaa86bc7b00b72eedfe9af32db12531ad434 100644 (file)
@@ -34,7 +34,7 @@ $query = http_build_query(
        )
 );
 
-$url = elgg_get_site_url() . "pg/search?$query";
+$url = elgg_get_site_url() . "search?$query";
 
 // get pagination
 if (array_key_exists('pagination', $vars) && $vars['pagination']) {
index 9de861179d6b8290d94416949490be7b37921112..7561a3767f05214931ae7666a97d332cdc866adb 100644 (file)
@@ -19,7 +19,7 @@ $value = stripslashes($value);
 
 ?>
 
-<form class="elgg-search" action="<?php echo elgg_get_site_url(); ?>pg/search/" method="get">
+<form class="elgg-search" action="<?php echo elgg_get_site_url(); ?>search" method="get">
        <fieldset>
                <input type="text" size="21" name="q" value="<?php echo elgg_echo('search'); ?>" onblur="if (this.value=='') { this.value='<?php echo elgg_echo('search'); ?>' }" onfocus="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' };" class="search-input" />
                <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search-submit-button" />
index f32f7e555c5e1a110fe73f9f75a60a31a97d9268..33936d5eea4bca2ce160048bfc57ea94adc82872 100644 (file)
@@ -26,7 +26,7 @@ if (!$guid) {
 if ($parent_guid) {\r
        thewire_send_response_notification($guid, $parent_guid, $user);\r
        $parent = get_entity($parent_guid);\r
-       forward("pg/thewire/thread/$parent->wire_thread");\r
+       forward("thewire/thread/$parent->wire_thread");\r
 }\r
 \r
 system_message(elgg_echo("thewire:posted"));\r
index 7758b4b03abd128f7571539585c1ae67746acd39..9d629325a179200f4347e9ab302ecb57226f06ff 100644 (file)
@@ -35,5 +35,5 @@ if ($thewire->getSubtype() == "thewire" && $thewire->canEdit()) {
                register_error(elgg_echo("thewire:notdeleted"));\r
        }\r
 \r
-       forward("pg/thewire/owner/" . $owner->username);\r
+       forward("thewire/owner/" . $owner->username);\r
 }\r
index 239359ec227a8d6623db296f9c7781060ed10a6e..6e8642544fa8f12d672eeb334ad711de2fbd4d50 100644 (file)
@@ -7,8 +7,8 @@ $owner = elgg_get_page_owner_entity();
 \r
 $title = elgg_echo('thewire:friends');\r
 \r
-elgg_push_breadcrumb(elgg_echo('thewire'), "pg/thewire/all/");\r
-elgg_push_breadcrumb($owner->name, "pg/thewire/owner/$owner->username");\r
+elgg_push_breadcrumb(elgg_echo('thewire'), "thewire/all");\r
+elgg_push_breadcrumb($owner->name, "thewire/owner/$owner->username");\r
 elgg_push_breadcrumb(elgg_echo('friends'));\r
 \r
 $content = list_user_friends_objects($owner->guid, 'thewire', 15, false);\r
index e349761f2e77309a784331dac517846fac33f498..c29f81669bd5afe60dec6616699da271d51d8984 100644 (file)
@@ -10,7 +10,7 @@ $post = get_entity(get_input('guid'));
 \r
 $title = elgg_echo('thewire:reply');\r
 \r
-elgg_push_breadcrumb(elgg_echo('thewire'), 'pg/thewire/all');\r
+elgg_push_breadcrumb(elgg_echo('thewire'), 'thewire/all');\r
 elgg_push_breadcrumb($title);\r
 \r
 $content = elgg_view('thewire/reply', array('post' => $post));\r
index 7e62a33de93d4f6086642b2fbf3969d06541d988..53f9e9db9fe72fd174041a5fdca331594eef7f9a 100644 (file)
@@ -5,10 +5,10 @@
 
 $tag = get_input('tag');
 if (!$tag) {
-       forward('pg/thewire/all');
+       forward('thewire/all');
 }
 
-elgg_push_breadcrumb(elgg_echo('thewire'), 'pg/thewire/all');
+elgg_push_breadcrumb(elgg_echo('thewire'), 'thewire/all');
 elgg_push_breadcrumb('#' . $tag);
 
 // remove # from tag
index 49ca3afd19b350273cd5f3bcf283192394f7f246..8b6ee4bd07970b73bd45ffff9ed915da056a9511 100644 (file)
@@ -7,7 +7,7 @@ $thread_id = get_input('thread_id');
 \r
 $title = elgg_echo('thewire:thread');\r
 \r
-elgg_push_breadcrumb(elgg_echo('thewire'), 'pg/thewire/all');\r
+elgg_push_breadcrumb(elgg_echo('thewire'), 'thewire/all');\r
 elgg_push_breadcrumb($title);\r
 \r
 $content = elgg_list_entities_from_metadata(array(\r
index cc966697f4f860435d6a6470237030f6e2d6ebce..5645b23ba16ccff5f5221ef75ff1949b4258d34b 100644 (file)
@@ -8,7 +8,7 @@ $owner = elgg_get_page_owner_entity();
 \r
 $title = elgg_echo('thewire:user', array($owner->name));\r
 \r
-elgg_push_breadcrumb(elgg_echo('thewire'), "pg/thewire/all/");\r
+elgg_push_breadcrumb(elgg_echo('thewire'), "thewire/all");\r
 elgg_push_breadcrumb($owner->name);\r
 \r
 if (get_loggedin_userid() == $owner->guid) {\r
index a9a57690468efe68eee1e903958dee68d2706b24..1724a33a9a903b6de1566287aa32adfbcc9b7439 100644 (file)
@@ -22,7 +22,7 @@ function thewire_init() {
        }\r
 \r
        // add a site navigation item\r
-       $item = new ElggMenuItem('thewire', elgg_echo('thewire'), 'pg/thewire/all');\r
+       $item = new ElggMenuItem('thewire', elgg_echo('thewire'), 'thewire/all');\r
        elgg_register_menu_item('site', $item);\r
 \r
        // remove entity menu items edit and access because they don't apply here.\r
@@ -66,19 +66,19 @@ function thewire_init() {
  * The wire page handler\r
  *\r
  * Supports:\r
- * pg/thewire/all                  View site wire posts\r
- * pg/thewire/owner/<username>     View this user's wire posts\r
- * pg/thewire/following/<username> View the posts of those this user follows\r
- * pg/thewire/reply/<guid>         Reply to a post\r
- * pg/thewire/view/<guid>          View a conversation thread\r
- * pg/thewire/tag/<tag>            View wire posts tagged with <tag>\r
+ * thewire/all                  View site wire posts\r
+ * thewire/owner/<username>     View this user's wire posts\r
+ * thewire/following/<username> View the posts of those this user follows\r
+ * thewire/reply/<guid>         Reply to a post\r
+ * thewire/view/<guid>          View a conversation thread\r
+ * thewire/tag/<tag>            View wire posts tagged with <tag>\r
  *\r
  * @param array $page From the page_handler function\r
  * @return true|false Depending on success\r
  */\r
 function thewire_page_handler($page) {\r
 \r
-       // if just pg/thewire/ go to global view in the else statement\r
+       // if just /thewire go to global view in the else statement\r
        if (isset($page[0]) && $page[0]) {\r
 \r
                switch ($page[0]) {\r
@@ -133,7 +133,7 @@ function thewire_page_handler($page) {
  */\r
 function thewire_url($thewirepost) {\r
        global $CONFIG;\r
-       return $CONFIG->url . "pg/thewire/view/" . $thewirepost->guid;\r
+       return $CONFIG->url . "thewire/view/" . $thewirepost->guid;\r
 }\r
 \r
 /**\r
@@ -163,7 +163,7 @@ function thewire_notify_message($hook, $entity_type, $returnvalue, $params) {
                        $body = sprintf(elgg_echo('thewire:notify:post'), $owner->name);\r
                }\r
                $body .= "\n\n" . $descr . "\n\n";\r
-               $body .= elgg_echo('thewire') . ": {$CONFIG->url}pg/thewire/";\r
+               $body .= elgg_echo('thewire') . ": {$CONFIG->url}thewire";\r
                return $body;\r
        }\r
        return $returnvalue;\r
@@ -206,13 +206,13 @@ function thewire_filter($text) {
        // usernames\r
        $text = preg_replace(\r
                                '/(^|[^\w])@([\w]+)/',\r
-                               '$1<a href="' . $CONFIG->wwwroot . 'pg/thewire/owner/$2">@$2</a>',\r
+                               '$1<a href="' . $CONFIG->wwwroot . 'thewire/owner/$2">@$2</a>',\r
                                $text);\r
 \r
        // hashtags\r
        $text = preg_replace(\r
                                '/(^|[^\w])#(\w*[^\s\d!-\/:-@]+\w*)/',\r
-                               '$1<a href="' . $CONFIG->wwwroot . 'pg/thewire/tag/$2">#$2</a>',\r
+                               '$1<a href="' . $CONFIG->wwwroot . 'thewire/tag/$2">#$2</a>',\r
                                $text);\r
 \r
        $text = trim($text);\r
index 5b53c69d662ea2aad9475161813c4c874a9f52bc..a1a432a207a3e24446f1c1eb1ab5af889b50feca 100644 (file)
@@ -39,13 +39,13 @@ class TheWireRegexTest extends ElggCoreUnitTest {
        }
 
        protected function getUserWireLink($username) {
-               $url = "pg/thewire/owner/$username";
+               $url = "thewire/owner/$username";
                $url = elgg_normalize_url($url);
                return "<a href=\"$url\">@$username</a>";
        }
 
        protected function getHashtagLink($tag) {
-               $url = "pg/thewire/tag/$tag";
+               $url = "thewire/tag/$tag";
                $url = elgg_normalize_url($url);
                return "<a href=\"$url\">#$tag</a>";
        }
index b784c5c087c2c2e22d8f6b78f0e887fb06402e85..dcc5e925a6cdf990dc111a1d3fc97d96419c8449 100644 (file)
@@ -23,7 +23,7 @@ $owner = $post->getOwnerEntity();
 
 $owner_icon = elgg_view_entity_icon($owner, 'tiny');
 $owner_link = elgg_view('output/url', array(
-       'href' => "pg/thewire/owner/$owner->username",
+       'href' => "thewire/owner/$owner->username",
        'text' => $owner->name,
 ));
 $author_text = elgg_echo('byline', array($owner_link));
index cdf1e9409857f6befb5e5902b1f2fe4e1ebde3d5..7b04cba506a09effa85cc4ff3d1d112e3c292d05 100644 (file)
@@ -23,7 +23,7 @@ if ($latest_wire && count($latest_wire) > 0) {
 
        $button = '';
        if ($owner == elgg_get_logged_in_user_guid()) {
-       $url_to_wire = "pg/thewire/owner/" . $vars['entity']->username;
+       $url_to_wire = "thewire/owner/" . $vars['entity']->username;
                $button = elgg_view('output/url', array(
                        'text' => elgg_echo('thewire:update'),
                        'href' => $url_to_wire,
index a8471a4b14a7fae6296968ea86ad5e0e5f410338..835a328b0ab8a7453d26abdc8c26116fff3b3dcb 100644 (file)
@@ -18,7 +18,7 @@ $content = elgg_list_entities($options);
 echo $content;
 
 if ($content) {
-       $owner_url = "pg/thewire/owner/" . elgg_get_page_owner_entity()->username;
+       $owner_url = "thewire/owner/" . elgg_get_page_owner_entity()->username;
        $more_link = elgg_view('output/url', array(
                'href' => $owner_url,
                'text' => elgg_echo('thewire:moreposts'),
index f62527593bef8b51273be286aaa0b70b83474c4e..33319a659a07dcc80d8e252546e5ebee2d11a0e6 100644 (file)
@@ -144,8 +144,8 @@ function twitterservice_fetch_tweets($user_guid, $options=array()) {
  * @param unknown_type $params
  */
 function twitterservice_public_pages($hook, $type, $return_value, $params) {
-       $return_value[] = 'pg/twitterservice/forward';
-       $return_value[] = 'pg/twitterservice/login';
+       $return_value[] = 'twitterservice/forward';
+       $return_value[] = 'twitterservice/login';
 
        return $return_value;
 }
index e58b1303061f7e319ef6bb3babd5c7f630fa2dc3..8e886f2d961703c4e2802e145d09b0901f1a9172 100644 (file)
@@ -34,7 +34,7 @@ function twitterservice_forward() {
                forward();
        }
 
-       $callback = elgg_normalize_url("pg/twitterservice/login");
+       $callback = elgg_normalize_url("twitterservice/login");
        $request_link = twitterservice_get_authorize_url($callback);
 
        forward($request_link, 'twitterservice');
@@ -140,7 +140,7 @@ function twitterservice_login() {
                        $site_name = elgg_get_site_entity()->name;
                        system_message(elgg_echo('twitterservice:login:email', array($site_name)));
 
-                       $forward = "pg/settings/user/{$user->username}";
+                       $forward = "settings/user/{$user->username}";
                }
 
                // set twitter services tokens
@@ -218,7 +218,7 @@ function twitterservice_authorize() {
        $token = twitterservice_get_access_token();
        if (!isset($token['oauth_token']) || !isset($token['oauth_token_secret'])) {
                register_error(elgg_echo('twitterservice:authorize:error'));
-               forward('pg/settings/plugins', 'twitterservice');
+               forward('settings/plugins', 'twitterservice');
        }
 
        // make sure no other users are registered to this twitter account.
@@ -251,7 +251,7 @@ function twitterservice_authorize() {
        elgg_trigger_plugin_hook('authorize', 'twitterservice', array('token' => $token));
 
        system_message(elgg_echo('twitterservice:authorize:success'));
-       forward('pg/settings/plugins', 'twitterservice');
+       forward('settings/plugins', 'twitterservice');
 }
 
 /**
@@ -264,7 +264,7 @@ function twitterservice_revoke() {
        elgg_unset_plugin_user_setting('access_secret');
 
        system_message(elgg_echo('twitterservice:revoke:success'));
-       forward('pg/settings/plugins', 'twitterservice');
+       forward('settings/plugins', 'twitterservice');
 }
 
 /**
index 65adba1f799b25ed83d1a81ecbfc10cd95dce3bb..d4bc0415063f1fa675a147c9ebce90c42470c0b0 100644 (file)
@@ -3,7 +3,7 @@
  * 
  */
 
-$url = elgg_get_site_url() . 'pg/twitterservice/forward';
+$url = elgg_get_site_url() . 'twitterservice/forward';
 $img_url = elgg_get_site_url() . 'mod/twitterservice/graphics/sign_in_with_twitter.gif';
 
 $login = <<<__HTML
index 66f5c54f5913362ca5fa2b94d91b6ae922c79cc4..2a5ef8b05c38471b01296288e7f9fe0b37b23375 100644 (file)
@@ -16,7 +16,7 @@ if (!$access_key || !$access_secret) {
        $request_link = twitterservice_get_authorize_url();
        echo '<div>' . elgg_echo('twitterservice:usersettings:request', array($request_link, $site_name)) . '</div>';
 } else {
-       $url = elgg_get_site_url() . "pg/twitterservice/revoke";
+       $url = elgg_get_site_url() . "twitterservice/revoke";
        echo '<div class="twitter_anywhere">' . elgg_echo('twitterservice:usersettings:authorized', array($site_name, $twitter_name)) . '</div>';
        echo '<div>' . sprintf(elgg_echo('twitterservice:usersettings:revoke'), $url) . '</div>';
 }
index 8a97c40b5b5481733f396ea41469804f79bb210f..eaca374f43628a58ab2e573d33a3a09189250bf1 100644 (file)
@@ -39,7 +39,7 @@ function uservalidationbyemail_request_validation($user_guid, $admin_requested =
        if (($user) && ($user instanceof ElggUser)) {
                // Work out validate link
                $code = uservalidationbyemail_generate_code($user_guid, $user->email);
-               $link = "{$site->url}pg/uservalidationbyemail/confirm?u=$user_guid&c=$code";
+               $link = "{$site->url}uservalidationbyemail/confirm?u=$user_guid&c=$code";
 
 
                // Send validation email
index 91bb454cf5af994417eedb03299487d0d6298888..175905d1db42a6e84065f965fe2989cba703eb08 100644 (file)
@@ -204,7 +204,7 @@ function uservalidationbyemail_validate_new_admin_user($event, $type, $user) {
  * Registers public pages to allow in the case walled garden has been enabled.
  */
 function uservalidationbyemail_public_pages($hook, $type, $return_value, $params) {
-       $return_value[] = 'pg/uservalidationbyemail/confirm';
+       $return_value[] = 'uservalidationbyemail/confirm';
        return $return_value;
 }
 
index 9f04aca94c610a4d8c317699cabeb74b499ab40d..f979d5e2cf75f426aa2c782fddb46185d374f166 100644 (file)
@@ -40,7 +40,7 @@ elgg_set_ignore_access($ia);
 
 // setup pagination
 $pagination = elgg_view('navigation/pagination',array(
-       'baseurl' => $vars['url'] . '/pg/uservalidationbyemail/admin/',
+       'baseurl' => $vars['url'] . '/uservalidationbyemail/admin',
        'offset' => $offset,
        'count' => $count,
        'limit' => $limit,
index 01ea1653c621ed270b87307ff77ab1f42391530e..7462dfa7cd857147306480833b51674bda4ead7c 100644 (file)
@@ -18,7 +18,7 @@ if (!$widget_context && $list) {
 $current_info = null;
 $tabs = array();
 foreach ($list as $info) {
-       $url = "pg/admin/appearance/default_widgets?widget_context={$info['widget_context']}";
+       $url = "admin/appearance/default_widgets?widget_context={$info['widget_context']}";
        $selected = false;
        if ($widget_context == $info['widget_context']) {
                $selected = true;
index 826fbdb9a18c738f55bb55d42d18986c4592a773..3919c017ef843ed1a6a377d4ead1ad8c24e41976 100644 (file)
@@ -14,7 +14,7 @@ $logout = elgg_view('output/url', array(
 ));
 ?>
 <h1 class="elgg-heading-site">
-       <a href="<?php echo elgg_get_site_url(); ?>pg/admin/">
+       <a href="<?php echo elgg_get_site_url(); ?>admin">
                <?php echo $admin_title; ?>
        </a>
 </h1>
index 39919f9c7d053d929896a1e4aebb4985778ea345..49e31d9c1887d6c6855cd002919860de27f27b77 100644 (file)
@@ -55,7 +55,7 @@ $category_button = elgg_view('input/submit', array(
 $category_form = elgg_view('input/form', array(
        'body' => $category_dropdown . $category_button,
        'method' => 'get',
-       'action' => 'pg/admin/plugins/advanced',
+       'action' => 'admin/plugins/advanced',
        'disable_security' => true,
 ));
 
index 3c62a5448f04fb692861bddcf713469b27ac7159..f3f105be14d9a616e502a13507738f5bc6f0cad5 100644 (file)
@@ -19,7 +19,7 @@ $body = elgg_view_form('login', array('action' => "{$login_url}action/login"), a
 <div id="login-dropdown">
        <?php 
                echo elgg_view('output/url', array(
-                       'href' => 'pg/login',
+                       'href' => 'login',
                        'text' => elgg_echo('login'),
                )); 
                echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); 
index dbb9f866fb82dd0fee02674a25035cdad5522704..57c3c31d72034ab0c229af8eff01045414419b72 100644 (file)
@@ -5,7 +5,7 @@
  * @todo still requires clean up
  */
 
-$reg_url = elgg_normalize_url('pg/register/');
+$reg_url = elgg_normalize_url('register');
 $forgot_url = elgg_normalize_url('pages/account/forgotten_password.php');
 $cancel_button = elgg_view('input/button', array(
        'value' => elgg_echo('cancel'),
index a713fa8a339bc9f534e44398a6e8c8044c88cf47..510d1849b9d2b87a6c09114e7f1e56a6c4431977 100644 (file)
@@ -6,17 +6,17 @@
 $tabs = array(
        'newest' => array(
                'title' => elgg_echo('members:label:newest'),
-               'url' => "pg/members/newest/",
+               'url' => "members/newest",
                'selected' => $vars['selected'] == 'newest',
        ),
        'popular' => array(
                'title' => elgg_echo('members:label:popular'),
-               'url' => "pg/members/popular/",
+               'url' => "members/popular",
                'selected' => $vars['selected'] == 'popular',
        ),
        'online' => array(
                'title' => elgg_echo('members:label:online'),
-               'url' => "pg/members/online/",
+               'url' => "members/online",
                'selected' => $vars['selected'] == 'online',
        ),
 );
index 3a00bf70028f59c713f34be71cf00122bcaebe5a..8fa0fe02b21883464027e8206f1e3588a36edaa5 100644 (file)
@@ -6,7 +6,7 @@
 // Tag search
 $params = array(
        'method' => 'get',
-       'action' => elgg_get_site_url() . 'pg/members/search/tag/',
+       'action' => elgg_get_site_url() . 'members/search/tag',
        'disable_security' => true,
 );
 
@@ -17,7 +17,7 @@ echo elgg_view_module('aside', elgg_echo('members:searchtag'), $body);
 // name search
 $params = array(
        'method' => 'get',
-       'action' => elgg_get_site_url() . 'pg/members/search/name/',
+       'action' => elgg_get_site_url() . 'members/search/name',
        'disable_security' => true,
 );
 $body = elgg_view_form('members/name_search', $params);
index a4d9e57c6b28d717d26ff557cf13fc2eab57049f..452c4c4252d7cb04a57916b37c5009eea9612813 100644 (file)
@@ -36,7 +36,7 @@
 <ul class="elgg-menu elgg-menu-footer">
 <?php
        if (elgg_get_config('allow_registration')) {
-               echo '<li><a class="registration_link" href="' . elgg_get_site_url() . 'pg/register/">' . elgg_echo('register') . '</a></li>';
+               echo '<li><a class="registration_link" href="' . elgg_get_site_url() . 'register">' . elgg_echo('register') . '</a></li>';
        }
 ?>
        <li><a class="forgotten_password_link" href="<?php echo elgg_get_site_url(); ?>pages/account/forgotten_password.php">
index a21f958815552d98ba4ca402a2a8044231683214..ceaeb0ff0a0c215141597841f4649ce851798a63 100644 (file)
@@ -9,7 +9,7 @@ elgg_deprecated_notice('view groups/search/finishblurb was deprecated.', 1.7);
 if ($vars['count'] > $vars['threshold']) {
 
 ?>
-<div class="contentWrapper"><a href="<?php echo elgg_get_site_url(); ?>pg/search/groups/?tag=<?php echo urlencode($vars['tag']); ?>">
+<div class="contentWrapper"><a href="<?php echo elgg_get_site_url(); ?>search/groups?tag=<?php echo urlencode($vars['tag']); ?>">
        <?php
        echo elgg_echo("group:search:finishblurb");
        ?></a>
index 1093de2d33944a95716f4000abec34e10f0f68ee..61f33861190d3f369f9a0c73d9f3246b3b2700e2 100644 (file)
@@ -35,7 +35,7 @@ elgg_register_js('js/lib/autocomplete.js', 'autocomplete', 'head');
 
 <script type="text/javascript">
 elgg.provide('elgg.autocomplete');
-elgg.autocomplete.url = "<?php elgg_get_site_url() . 'pg/livesearch?' . $ac_url_params; ?>";
+elgg.autocomplete.url = "<?php elgg_get_site_url() . 'livesearch?' . $ac_url_params; ?>";
 </script> 
 <input type="text" <?php echo elgg_format_attributes($vars); ?> />
 
index 1c8914ffe8320a013e399f44f9a318e0a8954029..4b5a3ba4884b42362d4e0ca726ed42b4c38e2db3 100644 (file)
@@ -112,7 +112,7 @@ if ($can_activate) {
 $categories_html = '';
 if ($categories) {
        $categories_arr = array();
-       $base_url = elgg_get_site_url() . "pg/admin/plugins?category=";
+       $base_url = elgg_get_site_url() . "admin/plugins?category=";
 
        foreach ($categories as $category) {
                $url = $base_url . urlencode($category);
@@ -129,8 +129,8 @@ if ($screenshots) {
        foreach ($screenshots as $screenshot) {
                $desc = elgg_echo($screenshot['description']);
                $alt = htmlentities($desc, ENT_QUOTES, 'UTF-8');
-               $screenshot_full = "{$vars['url']}pg/admin_plugin_screenshot/{$plugin->getID()}/full/{$screenshot['path']}";
-               $screenshot_src = "{$vars['url']}pg/admin_plugin_screenshot/{$plugin->getID()}/thumbnail/{$screenshot['path']}";
+               $screenshot_full = "{$vars['url']}admin_plugin_screenshot/{$plugin->getID()}/full/{$screenshot['path']}";
+               $screenshot_src = "{$vars['url']}admin_plugin_screenshot/{$plugin->getID()}/thumbnail/{$screenshot['path']}";
 
                $screenshots_html .= "<li class=\"elgg-plugin-screenshot prm ptm\"><a href=\"$screenshot_full\">"
                                                        . "<img src=\"$screenshot_src\" alt=\"$alt\"></a></li>";
@@ -166,7 +166,7 @@ $license = elgg_view('output/text', array('value' => $plugin->manifest->getLicen
 <?php
 $settings_view = 'settings/' . $plugin->getID() . '/edit';
 if (elgg_view_exists($settings_view)) {
-       $link = elgg_get_site_url() . "pg/admin/plugin_settings/" . $plugin->getID();
+       $link = elgg_get_site_url() . "admin/plugin_settings/" . $plugin->getID();
        $settings_link = "<a class='plugin_settings small link' href='$link'>[" . elgg_echo('settings') . "]</a>";
 }
 ?>
index 49ef58313e1954502310ec0c6c6bf7f3419d618e..0361666ff0d314dae880a0a2d7e451c9a82509d8 100644 (file)
@@ -43,7 +43,7 @@ if ($website) {
 }
 
 if (elgg_view_exists("settings/$plugin_id/edit")) {
-       $settings_href = elgg_get_site_url() . "pg/admin/plugin_settings/$plugin_id";
+       $settings_href = elgg_get_site_url() . "admin/plugin_settings/$plugin_id";
        $plugin_footer .= "<li><a class='plugin_settings link' href='$settings_href'>" . elgg_echo('settings') . "</a></li>";
 }
 
index 6742d9954ccad9913c24252c4ef928ce1b986148..3bc04a3fb479c7a1dc0042a84c035652d62d1332 100644 (file)
@@ -49,7 +49,7 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
                if ($size < 100) {
                        $size = 100;
                }
-               $url = elgg_get_site_url()."pg/search/?q=". urlencode($tag->tag) . "&search_type=tags$type$subtype";
+               $url = elgg_get_site_url()."search?q=". urlencode($tag->tag) . "&search_type=tags$type$subtype";
                $url = elgg_format_url($url);
                $cloud .= "<a href=\"$url\" style=\"font-size: $size%\" title=\"".addslashes($tag->tag)." ($tag->total)\">" . htmlspecialchars($tag->tag, ENT_QUOTES, 'UTF-8') . "</a>";
        }
@@ -58,7 +58,7 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
                $cloud .= '<p class="small">';
                $cloud .= elgg_view_icon('tag');
                $cloud .= elgg_view('output/url', array(
-                       'href' => 'pg/tags', 
+                       'href' => 'tags', 
                        'text' => elgg_echo('tagcloud:allsitetags'),
                ));
                $cloud .= '</p>';
index 2af4c2757db306ff3dd3fccff7c50bc56392a4da..345b256c451008fbb25ae4ac5ac910f7ac3259b6 100644 (file)
@@ -41,7 +41,7 @@ if (!empty($vars['tags'])) {
                } else {
                        $type = "";
                }
-               $url = elgg_get_site_url() . 'pg/search/?q=' . urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}";
+               $url = elgg_get_site_url() . 'search?q=' . urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}";
                if (is_string($tag)) {
                        echo '<li>';
                        echo elgg_view('output/url', array('href' => $url, 'text' => $tag, 'rel' => 'tag'));
index a7190c90e40ef8c90773254802a89618619bd587..6604b047c6b12560bb064416fcb11552ec3cb014 100644 (file)
@@ -12,9 +12,9 @@
  */
 
 // backward compatability support for plugins that are not using the new approach
-// of routing through pg/admin. See reportedcontent plugin for a simple example.
+// of routing through admin. See reportedcontent plugin for a simple example.
 if (elgg_get_context() == 'admin') {
-       elgg_deprecated_notice("admin plugins should route through pg/admin.", 1.8);
+       elgg_deprecated_notice("admin plugins should route through 'admin'.", 1.8);
        elgg_admin_add_plugin_settings_menu();
        elgg_unregister_css('elgg');
        echo elgg_view('page/shells/admin', $vars);
index 0af293e24d96dc37ffc3b93a454637198c0a4415..701c6418a5fcc815197210a9a7e96a7e98acf0e3 100644 (file)
@@ -24,19 +24,19 @@ if (elgg_is_logged_in() && $context) {
        $tabs = array(
                'all' => array(
                        'text' => elgg_echo('all'),
-                       'href' => (isset($vars['all_link'])) ? $vars['all_link'] : "pg/$context/all/",
+                       'href' => (isset($vars['all_link'])) ? $vars['all_link'] : "$context/all",
                        'selected' => ($filter_context == 'all'),
                        'priority' => 200,
                ),
                'mine' => array(
                        'text' => elgg_echo('mine'),
-                       'href' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$context/owner/$username/",
+                       'href' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "$context/owner/$username",
                        'selected' => ($filter_context == 'mine'),
                        'priority' => 300,
                ),
                'friend' => array(
                        'text' => elgg_echo('friends'),
-                       'href' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$context/friends/$username/",
+                       'href' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "$context/friends/$username",
                        'selected' => ($filter_context == 'friends'),
                        'priority' => 400,
                ),
index 830c3388502b7ce6c77eaeacb9f6b741a56992a5..e9c099b7096e431a5c7f1a0d8291671015d3b74b 100644 (file)
@@ -35,7 +35,7 @@ if ($context) {
                        
                        elgg_register_menu_item('title', array(
                                'name' => 'add',
-                               'href' => elgg_extract('new_link', $vars, "pg/$context/add/$guid"),
+                               'href' => elgg_extract('new_link', $vars, "$context/add/$guid"),
                                'text' => elgg_echo("$context:add"),
                                'class' => 'elgg-button elgg-button-action',
                        ));
index 97f4d2719e7f009d1595432ef960e9dc489004a2..e395a5053d95a5ef2c4954d2c4b81ee069fa8ef1 100644 (file)
@@ -17,7 +17,7 @@ unset($vars['area2']);
 unset($vars['area3']);
 
 // backward compatability support for plugins that are not using the new approach
-// of routing through pg/admin
+// of routing through 'admin'
 if (elgg_get_context() == 'admin') {
        echo elgg_view('page/layouts/admin', $vars);
        return true;
index 1e48d614546514079bae4f76bf7224a81d30efe2..a3878a80323f42959bca21762102910be49ee0e9 100644 (file)
@@ -10,7 +10,7 @@ elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7);
 if ($vars['count'] > $vars['threshold']) {
 
 ?>
-<a href="<?php echo elgg_get_site_url(); ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
+<a href="<?php echo elgg_get_site_url(); ?>search/users?tag=<?php echo urlencode($vars['tag']); ?>"><?php
        echo elgg_echo("user:search:finishblurb");
        ?></a>
 <?php
index 568ebeeff4f017deedfe56343f2684f42957cb52..7086e4b9e4063914151b013cf6b3b44ba9070218 100644 (file)
@@ -20,6 +20,6 @@ foreach ($object_stats as $subtype => $num) {
 echo '</table>';
 
 echo elgg_view('output/url', array(
-       'href' => 'pg/admin/statistics/overview',
+       'href' => 'admin/statistics/overview',
        'text' => 'more',
 ));
index f955279d016eb4811132499e7386fdbce162d400..7dac2a0aa2bf791fc67b7b2163196006c9b55a9a 100644 (file)
@@ -6,7 +6,7 @@
  * @subpackage Core
  *
  * // @todo removed below because blog is a plugin
- * <foaf:weblog rdf:resource="<?php echo elgg_get_site_url(); ?>pg/blog/<?php echo $owner->username; ?>" />
+ * <foaf:weblog rdf:resource="<?php echo elgg_get_site_url(); ?>blog/<?php echo $owner->username; ?>" />
  */
 
 header("Content-Type: text/xml");
index 69cd27f660c6444fd76d232fbaec5fa173ee8df2..3f7bdf189a99a6d25864e39afe8d42486538f2b0 100644 (file)
@@ -6,5 +6,5 @@
 <ul>
        <li><a href="http://docs.elgg.org/wiki/Installation">Install instructions</a></li>
        <li><a href="http://docs.elgg.org/wiki/Install_Troubleshooting">Install troubleshooting</a></li>
-       <li><a href="http://community.elgg.org/pg/groups/world/">Elgg community forums</a></li>
+       <li><a href="http://community.elgg.org/pg/groups/world">Elgg community forums</a></li>
 </ul>
\ No newline at end of file
index a168dd6a92965a070a96265eb7929e00c63d4771..f84e6ccf0f094053e2413987ab0ef346734f1e8f 100644 (file)
@@ -19,7 +19,7 @@ $object = $item->getObjectEntity();
 if ($object) {
        $url = htmlspecialchars($object->getURL());
 } else {
-       $url = elgg_get_site_url() . 'pg/activity';
+       $url = elgg_get_site_url() . 'activity';
 }
 
 ?>