fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-04 17:44:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'hotfix/1.7.4.1' into develop

Browse source
This commit is contained in:
khongchi 2014-03-12 14:24:04 +09:00
commit bccedcaf9d
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/comment/comment.controller.php
View file

@ -266,9 +266,13 @@ class commentController extends comment
return new Object(-1, 'msg_invalid_request'); return new Object(-1, 'msg_invalid_request');
} }
if($obj->homepage && !preg_match('/^[a-z]+:\/\//i', $obj->homepage)) if($obj->homepage)
{ {
$obj->homepage = 'http://' . $obj->homepage; $obj->homepage = removeHackTag($obj->homepage);
if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
{
$obj->homepage = 'http://'.$obj->homepage;
}
} }
// input the member's information if logged-in // input the member's information if logged-in
@ -655,9 +659,13 @@ class commentController extends comment
$obj->password = md5($obj->password); $obj->password = md5($obj->password);
} }
if($obj->homepage && !preg_match('/^[a-z]+:\/\//i', $obj->homepage)) if($obj->homepage)
{ {
$obj->homepage = 'http://' . $obj->homepage; $obj->homepage = removeHackTag($obj->homepage);
if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
{
$obj->homepage = 'http://'.$obj->homepage;
}
} }
// set modifier's information if logged-in and posting author and modifier are matched. // set modifier's information if logged-in and posting author and modifier are matched.

10
modules/document/document.controller.php
View file

@ -398,7 +398,15 @@ class documentController extends document
if(!$obj->commentStatus) $obj->commentStatus = 'DENY'; if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj); if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N'; if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
if($obj->homepage && !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage; if($obj->homepage)
{
$obj->homepage = removeHackTag($obj->homepage);
if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
{
$obj->homepage = 'http://'.$obj->homepage;
}
}
if($obj->notify_message != 'Y') $obj->notify_message = 'N'; if($obj->notify_message != 'Y') $obj->notify_message = 'N';
// can modify regdate only manager // can modify regdate only manager