merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545

addons/captcha/captcha.addon.php

@@ -10,6 +10,9 @@
 
 	if(!class_exists('AddonCaptcha'))
 	{
+	// On the mobile mode, XE Core does not load jquery and xe.js as normal.
+	Context::loadFile(array('./common/js/jquery.min.js','head', NULL,-100000),true);
+	Context::loadFile(array('./common/js/xe.min.js','head', NULL,-100000),true);
 		class AddonCaptcha
 		{
 			var $addon_info;
@@ -31,6 +34,7 @@ function before_module_init(&$ModuleHandler)
 				$logged_info = Context::get('logged_info');
 				if($logged_info->is_admin == 'Y' || $logged_info->is_site_admin) return false;
 				if($this->addon_info->target != 'all' && Context::get('is_logged')) return false;
+				if($_SESSION['XE_VALIDATOR_ERROR'] == -1) $_SESSION['captcha_authed'] = false;
 				if($_SESSION['captcha_authed']) return false;
 
 				$type = Context::get('captchaType');
@@ -54,7 +58,7 @@ function before_module_init(&$ModuleHandler)
 						}
 					}  else {
 						Context::addHtmlHeader('<script type="text/javascript"> var captchaTargetAct = new Array("'.implode('","',$target_acts).'"); </script>');
-						Context::loadFile(array('./addons/captcha/captcha.js', 'body', '', null), true);
+						Context::loadFile(array('./addons/captcha/captcha.min.js', 'body', '', null), true);
 					}
 				}
 
@@ -286,7 +290,7 @@ function inlineDisplay()
 				$this->createKeyword();
 
 				$swfURL = getUrl().'addons/captcha/swf/play.swf';
-				Context::unloadFile('./addons/captcha/captcha.js');
+				Context::unloadFile('./addons/captcha/captcha.min.js');
 				Context::loadFile(array('./addons/captcha/inline_captcha.js','body'));
 
 				global $lang;

addons/captcha/captcha.js

@@ -80,7 +80,9 @@ var calledArgs = null;
 
 				captchaXE = $('<div id="captcha_layer" style="position:fixed; top:0; left:0; width:100%; height:100%;display:none;z-index:10">').appendTo(document.body);
 
-                var $div = $('<div style="z-index:1000;position:absolute; width:310px; margin:-105px 0 0 -105px; top:50%; left:50%; background:#fff; border:3px solid #ccc;">'+
+				var top_left = 'margin:-105px 0 0 -105px; top:50%; left:50%;';
+				if(screen.width<480) { top_left = ''; }
+				var $div = $('<div style="z-index:1000;position:absolute; width:310px;' + top_left + ' background:#fff; border:3px solid #ccc;">'+
 								'<form method="post" action="">'+
 									'<div style="position:relative; margin:25px 20px 15px 20px">'+
 										'<img src="about:blank" id="captcha_image" alt="CAPTCHA" width="240" height="50" style="display:block; width:240px; height:50px; border:1px solid #b0b0b0" />'+

addons/member_communication/member_communication.addon.php

@@ -4,7 +4,7 @@
 /**
  * @file member_communication.addon.php
  * @author NHN ([email protected])
- * @brief Promote user communication 
+ * @brief Promote user communication
  *
  * - Pop-up the message if new message comes in
  * - When calling MemberModel::getMemberMenu, feature to send a message is added
@@ -46,7 +46,7 @@
 	$mid = Context::get('cur_mid');
 	// Creates communication model object
 	$oCommunicationModel = &getModel('communication');
-	// Add a feature to display own message box. 
+	// Add a feature to display own message box.
 	if($logged_info->member_srl == $member_srl) {
 		// Add your own viewing Note Template
 		$oMemberController->addMemberPopupMenu(getUrl('','mid',$mid,'act','dispCommunicationMessages'), 'cmd_view_message_box', '', 'self');
@@ -55,7 +55,7 @@
 	// If not, Add menus to send message and to add friends
 	} else {
 		// Get member information
-		$oMemberModel = &getModel('member'); 
+		$oMemberModel = &getModel('member');
 		$target_member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
 		if(!$target_member_info->member_srl) return;
 		// Get logged-in user information

addons/member_communication/tpl/member_communication.js

@@ -5,6 +5,10 @@ window.xeNotifyMessage = function(text, count){
 	if(!$bar.length) {
 		$bar = $('<div class="message info" />')
 			.hide()
+			.css({
+				'position'   : 'absolute',
+				'z-index' : '100',
+			})
 			.prependTo(document.body);
 	}
 	text = text.replace('%d', count);
@@ -13,6 +17,6 @@ window.xeNotifyMessage = function(text, count){
 	// hide after 10 seconds
 	setTimeout(function(){
 		$bar.slideUp();
-	}, 10000);
+	}, 5000);
 };
 })(jQuery);

addons/member_extra_info/member_extra_info.addon.php

@@ -17,7 +17,7 @@
 // Include a file having functions to replace member image name/mark
 require_once('./addons/member_extra_info/member_extra_info.lib.php');
 // 1. Find a part <div class="member_MemberSerialNumber"> content </div> in the output document, change it to image name/mark by using MemberController::transImageName()
-$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>([^\<]*)\<\/(div|span|a)\>!is', 'memberTransImageName', $output);
+$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'memberTransImageName', $output);
 if($temp_output) $output = $temp_output;
 unset($temp_output);
 ?>

addons/point_level_icon/point_level_icon.addon.php

@@ -13,7 +13,7 @@
 
 require_once('./addons/point_level_icon/point_level_icon.lib.php');
 
-$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>([^\<]*)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output);
+$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output);
 if($temp_output) $output = $temp_output;
 unset($temp_output);
 ?>