1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-21 05:41:58 +02:00

Linkgen Fixes. Added e107::url() backward compatibility with earlier SEF creation method.

This commit is contained in:
Cameron
2016-03-08 13:53:58 -08:00
parent 7e55a677b3
commit daf5495214
9 changed files with 133 additions and 23 deletions

View File

@@ -301,10 +301,17 @@ class links_admin_ui extends e_admin_ui
$sublink_type['news']['title'] = LINKLAN_8; // "News Categories";
$sublink_type['news']['table'] = "news_category";
$sublink_type['news']['query'] = "category_id !='-2' ORDER BY category_name ASC";
$sublink_type['news']['url'] = "news.php?cat.#";
$sublink_type['news']['url'] = "news.php?list.#";
$sublink_type['news']['fieldid'] = "category_id";
$sublink_type['news']['fieldname'] = "category_name";
$sublink_type['news']['fieldicon'] = "category_icon";
$sublink_type['news']['sef'] = "news/list/category";
$sublink_type['newsalt'] = $sublink_type['news'];
$sublink_type['newsalt']['url'] = "news.php?cat.#";
$sublink_type['newsalt']['title'] = LINKLAN_8." (".LAN_LIST.")"; // "News Categories";
$sublink_type['newsalt']['sef'] = "news/list/short";
$sublink_type['downloads']['title'] = LINKLAN_9; //"Download Categories";
$sublink_type['downloads']['table'] = "download_category";
@@ -377,7 +384,16 @@ class links_admin_ui extends e_admin_ui
$subcat = $row[($sublink['fieldid'])];
$name = $row[($sublink['fieldname'])];
$subname = $name; // eliminate old embedded hierarchy from names. (e.g. 'submenu.TopName.name')
$suburl = str_replace("#", $subcat, $sublink['url']);
if(!empty($sublink['sef']))
{
$suburl = e107::url($sublink['sef'], $row);
}
else
{
$suburl = str_replace("#", $subcat, $sublink['url']);
}
$subicon = ($sublink['fieldicon']) ? $row[($sublink['fieldicon'])] : $par['link_button'];
$subdiz = ($sublink['fielddiz']) ? $row[($sublink['fielddiz'])] : $par['link_description'];
$subparent = $pid;
@@ -406,7 +422,14 @@ class links_admin_ui extends e_admin_ui
$subcat = $row[($sublink['fieldid'])];
$name = $row[($sublink['fieldname'])];
$subname = $name; // eliminate old embedded hierarchy from names. (e.g. 'submenu.TopName.name')
$suburl = str_replace("#", $subcat, $sublink['url']);
if(!empty($sublink['sef']))
{
$suburl = e107::url($sublink['sef'], $row);
}
else
{
$suburl = str_replace("#", $subcat, $sublink['url']);
}
$subicon = ($sublink['fieldicon']) ? $row[($sublink['fieldicon'])] : $par['link_button'];
$subdiz = ($sublink['fielddiz']) ? $row[($sublink['fielddiz'])] : $par['link_description'];
$subparent = $pid;
@@ -424,6 +447,8 @@ class links_admin_ui extends e_admin_ui
'link_function' => ''
);
e107::getMessage()->addDebug(print_a($insert_array,true));
if($sql2->insert("links",$insert_array))
{
$message = LAN_CREATED." ({$name})[!br!]";