Merge pull request #3 from xpressengine/develop

Develop 1.7.5 - 140518

.travis.yml

@@ -4,6 +4,8 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+  - hhvm
 before_script:
   - npm install -g grunt-cli
   - npm install

classes/httprequest/XEHttpRequest.class.php

@@ -8,6 +8,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @package /classes/httprequest
  * @version 0.1
+ * @deprecated
  */
 class XEHttpRequest
 {
@@ -24,6 +25,12 @@ class XEHttpRequest
 	 */
 	var $m_port;
 
+	/**
+	 * target scheme 
+	 * @var string
+	 */
+	var $m_scheme;
+
 	/**
 	 * target header
 	 * @var array
@@ -34,10 +41,11 @@ class XEHttpRequest
 	 * constructor
 	 * @return void
 	 */
-	function XEHttpRequest($host, $port)
+	function XEHttpRequest($host, $port, $scheme='')
 	{
 		$this->m_host = $host;
 		$this->m_port = $port;
+		$this->m_scheme = $scheme;
 		$this->m_headers = array();
 	}
 
@@ -108,7 +116,13 @@ class XEHttpRequest
 	{
 		static $crlf = "\r\n";
 
-		$sock = @fsockopen($this->m_host, $this->m_port, $errno, $errstr, $timeout);
+		$scheme = '';
+		if($this->m_scheme=='https')
+		{
+			$scheme = 'ssl://';
+		}
+
+		$sock = @fsockopen($scheme . $this->m_host, $this->m_port, $errno, $errstr, $timeout);
 		if(!$sock)
 		{
 			return new Object(-1, 'socket_connect_failed');

config/config.inc.php

@@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
 /**
  * Display XE's full version.
  */
-define('__XE_VERSION__', '1.7.5-beta2');
+define('__XE_VERSION__', '1.7.5');
 define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
 define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
 define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

index.php

@@ -45,7 +45,7 @@ require dirname(__FILE__) . '/config/config.inc.php';
  * @brief Initialize by creating Context object
  * Set all Request Argument/Environment variables
  **/
-$oContext = &Context::getInstance();
+$oContext = Context::getInstance();
 $oContext->init();
 
 /**
@@ -59,8 +59,7 @@ if($oContext->checkSSO())
 	{
 		if($oModuleHandler->init())
 		{
-			$oModule = &$oModuleHandler->procModule();
-			$oModuleHandler->displayContent($oModule);
+			$oModuleHandler->displayContent($oModuleHandler->procModule());
 		}
 	}
 	catch(Exception $e)

modules/admin/tpl/css/admin.css

@@ -358,6 +358,9 @@ body>.x,
 .x_modal-backdrop {
 	display: none;
 }
+.x_modal {
+	top: 30px;
+}
 .x_modal-backdrop {
 	opacity: .6;
 	filter: alpha(opacity=60);
@@ -410,7 +413,7 @@ body>.x,
 	min-width: 220px;
 }
 .x .x_form-horizontal .x_control-group {
-	margin-bottom: 10px;
+margin-bottom: 10px;
 }
 .x input[type="text"], 
 .x input[type="password"], 

modules/admin/tpl/js/admin.js

@@ -422,6 +422,14 @@ jQuery(function($){
 				var zIndex = xeModalInitailZIndex + ((xeModalStack.length - 1) * 2);
 
 				$xeModalBackdrop.css('z-index', zIndex).show();
+				var xeModalBackdropHeight = $xeModalBackdrop.height();
+				var modalBodyHeight = xeModalBackdropHeight;
+				modalBodyHeight -= $modal.find('.x_modal-header:visible').height();
+				modalBodyHeight -= $modal.find('.x_modal-footer:visible').height();
+				modalBodyHeight -= 150;
+
+				$modal.find('.x_modal-body').css('height', modalBodyHeight);
+
 				$modal.css('z-index', zIndex + 1);
 			})
 			.bind('close.mw', function(){

modules/comment/comment.model.php

@@ -385,6 +385,7 @@ class commentModel extends comment
 			$args->module_srl = $obj->module_srl;
 		}
 
+		$args->document_srl = $obj->document_srl;
 		$args->list_count = $obj->list_count;
 
 		if(strpos($args->module_srl, ",") === false)

modules/comment/queries/getNewestCommentList.xml

@@ -8,6 +8,7 @@
     <conditions>
         <condition operation="equal" column="status" var="status" pipe="and" />
         <condition operation="in" column="module_srl" var="module_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="document_srl" var="document_srl" filter="number" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="list_order" order="asc" />

modules/member/member.admin.controller.php

@@ -831,7 +831,6 @@ class memberAdminController extends member
 						{
 							$args->denied = $var->denied;
 							$output = executeQuery('member.updateMemberDeniedInfo', $args);
-							$this->_clearMemberCache($args->member_srl);
 							if(!$output->toBool())
 							{
 								$oDB->rollback();
@@ -853,6 +852,7 @@ class memberAdminController extends member
 						$this->setMessage('success_deleted');
 					}
 			}
+			$oMemberController->_clearMemberCache($args->member_srl);
 		}
 
 		$message = $var->message;

modules/member/tpl/member_list.html

@@ -154,7 +154,12 @@
 				<h3>{$lang->member_group}</h3>
 				<label loop="$group_list => $key,$val" for="g{$val->group_srl}" class="x_inline"><input type="checkbox" name="groups[]" id="g{$val->group_srl}" value="{$val->group_srl}"/> {$val->title}</label>
 			</div>
-			<div class="x_control-group">
+			<div class="x_control-group _moveTarget" hidden>
+				<h3>{$lang->denied}</h3>
+				<label class="x_inline" for="appoval"><input type="radio" name="denied" id="appoval" value="N" /> {$lang->approval}</label>
+				<label class="x_inline" for="deny"><input type="radio" name="denied" id="deny" value="Y" /> {$lang->denied}</label>
+			</div>
+			<div class="x_control-group _moveTarget" hidden>
 				<h3>{$lang->about_send_message}</h3>
 				<textarea rows="5" cols="42" id="message" style="width:98%" name="message" title="{$lang->about_send_message}"></textarea>
 			</div>