diff --git a/addons/blogapi/blogapi.addon.php b/addons/blogapi/blogapi.addon.php
index c17ecb9ed..5dfd4c6a2 100644
--- a/addons/blogapi/blogapi.addon.php
+++ b/addons/blogapi/blogapi.addon.php
@@ -243,7 +243,7 @@
$obj->content = str_replace($uploaded_target_path,sprintf('/files/attach/images/%s/%s%s', $this->module_srl, getNumberingPath($document_srl,3), $filename), $obj->content);
$oDocumentController = &getController('document');
- $obj->allow_comment = 'Y';
+ $obj->commentStatus = 'ALLOW';
$obj->allow_trackback = 'Y';
$output = $oDocumentController->insertDocument($obj);
@@ -403,7 +403,7 @@
$post->publish = 1;
$post->userid = $oDocument->get('user_id');
$post->mt_allow_pings = 0;
- $post->mt_allow_comments = $oDocument->allowComment()=='Y'?1:0;
+ $post->mt_allow_comments = $oDocument->allowComment()?1:0;
$posts[] = $post;
}
$content = getXmlRpcResponse($posts);
diff --git a/addons/member_extra_info/member_extra_info.lib.php b/addons/member_extra_info/member_extra_info.lib.php
index 3cb808e31..fe2edfaf5 100644
--- a/addons/member_extra_info/member_extra_info.lib.php
+++ b/addons/member_extra_info/member_extra_info.lib.php
@@ -32,7 +32,7 @@
if($image_name_file) $nick_name = sprintf('
', Context::getRequestUri(),$image_name_file, strip_tags($nick_name), strip_tags($nick_name));
if($image_mark_file) $nick_name = sprintf('%s', Context::getRequestUri(),$image_mark_file, strip_tags($nick_name), strip_tags($nick_name), $nick_name);
- if($group_image) $nick_name = sprintf('
%s', $group_image->src, $nick_name);
+ if($group_image) $nick_name = sprintf('%s', $group_image->src, $group_image->title, $group_image->description, $nick_name);
$orig_text = preg_replace('/'.preg_quote($matches[5],'/').'<\/'.$matches[6].'>$/', '', $matches[0]);
diff --git a/addons/point_level_icon/point_level_icon.lib.php b/addons/point_level_icon/point_level_icon.lib.php
index 014e31e23..a81829bc4 100644
--- a/addons/point_level_icon/point_level_icon.lib.php
+++ b/addons/point_level_icon/point_level_icon.lib.php
@@ -6,6 +6,12 @@
$member_srl = $matches[3];
if($member_srl<1) return $matches[0];
+ $orig_text = preg_replace('/'.preg_quote($matches[5],'/').'<\/'.$matches[6].'>$/', '', $matches[0]);
+
+ // Check Group Image Mark
+ $oMemberModel = &getModel('member');
+ if($oMemberModel->getGroupImageMark($member_srl)) return $orig_text.$matches[5].'';
+
if(!isset($GLOBALS['_pointLevelIcon'][$member_srl])) {
// Get point configuration
if(!$GLOBALS['_pointConfig']) {
@@ -40,7 +46,6 @@
}
$text = $GLOBALS['_pointLevelIcon'][$member_srl];
- $orig_text = preg_replace('/'.preg_quote($matches[5],'/').'<\/'.$matches[6].'>$/', '', $matches[0]);
return $orig_text.$text.$matches[5].'';
}
?>
diff --git a/config/config.inc.php b/config/config.inc.php
index 357e52bfb..858a8769a 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -158,6 +158,7 @@
require(_XE_PATH_.'classes/mail/Mail.class.php');
require(_XE_PATH_.'classes/page/PageHandler.class.php');
require(_XE_PATH_.'classes/mobile/Mobile.class.php');
+ require(_XE_PATH_.'classes/validator/Validator.class.php');
if(__DEBUG__) $GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__;
}
?>
diff --git a/config/func.inc.php b/config/func.inc.php
index 9b3f5fa03..8e606228b 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -820,6 +820,14 @@
return $url;
}
+ /**
+ * return the requested script path
+ **/
+ function getRequestUriByServerEnviroment()
+ {
+ return $_SERVER['REQUEST_URI'];
+ }
+
/**
* php unescape function of javascript's escape
* Function converts an Javascript escaped string back into a string with specified charset (default is UTF-8).
@@ -972,4 +980,21 @@
}
}
+ function alertScript($msg)
+ {
+ if(!$msg) return;
+ echo '';
+ }
+
+ function closePopupScript()
+ {
+ echo '';
+ }
+
+ function reload($isOpener = false)
+ {
+ $reloadScript = $isOpener ? 'window.opener.location.reload()' : 'document.location.reload()';
+
+ echo '';
+ }
?>
diff --git a/layouts/user_layout/conf/info.xml b/layouts/user_layout/conf/info.xml
new file mode 100644
index 000000000..109143907
--- /dev/null
+++ b/layouts/user_layout/conf/info.xml
@@ -0,0 +1,19 @@
+
+
+ 사용자 정의 레이아웃
+ User defined layout
+ ユーザー定義のレイアウト
+ 사용자 정의 레이아웃에 관한 설명 입니다.
+ Description for user defined layout.
+ ユーザー定義のレイアウトについての説明です。
+ 1.0
+ 2010-12-24
+
+ User Name
+
+
+
+
+
diff --git a/layouts/user_layout/layout.html b/layouts/user_layout/layout.html
new file mode 100644
index 000000000..5a3554723
--- /dev/null
+++ b/layouts/user_layout/layout.html
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
![]()
+
+
+ .lnb
+
+
+
+
+
.content{$content}
+
+
+
+