fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-27 22:33:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

#51 preg_match()를 substr_compare() 또는 strncmp()로 대체

Browse source
This commit is contained in:
bnu 2013-11-22 12:50:01 +09:00
parent 681a9b2d07
commit 63e0fd6f3b
20 changed files with 68 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/module/module.controller.php
View file

@ -232,7 +232,7 @@ class moduleController extends module
}
$args->site_srl = getNextSequence();
$args->domain = preg_replace('/\/$/','',$domain);
$args->domain = (substr_compare($domain, '/', -1) === 0) ? substr($domain, 0, -1) : $domain;
$args->index_module_srl = $index_module_srl;
$args->default_language = Context::getLangType();
@ -264,7 +264,7 @@ class moduleController extends module
if($args->domain && !isSiteID($args->domain))
{
$args->domain = preg_replace('/\/$/','',$args->domain);
$args->domain = (substr_compare($domain, '/', -1) === 0) ? substr($domain, 0, -1) : $domain;
}
}
$output = executeQuery('module.updateSite', $args);

12
modules/module/module.model.php
View file

@ -81,8 +81,12 @@ class moduleModel extends module
*/
function getDefaultMid()
{
$default_url = preg_replace('/\/$/','',Context::getDefaultUrl());
$request_url = preg_replace('/\/$/','',Context::getRequestUri());
$default_url = Context::getDefaultUrl();
if(substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
$request_url = Context::getRequestUri();
if(substr_compare($request_url, '/', -1) === 0) $request_url = substr($request_url, 0, -1);
$default_url_parse = parse_url($default_url);
$request_url_parse = parse_url($request_url);
$vid = Context::get('vid');
@ -95,7 +99,9 @@ class moduleModel extends module
{
$url_info = parse_url($request_url);
$hostname = $url_info['host'];
$path = preg_replace('/\/$/','',$url_info['path']);
$path = $url_info['path'];
if(substr_compare($path, '/', -1) === 0) $path = substr($path, 0, -1);
$domain = sprintf('%s%s%s', $hostname, $url_info['port']&&$url_info['port']!=80?':'.$url_info['port']:'',$path);
}
// xe.com/blog