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

Clean up trash handling logic

Browse source
This commit is contained in:
Kijin Sung 2023-09-22 02:05:14 +09:00
parent 10123a86a8
commit 565cfad15f
4 changed files with 25 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/trash/model/TrashVO.php
View file

@ -24,8 +24,8 @@ class TrashVO
}
function getTitle()
{
if(empty($this->title)) return $lang->untitle;
return htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
if(empty($this->title)) return lang('untitle');
return escape($this->title, false);
}
function setTitle($title)
{
@ -90,7 +90,7 @@ class TrashVO
}
function getNickName()
{
return htmlspecialchars($this->nickName, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
return escape($this->nickName, false);
}
function setNickName($nickName)
{

7
modules/trash/trash.admin.controller.php
View file

@ -12,16 +12,13 @@ class trashAdminController extends trash
{
/**
* object insert to trash
* @param TrashVO $obj
* @param TrashVO $oTrashVO
* @return Object
*/
function insertTrash($obj)
function insertTrash($oTrashVO)
{
$logged_info = Context::get('logged_info');
$oTrashVO = new TrashVO();
$oTrashVO = &$obj;
if(!$oTrashVO->getTrashSrl()) $oTrashVO->setTrashSrl(getNextSequence());
if(!is_string($oTrashVO->getSerializedObject())) $oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
$oTrashVO->setIpaddress(\RX_CLIENT_IP);