merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,170 +1,215 @@
<?php
/**
* Counter module's controller class
/**
* Counter module's controller class
*
* @author NHN (developers@xpressengine.com)
*/
class counterController extends counter
{
/**
* Initialization
*
* @author NHN (developers@xpressengine.com)
**/
* @return void
*/
function init()
{
class counterController extends counter {
}
/**
* Initialization
*
* @return void
**/
function init() {
}
/**
* Counter logs.
* If want use below function, you can use 'counterExecute' function instead this function
*
* @return void
*/
function procCounterExecute()
{
/**
* Counter logs.
* If want use below function, you can use 'counterExecute' function instead this function
*
* @return void
**/
function procCounterExecute() {
}
}
/**
* Counter logs
*
* @return void
**/
function counterExecute() {
$oDB = &DB::getInstance();
$oDB->begin();
/**
* Counter logs
*
* @return void
*/
function counterExecute()
{
$oDB = DB::getInstance();
$oDB->begin();
$site_module_info = Context::get('site_module_info');
$site_srl = (int)$site_module_info->site_srl;
// Check the logs
$oCounterModel = &getModel('counter');
// Register today's row if not exist
if(!$oCounterModel->isInsertedTodayStatus($site_srl)) {
$this->insertTodayStatus(0,$site_srl);
// check user if the previous row exists
} else {
// If unregistered IP
if(!$oCounterModel->isLogged($site_srl)) {
// Leave logs
$this->insertLog($site_srl);
// Register unique and pageview
$this->insertUniqueVisitor($site_srl);
} else {
// Register pageview
$this->insertPageView($site_srl);
}
}
$site_module_info = Context::get('site_module_info');
$site_srl = (int) $site_module_info->site_srl;
$oDB->commit();
}
// Check the logs
$oCounterModel = getModel('counter');
/**
* Leave logs
*
* @param integer $site_srl
* @return Object result of count query
**/
function insertLog($site_srl=0) {
$args->regdate = date("YmdHis");
$args->user_agent = substr ($_SERVER['HTTP_USER_AGENT'], 0, 250);
$args->site_srl = $site_srl;
return executeQuery('counter.insertCounterLog', $args);
}
// Register today's row if not exist
if(!$oCounterModel->isInsertedTodayStatus($site_srl))
{
$this->insertTodayStatus(0, $site_srl);
// check user if the previous row exists
}
else
{
// If unregistered IP
if(!$oCounterModel->isLogged($site_srl))
{
// Leave logs
$this->insertLog($site_srl);
// Register unique and pageview
$this->insertUniqueVisitor($site_srl);
}
else
{
// Register pageview
$this->insertPageView($site_srl);
}
}
/**
* Register the unique visitor
*
* @param integer $site_srl
* @return void
**/
function insertUniqueVisitor($site_srl=0) {
if($site_srl) {
$args->regdate = '0';
$args->site_srl = $site_srl;
$output = executeQuery('counter.updateSiteCounterUnique', $args);
$args->regdate = date('Ymd');
$output = executeQuery('counter.updateSiteCounterUnique', $args);
} else {
$args->regdate = '0';
$output = executeQuery('counter.updateCounterUnique', $args);
$args->regdate = date('Ymd');
$output = executeQuery('counter.updateCounterUnique', $args);
}
}
$oDB->commit();
}
/**
* Register pageview
*
* @param integer $site_srl
* @return void
**/
function insertPageView($site_srl=0) {
if($site_srl) {
$args->regdate = '0';
$args->site_srl = $site_srl;
executeQuery('counter.updateSiteCounterPageview', $args);
$args->regdate = date('Ymd');
executeQuery('counter.updateSiteCounterPageview', $args);
} else {
$args->regdate = '0';
executeQuery('counter.updateCounterPageview', $args);
$args->regdate = date('Ymd');
executeQuery('counter.updateCounterPageview', $args);
}
}
/**
* Leave logs
*
* @param integer $site_srl
* @return Object result of count query
*/
function insertLog($site_srl = 0)
{
$args = new stdClass();
$args->regdate = date("YmdHis");
$args->user_agent = substr($_SERVER['HTTP_USER_AGENT'], 0, 250);
$args->site_srl = $site_srl;
/**
* Add the total counter status
*
* @param integer $site_srl
* @return void
**/
function insertTotalStatus($site_srl=0) {
$args->regdate = 0;
if($site_srl) {
$args->site_srl = $site_srl;
executeQuery('counter.insertSiteTodayStatus', $args);
} else {
executeQuery('counter.insertTodayStatus', $args);
}
}
return executeQuery('counter.insertCounterLog', $args);
}
/**
* Add today's counter status
*
* @param integer $regdate date(YYYYMMDD) type
* @param integer $site_srl
* @return void
**/
function insertTodayStatus($regdate = 0, $site_srl=0) {
if($regdate) $args->regdate = $regdate;
else $args->regdate = date("Ymd");
if($site_srl) {
$args->site_srl = $site_srl;
$query_id = 'counter.insertSiteTodayStatus';
/**
* Register the unique visitor
*
* @param integer $site_srl
* @return void
*/
function insertUniqueVisitor($site_srl = 0)
{
$args = new stdClass();
$u_args->site_srl = $site_srl; // /< when inserting a daily row, attempt to inser total rows(where regdate=0) together
executeQuery($query_id, $u_args);
} else {
$query_id = 'counter.insertTodayStatus';
executeQuery($query_id); // /< when inserting a daily row, attempt to inser total rows(where regdate=0) together
}
$output = executeQuery($query_id, $args);
// Leave logs
$this->insertLog($site_srl);
// Register unique and pageview
$this->insertUniqueVisitor($site_srl);
}
if($site_srl)
{
$args->regdate = '0,' . date('Ymd');
$args->site_srl = $site_srl;
$output = executeQuery('counter.updateSiteCounterUnique', $args);
}
else
{
$args->regdate = '0,' . date('Ymd');
$output = executeQuery('counter.updateCounterUnique', $args);
}
}
/**
* Delete counter logs of the specific virtual site
*
* @param integer $site_srl
* @return void
**/
function deleteSiteCounterLogs($site_srl) {
$args->site_srl = $site_srl;
executeQuery('counter.deleteSiteCounter',$args);
executeQuery('counter.deleteSiteCounterLog',$args);
}
}
?>
/**
* Register pageview
*
* @param integer $site_srl
* @return void
*/
function insertPageView($site_srl = 0)
{
$args = new stdClass;
$args->regdate = '0,' . date('Ymd');
if($site_srl)
{
$args->site_srl = $site_srl;
executeQuery('counter.updateSiteCounterPageview', $args);
}
else
{
executeQuery('counter.updateCounterPageview', $args);
}
}
/**
* Add the total counter status
*
* @param integer $site_srl
* @return void
*/
function insertTotalStatus($site_srl = 0)
{
$args = new stdClass();
$args->regdate = 0;
if($site_srl)
{
$args->site_srl = $site_srl;
executeQuery('counter.insertSiteTodayStatus', $args);
}
else
{
executeQuery('counter.insertTodayStatus', $args);
}
}
/**
* Add today's counter status
*
* @param integer $regdate date(YYYYMMDD) type
* @param integer $site_srl
* @return void
*/
function insertTodayStatus($regdate = 0, $site_srl = 0)
{
$args = new stdClass();
if($regdate)
{
$args->regdate = $regdate;
}
else
{
$args->regdate = date("Ymd");
}
if($site_srl)
{
$args->site_srl = $site_srl;
$query_id = 'counter.insertSiteTodayStatus';
$u_args->site_srl = $site_srl; // /< when inserting a daily row, attempt to inser total rows(where regdate=0) together
executeQuery($query_id, $u_args);
}
else
{
$query_id = 'counter.insertTodayStatus';
executeQuery($query_id); // /< when inserting a daily row, attempt to inser total rows(where regdate=0) together
}
$output = executeQuery($query_id, $args);
// Leave logs
$this->insertLog($site_srl);
// Register unique and pageview
$this->insertUniqueVisitor($site_srl);
}
/**
* Delete counter logs of the specific virtual site
*
* @param integer $site_srl
* @return void
*/
function deleteSiteCounterLogs($site_srl)
{
$args = new stdClass();
$args->site_srl = $site_srl;
executeQuery('counter.deleteSiteCounter', $args);
executeQuery('counter.deleteSiteCounterLog', $args);
}
}
/* End of file counter.controller.php */
/* Location: ./modules/counter/counter.controller.php */