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

- Important URL assembling feature, all routes have now safe fallback option

Browse Source 
- News configs updates and refactoring, introducing new config, various bugfixes
- News DB changes: news_sef and category_sef fields, titles no more used in URL assembling
- Aliases now not able to match existing URL module
- New URL setting - choose type of SEF string when auto-extracted from titles (implemented in News and Custom pages, leave SEF string empty to see it in action)
- Overall system stability bugfixes
This commit is contained in:
secretr
2011-12-10 00:00:15 +00:00
parent 4d7e06ec70
commit 0d0fa1e2ca
15 changed files with 456 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
e107_admin/eurl.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2011 e107 Inc (e107.org)
* Copyright (C) e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -55,8 +55,9 @@ class eurl_admin_ui extends e_admin_controller_ui
protected $prefs = array(
'url_disable_pathinfo' => array('title'=>LAN_EURL_SETTINGS_PATHINFO, 'type'=>'boolean', 'help'=>LAN_EURL_MODREWR_DESCR),
'url_main_module' => array('title'=>LAN_EURL_SETTINGS_MAINMODULE, 'type'=>'dropdown', 'data' => 'string','help'=>LAN_EURL_SETTINGS_MAINMODULE_HELP),
'url_main_module' => array('title'=>LAN_EURL_SETTINGS_MAINMODULE, 'type'=>'dropdown', 'data' => 'string', 'help'=>LAN_EURL_SETTINGS_MAINMODULE_HELP),
'url_error_redirect' => array('title'=>LAN_EURL_SETTINGS_REDIRECT, 'type'=>'boolean', 'help'=>LAN_EURL_SETTINGS_REDIRECT_HELP),
'url_sef_translate' => array('title'=>LAN_EURL_SETTINGS_SEFTRANSLATE, 'type'=>'dropdown', 'data' => 'string', 'help'=>LAN_EURL_SETTINGS_SEFTRANSLATE_HELP),
);
public function init()
@@ -82,6 +83,7 @@ class eurl_admin_ui extends e_admin_controller_ui
public function SettingsObserver()
{
// main module pref dropdown
$this->prefs['url_main_module']['writeParms'][''] = 'None';
$modules = e107::getPref('url_config', array());
ksort($modules);
@@ -99,6 +101,14 @@ class eurl_admin_ui extends e_admin_controller_ui
$this->prefs['url_main_module']['writeParms'][$module] = vartrue($section['name'], eHelper::labelize($module));
}
// title2sef transform type pref
$types = explode('|', 'none|dashl|dashc|dash|underscorel|underscorec|underscore|plusl|plusc|plus');
$this->prefs['url_sef_translate']['writeParms'] = array();
foreach ($types as $type)
{
$this->prefs['url_sef_translate']['writeParms'][$type] = deftrue('LAN_EURL_SETTINGS_SEFTRTYPE_'.strtoupper($type), ucfirst($type));
}
if(isset($_POST['etrigger_save']))
{
$this->getConfig()
@@ -121,7 +131,10 @@ class eurl_admin_ui extends e_admin_controller_ui
if(isset($_POST['update']))
{
$posted = is_array($_POST['eurl_aliases']) ? e107::getParser()->post_toForm($_POST['eurl_aliases']) : '';
$locations = array_keys(e107::getPref('url_locations', array()));
$aliases = array();
$message = e107::getMessage();
foreach ($posted as $lan => $als)
{
foreach ($als as $module => $alias)
@@ -130,8 +143,12 @@ class eurl_admin_ui extends e_admin_controller_ui
$module = trim($module);
if($module !== $alias)
{
// TODO - basic validation
$aliases[$lan][$alias] = $module;
$cindex = array_search($module, $locations);
$sarray = $locations;
unset($sarray[$cindex]);
if(!in_array(strtolower($alias), $sarray)) $aliases[$lan][$alias] = $module;
else $message->addError(sprintf(LAN_EURL_ERR_ALIAS_MODULE, $alias, $module));
}
}
}
@@ -198,8 +215,7 @@ class eurl_admin_ui extends e_admin_controller_ui
{
$this->addTitle(LAN_EURL_NAME_CONFIG);
$active = e107::getPref('url_config');
//echo(e107::getUrl()->create('system/error/notfound', '', 'full=1'));
//eRouter::adminReadConfigs(e_CORE.'url/news', 'core');
$set = array();
// all available URL modules
$set['url_modules'] = eRouter::adminReadModules();