diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php index 1c22a5bd4..fdc79d663 100644 --- a/e107_admin/eurl.php +++ b/e107_admin/eurl.php @@ -37,10 +37,11 @@ class eurl_admin extends e_admin_dispatcher ); protected $adminMenu = array( - 'main/config' => array('caption'=> LAN_EURL_MENU_CONFIG, 'perm' => 'L'), + 'main/config' => array('caption'=> LAN_EURL_MENU_PROFILES, 'perm' => 'L'), 'main/alias' => array('caption'=> LAN_EURL_MENU_ALIASES, 'perm' => 'L'), + 'main/simple' => array('caption'=> LAN_EURL_MENU_CONFIG, 'perm' => 'L'), 'main/settings' => array('caption'=> LAN_EURL_MENU_SETTINGS, 'perm' => 'L'), - 'main/simple' => array('caption'=> LAN_EURL_MENU_REDIRECTS, 'perm' => 'L'), + // 'main/help' => array('caption'=> LAN_EURL_MENU_HELP, 'perm' => 'L'), ); diff --git a/e107_languages/English/admin/lan_eurl.php b/e107_languages/English/admin/lan_eurl.php index ea8cd1ed0..49d80e9cb 100644 --- a/e107_languages/English/admin/lan_eurl.php +++ b/e107_languages/English/admin/lan_eurl.php @@ -55,11 +55,11 @@ define("LAN_EURL_MODREWR_DESCR", "Removes entry script file name (index.php/) fr // navigation define("LAN_EURL_MENU", "Site URLs"); -define("LAN_EURL_MENU_CONFIG", "URL Profiles"); -define("LAN_EURL_MENU_ALIASES", "Aliases"); +define("LAN_EURL_MENU_CONFIG", "Configurations"); +define("LAN_EURL_MENU_ALIASES", "Profile Aliases"); define("LAN_EURL_MENU_SETTINGS", "Settings"); define("LAN_EURL_MENU_HELP", "Help"); -define("LAN_EURL_MENU_REDIRECTS", "Redirects"); +define("LAN_EURL_MENU_PROFILES", "Profiles"); define("LAN_EURL_UC", "Under Construction"); diff --git a/e107_plugins/gsitemap/e_url.php b/e107_plugins/gsitemap/e_url.php new file mode 100644 index 000000000..457af3e76 --- /dev/null +++ b/e107_plugins/gsitemap/e_url.php @@ -0,0 +1,44 @@ + 'sitemap', + 'regex' => '^{alias}/?$', // matched against url, and if true, redirected to 'redirect' below. + 'sef' => '{alias}', // used by e107::url(); to create a url from the db table. + 'redirect' => '{e_BASE}gsitemap.php?show=1', // file-path of what to load when the regex returns true. + + ); + + + + return $config; + } + + + +} \ No newline at end of file diff --git a/e107_plugins/gsitemap/plugin.xml b/e107_plugins/gsitemap/plugin.xml index 6c3996c0d..d5a44ee88 100644 --- a/e107_plugins/gsitemap/plugin.xml +++ b/e107_plugins/gsitemap/plugin.xml @@ -7,7 +7,7 @@ LAN_CONFIGURE - Sitemap + Sitemap diff --git a/e107_plugins/log/e_url.php b/e107_plugins/log/e_url.php index 9571f0e63..5d2e1c2c6 100644 --- a/e107_plugins/log/e_url.php +++ b/e107_plugins/log/e_url.php @@ -26,15 +26,17 @@ class log_url // plugin-folder + '_url' $config = array(); $config['index'] = array( - 'regex' => '^stats/?$', // matched against url, and if true, redirected to 'redirect' below. - 'sef' => 'stats', // used by e107::url(); to create a url from the db table. + 'alias' => 'stats', + 'regex' => '^{alias}/?$', // matched against url, and if true, redirected to 'redirect' below. + 'sef' => '{alias}', // used by e107::url(); to create a url from the db table. 'redirect' => '{e_PLUGIN}log/stats.php?1', // file-path of what to load when the regex returns true. ); $config['others'] = array( - 'regex' => '^stats/\?([\d]*)$', // matched against url, and if true, redirected to 'redirect' below. - 'sef' => 'stats', // used by e107::url(); to create a url from the db table. + 'alias' => 'stats', + 'regex' => '^{alias}/\?([\d]*)$', // matched against url, and if true, redirected to 'redirect' below. + 'sef' => '{alias}', // used by e107::url(); to create a url from the db table. 'redirect' => '{e_PLUGIN}log/stats.php?$1', // file-path of what to load when the regex returns true. ); diff --git a/gsitemap.php b/gsitemap.php index 7b411a482..4e23101ae 100644 --- a/gsitemap.php +++ b/gsitemap.php @@ -23,12 +23,25 @@ if(!e107::isInstalled('gsitemap')) e107::lan('gsitemap'); -if(e_QUERY == "show") +if(e_QUERY == "show" || !empty($_GET['show'])) { require_once(HEADERF); $nfArray = $sql ->retrieve("gsitemap", "*", "gsitemap_active IN (".USERCLASS_LIST.") ORDER BY gsitemap_order ",true); - $text = "