mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-05-04 17:44:38 +09:00
NOISSUE PHP 5.4 이상 호환성 개선.
This commit is contained in:
parent
742af78932
commit
41ff8ace3b
32 changed files with 365 additions and 113 deletions
|
|
@ -335,7 +335,7 @@ class DB
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$obj = NULL;
|
$obj = new stdClass;
|
||||||
$obj->db_type = $db_type;
|
$obj->db_type = $db_type;
|
||||||
$obj->enable = $oDB->isSupported() ? TRUE : FALSE;
|
$obj->enable = $oDB->isSupported() ? TRUE : FALSE;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
class VirtualXMLDisplayHandler
|
class VirtualXMLDisplayHandler
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Produce virtualXML compliant content given a module object.\n
|
* Produce virtualXML compliant content given a module object.\n
|
||||||
* @param ModuleObject $oModule the module object
|
* @param ModuleObject $oModule the module object
|
||||||
|
|
@ -16,6 +15,8 @@ class VirtualXMLDisplayHandler
|
||||||
$redirect_url = $oModule->get('redirect_url');
|
$redirect_url = $oModule->get('redirect_url');
|
||||||
$request_uri = Context::get('xeRequestURI');
|
$request_uri = Context::get('xeRequestURI');
|
||||||
$request_url = Context::get('xeVirtualRequestUrl');
|
$request_url = Context::get('xeVirtualRequestUrl');
|
||||||
|
$output = new stdClass;
|
||||||
|
|
||||||
if(substr_compare($request_url, '/', -1) !== 0)
|
if(substr_compare($request_url, '/', -1) !== 0)
|
||||||
{
|
{
|
||||||
$request_url .= '/';
|
$request_url .= '/';
|
||||||
|
|
@ -27,6 +28,7 @@ class VirtualXMLDisplayHandler
|
||||||
{
|
{
|
||||||
$output->message = $message;
|
$output->message = $message;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($redirect_url)
|
if($redirect_url)
|
||||||
{
|
{
|
||||||
$output->url = $redirect_url;
|
$output->url = $redirect_url;
|
||||||
|
|
@ -52,6 +54,7 @@ class VirtualXMLDisplayHandler
|
||||||
{
|
{
|
||||||
$html[] = 'alert("' . $output->message . '");';
|
$html[] = 'alert("' . $output->message . '");';
|
||||||
}
|
}
|
||||||
|
|
||||||
if($output->url)
|
if($output->url)
|
||||||
{
|
{
|
||||||
$url = preg_replace('/#(.+)$/i', '', $output->url);
|
$url = preg_replace('/#(.+)$/i', '', $output->url);
|
||||||
|
|
|
||||||
|
|
@ -371,6 +371,10 @@ class XmlQueryParser extends XmlParser
|
||||||
*/
|
*/
|
||||||
function _setConditions($conditions)
|
function _setConditions($conditions)
|
||||||
{
|
{
|
||||||
|
$obj = new stdClass;
|
||||||
|
$output = new stdClass;
|
||||||
|
$output->conditions = array();
|
||||||
|
|
||||||
// 조건절 정리
|
// 조건절 정리
|
||||||
$condition = $conditions->condition;
|
$condition = $conditions->condition;
|
||||||
if($condition)
|
if($condition)
|
||||||
|
|
@ -403,6 +407,8 @@ class XmlQueryParser extends XmlParser
|
||||||
foreach($cond as $key => $val)
|
foreach($cond as $key => $val)
|
||||||
{
|
{
|
||||||
unset($cond_output);
|
unset($cond_output);
|
||||||
|
$cond_output = new stdClass;
|
||||||
|
$cond_output->condition = array();
|
||||||
|
|
||||||
if($val->attrs->pipe)
|
if($val->attrs->pipe)
|
||||||
{
|
{
|
||||||
|
|
@ -477,6 +483,9 @@ class XmlQueryParser extends XmlParser
|
||||||
*/
|
*/
|
||||||
function _setNavigation($xml_obj)
|
function _setNavigation($xml_obj)
|
||||||
{
|
{
|
||||||
|
$output = new stdClass;
|
||||||
|
$output->order = array();
|
||||||
|
|
||||||
$navigation = $xml_obj->query->navigation;
|
$navigation = $xml_obj->query->navigation;
|
||||||
if($navigation)
|
if($navigation)
|
||||||
{
|
{
|
||||||
|
|
@ -502,6 +511,7 @@ class XmlQueryParser extends XmlParser
|
||||||
$page = $navigation->page->attrs;
|
$page = $navigation->page->attrs;
|
||||||
$output->page = $page;
|
$output->page = $page;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -229,6 +229,7 @@ class addonAdminController extends addonController
|
||||||
*/
|
*/
|
||||||
function doInsert($addon, $site_srl = 0, $gtype = 'site', $isUsed = 'N')
|
function doInsert($addon, $site_srl = 0, $gtype = 'site', $isUsed = 'N')
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->addon = $addon;
|
$args->addon = $addon;
|
||||||
$args->is_used = $isUsed;
|
$args->is_used = $isUsed;
|
||||||
if($gtype == 'global')
|
if($gtype == 'global')
|
||||||
|
|
|
||||||
|
|
@ -170,7 +170,6 @@ class adminAdminController extends admin
|
||||||
$skinTarget = 'mskin';
|
$skinTarget = 'mskin';
|
||||||
}
|
}
|
||||||
|
|
||||||
$buff = '';
|
|
||||||
if(is_readable($siteDesignFile))
|
if(is_readable($siteDesignFile))
|
||||||
{
|
{
|
||||||
include($siteDesignFile);
|
include($siteDesignFile);
|
||||||
|
|
@ -202,31 +201,33 @@ class adminAdminController extends admin
|
||||||
|
|
||||||
function makeDefaultDesignFile($designInfo, $site_srl = 0)
|
function makeDefaultDesignFile($designInfo, $site_srl = 0)
|
||||||
{
|
{
|
||||||
|
$buff = array();
|
||||||
|
$buff[] = '<?php if(!defined("__XE__")) exit();';
|
||||||
|
$buff[] = '$designInfo = new stdClass;';
|
||||||
|
|
||||||
if($designInfo->layout_srl)
|
if($designInfo->layout_srl)
|
||||||
{
|
{
|
||||||
$buff .= sprintf('$designInfo->layout_srl = %s; ', $designInfo->layout_srl) . "\n";
|
$buff[] = sprintf('$designInfo->layout_srl = %s; ', $designInfo->layout_srl);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($designInfo->mlayout_srl)
|
if($designInfo->mlayout_srl)
|
||||||
{
|
{
|
||||||
$buff .= sprintf('$designInfo->mlayout_srl = %s;', $designInfo->mlayout_srl) . "\n";
|
$buff[] = sprintf('$designInfo->mlayout_srl = %s;', $designInfo->mlayout_srl);
|
||||||
}
|
}
|
||||||
|
|
||||||
$buff .= '$designInfo->module = new stdClass();' . "\n";
|
$buff[] = '$designInfo->module = new stdClass;';
|
||||||
|
|
||||||
foreach($designInfo->module as $moduleName => $skinInfo)
|
foreach($designInfo->module as $moduleName => $skinInfo)
|
||||||
{
|
{
|
||||||
$buff .= sprintf('$designInfo->module->%s = new stdClass();', $moduleName) . "\n";
|
$buff[] = sprintf('$designInfo->module->%s = new stdClass;', $moduleName);
|
||||||
foreach($skinInfo as $target => $skinName)
|
foreach($skinInfo as $target => $skinName)
|
||||||
{
|
{
|
||||||
$buff .= sprintf('$designInfo->module->%s->%s = \'%s\';', $moduleName, $target, $skinName) . "\n";
|
$buff[] = sprintf('$designInfo->module->%s->%s = \'%s\';', $moduleName, $target, $skinName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$buff = sprintf('<?php if(!defined("__XE__")) exit();' . "\n" . '$designInfo = new stdClass();' . "\n" . '%s ?>', $buff);
|
|
||||||
|
|
||||||
$siteDesignFile = _XE_PATH_ . 'files/site_design/design_' . $site_srl . '.php';
|
$siteDesignFile = _XE_PATH_ . 'files/site_design/design_' . $site_srl . '.php';
|
||||||
FileHandler::writeFile($siteDesignFile, $buff);
|
FileHandler::writeFile($siteDesignFile, implode(PHP_EOL, $buff));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -316,8 +316,9 @@ class adminAdminModel extends admin
|
||||||
, 'module' => array('addon', 'admin', 'autoinstall', 'comment', 'communication', 'counter', 'document', 'editor', 'file', 'importer', 'install', 'integration_search', 'layout', 'member', 'menu', 'message', 'module', 'opage', 'page', 'point', 'poll', 'rss', 'session', 'spamfilter', 'tag', 'trackback', 'trash', 'widget')
|
, 'module' => array('addon', 'admin', 'autoinstall', 'comment', 'communication', 'counter', 'document', 'editor', 'file', 'importer', 'install', 'integration_search', 'layout', 'member', 'menu', 'message', 'module', 'opage', 'page', 'point', 'poll', 'rss', 'session', 'spamfilter', 'tag', 'trackback', 'trash', 'widget')
|
||||||
, 'addon' => array('autolink', 'blogapi', 'captcha', 'counter', 'member_communication', 'member_extra_info', 'mobile', 'openid_delegation_id', 'point_level_icon', 'resize_image')
|
, 'addon' => array('autolink', 'blogapi', 'captcha', 'counter', 'member_communication', 'member_extra_info', 'mobile', 'openid_delegation_id', 'point_level_icon', 'resize_image')
|
||||||
);
|
);
|
||||||
|
|
||||||
$info = array();
|
$info = array();
|
||||||
|
$db_info = Context::getDBInfo();
|
||||||
|
|
||||||
$info['type'] = ($type != 'INSTALL' ? 'WORKING' : 'INSTALL');
|
$info['type'] = ($type != 'INSTALL' ? 'WORKING' : 'INSTALL');
|
||||||
$info['location'] = _XE_LOCATION_;
|
$info['location'] = _XE_LOCATION_;
|
||||||
$info['package'] = _XE_PACKAGE_;
|
$info['package'] = _XE_PACKAGE_;
|
||||||
|
|
@ -326,12 +327,11 @@ class adminAdminModel extends admin
|
||||||
$info['xe_version'] = __XE_VERSION__;
|
$info['xe_version'] = __XE_VERSION__;
|
||||||
$info['php'] = phpversion();
|
$info['php'] = phpversion();
|
||||||
|
|
||||||
$db_info = Context::getDBInfo();
|
|
||||||
$info['db_type'] = Context::getDBType();
|
$info['db_type'] = Context::getDBType();
|
||||||
$info['use_rewrite'] = $db_info->use_rewrite;
|
$info['use_rewrite'] = $db_info->use_rewrite;
|
||||||
$info['use_db_session'] = $db_info->use_db_session == 'Y' ? 'Y' : 'N';
|
$info['use_db_session'] = $db_info->use_db_session == 'Y' ? 'Y' : 'N';
|
||||||
$info['use_ssl'] = $db_info->use_ssl;
|
$info['use_ssl'] = $db_info->use_ssl;
|
||||||
|
|
||||||
$info['phpext'] = '';
|
$info['phpext'] = '';
|
||||||
foreach(get_loaded_extensions() as $ext)
|
foreach(get_loaded_extensions() as $ext)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -89,6 +89,7 @@ class autoinstall extends ModuleObject
|
||||||
{
|
{
|
||||||
$oModuleController = getController('module');
|
$oModuleController = getController('module');
|
||||||
|
|
||||||
|
$config = new stdClass;
|
||||||
$config->downloadServer = _XE_DOWNLOAD_SERVER_;
|
$config->downloadServer = _XE_DOWNLOAD_SERVER_;
|
||||||
$oModuleController->insertModuleConfig('autoinstall', $config);
|
$oModuleController->insertModuleConfig('autoinstall', $config);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -705,7 +705,7 @@ class documentController extends document
|
||||||
$trash_args->nick_name = htmlspecialchars_decode($logged_info->nick_name);
|
$trash_args->nick_name = htmlspecialchars_decode($logged_info->nick_name);
|
||||||
}
|
}
|
||||||
// Date setting for updating documents
|
// Date setting for updating documents
|
||||||
$doucment_args = new stdClass();
|
$document_args = new stdClass;
|
||||||
$document_args->module_srl = 0;
|
$document_args->module_srl = 0;
|
||||||
$document_args->document_srl = $obj->document_srl;
|
$document_args->document_srl = $obj->document_srl;
|
||||||
|
|
||||||
|
|
@ -1143,7 +1143,7 @@ class documentController extends document
|
||||||
{
|
{
|
||||||
$args->ipaddress = $_SERVER['REMOTE_ADDR'];
|
$args->ipaddress = $_SERVER['REMOTE_ADDR'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$args->document_srl = $document_srl;
|
$args->document_srl = $document_srl;
|
||||||
$output = executeQuery('document.getDocumentDeclaredLogInfo', $args);
|
$output = executeQuery('document.getDocumentDeclaredLogInfo', $args);
|
||||||
|
|
||||||
|
|
@ -1296,6 +1296,7 @@ class documentController extends document
|
||||||
$oDocumentModel = &getModel('document');
|
$oDocumentModel = &getModel('document');
|
||||||
if(!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
|
if(!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->category_srl = $category_srl;
|
$args->category_srl = $category_srl;
|
||||||
$args->document_count = $document_count;
|
$args->document_count = $document_count;
|
||||||
$output = executeQuery('document.updateCategoryCount', $args);
|
$output = executeQuery('document.updateCategoryCount', $args);
|
||||||
|
|
@ -1784,10 +1785,10 @@ class documentController extends document
|
||||||
$php_buff = sprintf(
|
$php_buff = sprintf(
|
||||||
'<?php '.
|
'<?php '.
|
||||||
'if(!defined("__XE__")) exit(); '.
|
'if(!defined("__XE__")) exit(); '.
|
||||||
'%s; '.
|
'%s'.
|
||||||
'%s; '.
|
'%s'.
|
||||||
'$menu->list = array(%s); '.
|
'$menu = new stdClass;'.
|
||||||
'?>',
|
'$menu->list = array(%s); ',
|
||||||
$header_script,
|
$header_script,
|
||||||
$php_header_buff,
|
$php_header_buff,
|
||||||
$php_output['buff']
|
$php_output['buff']
|
||||||
|
|
@ -1831,11 +1832,24 @@ class documentController extends document
|
||||||
|
|
||||||
$title = $node->title;
|
$title = $node->title;
|
||||||
$oModuleAdminModel = &getAdminModel('module');
|
$oModuleAdminModel = &getAdminModel('module');
|
||||||
|
|
||||||
$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
|
$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
|
||||||
if(count($langs)) foreach($langs as $key => $val) $xml_header_buff .= sprintf('$_titles[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)));
|
if(count($langs))
|
||||||
|
{
|
||||||
|
foreach($langs as $key => $val)
|
||||||
|
{
|
||||||
|
$xml_header_buff .= sprintf('$_titles[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$langx = $oModuleAdminModel->getLangCode($site_srl, $description);
|
$langx = $oModuleAdminModel->getLangCode($site_srl, $description);
|
||||||
if(count($langx)) foreach($langx as $key => $val) $xml_header_buff .= sprintf('$_descriptions[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)));
|
if(count($langx))
|
||||||
|
{
|
||||||
|
foreach($langx as $key => $val)
|
||||||
|
{
|
||||||
|
$xml_header_buff .= sprintf('$_descriptions[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$attribute = sprintf(
|
$attribute = sprintf(
|
||||||
'mid="%s" module_srl="%d" node_srl="%d" parent_srl="%d" category_srl="%d" text="<?php echo (%s?($_titles[%d][$lang_type]):"")?>" url="%s" expand="%s" color="%s" description="<?php echo (%s?($_descriptions[%d][$lang_type]):"")?>" document_count="%d" ',
|
'mid="%s" module_srl="%d" node_srl="%d" parent_srl="%d" category_srl="%d" text="<?php echo (%s?($_titles[%d][$lang_type]):"")?>" url="%s" expand="%s" color="%s" description="<?php echo (%s?($_descriptions[%d][$lang_type]):"")?>" document_count="%d" ',
|
||||||
|
|
@ -1875,30 +1889,70 @@ class documentController extends document
|
||||||
{
|
{
|
||||||
$output = array("buff"=>"", "category_srl_list"=>array());
|
$output = array("buff"=>"", "category_srl_list"=>array());
|
||||||
if(!$source_node) return $output;
|
if(!$source_node) return $output;
|
||||||
|
|
||||||
// Set to an arraty for looping and then generate php script codes to be included
|
// Set to an arraty for looping and then generate php script codes to be included
|
||||||
foreach($source_node as $category_srl => $node)
|
foreach($source_node as $category_srl => $node)
|
||||||
{
|
{
|
||||||
// Get data from child nodes first if exist.
|
// Get data from child nodes first if exist.
|
||||||
if($category_srl&&$tree[$category_srl]) $child_output = $this->getPhpCacheCode($tree[$category_srl], $tree, $site_srl, $php_header_buff);
|
if($category_srl && $tree[$category_srl]){
|
||||||
else $child_output = array("buff"=>"", "category_srl_list"=>array());
|
$child_output = $this->getPhpCacheCode($tree[$category_srl], $tree, $site_srl, $php_header_buff);
|
||||||
|
} else {
|
||||||
|
$child_output = array("buff"=>"", "category_srl_list"=>array());
|
||||||
|
}
|
||||||
|
|
||||||
// Set values into category_srl_list arrary if url of the current node is not empty
|
// Set values into category_srl_list arrary if url of the current node is not empty
|
||||||
$child_output['category_srl_list'][] = $node->category_srl;
|
$child_output['category_srl_list'][] = $node->category_srl;
|
||||||
$output['category_srl_list'] = array_merge($output['category_srl_list'], $child_output['category_srl_list']);
|
$output['category_srl_list'] = array_merge($output['category_srl_list'], $child_output['category_srl_list']);
|
||||||
|
|
||||||
// If node->group_srls value exists
|
// If node->group_srls value exists
|
||||||
if($node->group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$node->group_srls);
|
if($node->group_srls) {
|
||||||
else $group_check_code = "true";
|
$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$node->group_srls);
|
||||||
|
} else {
|
||||||
|
$group_check_code = "true";
|
||||||
|
}
|
||||||
|
|
||||||
// List variables
|
// List variables
|
||||||
$selected = '"'.implode('","',$child_output['category_srl_list']).'"';
|
$selected = '"' . implode('","', $child_output['category_srl_list']) . '"';
|
||||||
$child_buff = $child_output['buff'];
|
$child_buff = $child_output['buff'];
|
||||||
$expand = $node->expand;
|
$expand = $node->expand;
|
||||||
|
|
||||||
$title = $node->title;
|
$title = $node->title;
|
||||||
$description= $node->description;
|
$description = $node->description;
|
||||||
$oModuleAdminModel = &getAdminModel('module');
|
$oModuleAdminModel = &getAdminModel('module');
|
||||||
$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
|
$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
|
||||||
if(count($langs)) foreach($langs as $key => $val) $php_header_buff .= sprintf('$_titles[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)));
|
|
||||||
|
if(count($langs))
|
||||||
|
{
|
||||||
|
$php_header_buff .= '$_titles = array();';
|
||||||
|
foreach($langs as $key => $val)
|
||||||
|
{
|
||||||
|
$val = htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
|
||||||
|
$php_header_buff .= sprintf(
|
||||||
|
'$_titles[%d]["%s"] = "%s"; ',
|
||||||
|
$category_srl,
|
||||||
|
$key,
|
||||||
|
str_replace('"','\\"', $val)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$langx = $oModuleAdminModel->getLangCode($site_srl, $description);
|
$langx = $oModuleAdminModel->getLangCode($site_srl, $description);
|
||||||
if(count($langx)) foreach($langx as $key => $val) $php_header_buff .= sprintf('$_descriptions[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)));
|
|
||||||
|
if(count($langx))
|
||||||
|
{
|
||||||
|
$php_header_buff .= '$_descriptions = array();';
|
||||||
|
foreach($langx as $key => $val)
|
||||||
|
{
|
||||||
|
$val = htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
|
||||||
|
$php_header_buff .= sprintf(
|
||||||
|
'$_descriptions[%d]["%s"] = "%s"; ',
|
||||||
|
$category_srl,
|
||||||
|
$key,
|
||||||
|
str_replace('"','\\"', $val)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Create attributes(Use the category_srl_list to check whether to belong to the menu's node. It seems to be tricky but fast fast and powerful;)
|
// Create attributes(Use the category_srl_list to check whether to belong to the menu's node. It seems to be tricky but fast fast and powerful;)
|
||||||
$attribute = sprintf(
|
$attribute = sprintf(
|
||||||
'"mid" => "%s", "module_srl" => "%d","node_srl"=>"%s","category_srl"=>"%s","parent_srl"=>"%s","text"=>$_titles[%d][$lang_type],"selected"=>(in_array(Context::get("category"),array(%s))?1:0),"expand"=>"%s","color"=>"%s","description"=>$_descriptions[%d][$lang_type],"list"=>array(%s),"document_count"=>"%d","grant"=>%s?true:false',
|
'"mid" => "%s", "module_srl" => "%d","node_srl"=>"%s","category_srl"=>"%s","parent_srl"=>"%s","text"=>$_titles[%d][$lang_type],"selected"=>(in_array(Context::get("category"),array(%s))?1:0),"expand"=>"%s","color"=>"%s","description"=>$_descriptions[%d][$lang_type],"list"=>array(%s),"document_count"=>"%d","grant"=>%s?true:false',
|
||||||
|
|
@ -1920,6 +1974,7 @@ class documentController extends document
|
||||||
// Generate buff data
|
// Generate buff data
|
||||||
$output['buff'] .= sprintf('%s=>array(%s),', $node->category_srl, $attribute);
|
$output['buff'] .= sprintf('%s=>array(%s),', $node->category_srl, $attribute);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1953,15 +2008,19 @@ class documentController extends document
|
||||||
function procDocumentAddCart()
|
function procDocumentAddCart()
|
||||||
{
|
{
|
||||||
if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
|
if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
|
||||||
|
|
||||||
// Get document_srl
|
// Get document_srl
|
||||||
$srls = explode(',',Context::get('srls'));
|
$srls = explode(',',Context::get('srls'));
|
||||||
for($i=0;$i<count($srls);$i++)
|
for($i = 0; $i < count($srls); $i++)
|
||||||
{
|
{
|
||||||
$srl = trim($srls[$i]);
|
$srl = trim($srls[$i]);
|
||||||
|
|
||||||
if(!$srl) continue;
|
if(!$srl) continue;
|
||||||
|
|
||||||
$document_srls[] = $srl;
|
$document_srls[] = $srl;
|
||||||
}
|
}
|
||||||
if(!count($document_srls)) return;
|
if(!count($document_srls)) return;
|
||||||
|
|
||||||
// Get module_srl of the documents
|
// Get module_srl of the documents
|
||||||
$args->list_count = count($document_srls);
|
$args->list_count = count($document_srls);
|
||||||
$args->document_srls = implode(',',$document_srls);
|
$args->document_srls = implode(',',$document_srls);
|
||||||
|
|
@ -1975,6 +2034,7 @@ class documentController extends document
|
||||||
$document_srls[$val->module_srl][] = $val->document_srl;
|
$document_srls[$val->module_srl][] = $val->document_srl;
|
||||||
}
|
}
|
||||||
if(!$document_srls || !count($document_srls)) return new Object();
|
if(!$document_srls || !count($document_srls)) return new Object();
|
||||||
|
|
||||||
// Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents)
|
// Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents)
|
||||||
$oModuleModel = &getModel('module');
|
$oModuleModel = &getModel('module');
|
||||||
$module_srls = array_keys($document_srls);
|
$module_srls = array_keys($document_srls);
|
||||||
|
|
|
||||||
|
|
@ -728,7 +728,7 @@ class documentModel extends document
|
||||||
$list_order = array();
|
$list_order = array();
|
||||||
foreach($list as $key => $val)
|
foreach($list as $key => $val)
|
||||||
{
|
{
|
||||||
$obj = null;
|
$obj = new stdClass;
|
||||||
$obj->mid = $val['mid'];
|
$obj->mid = $val['mid'];
|
||||||
$obj->module_srl = $val['module_srl'];
|
$obj->module_srl = $val['module_srl'];
|
||||||
$obj->category_srl = $val['category_srl'];
|
$obj->category_srl = $val['category_srl'];
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,9 @@ class file extends ModuleObject
|
||||||
{
|
{
|
||||||
// Register action forward (to use in administrator mode)
|
// Register action forward (to use in administrator mode)
|
||||||
$oModuleController = &getController('module');
|
$oModuleController = &getController('module');
|
||||||
|
|
||||||
// Save the default settings for attachments
|
// Save the default settings for attachments
|
||||||
|
$config = new stdClass;
|
||||||
$config->allowed_filesize = '2';
|
$config->allowed_filesize = '2';
|
||||||
$config->allowed_attach_size = '2';
|
$config->allowed_attach_size = '2';
|
||||||
$config->allowed_filetypes = '*.*';
|
$config->allowed_filetypes = '*.*';
|
||||||
|
|
|
||||||
|
|
@ -110,6 +110,7 @@ class installAdminController extends install
|
||||||
Context::setDBInfo($db_info);
|
Context::setDBInfo($db_info);
|
||||||
if($default_url)
|
if($default_url)
|
||||||
{
|
{
|
||||||
|
$site_args = new stdClass;
|
||||||
$site_args->site_srl = 0;
|
$site_args->site_srl = 0;
|
||||||
$site_args->domain = $default_url;
|
$site_args->domain = $default_url;
|
||||||
$oModuleController = &getController('module');
|
$oModuleController = &getController('module');
|
||||||
|
|
@ -306,6 +307,7 @@ class installAdminController extends install
|
||||||
|
|
||||||
unset($args);
|
unset($args);
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->htmlFooter = $config->htmlFooter;
|
$args->htmlFooter = $config->htmlFooter;
|
||||||
$args->siteTitle = $config->siteTitle;
|
$args->siteTitle = $config->siteTitle;
|
||||||
$oModuleController->updateModuleConfig('module',$args);
|
$oModuleController->updateModuleConfig('module',$args);
|
||||||
|
|
|
||||||
|
|
@ -155,7 +155,7 @@ class installController extends install
|
||||||
// install by default XE UI
|
// install by default XE UI
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
|
if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
|
||||||
if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
|
if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -262,6 +262,7 @@ class memberAdminController extends member
|
||||||
if($signupItem->isUse != ($extendItem->is_active == 'Y') || $signupItem->required != ($extendItem->required == 'Y'))
|
if($signupItem->isUse != ($extendItem->is_active == 'Y') || $signupItem->required != ($extendItem->required == 'Y'))
|
||||||
{
|
{
|
||||||
unset($update_args);
|
unset($update_args);
|
||||||
|
$update_args = new stdClass;
|
||||||
$update_args->member_join_form_srl = $extendItem->member_join_form_srl;
|
$update_args->member_join_form_srl = $extendItem->member_join_form_srl;
|
||||||
$update_args->is_active = $signupItem->isUse?'Y':'N';
|
$update_args->is_active = $signupItem->isUse?'Y':'N';
|
||||||
$update_args->required = $signupItem->required?'Y':'N';
|
$update_args->required = $signupItem->required?'Y':'N';
|
||||||
|
|
@ -388,6 +389,7 @@ class memberAdminController extends member
|
||||||
foreach($items as $key)
|
foreach($items as $key)
|
||||||
{
|
{
|
||||||
unset($signupItem);
|
unset($signupItem);
|
||||||
|
$signupItem = new stdClass;
|
||||||
$signupItem->isDefaultForm = true;
|
$signupItem->isDefaultForm = true;
|
||||||
$signupItem->name = $key;
|
$signupItem->name = $key;
|
||||||
$signupItem->title = $key;
|
$signupItem->title = $key;
|
||||||
|
|
@ -415,6 +417,7 @@ class memberAdminController extends member
|
||||||
foreach($extendItems as $form_srl=>$item_info)
|
foreach($extendItems as $form_srl=>$item_info)
|
||||||
{
|
{
|
||||||
unset($signupItem);
|
unset($signupItem);
|
||||||
|
$signupItem = new stdClass;
|
||||||
$signupItem->name = $item_info->column_name;
|
$signupItem->name = $item_info->column_name;
|
||||||
$signupItem->title = $item_info->column_title;
|
$signupItem->title = $item_info->column_title;
|
||||||
$signupItem->type = $item_info->column_type;
|
$signupItem->type = $item_info->column_type;
|
||||||
|
|
@ -628,7 +631,7 @@ class memberAdminController extends member
|
||||||
* Add a join form
|
* Add a join form
|
||||||
* @return void|Object (void : success, Object : fail)
|
* @return void|Object (void : success, Object : fail)
|
||||||
*/
|
*/
|
||||||
function procMemberAdminInsertJoinForm()
|
function procMemberAdminInsertJoinForm()
|
||||||
{
|
{
|
||||||
$args = new stdClass();
|
$args = new stdClass();
|
||||||
$args->member_join_form_srl = Context::get('member_join_form_srl');
|
$args->member_join_form_srl = Context::get('member_join_form_srl');
|
||||||
|
|
@ -654,7 +657,7 @@ class memberAdminController extends member
|
||||||
// Check ID duplicated
|
// Check ID duplicated
|
||||||
$oMemberModel = &getModel('member');
|
$oMemberModel = &getModel('member');
|
||||||
$config = $oMemberModel->getMemberConfig();
|
$config = $oMemberModel->getMemberConfig();
|
||||||
foreach($config->signupForm as $item)
|
foreach($config->signupForm as $item)
|
||||||
{
|
{
|
||||||
if($item->name == $args->column_name)
|
if($item->name == $args->column_name)
|
||||||
{
|
{
|
||||||
|
|
@ -694,7 +697,7 @@ class memberAdminController extends member
|
||||||
|
|
||||||
if($isInsert)
|
if($isInsert)
|
||||||
{
|
{
|
||||||
$config->signupForm[] = $signupItem;
|
$config->signupForm[] = $signupItem;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -773,7 +776,7 @@ class memberAdminController extends member
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* selected member manager layer in dispAdminList
|
* selected member manager layer in dispAdminList
|
||||||
* @return void|Object (void : success, Object : fail)
|
* @return void|Object (void : success, Object : fail)
|
||||||
*/
|
*/
|
||||||
function procMemberAdminSelectedMemberManage()
|
function procMemberAdminSelectedMemberManage()
|
||||||
|
|
@ -789,7 +792,7 @@ class memberAdminController extends member
|
||||||
foreach($members as $key=>$member_srl)
|
foreach($members as $key=>$member_srl)
|
||||||
{
|
{
|
||||||
$args = new stdClass();
|
$args = new stdClass();
|
||||||
$args->member_srl = $member_srl;
|
$args->member_srl = $member_srl;
|
||||||
switch($var->type)
|
switch($var->type)
|
||||||
{
|
{
|
||||||
case 'modify':
|
case 'modify':
|
||||||
|
|
@ -901,6 +904,7 @@ class memberAdminController extends member
|
||||||
$oDB = &DB::getInstance();
|
$oDB = &DB::getInstance();
|
||||||
$oDB->begin();
|
$oDB->begin();
|
||||||
// Delete a group of selected members
|
// Delete a group of selected members
|
||||||
|
$args = new stdClass;
|
||||||
$args->member_srl = $member_srl;
|
$args->member_srl = $member_srl;
|
||||||
$output = executeQuery('member.deleteMembersGroup', $args);
|
$output = executeQuery('member.deleteMembersGroup', $args);
|
||||||
if(!$output->toBool())
|
if(!$output->toBool())
|
||||||
|
|
@ -920,7 +924,7 @@ class memberAdminController extends member
|
||||||
$member_srl = (int)trim($member_srls[$i]);
|
$member_srl = (int)trim($member_srls[$i]);
|
||||||
if(!$member_srl) continue;
|
if(!$member_srl) continue;
|
||||||
|
|
||||||
$args = null;
|
$args = new stdClass;
|
||||||
$args->member_srl = $member_srl;
|
$args->member_srl = $member_srl;
|
||||||
$args->group_srl = $group_srl;
|
$args->group_srl = $group_srl;
|
||||||
|
|
||||||
|
|
@ -1055,6 +1059,7 @@ class memberAdminController extends member
|
||||||
*/
|
*/
|
||||||
function changeGroup($source_group_srl, $target_group_srl)
|
function changeGroup($source_group_srl, $target_group_srl)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->source_group_srl = $source_group_srl;
|
$args->source_group_srl = $source_group_srl;
|
||||||
$args->target_group_srl = $target_group_srl;
|
$args->target_group_srl = $target_group_srl;
|
||||||
|
|
||||||
|
|
@ -1069,7 +1074,7 @@ class memberAdminController extends member
|
||||||
function insertGroup($args)
|
function insertGroup($args)
|
||||||
{
|
{
|
||||||
if(!$args->site_srl) $args->site_srl = 0;
|
if(!$args->site_srl) $args->site_srl = 0;
|
||||||
// Check the value of is_default.
|
// Check the value of is_default.
|
||||||
if($args->is_default!='Y')
|
if($args->is_default!='Y')
|
||||||
{
|
{
|
||||||
$args->is_default = 'N';
|
$args->is_default = 'N';
|
||||||
|
|
@ -1091,7 +1096,7 @@ class memberAdminController extends member
|
||||||
*/
|
*/
|
||||||
function updateGroup($args)
|
function updateGroup($args)
|
||||||
{
|
{
|
||||||
// Check the value of is_default.
|
// Check the value of is_default.
|
||||||
if(!$args->group_srl) return new Object(-1, 'lang->msg_not_founded');
|
if(!$args->group_srl) return new Object(-1, 'lang->msg_not_founded');
|
||||||
if($args->is_default!='Y')
|
if($args->is_default!='Y')
|
||||||
{
|
{
|
||||||
|
|
@ -1129,6 +1134,7 @@ class memberAdminController extends member
|
||||||
// Change to default_group_srl
|
// Change to default_group_srl
|
||||||
$this->changeGroup($group_srl, $default_group_srl);
|
$this->changeGroup($group_srl, $default_group_srl);
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->group_srl = $group_srl;
|
$args->group_srl = $group_srl;
|
||||||
return executeQuery('member.deleteGroup', $args);
|
return executeQuery('member.deleteGroup', $args);
|
||||||
}
|
}
|
||||||
|
|
@ -1139,7 +1145,7 @@ class memberAdminController extends member
|
||||||
*/
|
*/
|
||||||
public function procMemberAdminGroupConfig()
|
public function procMemberAdminGroupConfig()
|
||||||
{
|
{
|
||||||
$vars = Context::getRequestVars();
|
$vars = Context::getRequestVars();
|
||||||
|
|
||||||
$oMemberModel = &getModel('member');
|
$oMemberModel = &getModel('member');
|
||||||
$oModuleController = &getController('module');
|
$oModuleController = &getController('module');
|
||||||
|
|
@ -1201,6 +1207,7 @@ class memberAdminController extends member
|
||||||
|
|
||||||
foreach($vars->group_srls as $key => $val)
|
foreach($vars->group_srls as $key => $val)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->group_srl = $val;
|
$args->group_srl = $val;
|
||||||
$args->list_order = $key + 1;
|
$args->list_order = $key + 1;
|
||||||
executeQuery('member.updateMemberGroupListOrder', $args);
|
executeQuery('member.updateMemberGroupListOrder', $args);
|
||||||
|
|
@ -1241,6 +1248,7 @@ class memberAdminController extends member
|
||||||
*/
|
*/
|
||||||
function deleteDeniedID($user_id)
|
function deleteDeniedID($user_id)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->user_id = $user_id;
|
$args->user_id = $user_id;
|
||||||
return executeQuery('member.deleteDeniedID', $args);
|
return executeQuery('member.deleteDeniedID', $args);
|
||||||
}
|
}
|
||||||
|
|
@ -1252,6 +1260,7 @@ class memberAdminController extends member
|
||||||
*/
|
*/
|
||||||
function deleteDeniedNickName($nick_name)
|
function deleteDeniedNickName($nick_name)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->nick_name = $nick_name;
|
$args->nick_name = $nick_name;
|
||||||
return executeQuery('member.deleteDeniedNickName', $args);
|
return executeQuery('member.deleteDeniedNickName', $args);
|
||||||
}
|
}
|
||||||
|
|
@ -1279,6 +1288,7 @@ class memberAdminController extends member
|
||||||
{
|
{
|
||||||
$oMemberModel = &getModel('member');
|
$oMemberModel = &getModel('member');
|
||||||
// Get information of the join form
|
// Get information of the join form
|
||||||
|
$args = new stdClass;
|
||||||
$args->member_join_form_srl = $member_join_form_srl;
|
$args->member_join_form_srl = $member_join_form_srl;
|
||||||
$output = executeQuery('member.getJoinForm', $args);
|
$output = executeQuery('member.getJoinForm', $args);
|
||||||
|
|
||||||
|
|
@ -1298,9 +1308,11 @@ class memberAdminController extends member
|
||||||
// Return if no previous join form exists
|
// Return if no previous join form exists
|
||||||
if(!$prev_member_join_form) return new Object();
|
if(!$prev_member_join_form) return new Object();
|
||||||
// Information of the join form
|
// Information of the join form
|
||||||
|
$cur_args = new stdClass;
|
||||||
$cur_args->member_join_form_srl = $member_join_form_srl;
|
$cur_args->member_join_form_srl = $member_join_form_srl;
|
||||||
$cur_args->list_order = $prev_member_join_form->list_order;
|
$cur_args->list_order = $prev_member_join_form->list_order;
|
||||||
// Information of the target join form
|
// Information of the target join form
|
||||||
|
$prev_args = new stdClass;
|
||||||
$prev_args->member_join_form_srl = $prev_member_join_form->member_join_form_srl;
|
$prev_args->member_join_form_srl = $prev_member_join_form->member_join_form_srl;
|
||||||
$prev_args->list_order = $list_order;
|
$prev_args->list_order = $list_order;
|
||||||
// Execute Query
|
// Execute Query
|
||||||
|
|
@ -1323,6 +1335,7 @@ class memberAdminController extends member
|
||||||
{
|
{
|
||||||
$oMemberModel = &getModel('member');
|
$oMemberModel = &getModel('member');
|
||||||
// Get information of the join form
|
// Get information of the join form
|
||||||
|
$args = new stdClass;
|
||||||
$args->member_join_form_srl = $member_join_form_srl;
|
$args->member_join_form_srl = $member_join_form_srl;
|
||||||
$output = executeQuery('member.getJoinForm', $args);
|
$output = executeQuery('member.getJoinForm', $args);
|
||||||
|
|
||||||
|
|
@ -1343,9 +1356,11 @@ class memberAdminController extends member
|
||||||
if(!$next_member_join_form_srl) return new Object();
|
if(!$next_member_join_form_srl) return new Object();
|
||||||
$next_member_join_form = $join_form_list[$next_member_join_form_srl];
|
$next_member_join_form = $join_form_list[$next_member_join_form_srl];
|
||||||
// Information of the join form
|
// Information of the join form
|
||||||
|
$cur_args = new stdClass;
|
||||||
$cur_args->member_join_form_srl = $member_join_form_srl;
|
$cur_args->member_join_form_srl = $member_join_form_srl;
|
||||||
$cur_args->list_order = $next_member_join_form->list_order;
|
$cur_args->list_order = $next_member_join_form->list_order;
|
||||||
// Information of the target join form
|
// Information of the target join form
|
||||||
|
$next_args = new stdClass;
|
||||||
$next_args->member_join_form_srl = $next_member_join_form->member_join_form_srl;
|
$next_args->member_join_form_srl = $next_member_join_form->member_join_form_srl;
|
||||||
$next_args->list_order = $list_order;
|
$next_args->list_order = $list_order;
|
||||||
// Execute Query
|
// Execute Query
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@ class member extends ModuleObject {
|
||||||
$isNotInstall = empty($args);
|
$isNotInstall = empty($args);
|
||||||
|
|
||||||
// Set the basic information
|
// Set the basic information
|
||||||
|
$args = new stdClass;
|
||||||
$args->enable_join = 'Y';
|
$args->enable_join = 'Y';
|
||||||
$args->enable_openid = 'N';
|
$args->enable_openid = 'N';
|
||||||
if(!$args->enable_auth_mail) $args->enable_auth_mail = 'N';
|
if(!$args->enable_auth_mail) $args->enable_auth_mail = 'N';
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Scrap document
|
* Scrap document
|
||||||
*
|
*
|
||||||
* @return void|Object (void : success, Object : fail)
|
* @return void|Object (void : success, Object : fail)
|
||||||
*/
|
*/
|
||||||
function procMemberScrapDocument()
|
function procMemberScrapDocument()
|
||||||
|
|
@ -149,7 +149,7 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete a scrap
|
* Delete a scrap
|
||||||
*
|
*
|
||||||
* @return void|Object (void : success, Object : fail)
|
* @return void|Object (void : success, Object : fail)
|
||||||
*/
|
*/
|
||||||
function procMemberDeleteScrap()
|
function procMemberDeleteScrap()
|
||||||
|
|
@ -161,6 +161,7 @@ class memberController extends member
|
||||||
$document_srl = (int)Context::get('document_srl');
|
$document_srl = (int)Context::get('document_srl');
|
||||||
if(!$document_srl) return new Object(-1,'msg_invalid_request');
|
if(!$document_srl) return new Object(-1,'msg_invalid_request');
|
||||||
// Variables
|
// Variables
|
||||||
|
$args = new stdClass;
|
||||||
$args->member_srl = $logged_info->member_srl;
|
$args->member_srl = $logged_info->member_srl;
|
||||||
$args->document_srl = $document_srl;
|
$args->document_srl = $document_srl;
|
||||||
return executeQuery('member.deleteScrapDocument', $args);
|
return executeQuery('member.deleteScrapDocument', $args);
|
||||||
|
|
@ -178,7 +179,7 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete the post
|
* Delete the post
|
||||||
*
|
*
|
||||||
* @return void|Object (void : success, Object : fail)
|
* @return void|Object (void : success, Object : fail)
|
||||||
*/
|
*/
|
||||||
function procMemberDeleteSavedDocument()
|
function procMemberDeleteSavedDocument()
|
||||||
|
|
@ -196,7 +197,7 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check values when member joining
|
* Check values when member joining
|
||||||
*
|
*
|
||||||
* @return void|Object (void : success, Object : fail)
|
* @return void|Object (void : success, Object : fail)
|
||||||
*/
|
*/
|
||||||
function procMemberCheckValue()
|
function procMemberCheckValue()
|
||||||
|
|
@ -240,7 +241,7 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Join Membership
|
* Join Membership
|
||||||
*
|
*
|
||||||
* @return void|Object (void : success, Object : fail)
|
* @return void|Object (void : success, Object : fail)
|
||||||
*/
|
*/
|
||||||
function procMemberInsert()
|
function procMemberInsert()
|
||||||
|
|
@ -269,6 +270,8 @@ class memberController extends member
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
foreach($getVars as $val)
|
foreach($getVars as $val)
|
||||||
{
|
{
|
||||||
$args->{$val} = Context::get($val);
|
$args->{$val} = Context::get($val);
|
||||||
|
|
@ -421,10 +424,10 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Edit member profile
|
* Edit member profile
|
||||||
*
|
*
|
||||||
* @return void|Object (void : success, Object : fail)
|
* @return void|Object (void : success, Object : fail)
|
||||||
*/
|
*/
|
||||||
function procMemberModifyInfo()
|
function procMemberModifyInfo()
|
||||||
{
|
{
|
||||||
if(!Context::get('is_logged'))
|
if(!Context::get('is_logged'))
|
||||||
{
|
{
|
||||||
|
|
@ -451,6 +454,8 @@ class memberController extends member
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
foreach($getVars as $val)
|
foreach($getVars as $val)
|
||||||
{
|
{
|
||||||
$args->{$val} = Context::get($val);
|
$args->{$val} = Context::get($val);
|
||||||
|
|
@ -535,7 +540,7 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Change the user password
|
* Change the user password
|
||||||
*
|
*
|
||||||
* @return void|Object (void : success, Object : fail)
|
* @return void|Object (void : success, Object : fail)
|
||||||
*/
|
*/
|
||||||
function procMemberModifyPassword()
|
function procMemberModifyPassword()
|
||||||
|
|
@ -559,6 +564,7 @@ class memberController extends member
|
||||||
if($current_password == $password) return new Object(-1, 'invalid_new_password');
|
if($current_password == $password) return new Object(-1, 'invalid_new_password');
|
||||||
|
|
||||||
// Execute insert or update depending on the value of member_srl
|
// Execute insert or update depending on the value of member_srl
|
||||||
|
$args = new stdClass;
|
||||||
$args->member_srl = $member_srl;
|
$args->member_srl = $member_srl;
|
||||||
$args->password = $password;
|
$args->password = $password;
|
||||||
$output = $this->updateMemberPassword($args);
|
$output = $this->updateMemberPassword($args);
|
||||||
|
|
@ -573,7 +579,7 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Membership withdrawal
|
* Membership withdrawal
|
||||||
*
|
*
|
||||||
* @return void|Object (void : success, Object : fail)
|
* @return void|Object (void : success, Object : fail)
|
||||||
*/
|
*/
|
||||||
function procMemberLeave()
|
function procMemberLeave()
|
||||||
|
|
@ -609,7 +615,7 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a profile image
|
* Add a profile image
|
||||||
*
|
*
|
||||||
* @return void|Object (void : success, Object : fail)
|
* @return void|Object (void : success, Object : fail)
|
||||||
*/
|
*/
|
||||||
function procMemberInsertProfileImage()
|
function procMemberInsertProfileImage()
|
||||||
|
|
@ -638,7 +644,7 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Insert a profile image
|
* Insert a profile image
|
||||||
*
|
*
|
||||||
* @param int $member_srl
|
* @param int $member_srl
|
||||||
* @param object $target_file
|
* @param object $target_file
|
||||||
*
|
*
|
||||||
|
|
@ -646,10 +652,10 @@ class memberController extends member
|
||||||
*/
|
*/
|
||||||
function insertProfileImage($member_srl, $target_file)
|
function insertProfileImage($member_srl, $target_file)
|
||||||
{
|
{
|
||||||
|
|
||||||
// Check uploaded file
|
// Check uploaded file
|
||||||
if(!checkUploadedFile($target_file)) return;
|
if(!checkUploadedFile($target_file)) return;
|
||||||
|
|
||||||
$oModuleModel = &getModel('module');
|
$oModuleModel = &getModel('module');
|
||||||
$config = $oModuleModel->getModuleConfig('member');
|
$config = $oModuleModel->getModuleConfig('member');
|
||||||
// Get an image size
|
// Get an image size
|
||||||
|
|
@ -674,7 +680,7 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add an image name
|
* Add an image name
|
||||||
*
|
*
|
||||||
* @return void|Object (void : success, Object : fail)
|
* @return void|Object (void : success, Object : fail)
|
||||||
*/
|
*/
|
||||||
function procMemberInsertImageName()
|
function procMemberInsertImageName()
|
||||||
|
|
@ -703,7 +709,7 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Insert a image name
|
* Insert a image name
|
||||||
*
|
*
|
||||||
* @param int $member_srl
|
* @param int $member_srl
|
||||||
* @param object $target_file
|
* @param object $target_file
|
||||||
*
|
*
|
||||||
|
|
@ -713,7 +719,7 @@ class memberController extends member
|
||||||
{
|
{
|
||||||
// Check uploaded file
|
// Check uploaded file
|
||||||
if(!checkUploadedFile($target_file)) return;
|
if(!checkUploadedFile($target_file)) return;
|
||||||
|
|
||||||
$oModuleModel = &getModel('module');
|
$oModuleModel = &getModel('module');
|
||||||
$config = $oModuleModel->getModuleConfig('member');
|
$config = $oModuleModel->getModuleConfig('member');
|
||||||
// Get an image size
|
// Get an image size
|
||||||
|
|
@ -772,7 +778,7 @@ class memberController extends member
|
||||||
|
|
||||||
$logged_info = Context::get('logged_info');
|
$logged_info = Context::get('logged_info');
|
||||||
|
|
||||||
if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
|
if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
|
||||||
{
|
{
|
||||||
$oMemberModel = &getModel('member');
|
$oMemberModel = &getModel('member');
|
||||||
$image_name = $oMemberModel->getImageName($member_srl);
|
$image_name = $oMemberModel->getImageName($member_srl);
|
||||||
|
|
@ -812,7 +818,7 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Insert a image mark
|
* Insert a image mark
|
||||||
*
|
*
|
||||||
* @param int $member_srl
|
* @param int $member_srl
|
||||||
* @param object $target_file
|
* @param object $target_file
|
||||||
*
|
*
|
||||||
|
|
@ -822,7 +828,7 @@ class memberController extends member
|
||||||
{
|
{
|
||||||
// Check uploaded file
|
// Check uploaded file
|
||||||
if(!checkUploadedFile($target_file)) return;
|
if(!checkUploadedFile($target_file)) return;
|
||||||
|
|
||||||
$oModuleModel = &getModel('module');
|
$oModuleModel = &getModel('module');
|
||||||
$config = $oModuleModel->getModuleConfig('member');
|
$config = $oModuleModel->getModuleConfig('member');
|
||||||
// Get an image size
|
// Get an image size
|
||||||
|
|
@ -847,7 +853,7 @@ class memberController extends member
|
||||||
*
|
*
|
||||||
* @return Object
|
* @return Object
|
||||||
*/
|
*/
|
||||||
function procMemberDeleteImageMark($_memberSrl = 0)
|
function procMemberDeleteImageMark($_memberSrl = 0)
|
||||||
{
|
{
|
||||||
$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
|
$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
|
||||||
if(!$member_srl)
|
if(!$member_srl)
|
||||||
|
|
@ -857,7 +863,7 @@ class memberController extends member
|
||||||
|
|
||||||
$logged_info = Context::get('logged_info');
|
$logged_info = Context::get('logged_info');
|
||||||
|
|
||||||
if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
|
if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
|
||||||
{
|
{
|
||||||
$oMemberModel = &getModel('member');
|
$oMemberModel = &getModel('member');
|
||||||
$image_mark = $oMemberModel->getImageMark($member_srl);
|
$image_mark = $oMemberModel->getImageMark($member_srl);
|
||||||
|
|
@ -878,19 +884,24 @@ class memberController extends member
|
||||||
|
|
||||||
$oMemberModel = &getModel('member');
|
$oMemberModel = &getModel('member');
|
||||||
$oModuleModel = &getModel('module');
|
$oModuleModel = &getModel('module');
|
||||||
|
|
||||||
// Check if a member having the same email address exists
|
// Check if a member having the same email address exists
|
||||||
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
|
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
|
||||||
if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
|
if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
|
||||||
|
|
||||||
// Get information of the member
|
// Get information of the member
|
||||||
$columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name');
|
$columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name');
|
||||||
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
|
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
|
||||||
|
|
||||||
// Check if possible to find member's ID and password
|
// Check if possible to find member's ID and password
|
||||||
if($member_info->denied == 'Y')
|
if($member_info->denied == 'Y')
|
||||||
{
|
{
|
||||||
|
$chk_args = new stdClass;
|
||||||
$chk_args->member_srl = $member_info->member_srl;
|
$chk_args->member_srl = $member_info->member_srl;
|
||||||
$output = executeQuery('member.chkAuthMail', $chk_args);
|
$output = executeQuery('member.chkAuthMail', $chk_args);
|
||||||
if($output->toBool() && $output->data->count != '0') return new Object(-1, 'msg_user_not_confirmed');
|
if($output->toBool() && $output->data->count != '0') return new Object(-1, 'msg_user_not_confirmed');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Insert data into the authentication DB
|
// Insert data into the authentication DB
|
||||||
$args = new stdClass();
|
$args = new stdClass();
|
||||||
$args->user_id = $member_info->user_id;
|
$args->user_id = $member_info->user_id;
|
||||||
|
|
@ -905,6 +916,7 @@ class memberController extends member
|
||||||
Context::set('auth_args', $args);
|
Context::set('auth_args', $args);
|
||||||
|
|
||||||
$member_config = $oModuleModel->getModuleConfig('member');
|
$member_config = $oModuleModel->getModuleConfig('member');
|
||||||
|
$memberInfo = array();
|
||||||
global $lang;
|
global $lang;
|
||||||
if(is_array($member_config->signupForm))
|
if(is_array($member_config->signupForm))
|
||||||
{
|
{
|
||||||
|
|
@ -995,6 +1007,7 @@ class memberController extends member
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update to a temporary password and set change_password_date to 1
|
// Update to a temporary password and set change_password_date to 1
|
||||||
|
$args = new stdClass;
|
||||||
$args->member_srl = $member_srl;
|
$args->member_srl = $member_srl;
|
||||||
list($usec, $sec) = explode(" ", microtime());
|
list($usec, $sec) = explode(" ", microtime());
|
||||||
$temp_password = substr(md5($user_id . $member_info->find_account_answer. $usec . $sec),0,15);
|
$temp_password = substr(md5($user_id . $member_info->find_account_answer. $usec . $sec),0,15);
|
||||||
|
|
@ -1025,6 +1038,7 @@ class memberController extends member
|
||||||
$auth_key = Context::get('auth_key');
|
$auth_key = Context::get('auth_key');
|
||||||
if(!$member_srl || !$auth_key) return $this->stop('msg_invalid_request');
|
if(!$member_srl || !$auth_key) return $this->stop('msg_invalid_request');
|
||||||
// Test logs for finding password by user_id and authkey
|
// Test logs for finding password by user_id and authkey
|
||||||
|
$args = new stdClass;
|
||||||
$args->member_srl = $member_srl;
|
$args->member_srl = $member_srl;
|
||||||
$args->auth_key = $auth_key;
|
$args->auth_key = $auth_key;
|
||||||
$output = executeQuery('member.getAuthMail', $args);
|
$output = executeQuery('member.getAuthMail', $args);
|
||||||
|
|
@ -1071,10 +1085,12 @@ class memberController extends member
|
||||||
if($member_info->denied != 'Y')
|
if($member_info->denied != 'Y')
|
||||||
return new Object(-1, 'msg_invalid_request');
|
return new Object(-1, 'msg_invalid_request');
|
||||||
|
|
||||||
|
$chk_args = new stdClass;
|
||||||
$chk_args->member_srl = $member_srl;
|
$chk_args->member_srl = $member_srl;
|
||||||
$output = executeQuery('member.chkAuthMail', $chk_args);
|
$output = executeQuery('member.chkAuthMail', $chk_args);
|
||||||
if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
|
if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
|
||||||
// Insert data into the authentication DB
|
// Insert data into the authentication DB
|
||||||
|
$auth_args = new stdClass;
|
||||||
$auth_args->member_srl = $member_srl;
|
$auth_args->member_srl = $member_srl;
|
||||||
$auth_args->auth_key = md5(rand(0, 999999));
|
$auth_args->auth_key = md5(rand(0, 999999));
|
||||||
|
|
||||||
|
|
@ -1131,6 +1147,7 @@ class memberController extends member
|
||||||
// Log test by using email_address
|
// Log test by using email_address
|
||||||
$oMemberModel = &getModel('member');
|
$oMemberModel = &getModel('member');
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->email_address = $email_address;
|
$args->email_address = $email_address;
|
||||||
$memberSrl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
|
$memberSrl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
|
||||||
if(!$memberSrl) return $this->stop('msg_not_exists_member');
|
if(!$memberSrl) return $this->stop('msg_not_exists_member');
|
||||||
|
|
@ -1139,14 +1156,17 @@ class memberController extends member
|
||||||
$memberInfo = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList);
|
$memberInfo = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList);
|
||||||
|
|
||||||
// Check if a authentication mail has been sent previously
|
// Check if a authentication mail has been sent previously
|
||||||
|
$chk_args = new stdClass;
|
||||||
$chk_args->member_srl = $memberInfo->member_srl;
|
$chk_args->member_srl = $memberInfo->member_srl;
|
||||||
$output = executeQuery('member.chkAuthMail', $chk_args);
|
$output = executeQuery('member.chkAuthMail', $chk_args);
|
||||||
if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
|
if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
|
||||||
|
|
||||||
|
$auth_args = new stdClass;
|
||||||
$auth_args->member_srl = $memberInfo->member_srl;
|
$auth_args->member_srl = $memberInfo->member_srl;
|
||||||
$output = executeQueryArray('member.getAuthMailInfo', $auth_args);
|
$output = executeQueryArray('member.getAuthMailInfo', $auth_args);
|
||||||
if(!$output->data || !$output->data[0]->auth_key) return new Object(-1, 'msg_invalid_request');
|
if(!$output->data || !$output->data[0]->auth_key) return new Object(-1, 'msg_invalid_request');
|
||||||
$auth_info = $output->data[0];
|
$auth_info = $output->data[0];
|
||||||
|
|
||||||
// Get content of the email to send a member
|
// Get content of the email to send a member
|
||||||
Context::set('memberInfo', $memberInfo);
|
Context::set('memberInfo', $memberInfo);
|
||||||
$oModuleModel = &getModel('module');
|
$oModuleModel = &getModel('module');
|
||||||
|
|
@ -1207,10 +1227,11 @@ class memberController extends member
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove all key by member_srl
|
// remove all key by member_srl
|
||||||
|
$args = new stdClass;
|
||||||
$args->member_srl = $memberInfo->member_srl;
|
$args->member_srl = $memberInfo->member_srl;
|
||||||
$output = executeQuery('member.deleteAuthMail', $args);
|
$output = executeQuery('member.deleteAuthMail', $args);
|
||||||
|
|
||||||
if(!$output->toBool())
|
if(!$output->toBool())
|
||||||
{
|
{
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
@ -1220,12 +1241,13 @@ class memberController extends member
|
||||||
list($args->email_id, $args->email_host) = explode('@', $newEmail);
|
list($args->email_id, $args->email_host) = explode('@', $newEmail);
|
||||||
|
|
||||||
$output = executeQuery('member.updateMemberEmailAddress', $args);
|
$output = executeQuery('member.updateMemberEmailAddress', $args);
|
||||||
if(!$output->toBool())
|
if(!$output->toBool())
|
||||||
{
|
{
|
||||||
return $this->stop($output->getMessage());
|
return $this->stop($output->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
// generate new auth key
|
// generate new auth key
|
||||||
|
$auth_args = new stdClass;
|
||||||
$auth_args->user_id = $memberInfo->user_id;
|
$auth_args->user_id = $memberInfo->user_id;
|
||||||
$auth_args->member_srl = $memberInfo->member_srl;
|
$auth_args->member_srl = $memberInfo->member_srl;
|
||||||
$auth_args->new_password = $memberInfo->password;
|
$auth_args->new_password = $memberInfo->password;
|
||||||
|
|
@ -1329,6 +1351,7 @@ class memberController extends member
|
||||||
$logged_info = Context::get('logged_info');
|
$logged_info = Context::get('logged_info');
|
||||||
if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
|
if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->site_srl= $site_module_info->site_srl;
|
$args->site_srl= $site_module_info->site_srl;
|
||||||
$args->member_srl = $logged_info->member_srl;
|
$args->member_srl = $logged_info->member_srl;
|
||||||
$output = executeQuery('member.deleteMembersGroup', $args);
|
$output = executeQuery('member.deleteMembersGroup', $args);
|
||||||
|
|
@ -1452,6 +1475,7 @@ class memberController extends member
|
||||||
*/
|
*/
|
||||||
function replaceMemberGroup($args)
|
function replaceMemberGroup($args)
|
||||||
{
|
{
|
||||||
|
$obj = new stdClass;
|
||||||
$obj->site_srl = $args->site_srl;
|
$obj->site_srl = $args->site_srl;
|
||||||
$obj->member_srl = implode(',',$args->member_srl);
|
$obj->member_srl = implode(',',$args->member_srl);
|
||||||
|
|
||||||
|
|
@ -1468,6 +1492,7 @@ class memberController extends member
|
||||||
$inserted_members[$val] = true;
|
$inserted_members[$val] = true;
|
||||||
|
|
||||||
unset($obj);
|
unset($obj);
|
||||||
|
$obj = new stdClass;
|
||||||
$obj->member_srl = $val;
|
$obj->member_srl = $val;
|
||||||
$obj->group_srl = $args->group_srl;
|
$obj->group_srl = $args->group_srl;
|
||||||
$obj->site_srl = $args->site_srl;
|
$obj->site_srl = $args->site_srl;
|
||||||
|
|
@ -1495,6 +1520,7 @@ class memberController extends member
|
||||||
function doAutologin()
|
function doAutologin()
|
||||||
{
|
{
|
||||||
// Get a key value of auto log-in
|
// Get a key value of auto log-in
|
||||||
|
$args = new stdClass;
|
||||||
$args->autologin_key = $_COOKIE['xeak'];
|
$args->autologin_key = $_COOKIE['xeak'];
|
||||||
// Get information of the key
|
// Get information of the key
|
||||||
$output = executeQuery('member.getAutologin', $args);
|
$output = executeQuery('member.getAutologin', $args);
|
||||||
|
|
@ -1640,11 +1666,11 @@ class memberController extends member
|
||||||
}
|
}
|
||||||
|
|
||||||
// If denied == 'Y', notify
|
// If denied == 'Y', notify
|
||||||
if($this->memberInfo->denied == 'Y')
|
if($this->memberInfo->denied == 'Y')
|
||||||
{
|
{
|
||||||
$args->member_srl = $this->memberInfo->member_srl;
|
$args->member_srl = $this->memberInfo->member_srl;
|
||||||
$output = executeQuery('member.chkAuthMail', $args);
|
$output = executeQuery('member.chkAuthMail', $args);
|
||||||
if ($output->toBool() && $output->data->count != '0')
|
if ($output->toBool() && $output->data->count != '0')
|
||||||
{
|
{
|
||||||
$_SESSION['auth_member_srl'] = $this->memberInfo->member_srl;
|
$_SESSION['auth_member_srl'] = $this->memberInfo->member_srl;
|
||||||
$redirectUrl = getUrl('', 'act', 'dispMemberResendAuthMail');
|
$redirectUrl = getUrl('', 'act', 'dispMemberResendAuthMail');
|
||||||
|
|
@ -1798,6 +1824,7 @@ class memberController extends member
|
||||||
$member_popup_menu_list = Context::get('member_popup_menu_list');
|
$member_popup_menu_list = Context::get('member_popup_menu_list');
|
||||||
if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array();
|
if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array();
|
||||||
|
|
||||||
|
$obj = new stdClass;
|
||||||
$obj->url = $url;
|
$obj->url = $url;
|
||||||
$obj->str = $str;
|
$obj->str = $str;
|
||||||
$obj->icon = $icon;
|
$obj->icon = $icon;
|
||||||
|
|
@ -1902,7 +1929,7 @@ class memberController extends member
|
||||||
{
|
{
|
||||||
// Add to the default group
|
// Add to the default group
|
||||||
$output = $this->addMemberToGroup($args->member_srl,$default_group->group_srl);
|
$output = $this->addMemberToGroup($args->member_srl,$default_group->group_srl);
|
||||||
if(!$output->toBool())
|
if(!$output->toBool())
|
||||||
{
|
{
|
||||||
$oDB->rollback();
|
$oDB->rollback();
|
||||||
return $output;
|
return $output;
|
||||||
|
|
@ -1929,6 +1956,7 @@ class memberController extends member
|
||||||
if($args->denied == 'Y')
|
if($args->denied == 'Y')
|
||||||
{
|
{
|
||||||
// Insert data into the authentication DB
|
// Insert data into the authentication DB
|
||||||
|
$auth_args = new stdClass;
|
||||||
$auth_args->user_id = $args->user_id;
|
$auth_args->user_id = $args->user_id;
|
||||||
$auth_args->member_srl = $args->member_srl;
|
$auth_args->member_srl = $args->member_srl;
|
||||||
$auth_args->new_password = $args->password;
|
$auth_args->new_password = $args->password;
|
||||||
|
|
@ -1962,10 +1990,10 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Modify member information
|
* Modify member information
|
||||||
*
|
*
|
||||||
* @param bool $is_admin , modified 2013-11-22
|
* @param bool $is_admin , modified 2013-11-22
|
||||||
*/
|
*/
|
||||||
function updateMember($args, $is_admin = FALSE)
|
function updateMember($args, $is_admin = FALSE)
|
||||||
{
|
{
|
||||||
// Call a trigger (before)
|
// Call a trigger (before)
|
||||||
$output = ModuleHandler::triggerCall('member.updateMember', 'before', $args);
|
$output = ModuleHandler::triggerCall('member.updateMember', 'before', $args);
|
||||||
|
|
@ -2142,7 +2170,7 @@ class memberController extends member
|
||||||
function deleteMember($member_srl)
|
function deleteMember($member_srl)
|
||||||
{
|
{
|
||||||
// Call a trigger (before)
|
// Call a trigger (before)
|
||||||
$tirgger_obj = new stdClass();
|
$trigger_obj = new stdClass();
|
||||||
$trigger_obj->member_srl = $member_srl;
|
$trigger_obj->member_srl = $member_srl;
|
||||||
$output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj);
|
$output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj);
|
||||||
if(!$output->toBool()) return $output;
|
if(!$output->toBool()) return $output;
|
||||||
|
|
@ -2284,6 +2312,7 @@ class memberController extends member
|
||||||
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
|
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
|
||||||
if($member_srl) return new Object(-1,'msg_exists_email_address');
|
if($member_srl) return new Object(-1,'msg_exists_email_address');
|
||||||
|
|
||||||
|
$auth_args = new stdClass;
|
||||||
$auth_args->user_id = $newEmail;
|
$auth_args->user_id = $newEmail;
|
||||||
$auth_args->member_srl = $member_info->member_srl;
|
$auth_args->member_srl = $member_info->member_srl;
|
||||||
$auth_args->auth_key = md5(rand(0, 999999));
|
$auth_args->auth_key = md5(rand(0, 999999));
|
||||||
|
|
@ -2304,6 +2333,7 @@ class memberController extends member
|
||||||
|
|
||||||
global $lang;
|
global $lang;
|
||||||
|
|
||||||
|
$memberInfo = array();
|
||||||
$memberInfo[$lang->email_address] = $member_info->email_address;
|
$memberInfo[$lang->email_address] = $member_info->email_address;
|
||||||
$memberInfo[$lang->nick_name] = $member_info->nick_name;
|
$memberInfo[$lang->nick_name] = $member_info->nick_name;
|
||||||
|
|
||||||
|
|
@ -2338,6 +2368,7 @@ class memberController extends member
|
||||||
if(!$member_srl || !$auth_key) return $this->stop('msg_invalid_request');
|
if(!$member_srl || !$auth_key) return $this->stop('msg_invalid_request');
|
||||||
|
|
||||||
// Test logs for finding password by user_id and authkey
|
// Test logs for finding password by user_id and authkey
|
||||||
|
$args = new stdClass;
|
||||||
$args->member_srl = $member_srl;
|
$args->member_srl = $member_srl;
|
||||||
$args->auth_key = $auth_key;
|
$args->auth_key = $auth_key;
|
||||||
$output = executeQuery('member.getAuthMail', $args);
|
$output = executeQuery('member.getAuthMail', $args);
|
||||||
|
|
@ -2360,9 +2391,9 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* trigger for document.getDocumentMenu. Append to popup menu a button for procMemberSpammerManage()
|
* trigger for document.getDocumentMenu. Append to popup menu a button for procMemberSpammerManage()
|
||||||
*
|
*
|
||||||
* @param array &$menu_list
|
* @param array &$menu_list
|
||||||
*
|
*
|
||||||
* @return object
|
* @return object
|
||||||
**/
|
**/
|
||||||
function triggerGetDocumentMenu(&$menu_list)
|
function triggerGetDocumentMenu(&$menu_list)
|
||||||
|
|
@ -2390,9 +2421,9 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* trigger for comment.getCommentMenu. Append to popup menu a button for procMemberSpammerManage()
|
* trigger for comment.getCommentMenu. Append to popup menu a button for procMemberSpammerManage()
|
||||||
*
|
*
|
||||||
* @param array &$menu_list
|
* @param array &$menu_list
|
||||||
*
|
*
|
||||||
* @return object
|
* @return object
|
||||||
**/
|
**/
|
||||||
function triggerGetCommentMenu(&$menu_list)
|
function triggerGetCommentMenu(&$menu_list)
|
||||||
|
|
@ -2420,11 +2451,11 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spammer manage. Denied user login. And delete or trash all documents. Response Ajax string
|
* Spammer manage. Denied user login. And delete or trash all documents. Response Ajax string
|
||||||
*
|
*
|
||||||
* @return object
|
* @return object
|
||||||
**/
|
**/
|
||||||
function procMemberSpammerManage()
|
function procMemberSpammerManage()
|
||||||
{
|
{
|
||||||
if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
|
if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
|
||||||
|
|
||||||
$logged_info = Context::get('logged_info');
|
$logged_info = Context::get('logged_info');
|
||||||
|
|
@ -2454,7 +2485,7 @@ class memberController extends member
|
||||||
if($cnt_loop == 1)
|
if($cnt_loop == 1)
|
||||||
$this->_spammerMember($member_srl);
|
$this->_spammerMember($member_srl);
|
||||||
// proc document and comment
|
// proc document and comment
|
||||||
elseif($cnt_loop>1)
|
elseif($cnt_loop>1)
|
||||||
$this->_spammerDocuments($member_srl, $isMoveToTrash);
|
$this->_spammerDocuments($member_srl, $isMoveToTrash);
|
||||||
|
|
||||||
// get destination count
|
// get destination count
|
||||||
|
|
@ -2465,7 +2496,7 @@ class memberController extends member
|
||||||
$remain_count = $cnt_document + $cnt_comment;
|
$remain_count = $cnt_document + $cnt_comment;
|
||||||
if($cnt_loop == 1) $total_count = $remain_count;
|
if($cnt_loop == 1) $total_count = $remain_count;
|
||||||
|
|
||||||
// get progress percent
|
// get progress percent
|
||||||
if($total_count > 0)
|
if($total_count > 0)
|
||||||
$progress = intval( ( ( $total_count - $remain_count ) / $total_count ) * 100 );
|
$progress = intval( ( ( $total_count - $remain_count ) / $total_count ) * 100 );
|
||||||
else
|
else
|
||||||
|
|
@ -2484,10 +2515,10 @@ class memberController extends member
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Denied user login and write description
|
* Denied user login and write description
|
||||||
*
|
*
|
||||||
* @param int $member_srl
|
* @param int $member_srl
|
||||||
*
|
*
|
||||||
* @return object
|
* @return object
|
||||||
**/
|
**/
|
||||||
private function _spammerMember($member_srl) {
|
private function _spammerMember($member_srl) {
|
||||||
$logged_info = Context::get('logged_info');
|
$logged_info = Context::get('logged_info');
|
||||||
|
|
@ -2521,24 +2552,24 @@ class memberController extends member
|
||||||
* @param int $member_srl
|
* @param int $member_srl
|
||||||
* @param bool $isMoveToTrash
|
* @param bool $isMoveToTrash
|
||||||
*
|
*
|
||||||
* @return object
|
* @return object
|
||||||
**/
|
**/
|
||||||
private function _spammerDocuments($member_srl, $isMoveToTrash) {
|
private function _spammerDocuments($member_srl, $isMoveToTrash) {
|
||||||
$oDocumentController = &getController('document');
|
$oDocumentController = &getController('document');
|
||||||
$oDocumentModel = &getModel('document');
|
$oDocumentModel = &getModel('document');
|
||||||
$oCommentController = &getController('comment');
|
$oCommentController = &getController('comment');
|
||||||
$oCommentModel = &getModel('comment');
|
$oCommentModel = &getModel('comment');
|
||||||
|
|
||||||
// delete count by one request
|
// delete count by one request
|
||||||
$getContentsCount = 10;
|
$getContentsCount = 10;
|
||||||
|
|
||||||
// 1. proc comment, 2. proc document
|
// 1. proc comment, 2. proc document
|
||||||
$cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl);
|
$cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl);
|
||||||
$cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl);
|
$cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl);
|
||||||
if($cnt_comment > 0)
|
if($cnt_comment > 0)
|
||||||
{
|
{
|
||||||
$columnList = array();
|
$columnList = array();
|
||||||
$commentList = $oCommentModel->getCommentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount);
|
$commentList = $oCommentModel->getCommentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount);
|
||||||
if($commentList) {
|
if($commentList) {
|
||||||
foreach($commentList as $v) {
|
foreach($commentList as $v) {
|
||||||
$oCommentController->deleteComment($v->comment_srl, true, $isMoveToTrash);
|
$oCommentController->deleteComment($v->comment_srl, true, $isMoveToTrash);
|
||||||
|
|
|
||||||
|
|
@ -517,6 +517,7 @@ class memberModel extends member
|
||||||
*/
|
*/
|
||||||
function getGroup($group_srl, $columnList = array())
|
function getGroup($group_srl, $columnList = array())
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->group_srl = $group_srl;
|
$args->group_srl = $group_srl;
|
||||||
$output = executeQuery('member.getGroup', $args, $columnList);
|
$output = executeQuery('member.getGroup', $args, $columnList);
|
||||||
return $output->data;
|
return $output->data;
|
||||||
|
|
|
||||||
|
|
@ -1556,11 +1556,13 @@ class menuAdminController extends menu
|
||||||
$xml_info = $oModuleModel->getModuleActionXML($moduleInfo->module);
|
$xml_info = $oModuleModel->getModuleActionXML($moduleInfo->module);
|
||||||
|
|
||||||
$grantList = $xml_info->grant;
|
$grantList = $xml_info->grant;
|
||||||
|
if(!$grantList) $grantList = new stdClass;
|
||||||
$grantList->access = new stdClass();
|
$grantList->access = new stdClass();
|
||||||
$grantList->access->default = 'guest';
|
$grantList->access->default = 'guest';
|
||||||
$grantList->manager = new stdClass();
|
$grantList->manager = new stdClass();
|
||||||
$grantList->manager->default = 'manager';
|
$grantList->manager->default = 'manager';
|
||||||
|
|
||||||
|
$grant = new stdClass;
|
||||||
foreach($grantList AS $grantName=>$grantInfo)
|
foreach($grantList AS $grantName=>$grantInfo)
|
||||||
{
|
{
|
||||||
if(!$htPerm[$grantName])
|
if(!$htPerm[$grantName])
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,7 @@ class moduleAdminController extends module
|
||||||
*/
|
*/
|
||||||
function doDeleteModuleCategory()
|
function doDeleteModuleCategory()
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->module_category_srl = Context::get('module_category_srl');
|
$args->module_category_srl = Context::get('module_category_srl');
|
||||||
return executeQuery('module.deleteModuleCategory', $args);
|
return executeQuery('module.deleteModuleCategory', $args);
|
||||||
}
|
}
|
||||||
|
|
@ -579,6 +580,8 @@ class moduleAdminController extends module
|
||||||
$grant_list->manager = new stdClass();
|
$grant_list->manager = new stdClass();
|
||||||
$grant_list->manager->default = 'manager';
|
$grant_list->manager->default = 'manager';
|
||||||
|
|
||||||
|
$grant = new stdClass;
|
||||||
|
|
||||||
foreach($grant_list as $grant_name => $grant_info)
|
foreach($grant_list as $grant_name => $grant_info)
|
||||||
{
|
{
|
||||||
// Get the default value
|
// Get the default value
|
||||||
|
|
@ -736,8 +739,9 @@ class moduleAdminController extends module
|
||||||
$site_keyword = Context::get('site_keyword');
|
$site_keyword = Context::get('site_keyword');
|
||||||
$site_srl = Context::get('site_srl');
|
$site_srl = Context::get('site_srl');
|
||||||
$vid = Context::get('vid');
|
$vid = Context::get('vid');
|
||||||
|
|
||||||
// If there is no site keyword, use as information of the current virtual site
|
// If there is no site keyword, use as information of the current virtual site
|
||||||
$args = null;
|
$args = new stdClass;
|
||||||
$logged_info = Context::get('logged_info');
|
$logged_info = Context::get('logged_info');
|
||||||
$site_module_info = Context::get('site_module_info');
|
$site_module_info = Context::get('site_module_info');
|
||||||
if($site_keyword) $args->site_keyword = $site_keyword;
|
if($site_keyword) $args->site_keyword = $site_keyword;
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ class moduleAdminModel extends module
|
||||||
{
|
{
|
||||||
$oModuleController = &getController('module');
|
$oModuleController = &getController('module');
|
||||||
$oModuleModel = &getModel('module');
|
$oModuleModel = &getModel('module');
|
||||||
|
$args = new stdClass;
|
||||||
$args->module_srls = Context::get('module_srls');
|
$args->module_srls = Context::get('module_srls');
|
||||||
$output = executeQueryArray('module.getModulesInfo', $args);
|
$output = executeQueryArray('module.getModulesInfo', $args);
|
||||||
if(!$output->toBool() || !$output->data) return new Object();
|
if(!$output->toBool() || !$output->data) return new Object();
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,9 @@ class module extends ModuleObject
|
||||||
FileHandler::makeDir('./files/cache/module_info');
|
FileHandler::makeDir('./files/cache/module_info');
|
||||||
FileHandler::makeDir('./files/cache/triggers');
|
FileHandler::makeDir('./files/cache/triggers');
|
||||||
FileHandler::makeDir('./files/ruleset');
|
FileHandler::makeDir('./files/ruleset');
|
||||||
|
|
||||||
// Insert site information into the sites table
|
// Insert site information into the sites table
|
||||||
|
$args = new stdClass;
|
||||||
$args->site_srl = 0;
|
$args->site_srl = 0;
|
||||||
$output = $oDB->executeQuery('module.getSite', $args);
|
$output = $oDB->executeQuery('module.getSite', $args);
|
||||||
if(!$output->data || !$output->data->index_module_srl)
|
if(!$output->data || !$output->data->index_module_srl)
|
||||||
|
|
@ -31,6 +33,8 @@ class module extends ModuleObject
|
||||||
$domain = Context::getDefaultUrl();
|
$domain = Context::getDefaultUrl();
|
||||||
$url_info = parse_url($domain);
|
$url_info = parse_url($domain);
|
||||||
$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
|
$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
|
||||||
|
|
||||||
|
$site_args = new stdClass;
|
||||||
$site_args->site_srl = 0;
|
$site_args->site_srl = 0;
|
||||||
$site_args->index_module_srl = 0;
|
$site_args->index_module_srl = 0;
|
||||||
$site_args->domain = $domain;
|
$site_args->domain = $domain;
|
||||||
|
|
@ -320,7 +324,9 @@ class module extends ModuleObject
|
||||||
if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
|
if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
|
||||||
$oDB->dropColumn('documents','extra_vars'.$i);
|
$oDB->dropColumn('documents','extra_vars'.$i);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enter the main site information sites on the table
|
// Enter the main site information sites on the table
|
||||||
|
$args = new stdClass;
|
||||||
$args->site_srl = 0;
|
$args->site_srl = 0;
|
||||||
$output = $oDB->executeQuery('module.getSite', $args);
|
$output = $oDB->executeQuery('module.getSite', $args);
|
||||||
if(!$output->data)
|
if(!$output->data)
|
||||||
|
|
@ -402,7 +408,7 @@ class module extends ModuleObject
|
||||||
$output = executeQuery('module.updateMobileSkinFixModules');
|
$output = executeQuery('module.updateMobileSkinFixModules');
|
||||||
}
|
}
|
||||||
|
|
||||||
unset($args);
|
$args = new stdClass;
|
||||||
$args->site_srl = 0;
|
$args->site_srl = 0;
|
||||||
$output = executeQueryArray('module.getNotLinkedModuleBySiteSrl',$args);
|
$output = executeQueryArray('module.getNotLinkedModuleBySiteSrl',$args);
|
||||||
|
|
||||||
|
|
@ -413,11 +419,11 @@ class module extends ModuleObject
|
||||||
$menuSrl = $args->menu_srl = getNextSequence();
|
$menuSrl = $args->menu_srl = getNextSequence();
|
||||||
$args->listorder = $args->menu_srl * -1;
|
$args->listorder = $args->menu_srl * -1;
|
||||||
|
|
||||||
$ioutput = executeQuery('menu.insertMenu', $args);
|
$output = executeQuery('menu.insertMenu', $args);
|
||||||
|
|
||||||
if(!$ioutput->toBool())
|
if(!$output->toBool())
|
||||||
{
|
{
|
||||||
return $ioutput;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
//getNotLinkedModuleBySiteSrl
|
//getNotLinkedModuleBySiteSrl
|
||||||
|
|
@ -433,6 +439,7 @@ class module extends ModuleObject
|
||||||
$output = executeQuery('module.updateMobileSkinFixModules');
|
$output = executeQuery('module.updateMobileSkinFixModules');
|
||||||
|
|
||||||
$oModuleController = getController('module');
|
$oModuleController = getController('module');
|
||||||
|
if(!isset($moduleConfig)) $moduleConfig = new stdClass;
|
||||||
$moduleConfig->isUpdateFixedValue = TRUE;
|
$moduleConfig->isUpdateFixedValue = TRUE;
|
||||||
$output = $oModuleController->updateModuleConfig('module', $moduleConfig);
|
$output = $oModuleController->updateModuleConfig('module', $moduleConfig);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -118,6 +118,7 @@ class moduleController extends module
|
||||||
$cache_file = './files/config/module_extend.php';
|
$cache_file = './files/config/module_extend.php';
|
||||||
FileHandler::removeFile($cache_file);
|
FileHandler::removeFile($cache_file);
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->parent_module = $parent_module;
|
$args->parent_module = $parent_module;
|
||||||
$args->extend_module = $extend_module;
|
$args->extend_module = $extend_module;
|
||||||
$args->type = $type;
|
$args->type = $type;
|
||||||
|
|
@ -139,6 +140,7 @@ class moduleController extends module
|
||||||
$cache_file = './files/config/module_extend.php';
|
$cache_file = './files/config/module_extend.php';
|
||||||
FileHandler::removeFile($cache_file);
|
FileHandler::removeFile($cache_file);
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->parent_module = $parent_module;
|
$args->parent_module = $parent_module;
|
||||||
$args->extend_module = $extend_module;
|
$args->extend_module = $extend_module;
|
||||||
$args->type = $type;
|
$args->type = $type;
|
||||||
|
|
@ -158,6 +160,8 @@ class moduleController extends module
|
||||||
$oModuleModel = &getModel('module');
|
$oModuleModel = &getModel('module');
|
||||||
$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
|
$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
|
||||||
|
|
||||||
|
if(!isset($origin_config)) $origin_config = new stdClass;
|
||||||
|
|
||||||
foreach($config as $key => $val)
|
foreach($config as $key => $val)
|
||||||
{
|
{
|
||||||
$origin_config->{$key} = $val;
|
$origin_config->{$key} = $val;
|
||||||
|
|
@ -233,6 +237,7 @@ class moduleController extends module
|
||||||
$domain = strtolower($domain);
|
$domain = strtolower($domain);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->site_srl = getNextSequence();
|
$args->site_srl = getNextSequence();
|
||||||
$args->domain = (substr_compare($domain, '/', -1) === 0) ? substr($domain, 0, -1) : $domain;
|
$args->domain = (substr_compare($domain, '/', -1) === 0) ? substr($domain, 0, -1) : $domain;
|
||||||
$args->index_module_srl = $index_module_srl;
|
$args->index_module_srl = $index_module_srl;
|
||||||
|
|
@ -399,6 +404,7 @@ class moduleController extends module
|
||||||
|
|
||||||
if($isMenuCreate == TRUE)
|
if($isMenuCreate == TRUE)
|
||||||
{
|
{
|
||||||
|
$menuArgs = new stdClass;
|
||||||
$menuArgs->menu_srl = $args->menu_srl;
|
$menuArgs->menu_srl = $args->menu_srl;
|
||||||
$menuOutput = executeQuery('menu.getMenu', $menuArgs);
|
$menuOutput = executeQuery('menu.getMenu', $menuArgs);
|
||||||
|
|
||||||
|
|
@ -410,10 +416,11 @@ class moduleController extends module
|
||||||
|
|
||||||
if(!$tempMenu)
|
if(!$tempMenu)
|
||||||
{
|
{
|
||||||
$siteMapOutput->site_srl = 0;
|
$siteMapArgs = new stdClass;
|
||||||
|
$siteMapArgs->site_srl = 0;
|
||||||
$siteMapArgs->title = 'Temporary menu';
|
$siteMapArgs->title = 'Temporary menu';
|
||||||
$tempMenu->menu_srl = $siteMapArgs->menu_srl = getNextSequence();
|
|
||||||
$siteMapArgs->listorder = $siteMapArgs->menu_srl * -1;
|
$siteMapArgs->listorder = $siteMapArgs->menu_srl * -1;
|
||||||
|
$tempMenu->menu_srl = $siteMapArgs->menu_srl = getNextSequence();
|
||||||
|
|
||||||
$siteMapOutput = executeQuery('menu.insertMenu', $siteMapArgs);
|
$siteMapOutput = executeQuery('menu.insertMenu', $siteMapArgs);
|
||||||
if(!$siteMapOutput->toBool())
|
if(!$siteMapOutput->toBool())
|
||||||
|
|
@ -530,6 +537,7 @@ class moduleController extends module
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$menuArgs = new stdClass;
|
||||||
$menuArgs->url = $module_info->mid;
|
$menuArgs->url = $module_info->mid;
|
||||||
$menuArgs->site_srl = $module_info->site_srl;
|
$menuArgs->site_srl = $module_info->site_srl;
|
||||||
$menuOutput = executeQuery('menu.getMenuItemByUrl', $menuArgs);
|
$menuOutput = executeQuery('menu.getMenuItemByUrl', $menuArgs);
|
||||||
|
|
@ -581,6 +589,7 @@ class moduleController extends module
|
||||||
*/
|
*/
|
||||||
function updateModuleSite($module_srl, $site_srl, $layout_srl = 0)
|
function updateModuleSite($module_srl, $site_srl, $layout_srl = 0)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->module_srl = $module_srl;
|
$args->module_srl = $module_srl;
|
||||||
$args->site_srl = $site_srl;
|
$args->site_srl = $site_srl;
|
||||||
$args->layout_srl = $layout_srl;
|
$args->layout_srl = $layout_srl;
|
||||||
|
|
@ -600,6 +609,7 @@ class moduleController extends module
|
||||||
|
|
||||||
$oModuleModel = &getModel('module');
|
$oModuleModel = &getModel('module');
|
||||||
$output = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
|
$output = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
|
||||||
|
|
||||||
$args = new stdClass();
|
$args = new stdClass();
|
||||||
$args->url = $output->mid;
|
$args->url = $output->mid;
|
||||||
$args->is_shortcut = 'N';
|
$args->is_shortcut = 'N';
|
||||||
|
|
@ -626,6 +636,7 @@ class moduleController extends module
|
||||||
if($output->data)
|
if($output->data)
|
||||||
{
|
{
|
||||||
unset($args);
|
unset($args);
|
||||||
|
$args = new stdClass;
|
||||||
$args->menu_srl = $output->data->menu_srl;
|
$args->menu_srl = $output->data->menu_srl;
|
||||||
$args->menu_item_srl = $output->data->menu_item_srl;
|
$args->menu_item_srl = $output->data->menu_item_srl;
|
||||||
$args->is_force = 'N';
|
$args->is_force = 'N';
|
||||||
|
|
@ -750,6 +761,7 @@ class moduleController extends module
|
||||||
{
|
{
|
||||||
if(!count($menu_srl_list)) return;
|
if(!count($menu_srl_list)) return;
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->layout_srl = $layout_srl;
|
$args->layout_srl = $layout_srl;
|
||||||
$args->menu_srls = implode(',',$menu_srl_list);
|
$args->menu_srls = implode(',',$menu_srl_list);
|
||||||
$output = executeQuery('module.updateModuleLayout', $args);
|
$output = executeQuery('module.updateModuleLayout', $args);
|
||||||
|
|
@ -762,6 +774,7 @@ class moduleController extends module
|
||||||
function insertSiteAdmin($site_srl, $arr_admins)
|
function insertSiteAdmin($site_srl, $arr_admins)
|
||||||
{
|
{
|
||||||
// Remove the site administrator
|
// Remove the site administrator
|
||||||
|
$args = new stdClass;
|
||||||
$args->site_srl = $site_srl;
|
$args->site_srl = $site_srl;
|
||||||
|
|
||||||
$output = executeQuery('module.deleteSiteAdmin', $args);
|
$output = executeQuery('module.deleteSiteAdmin', $args);
|
||||||
|
|
@ -792,6 +805,7 @@ class moduleController extends module
|
||||||
foreach($output->data as $key => $val)
|
foreach($output->data as $key => $val)
|
||||||
{
|
{
|
||||||
unset($args);
|
unset($args);
|
||||||
|
$args = new stdClass;
|
||||||
$args->site_srl = $site_srl;
|
$args->site_srl = $site_srl;
|
||||||
$args->member_srl = $val->member_srl;
|
$args->member_srl = $val->member_srl;
|
||||||
$output = executeQueryArray('module.insertSiteAdmin', $args);
|
$output = executeQueryArray('module.insertSiteAdmin', $args);
|
||||||
|
|
@ -877,6 +891,7 @@ class moduleController extends module
|
||||||
|
|
||||||
if(!$obj || !count($obj)) return new Object();
|
if(!$obj || !count($obj)) return new Object();
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->module_srl = $module_srl;
|
$args->module_srl = $module_srl;
|
||||||
foreach($obj as $key => $val)
|
foreach($obj as $key => $val)
|
||||||
{
|
{
|
||||||
|
|
@ -1153,6 +1168,7 @@ class moduleController extends module
|
||||||
*/
|
*/
|
||||||
function updateModuleFileBox($vars)
|
function updateModuleFileBox($vars)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
// have file
|
// have file
|
||||||
if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
|
if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
|
||||||
{
|
{
|
||||||
|
|
@ -1182,6 +1198,8 @@ class moduleController extends module
|
||||||
$args->module_filebox_srl = $vars->module_filebox_srl;
|
$args->module_filebox_srl = $vars->module_filebox_srl;
|
||||||
$args->comment = $vars->comment;
|
$args->comment = $vars->comment;
|
||||||
|
|
||||||
|
// FIXME $args ??
|
||||||
|
|
||||||
return executeQuery('module.updateModuleFileBox', $vars);
|
return executeQuery('module.updateModuleFileBox', $vars);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1211,6 +1229,7 @@ class moduleController extends module
|
||||||
}
|
}
|
||||||
|
|
||||||
// insert
|
// insert
|
||||||
|
$args = new stdClass;
|
||||||
$args->module_filebox_srl = $vars->module_filebox_srl;
|
$args->module_filebox_srl = $vars->module_filebox_srl;
|
||||||
$args->member_srl = $vars->member_srl;
|
$args->member_srl = $vars->member_srl;
|
||||||
$args->comment = $vars->comment;
|
$args->comment = $vars->comment;
|
||||||
|
|
@ -1258,6 +1277,7 @@ class moduleController extends module
|
||||||
function lock($lock_name, $timeout, $member_srl = null)
|
function lock($lock_name, $timeout, $member_srl = null)
|
||||||
{
|
{
|
||||||
$this->unlockTimeoutPassed();
|
$this->unlockTimeoutPassed();
|
||||||
|
$args = new stdClass;
|
||||||
$args->lock_name = $lock_name;
|
$args->lock_name = $lock_name;
|
||||||
if(!$timeout) $timeout = 60;
|
if(!$timeout) $timeout = 60;
|
||||||
$args->deadline = date("YmdHis", $_SERVER['REQUEST_TIME'] + $timeout);
|
$args->deadline = date("YmdHis", $_SERVER['REQUEST_TIME'] + $timeout);
|
||||||
|
|
@ -1278,6 +1298,7 @@ class moduleController extends module
|
||||||
|
|
||||||
function unlock($lock_name, $deadline)
|
function unlock($lock_name, $deadline)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->lock_name = $lock_name;
|
$args->lock_name = $lock_name;
|
||||||
$args->deadline = $deadline;
|
$args->deadline = $deadline;
|
||||||
$output = executeQuery('module.deleteLock', $args);
|
$output = executeQuery('module.deleteLock', $args);
|
||||||
|
|
@ -1286,6 +1307,7 @@ class moduleController extends module
|
||||||
|
|
||||||
function updateModuleInSites($site_srls, $args)
|
function updateModuleInSites($site_srls, $args)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->site_srls = $site_srls;
|
$args->site_srls = $site_srls;
|
||||||
$output = executeQuery('module.updateModuleInSites', $args);
|
$output = executeQuery('module.updateModuleInSites', $args);
|
||||||
return $output;
|
return $output;
|
||||||
|
|
|
||||||
|
|
@ -155,6 +155,8 @@ class moduleModel extends module
|
||||||
$domain = Context::getDefaultUrl();
|
$domain = Context::getDefaultUrl();
|
||||||
$url_info = parse_url($domain);
|
$url_info = parse_url($domain);
|
||||||
$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
|
$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
|
||||||
|
|
||||||
|
$site_args = new stdClass;
|
||||||
$site_args->site_srl = 0;
|
$site_args->site_srl = 0;
|
||||||
$site_args->index_module_srl = $mid_output->data->module_srl;
|
$site_args->index_module_srl = $mid_output->data->module_srl;
|
||||||
$site_args->domain = $domain;
|
$site_args->domain = $domain;
|
||||||
|
|
@ -383,6 +385,7 @@ class moduleModel extends module
|
||||||
function getModulesInfoByLayout($layout_srl, $columnList = array())
|
function getModulesInfoByLayout($layout_srl, $columnList = array())
|
||||||
{
|
{
|
||||||
// Imported data
|
// Imported data
|
||||||
|
$args = new stdClass;
|
||||||
$args->layout_srl = $layout_srl;
|
$args->layout_srl = $layout_srl;
|
||||||
$output = executeQueryArray('module.getModulesByLayout', $args, $columnList);
|
$output = executeQueryArray('module.getModulesByLayout', $args, $columnList);
|
||||||
|
|
||||||
|
|
@ -487,6 +490,7 @@ class moduleModel extends module
|
||||||
|
|
||||||
$site_module_info = Context::get('site_module_info');
|
$site_module_info = Context::get('site_module_info');
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->mid = $mid;
|
$args->mid = $mid;
|
||||||
if($site_module_info) $args->site_srl = $site_module_info->site_srl;
|
if($site_module_info) $args->site_srl = $site_module_info->site_srl;
|
||||||
$output = executeQuery('module.getModuleSrlByMid', $args);
|
$output = executeQuery('module.getModuleSrlByMid', $args);
|
||||||
|
|
@ -740,6 +744,7 @@ class moduleModel extends module
|
||||||
else $grant_list[] = $grants;
|
else $grant_list[] = $grants;
|
||||||
|
|
||||||
$info->grant = new stdClass();
|
$info->grant = new stdClass();
|
||||||
|
$buff[] = '$info->grant = new stdClass;';
|
||||||
foreach($grant_list as $grant)
|
foreach($grant_list as $grant)
|
||||||
{
|
{
|
||||||
$name = $grant->attrs->name;
|
$name = $grant->attrs->name;
|
||||||
|
|
@ -1228,6 +1233,7 @@ class moduleModel extends module
|
||||||
*/
|
*/
|
||||||
function getModuleCount($site_srl, $module = null)
|
function getModuleCount($site_srl, $module = null)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->site_srl = $site_srl;
|
$args->site_srl = $site_srl;
|
||||||
if(!is_null($module)) $args->module = $module;
|
if(!is_null($module)) $args->module = $module;
|
||||||
$output = executeQuery('module.getModuleCount', $args);
|
$output = executeQuery('module.getModuleCount', $args);
|
||||||
|
|
@ -1350,6 +1356,7 @@ class moduleModel extends module
|
||||||
function getModuleCategory($module_category_srl)
|
function getModuleCategory($module_category_srl)
|
||||||
{
|
{
|
||||||
// Get data from the DB
|
// Get data from the DB
|
||||||
|
$args = new stdClass;
|
||||||
$args->module_category_srl = $module_category_srl;
|
$args->module_category_srl = $module_category_srl;
|
||||||
$output = executeQuery('module.getModuleCategory', $args);
|
$output = executeQuery('module.getModuleCategory', $args);
|
||||||
if(!$output->toBool()) return $output;
|
if(!$output->toBool()) return $output;
|
||||||
|
|
@ -1559,6 +1566,7 @@ class moduleModel extends module
|
||||||
*/
|
*/
|
||||||
function getSiteAdmin($site_srl)
|
function getSiteAdmin($site_srl)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->site_srl = $site_srl;
|
$args->site_srl = $site_srl;
|
||||||
$output = executeQueryArray('module.getSiteAdmin', $args);
|
$output = executeQueryArray('module.getSiteAdmin', $args);
|
||||||
return $output->data;
|
return $output->data;
|
||||||
|
|
@ -1763,6 +1771,7 @@ class moduleModel extends module
|
||||||
}
|
}
|
||||||
if(!$output)
|
if(!$output)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->module_srl = $module_info->module_srl;
|
$args->module_srl = $module_info->module_srl;
|
||||||
$output = executeQueryArray('module.getModuleMobileSkinVars',$args);
|
$output = executeQueryArray('module.getModuleMobileSkinVars',$args);
|
||||||
//insert in cache
|
//insert in cache
|
||||||
|
|
@ -1833,6 +1842,7 @@ class moduleModel extends module
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->module_srl = $module_srl;
|
$args->module_srl = $module_srl;
|
||||||
$output = executeQueryArray('module.getModuleGrants', $args);
|
$output = executeQueryArray('module.getModuleGrants', $args);
|
||||||
}
|
}
|
||||||
|
|
@ -2061,6 +2071,7 @@ class moduleModel extends module
|
||||||
|
|
||||||
$requestVars = Context::getRequestVars();
|
$requestVars = Context::getRequestVars();
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->site_srl = (int)$requestVars->site_srl;
|
$args->site_srl = (int)$requestVars->site_srl;
|
||||||
$args->page = 1; // /< Page
|
$args->page = 1; // /< Page
|
||||||
$args->list_count = 100; // /< the number of posts to display on a single page
|
$args->list_count = 100; // /< the number of posts to display on a single page
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@ class page extends ModuleObject
|
||||||
*/
|
*/
|
||||||
function moduleUpdate()
|
function moduleUpdate()
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
// opage module instance update
|
// opage module instance update
|
||||||
$output = executeQueryArray('page.pageTypeOpageCheck');
|
$output = executeQueryArray('page.pageTypeOpageCheck');
|
||||||
if($output->toBool() && count($output->data) > 0)
|
if($output->toBool() && count($output->data) > 0)
|
||||||
|
|
|
||||||
|
|
@ -146,7 +146,9 @@ class pageView extends page
|
||||||
$oPageController = &getController('page');
|
$oPageController = &getController('page');
|
||||||
// change url of image, css, javascript and so on if the page is from external server
|
// change url of image, css, javascript and so on if the page is from external server
|
||||||
$content = $oPageController->replaceSrc($content, $path);
|
$content = $oPageController->replaceSrc($content, $path);
|
||||||
|
|
||||||
// Change the document to utf-8 format
|
// Change the document to utf-8 format
|
||||||
|
$buff = new stdClass;
|
||||||
$buff->content = $content;
|
$buff->content = $content;
|
||||||
$buff = Context::convertEncoding($buff);
|
$buff = Context::convertEncoding($buff);
|
||||||
$content = $buff->content;
|
$content = $buff->content;
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ class pollAdminController extends poll
|
||||||
*/
|
*/
|
||||||
function procPollAdminInsertConfig()
|
function procPollAdminInsertConfig()
|
||||||
{
|
{
|
||||||
|
$config = new stdClass;
|
||||||
$config->skin = Context::get('skin');
|
$config->skin = Context::get('skin');
|
||||||
$config->colorset = Context::get('colorset');
|
$config->colorset = Context::get('colorset');
|
||||||
|
|
||||||
|
|
@ -66,6 +67,7 @@ class pollAdminController extends poll
|
||||||
|
|
||||||
$oPollAdminModel = &getAdminModel('poll');
|
$oPollAdminModel = &getAdminModel('poll');
|
||||||
//$columnList = array('comment_srl');
|
//$columnList = array('comment_srl');
|
||||||
|
$args = new stdClass;
|
||||||
$args->pollIndexSrlList = array($poll_index_srl);
|
$args->pollIndexSrlList = array($poll_index_srl);
|
||||||
$args->list_count = 100;
|
$args->list_count = 100;
|
||||||
|
|
||||||
|
|
@ -86,6 +88,9 @@ class pollAdminController extends poll
|
||||||
*/
|
*/
|
||||||
function deletePollTitle($poll_index_srl)
|
function deletePollTitle($poll_index_srl)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
|
$dargs = new stdClass;
|
||||||
|
|
||||||
$args->poll_index_srl = $poll_index_srl;
|
$args->poll_index_srl = $poll_index_srl;
|
||||||
|
|
||||||
$oDB = &DB::getInstance();
|
$oDB = &DB::getInstance();
|
||||||
|
|
@ -137,6 +142,7 @@ class pollAdminController extends poll
|
||||||
*/
|
*/
|
||||||
function deletePoll($poll_srl)
|
function deletePoll($poll_srl)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->poll_srl = $poll_srl;
|
$args->poll_srl = $poll_srl;
|
||||||
|
|
||||||
$oDB = &DB::getInstance();
|
$oDB = &DB::getInstance();
|
||||||
|
|
|
||||||
|
|
@ -88,9 +88,9 @@ class pollAdminView extends poll
|
||||||
Context::set('page', $output->page);
|
Context::set('page', $output->page);
|
||||||
Context::set('poll_list', $output->data);
|
Context::set('poll_list', $output->data);
|
||||||
Context::set('page_navigation', $output->page_navigation);
|
Context::set('page_navigation', $output->page_navigation);
|
||||||
Context::set('module_list', $module_list);
|
Context::set('module_list', $module_list);
|
||||||
|
|
||||||
$security = new Security();
|
$security = new Security();
|
||||||
$security->encodeHTML('poll_list..title', 'poll_list..nick_name');
|
$security->encodeHTML('poll_list..title', 'poll_list..nick_name');
|
||||||
// Set a template
|
// Set a template
|
||||||
$this->setTemplatePath($this->module_path.'tpl');
|
$this->setTemplatePath($this->module_path.'tpl');
|
||||||
|
|
@ -114,7 +114,7 @@ class pollAdminView extends poll
|
||||||
// Set the skin colorset once the configurations is completed
|
// Set the skin colorset once the configurations is completed
|
||||||
Context::set('colorset_list', $skin_list[$config->skin]->colorset);
|
Context::set('colorset_list', $skin_list[$config->skin]->colorset);
|
||||||
|
|
||||||
$security = new Security();
|
$security = new Security();
|
||||||
$security->encodeHTML('config..');
|
$security->encodeHTML('config..');
|
||||||
$security->encodeHTML('skin_list..title');
|
$security->encodeHTML('skin_list..title');
|
||||||
$security->encodeHTML('colorset_list..name','colorset_list..title');
|
$security->encodeHTML('colorset_list..name','colorset_list..title');
|
||||||
|
|
@ -133,17 +133,21 @@ class pollAdminView extends poll
|
||||||
$this->setLayoutFile("popup_layout");
|
$this->setLayoutFile("popup_layout");
|
||||||
// Draw results
|
// Draw results
|
||||||
$args = new stdClass();
|
$args = new stdClass();
|
||||||
$args->poll_srl = Context::get('poll_srl');
|
$args->poll_srl = Context::get('poll_srl');
|
||||||
$args->poll_index_srl = Context::get('poll_index_srl');
|
$args->poll_index_srl = Context::get('poll_index_srl');
|
||||||
|
|
||||||
$output = executeQuery('poll.getPoll', $args);
|
$output = executeQuery('poll.getPoll', $args);
|
||||||
if(!$output->data) return $this->stop('msg_poll_not_exists');
|
if(!$output->data) return $this->stop('msg_poll_not_exists');
|
||||||
|
|
||||||
$poll = new stdClass();
|
$poll = new stdClass();
|
||||||
$poll->stop_date = $output->data->stop_date;
|
$poll->stop_date = $output->data->stop_date;
|
||||||
$poll->poll_count = $output->data->poll_count;
|
$poll->poll_count = $output->data->poll_count;
|
||||||
|
|
||||||
$output = executeQuery('poll.getPollTitle', $args);
|
$output = executeQuery('poll.getPollTitle', $args);
|
||||||
if(!$output->data) return $this->stop('msg_poll_not_exists');
|
if(!$output->data)
|
||||||
|
{
|
||||||
|
return $this->stop('msg_poll_not_exists');
|
||||||
|
}
|
||||||
|
|
||||||
$tmp = &$poll->poll[$args->poll_index_srl];
|
$tmp = &$poll->poll[$args->poll_index_srl];
|
||||||
$tmp->title = $output->data->title;
|
$tmp->title = $output->data->title;
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,8 @@ class poll extends ModuleObject
|
||||||
$oModuleController = &getController('module');
|
$oModuleController = &getController('module');
|
||||||
// Set the default skin
|
// Set the default skin
|
||||||
$oModuleController = &getController('module');
|
$oModuleController = &getController('module');
|
||||||
|
|
||||||
|
$config = new stdClass;
|
||||||
$config->skin = 'default';
|
$config->skin = 'default';
|
||||||
$config->colorset = 'normal';
|
$config->colorset = 'normal';
|
||||||
$oModuleController->insertModuleConfig('poll', $config);
|
$oModuleController->insertModuleConfig('poll', $config);
|
||||||
|
|
|
||||||
|
|
@ -20,10 +20,15 @@ class pollController extends poll
|
||||||
function procInsert()
|
function procInsert()
|
||||||
{
|
{
|
||||||
$stop_date = Context::get('stop_date');
|
$stop_date = Context::get('stop_date');
|
||||||
if($stop_date < date("Ymd")) $stop_date = date("YmdHis", $_SERVER['REQUEST_TIME']+60*60*24*365);
|
if($stop_date < date("Ymd"))
|
||||||
|
{
|
||||||
|
$stop_date = date("YmdHis", $_SERVER['REQUEST_TIME']+60*60*24*365);
|
||||||
|
}
|
||||||
|
|
||||||
$logged_info = Context::get('logged_info');
|
$logged_info = Context::get('logged_info');
|
||||||
$vars = Context::getRequestVars();
|
$vars = Context::getRequestVars();
|
||||||
|
$args = new stdClass;
|
||||||
|
|
||||||
foreach($vars as $key => $val)
|
foreach($vars as $key => $val)
|
||||||
{
|
{
|
||||||
if(strpos($key,'tidx')) continue;
|
if(strpos($key,'tidx')) continue;
|
||||||
|
|
@ -50,15 +55,17 @@ class pollController extends poll
|
||||||
if(!count($args->poll)) return new Object(-1, 'cmd_null_item');
|
if(!count($args->poll)) return new Object(-1, 'cmd_null_item');
|
||||||
|
|
||||||
$args->stop_date = $stop_date;
|
$args->stop_date = $stop_date;
|
||||||
|
|
||||||
// Configure the variables
|
// Configure the variables
|
||||||
$poll_srl = getNextSequence();
|
$poll_srl = getNextSequence();
|
||||||
|
|
||||||
$member_srl = $logged_info->member_srl?$logged_info->member_srl:0;
|
$member_srl = $logged_info->member_srl?$logged_info->member_srl:0;
|
||||||
|
|
||||||
$oDB = &DB::getInstance();
|
$oDB = &DB::getInstance();
|
||||||
$oDB->begin();
|
$oDB->begin();
|
||||||
|
|
||||||
// Register the poll
|
// Register the poll
|
||||||
unset($poll_args);
|
unset($poll_args);
|
||||||
|
$poll_args = new stdClass;
|
||||||
$poll_args->poll_srl = $poll_srl;
|
$poll_args->poll_srl = $poll_srl;
|
||||||
$poll_args->member_srl = $member_srl;
|
$poll_args->member_srl = $member_srl;
|
||||||
$poll_args->list_order = $poll_srl*-1;
|
$poll_args->list_order = $poll_srl*-1;
|
||||||
|
|
@ -70,10 +77,12 @@ class pollController extends poll
|
||||||
$oDB->rollback();
|
$oDB->rollback();
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Individual poll registration
|
// Individual poll registration
|
||||||
foreach($args->poll as $key => $val)
|
foreach($args->poll as $key => $val)
|
||||||
{
|
{
|
||||||
unset($title_args);
|
unset($title_args);
|
||||||
|
$title_args = new stdClass;
|
||||||
$title_args->poll_srl = $poll_srl;
|
$title_args->poll_srl = $poll_srl;
|
||||||
$title_args->poll_index_srl = getNextSequence();
|
$title_args->poll_index_srl = getNextSequence();
|
||||||
$title_args->title = $val->title;
|
$title_args->title = $val->title;
|
||||||
|
|
@ -88,10 +97,12 @@ class pollController extends poll
|
||||||
$oDB->rollback();
|
$oDB->rollback();
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add the individual survey items
|
// Add the individual survey items
|
||||||
foreach($val->item as $k => $v)
|
foreach($val->item as $k => $v)
|
||||||
{
|
{
|
||||||
unset($item_args);
|
unset($item_args);
|
||||||
|
$item_args = new stdClass;
|
||||||
$item_args->poll_srl = $poll_srl;
|
$item_args->poll_srl = $poll_srl;
|
||||||
$item_args->poll_index_srl = $title_args->poll_index_srl;
|
$item_args->poll_index_srl = $title_args->poll_index_srl;
|
||||||
$item_args->title = $v;
|
$item_args->title = $v;
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ class pollModel extends poll
|
||||||
*/
|
*/
|
||||||
function isPolled($poll_srl)
|
function isPolled($poll_srl)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->poll_srl = $poll_srl;
|
$args->poll_srl = $poll_srl;
|
||||||
|
|
||||||
if(Context::get('is_logged'))
|
if(Context::get('is_logged'))
|
||||||
|
|
@ -41,12 +42,14 @@ class pollModel extends poll
|
||||||
*/
|
*/
|
||||||
function getPollHtml($poll_srl, $style = '', $skin = 'default')
|
function getPollHtml($poll_srl, $style = '', $skin = 'default')
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->poll_srl = $poll_srl;
|
$args->poll_srl = $poll_srl;
|
||||||
// Get the information related to the survey
|
// Get the information related to the survey
|
||||||
$columnList = array('poll_count', 'stop_date');
|
$columnList = array('poll_count', 'stop_date');
|
||||||
$output = executeQuery('poll.getPoll', $args, $columnList);
|
$output = executeQuery('poll.getPoll', $args, $columnList);
|
||||||
if(!$output->data) return '';
|
if(!$output->data) return '';
|
||||||
|
|
||||||
|
$poll = new stdClass;
|
||||||
$poll->style = $style;
|
$poll->style = $style;
|
||||||
$poll->poll_count = (int)$output->data->poll_count;
|
$poll->poll_count = (int)$output->data->poll_count;
|
||||||
$poll->stop_date = $output->data->stop_date;
|
$poll->stop_date = $output->data->stop_date;
|
||||||
|
|
@ -55,8 +58,11 @@ class pollModel extends poll
|
||||||
$output = executeQuery('poll.getPollTitle', $args, $columnList);
|
$output = executeQuery('poll.getPollTitle', $args, $columnList);
|
||||||
if(!$output->data) return;
|
if(!$output->data) return;
|
||||||
if(!is_array($output->data)) $output->data = array($output->data);
|
if(!is_array($output->data)) $output->data = array($output->data);
|
||||||
|
|
||||||
|
$poll->poll = array();
|
||||||
foreach($output->data as $key => $val)
|
foreach($output->data as $key => $val)
|
||||||
{
|
{
|
||||||
|
$poll->poll[$val->poll_index_srl] = new stdClass;
|
||||||
$poll->poll[$val->poll_index_srl]->title = $val->title;
|
$poll->poll[$val->poll_index_srl]->title = $val->title;
|
||||||
$poll->poll[$val->poll_index_srl]->checkcount = $val->checkcount;
|
$poll->poll[$val->poll_index_srl]->checkcount = $val->checkcount;
|
||||||
$poll->poll[$val->poll_index_srl]->poll_count = $val->poll_count;
|
$poll->poll[$val->poll_index_srl]->poll_count = $val->poll_count;
|
||||||
|
|
@ -94,11 +100,13 @@ class pollModel extends poll
|
||||||
*/
|
*/
|
||||||
function getPollResultHtml($poll_srl, $skin = 'default')
|
function getPollResultHtml($poll_srl, $skin = 'default')
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
$args->poll_srl = $poll_srl;
|
$args->poll_srl = $poll_srl;
|
||||||
// Get the information related to the survey
|
// Get the information related to the survey
|
||||||
$output = executeQuery('poll.getPoll', $args);
|
$output = executeQuery('poll.getPoll', $args);
|
||||||
if(!$output->data) return '';
|
if(!$output->data) return '';
|
||||||
|
|
||||||
|
$poll = new stdClass;
|
||||||
$poll->style = $style;
|
$poll->style = $style;
|
||||||
$poll->poll_count = (int)$output->data->poll_count;
|
$poll->poll_count = (int)$output->data->poll_count;
|
||||||
$poll->stop_date = $output->data->stop_date;
|
$poll->stop_date = $output->data->stop_date;
|
||||||
|
|
@ -107,8 +115,11 @@ class pollModel extends poll
|
||||||
$output = executeQuery('poll.getPollTitle', $args, $columnList);
|
$output = executeQuery('poll.getPollTitle', $args, $columnList);
|
||||||
if(!$output->data) return;
|
if(!$output->data) return;
|
||||||
if(!is_array($output->data)) $output->data = array($output->data);
|
if(!is_array($output->data)) $output->data = array($output->data);
|
||||||
|
|
||||||
|
$poll->poll = array();
|
||||||
foreach($output->data as $key => $val)
|
foreach($output->data as $key => $val)
|
||||||
{
|
{
|
||||||
|
$poll->poll[$val->poll_index_srl] = new stdClass;
|
||||||
$poll->poll[$val->poll_index_srl]->title = $val->title;
|
$poll->poll[$val->poll_index_srl]->title = $val->title;
|
||||||
$poll->poll[$val->poll_index_srl]->checkcount = $val->checkcount;
|
$poll->poll[$val->poll_index_srl]->checkcount = $val->checkcount;
|
||||||
$poll->poll[$val->poll_index_srl]->poll_count = $val->poll_count;
|
$poll->poll[$val->poll_index_srl]->poll_count = $val->poll_count;
|
||||||
|
|
|
||||||
|
|
@ -23,12 +23,15 @@ class sessionModel extends session
|
||||||
{
|
{
|
||||||
if(!$session_key || !$this->session_started) return;
|
if(!$session_key || !$this->session_started) return;
|
||||||
|
|
||||||
|
$output = new Object();
|
||||||
|
|
||||||
$oCacheHandler = &CacheHandler::getInstance('object');
|
$oCacheHandler = &CacheHandler::getInstance('object');
|
||||||
if($oCacheHandler->isSupport())
|
if($oCacheHandler->isSupport())
|
||||||
{
|
{
|
||||||
$cache_key = 'object:'.$session_key;
|
$cache_key = 'object:'.$session_key;
|
||||||
$output->data = $oCacheHandler->get($cache_key);
|
$output->data = $oCacheHandler->get($cache_key);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!$output->data)
|
if(!$output->data)
|
||||||
{
|
{
|
||||||
$args = new stdClass();
|
$args = new stdClass();
|
||||||
|
|
@ -77,6 +80,7 @@ class sessionModel extends session
|
||||||
if(!$output->toBool()) return $output;
|
if(!$output->toBool()) return $output;
|
||||||
|
|
||||||
$member_srls = array();
|
$member_srls = array();
|
||||||
|
$member_keys = array();
|
||||||
if(count($output->data))
|
if(count($output->data))
|
||||||
{
|
{
|
||||||
foreach($output->data as $key => $val)
|
foreach($output->data as $key => $val)
|
||||||
|
|
|
||||||
|
|
@ -103,6 +103,7 @@ class spamfilterAdminController extends spamfilter
|
||||||
{
|
{
|
||||||
if(!$ipaddress) return;
|
if(!$ipaddress) return;
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->ipaddress = $ipaddress;
|
$args->ipaddress = $ipaddress;
|
||||||
return executeQuery('spamfilter.deleteDeniedIP', $args);
|
return executeQuery('spamfilter.deleteDeniedIP', $args);
|
||||||
}
|
}
|
||||||
|
|
@ -113,6 +114,7 @@ class spamfilterAdminController extends spamfilter
|
||||||
*/
|
*/
|
||||||
function insertWord($word_list)
|
function insertWord($word_list)
|
||||||
{
|
{
|
||||||
|
|
||||||
$word_list = str_replace("\r","",$word_list);
|
$word_list = str_replace("\r","",$word_list);
|
||||||
$word_list = explode("\n",$word_list);
|
$word_list = explode("\n",$word_list);
|
||||||
|
|
||||||
|
|
@ -127,6 +129,7 @@ class spamfilterAdminController extends spamfilter
|
||||||
$fail_word = '';
|
$fail_word = '';
|
||||||
foreach($word_list as $word)
|
foreach($word_list as $word)
|
||||||
{
|
{
|
||||||
|
$args = new stdClass;
|
||||||
if(trim($word)) $args->word = $word;
|
if(trim($word)) $args->word = $word;
|
||||||
$output = executeQuery('spamfilter.insertDeniedWord', $args);
|
$output = executeQuery('spamfilter.insertDeniedWord', $args);
|
||||||
if(!$output->toBool()) $fail_word .= $word.'<br />';
|
if(!$output->toBool()) $fail_word .= $word.'<br />';
|
||||||
|
|
@ -142,6 +145,7 @@ class spamfilterAdminController extends spamfilter
|
||||||
function deleteWord($word)
|
function deleteWord($word)
|
||||||
{
|
{
|
||||||
if(!$word) return;
|
if(!$word) return;
|
||||||
|
$args = new stdClass;
|
||||||
$args->word = $word;
|
$args->word = $word;
|
||||||
return executeQuery('spamfilter.deleteDeniedWord', $args);
|
return executeQuery('spamfilter.deleteDeniedWord', $args);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,18 @@ class tagModel extends tag
|
||||||
$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
|
$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
|
||||||
unset($obj->mid);
|
unset($obj->mid);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Module_srl passed the array may be a check whether the array
|
// Module_srl passed the array may be a check whether the array
|
||||||
if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
|
$args = new stdClass;
|
||||||
else $args->module_srl = $obj->module_srl;
|
if(is_array($obj->module_srl))
|
||||||
|
{
|
||||||
|
$args->module_srl = implode(',', $obj->module_srl);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$args->module_srl = $obj->module_srl;
|
||||||
|
}
|
||||||
|
|
||||||
$args->list_count = $obj->list_count;
|
$args->list_count = $obj->list_count;
|
||||||
$args->count = $obj->sort_index;
|
$args->count = $obj->sort_index;
|
||||||
|
|
||||||
|
|
@ -43,12 +52,18 @@ class tagModel extends tag
|
||||||
*/
|
*/
|
||||||
function getDocumentSrlByTag($obj)
|
function getDocumentSrlByTag($obj)
|
||||||
{
|
{
|
||||||
if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
|
$args = new stdClass;
|
||||||
else $args->module_srl = $obj->module_srl;
|
if(is_array($obj->module_srl))
|
||||||
|
{
|
||||||
|
$args->module_srl = implode(',', $obj->module_srl);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$args->module_srl = $obj->module_srl;
|
||||||
|
}
|
||||||
|
|
||||||
$args->tag = $obj->tag;
|
$args->tag = $obj->tag;
|
||||||
$output = executeQueryArray('tag.getDocumentSrlByTag', $args);
|
$output = executeQueryArray('tag.getDocumentSrlByTag', $args);
|
||||||
if(!$output->toBool()) return $output;
|
|
||||||
|
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
@ -58,8 +73,15 @@ class tagModel extends tag
|
||||||
*/
|
*/
|
||||||
function getDocumentsTagList($obj)
|
function getDocumentsTagList($obj)
|
||||||
{
|
{
|
||||||
if(is_array($obj->document_srl)) $args->document_srl = implode(',', $obj->document_srl);
|
$args = new stdClass;
|
||||||
else $args->document_srl = $obj->document_srl;
|
if(is_array($obj->document_srl))
|
||||||
|
{
|
||||||
|
$args->document_srl = implode(',', $obj->document_srl);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$args->document_srl = $obj->document_srl;
|
||||||
|
}
|
||||||
|
|
||||||
$output = executeQueryArray('tag.getDocumentsTagList', $args);
|
$output = executeQueryArray('tag.getDocumentsTagList', $args);
|
||||||
if(!$output->toBool()) return $output;
|
if(!$output->toBool()) return $output;
|
||||||
|
|
@ -72,8 +94,15 @@ class tagModel extends tag
|
||||||
*/
|
*/
|
||||||
function getTagWithUsedList($obj)
|
function getTagWithUsedList($obj)
|
||||||
{
|
{
|
||||||
if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
|
$args = new stdClass;
|
||||||
else $args->module_srl = $obj->module_srl;
|
if(is_array($obj->module_srl))
|
||||||
|
{
|
||||||
|
$args->module_srl = implode(',', $obj->module_srl);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$args->module_srl = $obj->module_srl;
|
||||||
|
}
|
||||||
|
|
||||||
$args->tag = $obj->tag;
|
$args->tag = $obj->tag;
|
||||||
$output = $this->getDocumentSrlByTag($args);
|
$output = $this->getDocumentSrlByTag($args);
|
||||||
|
|
@ -84,8 +113,11 @@ class tagModel extends tag
|
||||||
foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
|
foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
|
||||||
}
|
}
|
||||||
unset($args);
|
unset($args);
|
||||||
|
|
||||||
|
$args = new stdClass;
|
||||||
$args->document_srl = $document_srl;
|
$args->document_srl = $document_srl;
|
||||||
$output = $this->getDocumentsTagList($args);
|
$output = $this->getDocumentsTagList($args);
|
||||||
|
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue