diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index ef96b80d7..bec2e5ac3 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -1,3 +1,4 @@
+
diff --git a/modules/message/skins/simple_world/css/message.less b/modules/message/skins/simple_world/css/message.less
index c567a2db8..dc80e2dc1 100644
--- a/modules/message/skins/simple_world/css/message.less
+++ b/modules/message/skins/simple_world/css/message.less
@@ -65,6 +65,7 @@ script, style
box-sizing:border-box;
font-family: "맑은 고딕", "Apple SD Gothic Neo","나눔고딕",NanumGothic,'Nanum Gothic',Arial,Helvetica,sans-serif;
font-size: 14px;
+ text-align: justify;
padding: 0 5px;
}
diff --git a/modules/module/module.class.php b/modules/module/module.class.php
index 59425c718..543f015e2 100644
--- a/modules/module/module.class.php
+++ b/modules/module/module.class.php
@@ -17,32 +17,34 @@ class module extends ModuleObject
$oDB = &DB::getInstance();
$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"), true);
- $oDB->addIndex('sites','unique_domain',array('domain'),true);
+
+ // Insert new domain
+ if(!getModel('module')->getDefaultDomainInfo())
+ {
+ $current_url = Rhymix\Framework\Url::getCurrentUrl();
+ $domain = new stdClass();
+ $domain->domain_srl = 0;
+ $domain->domain = Rhymix\Framework\URL::getDomainFromURL($current_url);
+ $domain->is_default_domain = 'Y';
+ $domain->index_module_srl = 0;
+ $domain->index_document_srl = 0;
+ $domain->http_port = null;
+ $domain->https_port = null;
+ $domain->security = config('url.ssl') ?: 'none';
+ $domain->description = '';
+ $domain->settings = json_encode(array('language' => null, 'timezone' => null));
+ $output = executeQuery('module.insertDomain', $domain);
+ if (!$output->toBool())
+ {
+ return $output;
+ }
+ }
+
// Create a directory to use in the module module
FileHandler::makeDir('./files/cache/module_info');
FileHandler::makeDir('./files/cache/triggers');
FileHandler::makeDir('./files/ruleset');
- // Insert site information into the sites table
- $args = new stdClass;
- $args->site_srl = 0;
- $output = $oDB->executeQuery('module.getSite', $args);
- if(!$output->data || !$output->data->index_module_srl)
- {
- $domain = Context::getDefaultUrl();
- $url_info = parse_url($domain);
- $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->index_module_srl = 0;
- $site_args->domain = $domain;
- $site_args->default_language = config('locale.default_lang');
-
- $output = executeQuery('module.insertSite', $site_args);
- if(!$output->toBool()) return $output;
- }
-
return new Object();
}
@@ -58,23 +60,13 @@ class module extends ModuleObject
if(!$oDB->isIndexExists('modules',"idx_site_mid")) return true;
// Move permissions/skin information of all modules to the table, grants.
if($oDB->isColumnExists('modules', 'grants')) return true;
- // Move permissions/skin information of all modules to the table, grants.
- if(!$oDB->isColumnExists('sites', 'default_language')) return true;
// Delete extra_vars* column
for($i=1;$i<=20;$i++)
{
if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
}
- // Insert site information to the table, sites
- $args = new stdClass();
- $args->site_srl = 0;
- $output = $oDB->executeQuery('module.getSite', $args);
- if(!$output->data) return true;
-
- // If domain index is defined on the table, sites
- if($oDB->isIndexExists('sites', 'idx_domain')) return true;
- if(!$oDB->isIndexExists('sites','unique_domain')) return true;
+ // Check indexes
if(!$oDB->isColumnExists("modules", "use_mobile")) return true;
if(!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
if(!$oDB->isColumnExists("modules", "mcontent")) return true;
@@ -87,6 +79,7 @@ class module extends ModuleObject
if(!is_dir('./files/ruleset')) return true;
+ $args = new stdClass;
$args->skin = '.';
$output = executeQueryArray('module.getModuleSkinDotList', $args);
if($output->data && count($output->data) > 0)
@@ -99,7 +92,11 @@ class module extends ModuleObject
}
}
- // XE 1.7
+ // Check domains
+ if (!$oDB->isTableExists('domains') || !getModel('module')->getDefaultDomainInfo())
+ {
+ return true;
+ }
// check fix mskin
if(!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
@@ -303,11 +300,7 @@ class module extends ModuleObject
$oDB->dropColumn('modules','skin_vars');
$oDB->dropColumn('modules','extra_vars');
}
- // Rights of all modules/skins transferring the information into a table Update grants
- if(!$oDB->isColumnExists('sites', 'default_language'))
- {
- $oDB->addColumn('sites','default_language','varchar',255,0,false);
- }
+
// extra_vars * Remove Column
for($i=1;$i<=20;$i++)
{
@@ -315,35 +308,10 @@ class module extends ModuleObject
$oDB->dropColumn('documents','extra_vars'.$i);
}
- // Enter the main site information sites on the table
- $args = new stdClass;
- $args->site_srl = 0;
- $output = $oDB->executeQuery('module.getSite', $args);
- if(!$output->data)
+ // Migrate domains
+ if (!getModel('module')->getDefaultDomainInfo())
{
- // Basic mid, language Wanted
- $mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
- $domain = Context::getDefaultUrl();
- $url_info = parse_url($domain);
- $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->index_module_srl = $mid_output->data->module_srl;
- $site_args->domain = $domain;
- $site_args->default_language = config('locale.default_lang');
-
- $output = executeQuery('module.insertSite', $site_args);
- if(!$output->toBool()) return $output;
- }
-
- if($oDB->isIndexExists('sites','idx_domain'))
- {
- $oDB->dropIndex('sites','idx_domain');
- }
- if(!$oDB->isIndexExists('sites','unique_domain'))
- {
- $this->updateForUniqueSiteDomain();
- $oDB->addIndex('sites','unique_domain',array('domain'),true);
+ $this->migrateDomains();
}
if(!$oDB->isColumnExists("modules", "use_mobile"))
@@ -414,32 +382,145 @@ class module extends ModuleObject
return new Object(0, 'success_updated');
}
- function updateForUniqueSiteDomain()
+ /**
+ * @brief Migrate old sites and multidomain info to new 'domains' table
+ */
+ function migrateDomains()
{
- $output = executeQueryArray("module.getNonuniqueDomains");
- if(!$output->data) return;
- foreach($output->data as $data)
+ // Create the domains table.
+ $oDB = DB::getInstance();
+ if (!$oDB->isTableExists('domains'))
{
- if($data->count == 1) continue;
- $domain = $data->domain;
- $args = new stdClass;
- $args->domain = $domain;
- $output2 = executeQueryArray("module.getSiteByDomain", $args);
- $bFirst = true;
- foreach($output2->data as $site)
+ $oDB->createTableByXmlFile($this->module_path . 'schemas/domains.xml');
+ }
+
+ // Get current site configuration.
+ $oModuleModel = getModel('module');
+ $config = $oModuleModel->getModuleConfig('module');
+
+ // Initialize domains data.
+ $domains = array();
+ $default_domain = new stdClass;
+
+ // Check XE sites.
+ $output = executeQueryArray('module.getSites');
+ if ($output->data)
+ {
+ foreach ($output->data as $site_info)
{
- if($bFirst)
+ $site_domain = $site_info->domain;
+ if (!preg_match('@^https?://@', $site_domain))
{
- $bFirst = false;
- continue;
+ $site_domain = 'http://' . $site_domain;
+ }
+
+ $domain = new stdClass();
+ $domain->domain_srl = $site_info->site_srl;
+ $domain->domain = Rhymix\Framework\URL::getDomainFromURL(strtolower($site_domain));
+ $domain->is_default_domain = $site_info->site_srl == 0 ? 'Y' : 'N';
+ $domain->index_module_srl = $site_info->index_module_srl;
+ $domain->index_document_srl = 0;
+ $domain->http_port = config('url.http_port') ?: null;
+ $domain->https_port = config('url.https_port') ?: null;
+ $domain->security = config('url.ssl') ?: 'none';
+ $domain->description = '';
+ $domain->settings = json_encode(array(
+ 'title' => $config->siteTitle,
+ 'subtitle' => $config->siteSubtitle,
+ 'language' => $site_info->default_language,
+ 'timezone' => config('locale.default_timezone'),
+ 'html_footer' => $config->htmlFooter,
+ ));
+ $domain->regdate = $site_info->regdate;
+ $domains[$domain->domain] = $domain;
+ if ($domain->is_default_domain === 'Y')
+ {
+ $default_domain = $domain;
}
- $domain .= "_";
- $args = new stdClass;
- $args->domain = $domain;
- $args->site_srl = $site->site_srl;
- $output3 = executeQuery("module.updateSite", $args);
}
}
+ else
+ {
+ $output = executeQuery('module.getDefaultMidInfo', $args);
+ $default_hostinfo = parse_url(Rhymix\Framework\URL::getCurrentURL());
+
+ $domain = new stdClass();
+ $domain->domain_srl = 0;
+ $domain->domain = Rhymix\Framework\URL::decodeIdna(strtolower($default_hostinfo['host']));
+ $domain->is_default_domain = 'Y';
+ $domain->index_module_srl = $output->data ? $output->data->module_srl : 0;
+ $domain->index_document_srl = 0;
+ $domain->http_port = isset($default_hostinfo['port']) ? intval($default_hostinfo['port']) : null;
+ $domain->https_port = null;
+ $domain->security = config('url.ssl') ?: 'none';
+ $domain->description = '';
+ $domain->settings = json_encode(array(
+ 'title' => $config->siteTitle,
+ 'subtitle' => $config->siteSubtitle,
+ 'language' => $site_info->default_language,
+ 'timezone' => config('locale.default_timezone'),
+ 'html_footer' => $config->htmlFooter,
+ ));
+ $domains[$domain->domain] = $domain;
+ $default_domain = $domain;
+ }
+
+ // Check multidomain module.
+ if (getModel('multidomain'))
+ {
+ $output = executeQueryArray('multidomain.getMultidomainList', (object)array('order_type' => 'asc', 'list_count' => 100000000));
+ if ($output->data)
+ {
+ foreach ($output->data as $site_info)
+ {
+ $site_domain = $site_info->domain;
+ if (!preg_match('@^https?://@', $site_domain))
+ {
+ $site_domain = 'http://' . $site_domain;
+ }
+
+ $domain = new stdClass();
+ $domain->domain_srl = $site_info->multidomain_srl;
+ $domain->domain = Rhymix\Framework\URL::getDomainFromURL(strtolower($site_domain));
+ $domain->is_default_domain = isset($domains[$domain->domain]) ? $domains[$domain->domain]->is_default_domain : 'N';
+ $domain->index_module_srl = intval($site_info->module_srl);
+ $domain->index_document_srl = intval($site_info->document_srl);
+ $domain->http_port = config('url.http_port') ?: null;
+ $domain->https_port = config('url.https_port') ?: null;
+ $domain->security = config('url.ssl') ?: 'none';
+ $domain->description = '';
+ $domain->settings = json_encode(array(
+ 'title' => $config->siteTitle,
+ 'subtitle' => $config->siteSubtitle,
+ 'language' => $site_info->default_language,
+ 'timezone' => config('locale.default_timezone'),
+ 'html_footer' => $config->htmlFooter,
+ ));
+ $domain->regdate = $site_info->regdate;
+ $domains[$domain->domain] = $domain;
+ if ($domain->is_default_domain === 'Y')
+ {
+ $default_domain = $domain;
+ }
+ }
+ }
+ }
+
+ // Insert into DB.
+ foreach ($domains as $domain)
+ {
+ $output = executeQuery('module.insertDomain', $domain);
+ if (!$output->toBool())
+ {
+ return $output;
+ }
+ }
+
+ // Clear cache.
+ Rhymix\Framework\Cache::clearGroup('site_and_module');
+
+ // Return the default domain info.
+ return $default_domain;
}
/**
diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php
index f5568f294..279410ebd 100644
--- a/modules/module/module.controller.php
+++ b/modules/module/module.controller.php
@@ -784,53 +784,6 @@ class moduleController extends module
return $output;
}
- /**
- * @brief Change the site administrator
- */
- function insertSiteAdmin($site_srl, $arr_admins)
- {
- // Remove the site administrator
- $args = new stdClass;
- $args->site_srl = $site_srl;
-
- $output = executeQuery('module.deleteSiteAdmin', $args);
-
- if(!$output->toBool()) return $output;
- // Get user id of an administrator
- if(!is_array($arr_admins) || !count($arr_admins)) return new Object();
- foreach($arr_admins as $key => $user_id)
- {
- if(!trim($user_id)) continue;
- $admins[] = trim($user_id);
- }
- if(!count($admins)) return new Object();
-
- $oMemberModel = getModel('member');
- $member_config = $oMemberModel->getMemberConfig();
- if($member_config->identifier == 'email_address')
- {
- $args->email_address = '\''.implode('\',\'',$admins).'\'';
- }
- else
- {
- $args->user_ids = '\''.implode('\',\'',$admins).'\'';
- }
- $output = executeQueryArray('module.getAdminSrls', $args);
- if(!$output->toBool()||!$output->data) return $output;
-
- foreach($output->data as $key => $val)
- {
- unset($args);
- $args = new stdClass;
- $args->site_srl = $site_srl;
- $args->member_srl = $val->member_srl;
- $output = executeQueryArray('module.insertSiteAdmin', $args);
- if(!$output->toBool()) return $output;
- }
- Rhymix\Framework\Cache::delete("site_and_module:site_admins:$site_srl");
- return new Object();
- }
-
/**
* @brief Specify the admin ID to a module
*/
@@ -1087,18 +1040,11 @@ class moduleController extends module
if(is_null($lang))
{
- $site_module_info = Context::get('site_module_info');
- if(!$site_module_info)
- {
- $oModuleModel = getModel('module');
- $site_module_info = $oModuleModel->getDefaultMid();
- Context::set('site_module_info', $site_module_info);
- }
- $cache_file = sprintf('%sfiles/cache/lang_defined/%d.%s.php', _XE_PATH_, $site_module_info->site_srl, Context::getLangType());
+ $cache_file = sprintf('%sfiles/cache/lang_defined/%d.%s.php', _XE_PATH_, 0, Context::getLangType());
if(!file_exists($cache_file))
{
$oModuleAdminController = getAdminController('module');
- $oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
+ $oModuleAdminController->makeCacheDefinedLangCode(0);
}
if(file_exists($cache_file))
@@ -1108,7 +1054,7 @@ class moduleController extends module
if($cacheFileMtime < $moduleAdminControllerMtime)
{
$oModuleAdminController = getAdminController('module');
- $oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
+ $oModuleAdminController->makeCacheDefinedLangCode(0);
}
require_once($cache_file);
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 4d0c427de..5bca98341 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -44,24 +44,120 @@ class moduleModel extends module
return false;
}
-
+
/**
- * @brief Get site information
+ * @brief Get all domains
*/
- function getSiteInfo($site_srl, $columnList = array())
+ function getAllDomains($count = 20, $page = 1)
{
- $args = new stdClass();
- $args->site_srl = $site_srl;
- $output = executeQuery('module.getSiteInfo', $args, $columnList);
- return $output->data;
+ $args = new stdClass;
+ $args->list_count = $count;
+ $args->page = $page;
+ $output = executeQueryArray('module.getDomains', $args);
+ foreach ($output->data as &$domain)
+ {
+ $domain->settings = $domain->settings ? json_decode($domain->settings) : new stdClass;
+ }
+ return $output;
}
- function getSiteInfoByDomain($domain, $columnList = array())
+ /**
+ * @brief Get default domain information
+ */
+ function getDefaultDomainInfo()
{
- $args = new stdClass();
- $args->domain = $domain;
- $output = executeQuery('module.getSiteInfoByDomain', $args, $columnList);
- return $output->data;
+ $domain_info = Rhymix\Framework\Cache::get('site_and_module:domain_info:default');
+ if ($domain_info === null)
+ {
+ $args = new stdClass();
+ $args->is_default_domain = 'Y';
+ $output = executeQuery('module.getDomainInfo', $args);
+ if ($output->data)
+ {
+ $domain_info = $output->data;
+ $domain_info->site_srl = 0;
+ $domain_info->settings = $domain_info->settings ? json_decode($domain_info->settings) : new stdClass;
+ $domain_info->default_language = $domain_info->settings->language ?: config('locale.default_lang');
+ }
+ else
+ {
+ $domain_info = false;
+ }
+ Rhymix\Framework\Cache::set('site_and_module:domain_info:default', $domain_info, 0, true);
+ }
+
+ return $domain_info;
+ }
+
+ /**
+ * @brief Get site information by domain_srl
+ */
+ function getSiteInfo($domain_srl)
+ {
+ $domain_srl = intval($domain_srl);
+ $domain_info = Rhymix\Framework\Cache::get('site_and_module:domain_info:srl:' . $domain_srl);
+ if ($domain_info === null)
+ {
+ $args = new stdClass();
+ $args->domain_srl = $domain_srl;
+ $output = executeQuery('module.getDomainInfo', $args);
+ if ($output->data)
+ {
+ $domain_info = $output->data;
+ $domain_info->site_srl = 0;
+ $domain_info->settings = $domain_info->settings ? json_decode($domain_info->settings) : new stdClass;
+ $domain_info->default_language = $domain_info->settings->language ?: config('locale.default_lang');
+ }
+ else
+ {
+ $domain_info = false;
+ }
+ Rhymix\Framework\Cache::set('site_and_module:domain_info:srl:' . $domain_srl, $domain_info, 0, true);
+ }
+
+ return $domain_info;
+ }
+
+ /**
+ * @brief Get site information by domain name
+ */
+ function getSiteInfoByDomain($domain)
+ {
+ if (strpos($domain, '/') !== false)
+ {
+ $domain = Rhymix\Framework\URL::getDomainFromURL($domain);
+ }
+ if (strpos($domain, 'xn--') !== false)
+ {
+ $domain = Rhymix\Framework\URL::decodeIdna($domain);
+ }
+ if (strval($domain) === '')
+ {
+ return false;
+ }
+
+ $domain = strtolower($domain);
+ $domain_info = Rhymix\Framework\Cache::get('site_and_module:domain_info:domain:' . $domain);
+ if ($domain_info === null)
+ {
+ $args = new stdClass();
+ $args->domain = $domain;
+ $output = executeQuery('module.getDomainInfo', $args);
+ if ($output->data)
+ {
+ $domain_info = $output->data;
+ $domain_info->site_srl = 0;
+ $domain_info->settings = $domain_info->settings ? json_decode($domain_info->settings) : new stdClass;
+ $domain_info->default_language = $domain_info->settings->language ?: config('locale.default_lang');
+ }
+ else
+ {
+ $domain_info = false;
+ }
+ Rhymix\Framework\Cache::set('site_and_module:domain_info:domain:' . $domain, $domain_info, 0, true);
+ }
+
+ return $domain_info;
}
/**
@@ -82,108 +178,30 @@ class moduleModel extends module
*/
function getDefaultMid()
{
- $default_url = Context::getDefaultUrl();
- if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
-
- $request_url = Context::getRequestUri();
- if($request_url && substr_compare($request_url, '/', -1) === 0) $request_url = substr($request_url, 0, -1);
-
- $default_url_parse = parse_url($default_url);
- $request_url_parse = parse_url($request_url);
- $vid = Context::get('vid');
- $mid = Context::get('mid');
-
- // Set up
- $domain = '';
- $site_info = NULL;
- if($default_url && $default_url_parse['host'] != $request_url_parse['host'])
+ // Get current domain.
+ $domain = strtolower(preg_replace('/:\d+$/', '', $_SERVER['HTTP_HOST']));
+
+ // Find the domain information.
+ $domain_info = $this->getSiteInfoByDomain($domain);
+ if (!$domain_info)
{
- $url_info = parse_url($request_url);
- $hostname = $url_info['host'];
- $path = $url_info['path'];
- if(strlen($path) >= 1 && substr_compare($path, '/', -1) === 0) $path = substr($path, 0, -1);
-
- $domain = sprintf('%s%s%s', $hostname, $url_info['port']&&$url_info['port']!=80?':'.$url_info['port']:'',$path);
+ $domain_info = $this->getDefaultDomainInfo();
+ if (!$domain_info)
+ {
+ $domain_info = $this->migrateDomains();
+ }
+ $domain_info->is_default_replaced = true;
}
-
- if($domain === '')
+
+ // Fill in module extra vars and return.
+ if ($domain_info->module_srl)
{
- if(!$vid) $vid = $mid;
- if($vid)
- {
- $domain = $vid;
- }
+ return $this->addModuleExtraVars($domain_info);
}
-
- // If domain is set, look for subsite
- if($domain !== '')
+ else
{
- $site_info = Rhymix\Framework\Cache::get('site_and_module:site_info:' . md5($domain));
- if($site_info === null)
- {
- $args = new stdClass();
- $args->domain = $domain;
- $output = executeQuery('module.getSiteInfoByDomain', $args);
- $site_info = $output->data;
- Rhymix\Framework\Cache::set('site_and_module:site_info:' . md5($domain), $site_info, 0, true);
- }
-
- if($site_info && $vid)
- {
- Context::set('vid', $site_info->domain, true);
- if(strtolower($mid)==strtolower($site_info->domain)) Context::set('mid', $site_info->mid,true);
- }
- if(!$site_info || !$site_info->domain) { $domain = ''; unset($site_info); }
+ return $domain_info;
}
-
- // If no virtual website was found, get default website
- if($domain === '')
- {
- $site_info = Rhymix\Framework\Cache::get('site_and_module:default_site');
- if($site_info === null)
- {
- $args = new stdClass();
- $args->site_srl = 0;
- $output = executeQuery('module.getSiteInfo', $args);
- // Update the related informaion if there is no default site info
- if(!$output->data)
- {
- // Create a table if sites table doesn't exist
- $oDB = &DB::getInstance();
- if(!$oDB->isTableExists('sites')) $oDB->createTableByXmlFile(_XE_PATH_.'modules/module/schemas/sites.xml');
- if(!$oDB->isTableExists('sites')) return;
-
- // Get mid, language
- $mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
- $domain = Context::getDefaultUrl();
- $url_info = parse_url($domain);
- $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->index_module_srl = $mid_output->data->module_srl;
- $site_args->domain = $domain;
- $site_args->default_language = config('locale.default_lang');
-
- if($output->data && !$output->data->index_module_srl)
- {
- $output = executeQuery('module.updateSite', $site_args);
- }
- else
- {
- $output = executeQuery('module.insertSite', $site_args);
- if(!$output->toBool()) return $output;
- }
- $output = executeQuery('module.getSiteInfo', $args);
- }
- $site_info = $output->data;
- Rhymix\Framework\Cache::set('site_and_module:default_site', $site_info, 0, true);
- }
- }
-
- if(!$site_info->module_srl) return $site_info;
- if(is_array($site_info) && $site_info->data[0]) $site_info = $site_info[0];
- return $this->addModuleExtraVars($site_info);
}
/**
@@ -1596,36 +1614,14 @@ class moduleModel extends module
*/
function isSiteAdmin($member_info, $site_srl = null)
{
- if (!$member_info || !$member_info->member_srl)
- {
- return false;
- }
- if ($member_info->is_admin == 'Y')
+ if ($member_info && $member_info->is_admin == 'Y')
{
return true;
}
- if ($site_srl === null)
+ else
{
- $site_module_info = Context::get('site_module_info');
- if(!$site_module_info) return false;
- $site_srl = $site_module_info->site_srl;
+ return false;
}
-
- $site_srl = $site_srl ?: 0;
- $site_admins = Rhymix\Framework\Cache::get("site_and_module:site_admins:$site_srl");
- if ($site_admins === null)
- {
- $args = new stdClass;
- $args->site_srl = $site_srl;
- $output = executeQueryArray('module.isSiteAdmin', $args);
- $site_admins = array();
- foreach ($output->data as $site_admin)
- {
- $site_admins[$site_admin->member_srl] = true;
- }
- Rhymix\Framework\Cache::set("site_and_module:site_admins:$site_srl", $site_admins, 0, true);
- }
- return isset($site_admins[$member_info->member_srl]);
}
/**
@@ -1633,10 +1629,7 @@ class moduleModel extends module
*/
function getSiteAdmin($site_srl)
{
- $args = new stdClass;
- $args->site_srl = $site_srl;
- $output = executeQueryArray('module.getSiteAdmin', $args);
- return $output->data;
+ return array();
}
/**
@@ -1940,19 +1933,13 @@ class moduleModel extends module
if(!$module_srl)
{
$grant->access = true;
- if($this->isSiteAdmin($member_info, $module_info->site_srl))
- {
- $grant->access = $grant->manager = $grant->is_site_admin = true;
- }
-
- $grant->is_admin = $grant->manager = ($member_info->is_admin == 'Y') ? true : false;
+ $grant->is_admin = $grant->manager = $grant->is_site_admin = ($member_info->is_admin == 'Y') ? true : false;
}
else
{
// If module_srl exists
// Get a type of granted permission
- $grant->access = $grant->manager = $grant->is_site_admin = ($member_info->is_admin=='Y'||$this->isSiteAdmin($member_info, $module_info->site_srl))?true:false;
- $grant->is_admin = ($member_info->is_admin == 'Y') ? true : false;
+ $grant->access = $grant->is_admin = $grant->manager = $grant->is_site_admin = ($member_info->is_admin == 'Y') ? true : false;
// If a just logged-in member is, check if the member is a module administrator
if (!$grant->manager && $member_info->member_srl && $this->isModuleAdmin($member_info, $module_srl))
diff --git a/modules/module/queries/deleteDomain.xml b/modules/module/queries/deleteDomain.xml
new file mode 100644
index 000000000..85b47b290
--- /dev/null
+++ b/modules/module/queries/deleteDomain.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/module/queries/getDomainInfo.xml b/modules/module/queries/getDomainInfo.xml
new file mode 100644
index 000000000..7ee7aba4a
--- /dev/null
+++ b/modules/module/queries/getDomainInfo.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/module/queries/getDomains.xml b/modules/module/queries/getDomains.xml
new file mode 100644
index 000000000..f7a56b65f
--- /dev/null
+++ b/modules/module/queries/getDomains.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/module/queries/getSites.xml b/modules/module/queries/getSites.xml
new file mode 100644
index 000000000..788cb1e9e
--- /dev/null
+++ b/modules/module/queries/getSites.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/module/queries/insertDomain.xml b/modules/module/queries/insertDomain.xml
new file mode 100644
index 000000000..e42c04291
--- /dev/null
+++ b/modules/module/queries/insertDomain.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/module/queries/updateDefaultDomain.xml b/modules/module/queries/updateDefaultDomain.xml
new file mode 100644
index 000000000..0b814dee1
--- /dev/null
+++ b/modules/module/queries/updateDefaultDomain.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/module/queries/updateDomain.xml b/modules/module/queries/updateDomain.xml
new file mode 100644
index 000000000..7861c84ba
--- /dev/null
+++ b/modules/module/queries/updateDomain.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/module/schemas/domains.xml b/modules/module/schemas/domains.xml
new file mode 100644
index 000000000..eb488c96a
--- /dev/null
+++ b/modules/module/schemas/domains.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/ncenterlite/ncenterlite.admin.model.php b/modules/ncenterlite/ncenterlite.admin.model.php
index f715b3cee..e359ba49d 100644
--- a/modules/ncenterlite/ncenterlite.admin.model.php
+++ b/modules/ncenterlite/ncenterlite.admin.model.php
@@ -2,36 +2,33 @@
class ncenterliteAdminModel extends ncenterlite
{
-
- function getAdminNotifyList($member_srl=null, $page=1, $readed='N')
+ function getAdminNotifyList()
{
$oNcenterliteModel = getModel('ncenterlite');
- $config = $oNcenterliteModel->getConfig();
- global $lang;
-
- $act = Context::get('act');
$output = $oNcenterliteModel->getNcenterliteAdminList();
$oMemberModel = getModel('member');
$list = $output->data;
- foreach($list as $k => $v)
+ foreach($list as $key => $value)
{
- $v->text = $oNcenterliteModel->getNotificationText($v);
- $v->ago = $oNcenterliteModel->getAgo($v->regdate);
- $v->url = getUrl('','act','procNcenterliteRedirect', 'notify', $v->notify, 'url', $v->target_url);
- if($v->target_member_srl)
+ $value->text = $oNcenterliteModel->getNotificationText($value);
+ $value->ago = $oNcenterliteModel->getAgo($value->regdate);
+ $value->url = getUrl('','act','procNcenterliteRedirect', 'notify', $value->notify, 'url', $value->target_url);
+ if($value->target_member_srl)
{
- $profileImage = $oMemberModel->getProfileImage($v->target_member_srl);
- $v->profileImage = $profileImage->src;
+ $profileImage = $oMemberModel->getProfileImage($value->target_member_srl);
+ $value->profileImage = $profileImage->src;
}
- $list[$k] = $v;
+ $list[$key] = $value;
+ $member_info = $oMemberModel->getMemberInfoByMemberSrl($value->member_srl);
+
+ $list[$key]->nick_name = $member_info->nick_name;
}
$output->data = $list;
return $output;
}
-
}
diff --git a/modules/ncenterlite/ncenterlite.admin.view.php b/modules/ncenterlite/ncenterlite.admin.view.php
index 3dbd33898..95e0252a2 100644
--- a/modules/ncenterlite/ncenterlite.admin.view.php
+++ b/modules/ncenterlite/ncenterlite.admin.view.php
@@ -105,8 +105,6 @@ class ncenterliteAdminView extends ncenterlite
Context::set('page', $output->page);
Context::set('ncenterlite_list', $output->data);
Context::set('page_navigation', $output->page_navigation);
-
- $this->setTemplateFile('ncenter_list');
}
function dispNcenterliteAdminTest()
diff --git a/modules/ncenterlite/tpl/ncenter_list.html b/modules/ncenterlite/tpl/list.html
similarity index 90%
rename from modules/ncenterlite/tpl/ncenter_list.html
rename to modules/ncenterlite/tpl/list.html
index aab6896fc..dfe347b26 100644
--- a/modules/ncenterlite/tpl/ncenter_list.html
+++ b/modules/ncenterlite/tpl/list.html
@@ -31,13 +31,9 @@
- {@
- $oMemberModel = getModel('member');
- $member_info = $oMemberModel->getMemberInfoByMemberSrl($val->member_srl);
- }
| {$val->target_nick_name} |
- {$member_info->nick_name} | 타겟없음 |
+ {$val->nick_name} |
{$val->text} |
{$lang->ncenterlite_read_y}
diff --git a/tests/unit/framework/SessionTest.php b/tests/unit/framework/SessionTest.php
index 47ed06134..6f97c9cee 100644
--- a/tests/unit/framework/SessionTest.php
+++ b/tests/unit/framework/SessionTest.php
@@ -134,7 +134,7 @@ class SessionTest extends \Codeception\TestCase\Test
public function testCheckSSO()
{
- $this->assertFalse(Rhymix\Framework\Session::checkSSO());
+ $this->assertNull(Rhymix\Framework\Session::checkSSO(new stdClass));
}
public function testRefresh()
diff --git a/widgets/content/skins/simple_rectangle/css/css.less b/widgets/content/skins/simple_rectangle/css/css.less
index 13906cb0e..9ddb7841d 100644
--- a/widgets/content/skins/simple_rectangle/css/css.less
+++ b/widgets/content/skins/simple_rectangle/css/css.less
@@ -56,6 +56,7 @@ div.simple_content
{
font-family: "맑은 고딕", "Apple SD Gothic Neo","나눔고딕",NanumGothic,'Nanum Gothic',Arial,Helvetica,sans-serif;
font-size: 14px;
+ text-align: justify;
padding: 3px;
}
section.simple_content
|