diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php index ca2397eb9..1c22a5bd4 100644 --- a/e107_admin/eurl.php +++ b/e107_admin/eurl.php @@ -242,7 +242,7 @@ class eurl_admin_ui extends e_admin_controller_ui foreach($eUrl as $plug=>$val) { - $text .= "
Key | Regular Expression | @@ -466,9 +466,11 @@ class eurl_admin_ui extends e_admin_controller_ui $ret = array(); $url = e107::getUrl(); - - + ksort($locations); + + unset($locations['forum'],$locations['faqs'], $locations['pm']); // using new system so hide from here. + foreach ($locations as $module => $l) { $data = new e_vars(array( @@ -481,10 +483,12 @@ class eurl_admin_ui extends e_admin_controller_ui $data->locations = $l; $data->defaultLocation = $l[0]; $data->config = $obj; - + $ret[] = $data; } - + + + return $this->getUI()->moduleRows($ret); } @@ -629,7 +633,7 @@ class eurl_admin_form_ui extends e_admin_form_ui $text = ''; $tp = e107::getParser(); $frm = e107::getForm(); - + if(empty($data)) { return " @@ -703,6 +707,7 @@ class eurl_admin_form_ui extends e_admin_form_ui } } + if(strpos($path,'noid')!==false) { // $exampleUrl .= " ‡"; //XXX Add footer - denotes more CPU required. ? diff --git a/e107_plugins/forum/url/rewrite_url.php b/e107_plugins/forum/url/rewrite_url.php index b933f1f94..62d6e08e8 100644 --- a/e107_plugins/forum/url/rewrite_url.php +++ b/e107_plugins/forum/url/rewrite_url.php @@ -154,6 +154,7 @@ class plugin_forum_rewrite_url extends eUrlConfig public function admin() { // static may be used for performance + /* e107::plugLan('forum', 'lan_forum_url'); static $admin = array( 'labels' => array( @@ -166,6 +167,6 @@ class plugin_forum_rewrite_url extends eUrlConfig 'callbacks' => array(), // Under construction - could be used for e.g. URL generator functionallity ); - return $admin; + return $admin;*/ } } diff --git a/e107_plugins/forum/url/url.php b/e107_plugins/forum/url/url.php index e4a92d5e5..7c7b320ca 100644 --- a/e107_plugins/forum/url/url.php +++ b/e107_plugins/forum/url/url.php @@ -154,6 +154,8 @@ class plugin_forum_url extends eUrlConfig */ public function admin() { + return false; // whole file deprecated. + /* // static may be used for performance e107::plugLan('forum', 'lan_forum_url'); static $admin = array( @@ -166,7 +168,7 @@ class plugin_forum_url extends eUrlConfig 'form' => array(), // Under construction - additional configuration options 'callbacks' => array(), // Under construction - could be used for e.g. URL generator functionallity ); - + */ return $admin; } }
---|