mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Fixes #1326 URL Profiles were still displaying for plugins using new url system.

Browse Source
This commit is contained in:
Cameron
2016-02-05 19:05:55 -08:00
parent 7276be1aeb
commit e5fbd82d5a
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
e107_admin/eurl.php
View File

@@ -242,7 +242,7 @@ class eurl_admin_ui extends e_admin_controller_ui
foreach($eUrl as $plug=>$val) foreach($eUrl as $plug=>$val)
{ {
$text .= "<h5>".$plug."</h5>"; $text .= "<h4>".$plug."</h4>";
$text .= "<table class='table table-striped table-bordered'>"; $text .= "<table class='table table-striped table-bordered'>";
$text .= "<tr><th>Key</th><th>Regular Expression</th> $text .= "<tr><th>Key</th><th>Regular Expression</th>
@@ -466,9 +466,11 @@ class eurl_admin_ui extends e_admin_controller_ui
$ret = array(); $ret = array();
$url = e107::getUrl(); $url = e107::getUrl();
ksort($locations); ksort($locations);
unset($locations['forum'],$locations['faqs'], $locations['pm']); // using new system so hide from here.
foreach ($locations as $module => $l) foreach ($locations as $module => $l)
{ {
$data = new e_vars(array( $data = new e_vars(array(
@@ -481,10 +483,12 @@ class eurl_admin_ui extends e_admin_controller_ui
$data->locations = $l; $data->locations = $l;
$data->defaultLocation = $l[0]; $data->defaultLocation = $l[0];
$data->config = $obj; $data->config = $obj;
$ret[] = $data; $ret[] = $data;
} }
return $this->getUI()->moduleRows($ret); return $this->getUI()->moduleRows($ret);
} }
@@ -629,7 +633,7 @@ class eurl_admin_form_ui extends e_admin_form_ui
$text = ''; $text = '';
$tp = e107::getParser(); $tp = e107::getParser();
$frm = e107::getForm(); $frm = e107::getForm();
if(empty($data)) if(empty($data))
{ {
return " return "
@@ -703,6 +707,7 @@ class eurl_admin_form_ui extends e_admin_form_ui
} }
} }
if(strpos($path,'noid')!==false) if(strpos($path,'noid')!==false)
{ {
// $exampleUrl .= " &nbsp; &Dagger;"; //XXX Add footer - denotes more CPU required. ? // $exampleUrl .= " &nbsp; &Dagger;"; //XXX Add footer - denotes more CPU required. ?

3
e107_plugins/forum/url/rewrite_url.php
View File

@@ -154,6 +154,7 @@ class plugin_forum_rewrite_url extends eUrlConfig
public function admin() public function admin()
{ {
// static may be used for performance // static may be used for performance
/*
e107::plugLan('forum', 'lan_forum_url'); e107::plugLan('forum', 'lan_forum_url');
static $admin = array( static $admin = array(
'labels' => 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 'callbacks' => array(), // Under construction - could be used for e.g. URL generator functionallity
); );
return $admin; return $admin;*/
} }
} }

4
e107_plugins/forum/url/url.php
View File

@@ -154,6 +154,8 @@ class plugin_forum_url extends eUrlConfig
*/ */
public function admin() public function admin()
{ {
return false; // whole file deprecated.
/*
// static may be used for performance // static may be used for performance
e107::plugLan('forum', 'lan_forum_url'); e107::plugLan('forum', 'lan_forum_url');
static $admin = array( static $admin = array(
@@ -166,7 +168,7 @@ class plugin_forum_url extends eUrlConfig
'form' => array(), // Under construction - additional configuration options 'form' => array(), // Under construction - additional configuration options
'callbacks' => array(), // Under construction - could be used for e.g. URL generator functionallity 'callbacks' => array(), // Under construction - could be used for e.g. URL generator functionallity
); );
*/
return $admin; return $admin;
} }
} }