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

Moving the system to the new URL assembling, fixed call to a non-existent eUrl method system wide.

Browse Source
This commit is contained in:
secretr
2011-11-26 18:17:42 +00:00
parent 0f794aa225
commit 548b585f7e
16 changed files with 55 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/shortcodes/batch/comment_shortcodes.php
View File

@@ -33,7 +33,7 @@ SC_BEGIN USERNAME
global $USERNAME, $comrow;
if (isset($comrow['user_id']) && $comrow['user_id'])
{
$USERNAME = $parm == 'raw' ? $comrow['user_name'] : "<a href='".e107::getUrl()->create('core:user', 'main', 'func=profile&id='.$comrow['user_id'])."'>".$comrow['user_name']."</a>\n";
$USERNAME = $parm == 'raw' ? $comrow['user_name'] : "<a href='".e107::getUrl()->create('user/profile/view', array('id' => $comrow['user_id'], 'name' => $comrow['user_name']))."'>".$comrow['user_name']."</a>\n";
}
else
{

12
e107_core/shortcodes/single/nextprev.php
View File

@@ -477,8 +477,8 @@ function nextprev_shortcode($parm = '')
if(substr($url, 0, 5) == 'url::')
{
$urlParms = explode('::', $url);
$urlParms[3] = str_replace('[FROM]', $prevstart, $urlParms[3]);
$link = $e107->url->getUrl($urlParms[1], $urlParms[2], $urlParms[3]);
$urlParms[2] = str_replace('[FROM]', $prevstart, $urlParms[2]);
$link = $e107->url->create($urlParms[1], $urlParms[2], varset($urlParms[3]));
}
else
{
@@ -492,8 +492,8 @@ function nextprev_shortcode($parm = '')
if(substr($url, 0, 5) == 'url::')
{
$urlParms = explode('::', $url);
$urlParms[3] = str_replace('[FROM]', $nextstart, $urlParms[3]);
$link = $e107->url->getUrl($urlParms[1], $urlParms[2], $urlParms[3]);
$urlParms[2] = str_replace('[FROM]', $nextstart, $urlParms[2]);
$link = $e107->url->create($urlParms[1], $urlParms[2], varset($urlParms[3]));
}
else
{
@@ -513,8 +513,8 @@ function nextprev_shortcode($parm = '')
if(substr($url, 0, 5) == 'url::')
{
$urlParms = explode('::', $url);
$urlParms[3] = str_replace('[FROM]', $newstart, $urlParms[3]);
$link = $e107->url->getUrl($urlParms[1], $urlParms[2], $urlParms[3]);
$urlParms[2] = str_replace('[FROM]', $newstart, $urlParms[2]);
$link = $e107->url->create($urlParms[1], $urlParms[2], varset($urlParms[3]));
}
else
{

2
e107_core/url/user/e_url.php
View File

@@ -41,8 +41,8 @@ class core_user_url extends eUrlConfig
if(!varset($route[1])) $route[1] = 'index';
## aliases as retrieved from the DB, map vars to proper values
if(isset($params['user_name']) && !empty($params['user_name'])) $params['id'] = $params['user_name'];
if(isset($params['user_id']) && !empty($params['user_id'])) $params['id'] = $params['user_id'];
//if(isset($params['user_name']) && !empty($params['user_name'])) $params['id'] = $params['user_name'];
$url = 'user.php';
$page = $params['page'] ? intval($params['page']) : '0';

7
e107_core/url/user/rewrite/e_url.php
View File

@@ -75,6 +75,13 @@ class core_user_rewrite_url extends eUrlConfig
$name = $request->getRequestParam('name');
if(!$name) return;
// if id only is passed, don't do DB query
if(is_numeric($name))
{
$request->setRequestParam('id', $name)->setRequestParam('name', null);
return;
}
$sql = e107::getDb('url');
$name = e107::getParser()->toDB($name);
if($sql->db_Select('user', 'user_id', "user_name='{$name}'")) // XXX - new user_sef field? Discuss.