- | {htmlspecialchars($val->source_filename, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)} |
+
+ 
+
+ {htmlspecialchars($val->source_filename, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)} |
{FileHandler::filesize($val->file_size)} |
{$val->download_count} |
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
index 4b38c80ab..797779964 100644
--- a/modules/install/install.admin.controller.php
+++ b/modules/install/install.admin.controller.php
@@ -327,9 +327,17 @@ class installAdminController extends install
private function saveIconTmp($icon, $iconname)
{
+
+ $site_info = Context::get('site_module_info');
+ $virtual_site = '';
+ if($site_info->site_srl)
+ {
+ $virtual_site = $site_info->site_srl . '/';
+ }
+
$target_file = $icon['tmp_name'];
$type = $icon['type'];
- $relative_filename = 'files/attach/xeicon/tmp/'.$iconname;
+ $relative_filename = 'files/attach/xeicon/'.$virtual_site.'tmp/'.$iconname;
$target_filename = _XE_PATH_.$relative_filename;
list($width, $height, $type_no, $attrs) = @getimagesize($target_file);
@@ -364,7 +372,15 @@ class installAdminController extends install
}
private function updateIcon($iconname, $deleteIcon = false) {
- $image_filepath = _XE_PATH_.'files/attach/xeicon/';
+
+ $site_info = Context::get('site_module_info');
+ $virtual_site = '';
+ if($site_info->site_srl)
+ {
+ $virtual_site = $site_info->site_srl . '/';
+ }
+
+ $image_filepath = _XE_PATH_.'files/attach/xeicon/' . $virtual_site;
if($deleteIcon) {
FileHandler::removeFile($image_filepath.$iconname);
diff --git a/modules/integration_search/integration_search.admin.controller.php b/modules/integration_search/integration_search.admin.controller.php
index c43e36567..232af8d62 100644
--- a/modules/integration_search/integration_search.admin.controller.php
+++ b/modules/integration_search/integration_search.admin.controller.php
@@ -27,6 +27,7 @@ class integration_searchAdminController extends integration_search
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('integration_search');
+ $args = new stdClass;
$args->skin = Context::get('skin');
$args->target = Context::get('target');
$args->target_module_srl = Context::get('target_module_srl');
@@ -51,6 +52,7 @@ class integration_searchAdminController extends integration_search
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('integration_search');
+ $args = new stdClass;
$args->skin = $config->skin;
$args->target_module_srl = $config->target_module_srl;
// Get skin information (to check extra_vars)
diff --git a/modules/integration_search/skins/default/header.html b/modules/integration_search/skins/default/header.html
index 8404d9f37..12dcd5cc6 100644
--- a/modules/integration_search/skins/default/header.html
+++ b/modules/integration_search/skins/default/header.html
@@ -3,6 +3,7 @@
+ {@if(!is_object($module_info)) $module_info = new stdClass;}
{@$module_info->colorset = "white"}
diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php
index 459a2085b..f0fa15167 100644
--- a/modules/layout/layout.admin.controller.php
+++ b/modules/layout/layout.admin.controller.php
@@ -123,6 +123,7 @@ class layoutAdminController extends layout
{
$oModuleModel = getModel('module');
$start_module = $oModuleModel->getSiteInfo(0, $columnList);
+ $tmpArgs = new stdClass;
$tmpArgs->url = $start_module->mid;
$tmpArgs->site_srl = 0;
$output = executeQuery('menu.getMenuItemByUrl', $tmpArgs);
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index 2680a4a10..858d37400 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -478,7 +478,7 @@ class layoutModel extends layout
// Include the cache file if it is valid and then return $layout_info variable
if(!$layout_srl)
{
- $cache_file = $this->getLayoutCache($layout, Context::getLangType());
+ $cache_file = $this->getLayoutCache($layout, Context::getLangType(), $layout_type);
}
else
{
@@ -896,9 +896,16 @@ class layoutModel extends layout
* @param string $lang_type
* @return string
*/
- function getLayoutCache($layout_name,$lang_type)
+ function getLayoutCache($layout_name,$lang_type,$layout_type='P')
{
- return sprintf("%sfiles/cache/layout/%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
+ if($layout_type=='P')
+ {
+ return sprintf("%sfiles/cache/layout/%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
+ }
+ else
+ {
+ return sprintf("%sfiles/cache/layout/m.%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
+ }
}
/**
diff --git a/modules/member/lang/lang.xml b/modules/member/lang/lang.xml
index 8fdf9f596..59f123c97 100644
--- a/modules/member/lang/lang.xml
+++ b/modules/member/lang/lang.xml
@@ -1325,6 +1325,9 @@
+ -
+
+
-
이메일 변경요청을 다시 하거나 사이트 관리자에게 문의해주세요.]]>
Eメール変更要求を再度行うかサイト管理者へお問い合わせください。]]>
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index e9e32e80c..989cdaeb2 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -2462,7 +2462,7 @@ class memberController extends member
$oMail->setReceiptor( $member_info->nick_name, $newEmail );
$result = $oMail->send();
- $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $newEmail);
+ $msg = sprintf(Context::getLang('msg_change_mail_sent'), $newEmail);
$this->setMessage($msg);
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
@@ -2635,7 +2635,7 @@ class memberController extends member
$spam_description = trim( Context::get('spam_description') );
$oMemberModel = getModel('member');
- $columnList = array('member_srl', 'description');
+ $columnList = array('member_srl', 'email_address', 'user_id', 'nick_name', 'description');
// get member current infomation
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
@@ -2646,7 +2646,10 @@ class memberController extends member
$total_count = $cnt_comment + $cnt_document;
$args = new stdClass();
- $args->member_srl= $member_info->member_srl;
+ $args->member_srl = $member_info->member_srl;
+ $args->email_address = $member_info->email_address;
+ $args->user_id = $member_info->user_id;
+ $args->nick_name = $member_info->nick_name;
$args->denied = "Y";
$args->description = trim( $member_info->description );
if( $args->description != "" ) $args->description .= "\n"; // add new line
diff --git a/modules/message/message.mobile.php b/modules/message/message.mobile.php
index 8f73afba9..1b2041541 100644
--- a/modules/message/message.mobile.php
+++ b/modules/message/message.mobile.php
@@ -18,6 +18,7 @@ class messageMobile extends messageView
// Get configurations (using module model object)
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('message');
+ if(!is_object($config)) $config = new stdClass;
if(!$config->mskin) $config->mskin = 'default';
// Set the template path
$template_path = sprintf('%sm.skins/%s', $this->module_path, $config->mskin);
diff --git a/modules/module/lang/lang.xml b/modules/module/lang/lang.xml
index fdf5e9ebb..63b0abd01 100644
--- a/modules/module/lang/lang.xml
+++ b/modules/module/lang/lang.xml
@@ -905,6 +905,18 @@
+ -
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php
index f909834dc..3888ff39c 100644
--- a/modules/module/module.controller.php
+++ b/modules/module/module.controller.php
@@ -950,7 +950,7 @@ class moduleController extends module
}
}
- $oDB->commit;
+ $oDB->commit();
return new Object();
}
diff --git a/modules/page/page.class.php b/modules/page/page.class.php
index 2139881e2..ad82d6944 100644
--- a/modules/page/page.class.php
+++ b/modules/page/page.class.php
@@ -71,6 +71,7 @@ class page extends ModuleObject
if(count($skin_update_srls)>0)
{
+ $skin_args = new stdClass;
$skin_args->module_srls = implode(',',$skin_update_srls);
$skin_args->is_skin_fix = "Y";
$ouput = executeQuery('page.updateSkinFix', $skin_args);
diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php
index cb69a4a83..b3f32b9a3 100644
--- a/modules/point/point.controller.php
+++ b/modules/point/point.controller.php
@@ -608,6 +608,7 @@ class pointController extends point
// Remove linkage group
if($del_group_list && count($del_group_list))
{
+ $del_group_args = new stdClass;
$del_group_args->member_srl = $member_srl;
$del_group_args->group_srl = implode(',', $del_group_list);
$del_group_output = executeQuery('point.deleteMemberGroup', $del_group_args);
@@ -615,6 +616,7 @@ class pointController extends point
// Grant a new group
foreach($new_group_list as $group_srl)
{
+ $new_group_args = new stdClass;
$new_group_args->member_srl = $member_srl;
$new_group_args->group_srl = $group_srl;
executeQuery('member.addMemberToGroup', $new_group_args);
diff --git a/modules/rss/tpl/rss10.html b/modules/rss/tpl/rss10.html
index 4fd85fedb..38a6e7ca7 100644
--- a/modules/rss/tpl/rss10.html
+++ b/modules/rss/tpl/rss10.html
@@ -4,7 +4,7 @@
<![CDATA[{$info->title}]]>
{$info->link}
- description}
+ description}]]>
diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php
index 667fe0300..dd24bffba 100644
--- a/modules/widget/widget.model.php
+++ b/modules/widget/widget.model.php
@@ -142,7 +142,7 @@ class widgetModel extends widget
$xml_obj = $tmp_xml_obj->widget;
if(!$xml_obj) return;
- $buff = '';
+ $buff = '$widget_info = new stdClass;';
if($xml_obj->version && $xml_obj->attrs->version == '0.2')
{
@@ -166,6 +166,7 @@ class widgetModel extends widget
for($i=0; $i < count($author_list); $i++)
{
+ $buff .= '$widget_info->author['.$i.'] = new stdClass;';
$buff .= sprintf('$widget_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
$buff .= sprintf('$widget_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
$buff .= sprintf('$widget_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
@@ -185,6 +186,7 @@ class widgetModel extends widget
$buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
$buff .= sprintf('$widget_info->widget_title = $widget_title;');
// Author information
+ $buff .= '$widget_info->author[0] = new stdClass;';
$buff .= sprintf('$widget_info->author[0]->name = "%s";', $xml_obj->author->name->body);
$buff .= sprintf('$widget_info->author[0]->email_address = "%s";', $xml_obj->author->attrs->email_address);
$buff .= sprintf('$widget_info->author[0]->homepage = "%s";', $xml_obj->author->attrs->link);
@@ -203,6 +205,7 @@ class widgetModel extends widget
$extra_var_count = count($extra_vars);
$buff .= sprintf('$widget_info->extra_var_count = "%s";', $extra_var_count);
+ $buff .= '$widget_info->extra_var = new stdClass;';
for($i=0;$i<$extra_var_count;$i++)
{
unset($var);
@@ -212,8 +215,12 @@ class widgetModel extends widget
$id = $var->attrs->id?$var->attrs->id:$var->attrs->name;
$name = $var->name->body?$var->name->body:$var->title->body;
$type = $var->attrs->type?$var->attrs->type:$var->type->body;
- if($type =='filebox') $buff .= sprintf('$widget_info->extra_var->%s->filter = "%s";', $id, $var->type->attrs->filter);
- if($type =='filebox') $buff .= sprintf('$widget_info->extra_var->%s->allow_multiple = "%s";', $id, $var->type->attrs->allow_multiple);
+ $buff .= sprintf('$widget_info->extra_var->%s = new stdClass;', $id);
+ if($type =='filebox')
+ {
+ $buff .= sprintf('$widget_info->extra_var->%s->filter = "%s";', $id, $var->type->attrs->filter);
+ $buff .= sprintf('$widget_info->extra_var->%s->allow_multiple = "%s";', $id, $var->type->attrs->allow_multiple);
+ }
$buff .= sprintf('$widget_info->extra_var->%s->group = "%s";', $id, $group->title->body);
$buff .= sprintf('$widget_info->extra_var->%s->name = "%s";', $id, $name);
@@ -299,6 +306,7 @@ class widgetModel extends widget
for($i=0; $i < count($author_list); $i++)
{
+ $buff .= '$widgetStyle_info->author['.$i.'] = new stdClass;';
$buff .= sprintf('$widgetStyle_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
$buff .= sprintf('$widgetStyle_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
$buff .= sprintf('$widgetStyle_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
@@ -317,7 +325,7 @@ class widgetModel extends widget
{
$extra_var_count = count($extra_vars);
- $buff .= sprintf('$widgetStyle_info->extra_var_count = "%s";', $extra_var_count);
+ $buff .= sprintf('$widgetStyle_info->extra_var_count = "%s";$widgetStyle_info->extra_var = new stdClass;', $extra_var_count);
for($i=0;$i<$extra_var_count;$i++)
{
unset($var);
@@ -328,6 +336,7 @@ class widgetModel extends widget
$name = $var->name->body?$var->name->body:$var->title->body;
$type = $var->attrs->type?$var->attrs->type:$var->type->body;
+ $buff .= sprintf('$widgetStyle_info->extra_var->%s = new stdClass;', $id);
$buff .= sprintf('$widgetStyle_info->extra_var->%s->group = "%s";', $id, $group->title->body);
$buff .= sprintf('$widgetStyle_info->extra_var->%s->name = "%s";', $id, $name);
$buff .= sprintf('$widgetStyle_info->extra_var->%s->type = "%s";', $id, $type);
|