Merge branch 'release/1.7.8' into develop

Conflicts:
	classes/context/Context.class.php
	config/config.inc.php

Gruntfile.js

@@ -50,6 +50,15 @@ module.exports = function(grunt) {
 					'common/js/xe.min.js': ['common/js/xe.js']
 				}
 			},
+			'handlebars': {
+				options: {
+					sourceMap: true
+				},
+				files: {
+					'common/js/plugins/handlebars/handlebars.min.js': ['common/js/plugins/handlebars/handlebars.js'],
+					'common/js/plugins/handlebars.runtime/handlebars.runtime.min.js': ['common/js/plugins/handlebars.runtime/handlebars.runtime.js'],
+				}
+			},
 			'modules': {
 				files: {
 					'common/js/x.min.js' : ['common/js/x.js'],

classes/display/DisplayHandler.class.php

@@ -126,6 +126,8 @@ class DisplayHandler extends Handler
 
 		// call a trigger after display
 		ModuleHandler::triggerCall('display', 'after', $output);
+
+		flushSlowlog();
 	}
 
 	/**

classes/file/FileHandler.class.php

@@ -138,7 +138,7 @@ class FileHandler
 	 * Write $buff into the specified file
 	 *
 	 * @param string $filename Path of target file
-	 * @param string $buff Content to be writeen
+	 * @param string $buff Content to be written
 	 * @param string $mode a(append) / w(write)
 	 * @return void
 	 */
@@ -510,7 +510,7 @@ class FileHandler
 	 * @param int $timeout Connection timeout
 	 * @param string $method GET/POST
 	 * @param string $content_type Content type header of HTTP request
-	 * @param string[] $headers Headers key vaule array.
+	 * @param string[] $headers Headers key value array.
 	 * @param string[] $cookies Cookies key value array.
 	 * @param string $post_data Request arguments array for POST method
 	 * @return string If success, the content of the target file. Otherwise: none
@@ -612,7 +612,7 @@ class FileHandler
 	 * @param string $timeout Connection timeout
 	 * @param string $method GET/POST
 	 * @param string $content_type Content type header of HTTP request
-	 * @param string[] $headers Headers key vaule array.
+	 * @param string[] $headers Headers key value array.
 	 * @return bool TRUE: success, FALSE: failed
 	 */
 	function getRemoteFile($url, $target_filename, $body = null, $timeout = 3, $method = 'GET', $content_type = null, $headers = array(), $cookies = array(), $post_data = array(), $request_config = array())

classes/module/ModuleObject.class.php

@@ -22,7 +22,7 @@ class ModuleObject extends Object
 	var $layout_path = ''; ///< a path of directory where layout files reside
 	var $layout_file = ''; ///< name of layout file
 	var $edited_layout_file = ''; ///< name of temporary layout files that is modified in an admin mode
-	var $stop_proc = false; ///< a flag to indicating whether to stop the execution of code.
+	var $stop_proc = FALSE; ///< a flag to indicating whether to stop the execution of code.
 	var $module_config = NULL;
 	var $ajaxRequestMethod = array('XMLRPC', 'JSON');
 	var $gzhandler_enable = TRUE;
@@ -385,7 +385,7 @@ class ModuleObject extends Object
 		if($this->stop_proc)
 		{
 			debugPrint($this->message, 'ERROR');
-			return false;
+			return FALSE;
 		}
 
 		// trigger call
@@ -394,7 +394,7 @@ class ModuleObject extends Object
 		{
 			$this->setError($triggerOutput->getError());
 			$this->setMessage($triggerOutput->getMessage());
-			return false;
+			return FALSE;
 		}
 
 		// execute an addon(call called_position as before_module_proc)
@@ -444,7 +444,7 @@ class ModuleObject extends Object
 		}
 		else
 		{
-			return false;
+			return FALSE;
 		}
 
 		// trigger call
@@ -453,7 +453,7 @@ class ModuleObject extends Object
 		{
 			$this->setError($triggerOutput->getError());
 			$this->setMessage($triggerOutput->getMessage());
-			return false;
+			return FALSE;
 		}
 
 		// execute an addon(call called_position as after_module_proc)
@@ -469,7 +469,7 @@ class ModuleObject extends Object
 
 			if(!$output->toBool())
 			{
-				return false;
+				return FALSE;
 			}
 		}
 		// execute api methos of the module if view action is and result is XMLRPC or JSON
@@ -484,8 +484,9 @@ class ModuleObject extends Object
 				}
 			}
 		}
-		return true;
+		return TRUE;
 	}
 
 }
-?>
+/* End of file ModuleObject.class.php */
+/* Location: ./classes/module/ModuleObject.class.php */

classes/security/conf/embedWhiteUrl.xml

@@ -14,19 +14,17 @@
 			<pattern>http://flvs.daum.net/flvPlayer.swf</pattern>
 			<pattern>http://api.v.daum.net/</pattern>
 			<pattern>http://tvpot.daum.net/playlist/playlist.swf</pattern>
+			<pattern>http://videofarm.daum.net/</pattern>
 		</domain>
 		<domain name="http://www.youtube.com" desc="Youtube">
-			<pattern>http://www.youtube.com/v/</pattern>
+			<pattern>http://www.youtube.com/</pattern>
+			<pattern>https://www.youtube.com/</pattern>
 			<pattern>http://www.youtube-nocookie.com/</pattern>
-			<pattern>//www.youtube.com/v/</pattern>
+			<pattern>https://www.youtube-nocookie.com/</pattern>
-			<pattern>//www.youtube-nocookie.com/</pattern>
-			<pattern>//www.youtube.com/embed/</pattern>
 		</domain>
 		<domain name="http://www.mgoon.com" desc="엠군">
-			<pattern>http://play.mgoon.com/Video/</pattern>
+			<pattern>http://play.mgoon.com/</pattern>
 			<pattern>http://doc.mgoon.com/player/</pattern>
-			<pattern>http://play.mgoon.com/Game/</pattern>
-			<pattern>http://play.mgoon.com/Photo/</pattern>
 		</domain>
 		<domain name="http://www.pandora.tv" desc="판도라TV">
 			<pattern>http://flvr.pandora.tv/flv2pan/</pattern>
@@ -53,7 +51,7 @@
 			<pattern>http://vmark.kbs.co.kr/zzim/vmplayer/vmplayer.xap</pattern>
 		</domain>
 		<domain name="http://www.sbs.co.kr" desc="SBS">
-			<pattern>http://netv.sbs.co.kr/sbox/silverlight/ClientBin/NeTVPlayer.xap</pattern>
+			<pattern>http://netv.sbs.co.kr/sbox/</pattern>
 			<pattern>http://news.sbs.co.kr/</pattern>
 			<pattern>http://wizard2.sbs.co.kr/</pattern>
 			<pattern>http://sbsplayer.sbs.co.kr/</pattern>
@@ -62,7 +60,7 @@
 			<pattern>http://onemore.imbc.com/ClientBin/oneplus.xap</pattern>
 		</domain>
 		<domain name="" isNAVER="true" desc="socialsearch">
-			<pattern>http://static.campaign.naver.com/0/campaign/2010/10/socialsearch/swf/</pattern>
+			<pattern>http://static.campaign.naver.com/</pattern>
 		</domain>
 	</embed>
 	<iframe>
@@ -71,9 +69,6 @@
 			<pattern>https://www.youtube.com/</pattern>
 			<pattern>http://www.youtube-nocookie.com/</pattern>
 			<pattern>https://www.youtube-nocookie.com/</pattern>
-			<pattern>//www.youtube.com/v/</pattern>
-			<pattern>//www.youtube.com/embed/</pattern>
-			<pattern>//www.youtube-nocookie.com/</pattern>
 		</domain>
 		<domain name="http://maps.google.com" desc="구글맵스" mobile="true">
 			<pattern>http://maps.google.com/</pattern>
@@ -87,7 +82,9 @@
 		</domain>
 		<domain name="http://www.vimeo.com" desc="vimeo.com">
 			<pattern>http://player.vimeo.com/</pattern>
-			<pattern>//player.vimeo.com/</pattern>
+		</domain>
+		<domain name="http://tvcast.naver.com" isNAVER="true" desc="NAVER TVCAST">
+			<pattern>http://serviceapi.rmcnmv.naver.com/</pattern>
 		</domain>
 	</iframe>
 </whiteurl>

common/js/plugins/handlebars.runtime/handlebars.runtime.js

@@ -0,0 +1,660 @@
+/*!
+
+ handlebars v2.0.0
+
+Copyright (C) 2011-2014 by Yehuda Katz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+@license
+*/
+/* exported Handlebars */
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    define([], factory);
+  } else if (typeof exports === 'object') {
+    module.exports = factory();
+  } else {
+    root.Handlebars = root.Handlebars || factory();
+  }
+}(this, function () {
+// handlebars/safe-string.js
+var __module3__ = (function() {
+  "use strict";
+  var __exports__;
+  // Build out our basic SafeString type
+  function SafeString(string) {
+    this.string = string;
+  }
+
+  SafeString.prototype.toString = function() {
+    return "" + this.string;
+  };
+
+  __exports__ = SafeString;
+  return __exports__;
+})();
+
+// handlebars/utils.js
+var __module2__ = (function(__dependency1__) {
+  "use strict";
+  var __exports__ = {};
+  /*jshint -W004 */
+  var SafeString = __dependency1__;
+
+  var escape = {
+    "&": "&",
+    "<": "&lt;",
+    ">": "&gt;",
+    '"': "&quot;",
+    "'": "&#x27;",
+    "`": "&#x60;"
+  };
+
+  var badChars = /[&<>"'`]/g;
+  var possible = /[&<>"'`]/;
+
+  function escapeChar(chr) {
+    return escape[chr];
+  }
+
+  function extend(obj /* , ...source */) {
+    for (var i = 1; i < arguments.length; i++) {
+      for (var key in arguments[i]) {
+        if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
+          obj[key] = arguments[i][key];
+        }
+      }
+    }
+
+    return obj;
+  }
+
+  __exports__.extend = extend;var toString = Object.prototype.toString;
+  __exports__.toString = toString;
+  // Sourced from lodash
+  // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
+  var isFunction = function(value) {
+    return typeof value === 'function';
+  };
+  // fallback for older versions of Chrome and Safari
+  /* istanbul ignore next */
+  if (isFunction(/x/)) {
+    isFunction = function(value) {
+      return typeof value === 'function' && toString.call(value) === '[object Function]';
+    };
+  }
+  var isFunction;
+  __exports__.isFunction = isFunction;
+  /* istanbul ignore next */
+  var isArray = Array.isArray || function(value) {
+    return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false;
+  };
+  __exports__.isArray = isArray;
+
+  function escapeExpression(string) {
+    // don't escape SafeStrings, since they're already safe
+    if (string instanceof SafeString) {
+      return string.toString();
+    } else if (string == null) {
+      return "";
+    } else if (!string) {
+      return string + '';
+    }
+
+    // Force a string conversion as this will be done by the append regardless and
+    // the regex test will do this transparently behind the scenes, causing issues if
+    // an object's to string has escaped characters in it.
+    string = "" + string;
+
+    if(!possible.test(string)) { return string; }
+    return string.replace(badChars, escapeChar);
+  }
+
+  __exports__.escapeExpression = escapeExpression;function isEmpty(value) {
+    if (!value && value !== 0) {
+      return true;
+    } else if (isArray(value) && value.length === 0) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  __exports__.isEmpty = isEmpty;function appendContextPath(contextPath, id) {
+    return (contextPath ? contextPath + '.' : '') + id;
+  }
+
+  __exports__.appendContextPath = appendContextPath;
+  return __exports__;
+})(__module3__);
+
+// handlebars/exception.js
+var __module4__ = (function() {
+  "use strict";
+  var __exports__;
+
+  var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
+
+  function Exception(message, node) {
+    var line;
+    if (node && node.firstLine) {
+      line = node.firstLine;
+
+      message += ' - ' + line + ':' + node.firstColumn;
+    }
+
+    var tmp = Error.prototype.constructor.call(this, message);
+
+    // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
+    for (var idx = 0; idx < errorProps.length; idx++) {
+      this[errorProps[idx]] = tmp[errorProps[idx]];
+    }
+
+    if (line) {
+      this.lineNumber = line;
+      this.column = node.firstColumn;
+    }
+  }
+
+  Exception.prototype = new Error();
+
+  __exports__ = Exception;
+  return __exports__;
+})();
+
+// handlebars/base.js
+var __module1__ = (function(__dependency1__, __dependency2__) {
+  "use strict";
+  var __exports__ = {};
+  var Utils = __dependency1__;
+  var Exception = __dependency2__;
+
+  var VERSION = "2.0.0";
+  __exports__.VERSION = VERSION;var COMPILER_REVISION = 6;
+  __exports__.COMPILER_REVISION = COMPILER_REVISION;
+  var REVISION_CHANGES = {
+    1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
+    2: '== 1.0.0-rc.3',
+    3: '== 1.0.0-rc.4',
+    4: '== 1.x.x',
+    5: '== 2.0.0-alpha.x',
+    6: '>= 2.0.0-beta.1'
+  };
+  __exports__.REVISION_CHANGES = REVISION_CHANGES;
+  var isArray = Utils.isArray,
+      isFunction = Utils.isFunction,
+      toString = Utils.toString,
+      objectType = '[object Object]';
+
+  function HandlebarsEnvironment(helpers, partials) {
+    this.helpers = helpers || {};
+    this.partials = partials || {};
+
+    registerDefaultHelpers(this);
+  }
+
+  __exports__.HandlebarsEnvironment = HandlebarsEnvironment;HandlebarsEnvironment.prototype = {
+    constructor: HandlebarsEnvironment,
+
+    logger: logger,
+    log: log,
+
+    registerHelper: function(name, fn) {
+      if (toString.call(name) === objectType) {
+        if (fn) { throw new Exception('Arg not supported with multiple helpers'); }
+        Utils.extend(this.helpers, name);
+      } else {
+        this.helpers[name] = fn;
+      }
+    },
+    unregisterHelper: function(name) {
+      delete this.helpers[name];
+    },
+
+    registerPartial: function(name, partial) {
+      if (toString.call(name) === objectType) {
+        Utils.extend(this.partials,  name);
+      } else {
+        this.partials[name] = partial;
+      }
+    },
+    unregisterPartial: function(name) {
+      delete this.partials[name];
+    }
+  };
+
+  function registerDefaultHelpers(instance) {
+    instance.registerHelper('helperMissing', function(/* [args, ]options */) {
+      if(arguments.length === 1) {
+        // A missing field in a {{foo}} constuct.
+        return undefined;
+      } else {
+        // Someone is actually trying to call something, blow up.
+        throw new Exception("Missing helper: '" + arguments[arguments.length-1].name + "'");
+      }
+    });
+
+    instance.registerHelper('blockHelperMissing', function(context, options) {
+      var inverse = options.inverse,
+          fn = options.fn;
+
+      if(context === true) {
+        return fn(this);
+      } else if(context === false || context == null) {
+        return inverse(this);
+      } else if (isArray(context)) {
+        if(context.length > 0) {
+          if (options.ids) {
+            options.ids = [options.name];
+          }
+
+          return instance.helpers.each(context, options);
+        } else {
+          return inverse(this);
+        }
+      } else {
+        if (options.data && options.ids) {
+          var data = createFrame(options.data);
+          data.contextPath = Utils.appendContextPath(options.data.contextPath, options.name);
+          options = {data: data};
+        }
+
+        return fn(context, options);
+      }
+    });
+
+    instance.registerHelper('each', function(context, options) {
+      if (!options) {
+        throw new Exception('Must pass iterator to #each');
+      }
+
+      var fn = options.fn, inverse = options.inverse;
+      var i = 0, ret = "", data;
+
+      var contextPath;
+      if (options.data && options.ids) {
+        contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]) + '.';
+      }
+
+      if (isFunction(context)) { context = context.call(this); }
+
+      if (options.data) {
+        data = createFrame(options.data);
+      }
+
+      if(context && typeof context === 'object') {
+        if (isArray(context)) {
+          for(var j = context.length; i<j; i++) {
+            if (data) {
+              data.index = i;
+              data.first = (i === 0);
+              data.last  = (i === (context.length-1));
+
+              if (contextPath) {
+                data.contextPath = contextPath + i;
+              }
+            }
+            ret = ret + fn(context[i], { data: data });
+          }
+        } else {
+          for(var key in context) {
+            if(context.hasOwnProperty(key)) {
+              if(data) {
+                data.key = key;
+                data.index = i;
+                data.first = (i === 0);
+
+                if (contextPath) {
+                  data.contextPath = contextPath + key;
+                }
+              }
+              ret = ret + fn(context[key], {data: data});
+              i++;
+            }
+          }
+        }
+      }
+
+      if(i === 0){
+        ret = inverse(this);
+      }
+
+      return ret;
+    });
+
+    instance.registerHelper('if', function(conditional, options) {
+      if (isFunction(conditional)) { conditional = conditional.call(this); }
+
+      // Default behavior is to render the positive path if the value is truthy and not empty.
+      // The `includeZero` option may be set to treat the condtional as purely not empty based on the
+      // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
+      if ((!options.hash.includeZero && !conditional) || Utils.isEmpty(conditional)) {
+        return options.inverse(this);
+      } else {
+        return options.fn(this);
+      }
+    });
+
+    instance.registerHelper('unless', function(conditional, options) {
+      return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
+    });
+
+    instance.registerHelper('with', function(context, options) {
+      if (isFunction(context)) { context = context.call(this); }
+
+      var fn = options.fn;
+
+      if (!Utils.isEmpty(context)) {
+        if (options.data && options.ids) {
+          var data = createFrame(options.data);
+          data.contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]);
+          options = {data:data};
+        }
+
+        return fn(context, options);
+      } else {
+        return options.inverse(this);
+      }
+    });
+
+    instance.registerHelper('log', function(message, options) {
+      var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
+      instance.log(level, message);
+    });
+
+    instance.registerHelper('lookup', function(obj, field) {
+      return obj && obj[field];
+    });
+  }
+
+  var logger = {
+    methodMap: { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' },
+
+    // State enum
+    DEBUG: 0,
+    INFO: 1,
+    WARN: 2,
+    ERROR: 3,
+    level: 3,
+
+    // can be overridden in the host environment
+    log: function(level, message) {
+      if (logger.level <= level) {
+        var method = logger.methodMap[level];
+        if (typeof console !== 'undefined' && console[method]) {
+          console[method].call(console, message);
+        }
+      }
+    }
+  };
+  __exports__.logger = logger;
+  var log = logger.log;
+  __exports__.log = log;
+  var createFrame = function(object) {
+    var frame = Utils.extend({}, object);
+    frame._parent = object;
+    return frame;
+  };
+  __exports__.createFrame = createFrame;
+  return __exports__;
+})(__module2__, __module4__);
+
+// handlebars/runtime.js
+var __module5__ = (function(__dependency1__, __dependency2__, __dependency3__) {
+  "use strict";
+  var __exports__ = {};
+  var Utils = __dependency1__;
+  var Exception = __dependency2__;
+  var COMPILER_REVISION = __dependency3__.COMPILER_REVISION;
+  var REVISION_CHANGES = __dependency3__.REVISION_CHANGES;
+  var createFrame = __dependency3__.createFrame;
+
+  function checkRevision(compilerInfo) {
+    var compilerRevision = compilerInfo && compilerInfo[0] || 1,
+        currentRevision = COMPILER_REVISION;
+
+    if (compilerRevision !== currentRevision) {
+      if (compilerRevision < currentRevision) {
+        var runtimeVersions = REVISION_CHANGES[currentRevision],
+            compilerVersions = REVISION_CHANGES[compilerRevision];
+        throw new Exception("Template was precompiled with an older version of Handlebars than the current runtime. "+
+              "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").");
+      } else {
+        // Use the embedded version info since the runtime doesn't know about this revision yet
+        throw new Exception("Template was precompiled with a newer version of Handlebars than the current runtime. "+
+              "Please update your runtime to a newer version ("+compilerInfo[1]+").");
+      }
+    }
+  }
+
+  __exports__.checkRevision = checkRevision;// TODO: Remove this line and break up compilePartial
+
+  function template(templateSpec, env) {
+    /* istanbul ignore next */
+    if (!env) {
+      throw new Exception("No environment passed to template");
+    }
+    if (!templateSpec || !templateSpec.main) {
+      throw new Exception('Unknown template object: ' + typeof templateSpec);
+    }
+
+    // Note: Using env.VM references rather than local var references throughout this section to allow
+    // for external users to override these as psuedo-supported APIs.
+    env.VM.checkRevision(templateSpec.compiler);
+
+    var invokePartialWrapper = function(partial, indent, name, context, hash, helpers, partials, data, depths) {
+      if (hash) {
+        context = Utils.extend({}, context, hash);
+      }
+
+      var result = env.VM.invokePartial.call(this, partial, name, context, helpers, partials, data, depths);
+
+      if (result == null && env.compile) {
+        var options = { helpers: helpers, partials: partials, data: data, depths: depths };
+        partials[name] = env.compile(partial, { data: data !== undefined, compat: templateSpec.compat }, env);
+        result = partials[name](context, options);
+      }
+      if (result != null) {
+        if (indent) {
+          var lines = result.split('\n');
+          for (var i = 0, l = lines.length; i < l; i++) {
+            if (!lines[i] && i + 1 === l) {
+              break;
+            }
+
+            lines[i] = indent + lines[i];
+          }
+          result = lines.join('\n');
+        }
+        return result;
+      } else {
+        throw new Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
+      }
+    };
+
+    // Just add water
+    var container = {
+      lookup: function(depths, name) {
+        var len = depths.length;
+        for (var i = 0; i < len; i++) {
+          if (depths[i] && depths[i][name] != null) {
+            return depths[i][name];
+          }
+        }
+      },
+      lambda: function(current, context) {
+        return typeof current === 'function' ? current.call(context) : current;
+      },
+
+      escapeExpression: Utils.escapeExpression,
+      invokePartial: invokePartialWrapper,
+
+      fn: function(i) {
+        return templateSpec[i];
+      },
+
+      programs: [],
+      program: function(i, data, depths) {
+        var programWrapper = this.programs[i],
+            fn = this.fn(i);
+        if (data || depths) {
+          programWrapper = program(this, i, fn, data, depths);
+        } else if (!programWrapper) {
+          programWrapper = this.programs[i] = program(this, i, fn);
+        }
+        return programWrapper;
+      },
+
+      data: function(data, depth) {
+        while (data && depth--) {
+          data = data._parent;
+        }
+        return data;
+      },
+      merge: function(param, common) {
+        var ret = param || common;
+
+        if (param && common && (param !== common)) {
+          ret = Utils.extend({}, common, param);
+        }
+
+        return ret;
+      },
+
+      noop: env.VM.noop,
+      compilerInfo: templateSpec.compiler
+    };
+
+    var ret = function(context, options) {
+      options = options || {};
+      var data = options.data;
+
+      ret._setup(options);
+      if (!options.partial && templateSpec.useData) {
+        data = initData(context, data);
+      }
+      var depths;
+      if (templateSpec.useDepths) {
+        depths = options.depths ? [context].concat(options.depths) : [context];
+      }
+
+      return templateSpec.main.call(container, context, container.helpers, container.partials, data, depths);
+    };
+    ret.isTop = true;
+
+    ret._setup = function(options) {
+      if (!options.partial) {
+        container.helpers = container.merge(options.helpers, env.helpers);
+
+        if (templateSpec.usePartial) {
+          container.partials = container.merge(options.partials, env.partials);
+        }
+      } else {
+        container.helpers = options.helpers;
+        container.partials = options.partials;
+      }
+    };
+
+    ret._child = function(i, data, depths) {
+      if (templateSpec.useDepths && !depths) {
+        throw new Exception('must pass parent depths');
+      }
+
+      return program(container, i, templateSpec[i], data, depths);
+    };
+    return ret;
+  }
+
+  __exports__.template = template;function program(container, i, fn, data, depths) {
+    var prog = function(context, options) {
+      options = options || {};
+
+      return fn.call(container, context, container.helpers, container.partials, options.data || data, depths && [context].concat(depths));
+    };
+    prog.program = i;
+    prog.depth = depths ? depths.length : 0;
+    return prog;
+  }
+
+  __exports__.program = program;function invokePartial(partial, name, context, helpers, partials, data, depths) {
+    var options = { partial: true, helpers: helpers, partials: partials, data: data, depths: depths };
+
+    if(partial === undefined) {
+      throw new Exception("The partial " + name + " could not be found");
+    } else if(partial instanceof Function) {
+      return partial(context, options);
+    }
+  }
+
+  __exports__.invokePartial = invokePartial;function noop() { return ""; }
+
+  __exports__.noop = noop;function initData(context, data) {
+    if (!data || !('root' in data)) {
+      data = data ? createFrame(data) : {};
+      data.root = context;
+    }
+    return data;
+  }
+  return __exports__;
+})(__module2__, __module4__, __module1__);
+
+// handlebars.runtime.js
+var __module0__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+  "use strict";
+  var __exports__;
+  /*globals Handlebars: true */
+  var base = __dependency1__;
+
+  // Each of these augment the Handlebars object. No need to setup here.
+  // (This is done to easily share code between commonjs and browse envs)
+  var SafeString = __dependency2__;
+  var Exception = __dependency3__;
+  var Utils = __dependency4__;
+  var runtime = __dependency5__;
+
+  // For compatibility and usage outside of module systems, make the Handlebars object a namespace
+  var create = function() {
+    var hb = new base.HandlebarsEnvironment();
+
+    Utils.extend(hb, base);
+    hb.SafeString = SafeString;
+    hb.Exception = Exception;
+    hb.Utils = Utils;
+    hb.escapeExpression = Utils.escapeExpression;
+
+    hb.VM = runtime;
+    hb.template = function(spec) {
+      return runtime.template(spec, hb);
+    };
+
+    return hb;
+  };
+
+  var Handlebars = create();
+  Handlebars.create = create;
+
+  Handlebars['default'] = Handlebars;
+
+  __exports__ = Handlebars;
+  return __exports__;
+})(__module1__, __module3__, __module4__, __module2__, __module5__);
+
+  return __module0__;
+}));

common/js/plugins/handlebars.runtime/plugin.load

@@ -0,0 +1 @@
+handlebars.runtime.min.js

common/js/plugins/handlebars/plugin.load

@@ -0,0 +1 @@
+handlebars.min.js

common/lang/lang.xml

@@ -3945,4 +3945,20 @@
 		<value xml:lang="jp"><![CDATA[基本URLが設定されていません。]]></value>
 		<value xml:lang="de"><![CDATA[Standard URL ist null.]]></value>
 	</item>
+	<item name="license_agreement">
+		<value xml:lang="ko"><![CDATA[사용권 동의]]></value>
+		<value xml:lang="en"><![CDATA[License agree]]></value>
+	</item>
+	<item name="license">
+		<value xml:lang="ko"><![CDATA[<p>Copyright (C) NAVER &lt;http://www.navercorp.com&gt;</p> <p>"XpressEngine (XE)"은 자유 소프트웨어이며, 오픈 소스 프로젝트로 개발되고 있습니다. 자세한 내용은 아래 링크를 참조하시기 바랍니다.</p> <ul> <li>공식 사이트: <a href="http://www.xpressengine.com">http://www.xpressengine.com</a></li> <li>공식 저장소: <a href="http://github.com/xpressengine">http://github.com/xpressengine</a></li> </ul> <p>"XpressEngine (XE)"은 자유 소프트웨어입니다. 소프트웨어의 피양도자는 자유 소프트웨어 재단이 공표한 GNU 약소 일반 공중 사용 허가서 2.1판 또는 그 이후 판을 임의로 선택해서, 그 규정에 따라 소프트웨어를 개작하거나 재배포할 수 있습니다.</p> <p>이 소프트웨어는 유용하게 사용될 수 있으리라는 희망에서 배포되고 있지만, 특정한 목적에 맞는 적합성 여부나 판매용으로 사용할 수 있으리라는 묵시적인 보증을 포함한 어떠한 형태의 보증도 제공하지 않습니다. 보다 자세한 사항에 대해서는 GNU 약소 일반 공중 사용 허가서를 참고하시기 바랍니다.</p> <p>GNU 약소 일반 공중 사용 허가서는 이 라이브러리와 함께 제공됩니다. 만약, 이 문서가 누락되어 있다면 자유 소프트웨어 재단으로 문의하시기 바랍니다. (자유 소프트웨어 재단: Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA)</p> <ul> <li>한국어 번역문 (비공식) : <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" target="_blank">GNU Lesser General Public License, version 2.1</a></li> <li>영문 (공식 원본) : <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" target="_blank">GNU Lesser General Public License, version 2.1</a></li> </ul>]]></value>
+		<value xml:lang="en"><![CDATA[<p>Copyright (C) NAVER &lt;http://www.navercorp.com&gt;</p> <p>"XpressEngine (XE)" is an opensource and being developed in the opensource project. For more information, please see the link below.</p> <ul> <li>Official website: <a href="http://www.xpressengine.com">http://www.xpressengine.com</a></li> <li>Official Repository: <a href="http://github.com/xpressengine">http://github.com/xpressengine</a></li> </ul> <p>"XpressEngine (XE)" is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.</p> <p>This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.</p> <p>You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA</p> <ul> <li>License : <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" target="_blank">GNU Lesser General Public License, version 2.1</a></li> </ul>]]></value>
+	</item>
+	<item name="cmd_license_agree">
+		<value xml:lang="ko"><![CDATA[사용권에 대해 이해했으며, 이에 동의합니다.]]></value>
+		<value xml:lang="en"><![CDATA[I understand the license. I agree.]]></value>
+	</item>
+	<item name="msg_must_accept_license_agreement">
+		<value xml:lang="ko"><![CDATA[사용권에 동의해야 설치할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You must accept the license agreement]]></value>
+	</item>
 </lang>

config/config.inc.php

@@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
 /**
  * Display XE's full version.
  */
-define('__XE_VERSION__', '1.7.7.2');
+define('__XE_VERSION__', '1.7.8');
 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));
@@ -87,6 +87,9 @@ else
  * define('__DEBUG_PROTECT_IP__', '127.0.0.1');
  * define('__DEBUG_DB_OUTPUT__', 0);
  * define('__LOG_SLOW_QUERY__', 0);
+ * define('__LOG_SLOW_TRIGGER__', 0);
+ * define('__LOG_SLOW_ADDON__', 0);
+ * define('__LOG_SLOW_WIDGET__', 0);
  * define('__OB_GZHANDLER_ENABLE__', 1);
  * define('__ENABLE_PHPUNIT_TEST__', 0);
  * define('__PROXY_SERVER__', 'http://domain:port/path');
@@ -167,7 +170,7 @@ if(!defined('__LOG_SLOW_QUERY__'))
 	 * <pre>
 	 * 0: Do not leave a log
 	 * = 0: leave a log when the slow query takes over specified seconds
-	 * Log file is saved as ./files/_db_slow_query.php file
+	 * Log file is saved as ./files/_slowlog_query.php file
 	 * </pre>
 	 */
 	define('__LOG_SLOW_QUERY__', 0);
@@ -181,12 +184,40 @@ if(!defined('__LOG_SLOW_TRIGGER__'))
 	 * <pre>
 	 * 0: Do not leave a log
 	 * > 0: leave a log when the trigger takes over specified milliseconds
-	 * Log file is saved as ./files/_db_slow_trigger.php file
+	 * Log file is saved as ./files/_slowlog_trigger.php
 	 * </pre>
 	 */
 	define('__LOG_SLOW_TRIGGER__', 0);
 }
 
+if(!defined('__LOG_SLOW_ADDON__'))
+{
+	/**
+	 * Addon excute time log
+	 *
+	 * <pre>
+	 * 0: Do not leave a log
+	 * > 0: leave a log when the trigger takes over specified milliseconds
+	 * Log file is saved as ./files/_slowlog_addon.php
+	 * </pre>
+	 */
+	define('__LOG_SLOW_ADDON__', 0);
+}
+
+if(!defined('__LOG_SLOW_WIDGET__'))
+{
+	/**
+	 * Widget excute time log
+	 *
+	 * <pre>
+	 * 0: Do not leave a log
+	 * > 0: leave a log when the widget takes over specified milliseconds
+	 * Log file is saved as ./files/_slowlog_widget.php
+	 * </pre>
+	 */
+	define('__LOG_SLOW_WIDGET__', 0);
+}
+
 if(!defined('__DEBUG_QUERY__'))
 {
 	/**

config/func.inc.php

@@ -845,10 +845,13 @@ function debugPrint($debug_output = NULL, $display_option = TRUE, $file = '_debu
  */
 function writeSlowlog($type, $elapsed_time, $obj)
 {
+	if(!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
+
 	static $log_filename = array(
 		'query' => 'files/_slowlog_query.php',
 		'trigger' => 'files/_slowlog_trigger.php',
-		'addon' => 'files/_slowlog_addon.php'
+		'addon' => 'files/_slowlog_addon.php',
+		'widget' => 'files/_slowlog_widget.php'
 	);
 	$write_file = true;
 
@@ -863,6 +866,15 @@ function writeSlowlog($type, $elapsed_time, $obj)
 		$buff[] = "\tCaller : " . $obj->caller;
 		$buff[] = "\tCalled : " . $obj->called;
 	}
+	else if($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
+	{
+		$buff[] = "\tAddon : " . $obj->called;
+		$buff[] = "\tCalled position : " . $obj->caller;
+	}
+	else if($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
+	{
+		$buff[] = "\tWidget : " . $obj->called;
+	}
 	else if($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
 	{
 
@@ -883,15 +895,26 @@ function writeSlowlog($type, $elapsed_time, $obj)
 		file_put_contents($log_file, implode(PHP_EOL, $buff), FILE_APPEND);
 	}
 
-	$trigger_args = $obj;
-	$trigger_args->_log_type = $type;
-	$trigger_args->_elapsed_time = $elapsed_time;
 	if($type != 'query')
 	{
+		$trigger_args = $obj;
+		$trigger_args->_log_type = $type;
+		$trigger_args->_elapsed_time = $elapsed_time;
 		ModuleHandler::triggerCall('XE.writeSlowlog', 'after', $trigger_args);
 	}
 }
 
+/**
+ * @param void
+ */
+function flushSlowlog()
+{
+	$trigger_args = new stdClass();
+	$trigger_args->_log_type = 'flush';
+	$trigger_args->_elapsed_time = 0;
+	ModuleHandler::triggerCall('XE.writeSlowlog', 'after', $trigger_args);
+}
+
 /**
  * microtime() return
  *

index.php

@@ -5,13 +5,10 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief Start page
  *
- * Find and create module object by mif, act in Request Argument
- * Set module information
- *
  * @mainpage XpressEngine
  * @section intro introduction
  *
- * XE is an opensource and being developed in the opensource project.\n
+ * "XpressEngine (XE)" is an opensource and being developed in the opensource project.\n
  * For more information, please see the link below.
  * - Official website: http://www.xpressengine.com
  * - Offcial Repository: https://github.com/xpressengine/xe-core
@@ -21,7 +18,7 @@
  * License as published by the Free Software Foundation; either \n
  * version 2.1 of the License, or (at your option) any later version. \n
  * \n
- * This library is distributed in the hope that it will be useful,
+ * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.

modules/addon/addon.controller.php

@@ -130,12 +130,10 @@ class addonController extends addon
 			$buff[] = '}}}';
 			$buff[] = '$after_time = microtime(true);';
 			$buff[] = '$addon_time_log = new stdClass();';
-			$buff[] = '$addon_time_log->_log_type = "addon";';
 			$buff[] = '$addon_time_log->caller = $called_position;';
 			$buff[] = '$addon_time_log->called = "' . $addon . '";';
 			$buff[] = '$addon_time_log->called_extension = "' . $addon . '";';
-			$buff[] = '$addon_time_log->_elapsed_time = $after_time-$before_time;';
+			$buff[] = 'writeSlowlog("addon",$after_time-$before_time,$addon_time_log);';
-			$buff[] = 'ModuleHandler::triggerCall("XE.writeSlowlog", "after", $addon_time_log);';
 		}
 		$addon_path = _XE_PATH_ . 'files/cache/addons/';
 		FileHandler::makeDir($addon_path);

modules/admin/admin.admin.controller.php

@@ -61,6 +61,9 @@ class adminAdminController extends admin
 		FileHandler::rename('./files/cache', $temp_cache_dir);
 		FileHandler::makeDir('./files/cache');
 
+		// remove module extend cache
+		FileHandler::removeFile(_XE_PATH_ . 'files/config/module_extend.php');
+
 		// remove debug files
 		FileHandler::removeFile(_XE_PATH_ . 'files/_debug_message.php');
 		FileHandler::removeFile(_XE_PATH_ . 'files/_debug_db_query.php');

modules/admin/admin.admin.model.php

@@ -947,7 +947,6 @@ class adminAdminModel extends admin
 
 	function iconUrlCheck($iconname, $default_icon_name)
 	{
-
 		$site_info = Context::get('site_module_info');
 		$virtual_site = '';
 		if($site_info->site_srl) 
@@ -962,7 +961,8 @@ class adminAdminModel extends admin
 		}
 		else
 		{
-			$icon_url = $db_info->default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;
+			$default_url = Context::getDefaultUrl();
+			$icon_url = $default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;
 		}
 		return $icon_url;
 	}

modules/admin/admin.admin.view.php

@@ -273,7 +273,6 @@ class adminAdminView extends admin
 		$oDocumentModel = getModel('document');
 		$columnList = array('document_srl', 'module_srl', 'category_srl', 'title', 'nick_name', 'member_srl');
 		$args->list_count = 5;
-		;
 		$output = $oDocumentModel->getDocumentList($args, FALSE, FALSE, $columnList);
 		Context::set('latestDocumentList', $output->data);
 		unset($args, $output, $columnList);
@@ -381,6 +380,16 @@ class adminAdminView extends admin
 			$isEnviromentGatheringAgreement = TRUE;
 		}
 		Context::set('isEnviromentGatheringAgreement', $isEnviromentGatheringAgreement);
+
+		// license agreement check
+		$isLicenseAgreement = FALSE;
+		$path = FileHandler::getRealPath('./files/env/license_agreement');
+		$isLicenseAgreement = FALSE;
+		if(file_exists($path))
+		{
+			$isLicenseAgreement = TRUE;
+		}
+		Context::set('isLicenseAgreement', $isLicenseAgreement);
 		Context::set('layout', 'none');
 
 		$this->setTemplateFile('index');
@@ -436,7 +445,7 @@ class adminAdminView extends admin
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('module');
 		Context::set('siteTitle', $config->siteTitle);
-		Context::set('htmlFooter', $config->htmlFooter);
+		Context::set('htmlFooter', htmlspecialchars($config->htmlFooter));
 
 		// embed filter
 		require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
@@ -515,7 +524,6 @@ class adminAdminView extends admin
 			$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server . $params);
 			Context::addHtmlFooter($img);
 
-			FileHandler::removeDir($path);
 			FileHandler::writeFile($path . $mainVersion, '1');
 		}
 		else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
@@ -528,7 +536,6 @@ class adminAdminView extends admin
 				Context::addHtmlFooter($img);
 			}
 
-			FileHandler::removeDir($path);
 			FileHandler::writeFile($path . $mainVersion, '1');
 			unset($_SESSION['enviroment_gather']);
 		}

modules/admin/lang/lang.xml

@@ -1597,8 +1597,8 @@
 		<value xml:lang="jp"><![CDATA[HTMLタグを使用できます。]]></value>
 	</item>
 	<item name="sitelock_warning_whitelist">
-		<value xml:lang="ko"><![CDATA[이곳에 관리자의 IP를 반드시 포함해야 합니다.<br />만약 접근이 차단된 경우 './files/config/db.config.php' 파일에서 `'use_sitelock' => '<strong>Y</strong>'`를 `'use_sitelock' => '<strong>N</strong>'`으로 변경하여 차단을 해제할 수 있습니다.<br />사이트 잠금 디자인 파일의 위치는 './common/tpl/sitelock.html'이며<br />'./common/tpl/sitelock.user.html' 파일을 만들어서 디자인 파일을 편집하실 수 있습니다.]]></value>
+		<value xml:lang="ko"><![CDATA[이곳에 관리자의 IP를 반드시 포함해야 합니다.<br />만약 접근이 차단된 경우 './files/config/db.config.php' 파일에서 `'use_sitelock' => '<strong>Y</strong>'`를 `'use_sitelock' => '<strong>N</strong>'`으로 변경하여 차단을 해제할 수 있습니다.<br />사이트 잠금 디자인 파일의 위치는 './common/tpl/sitelock.html' 입니다.]]></value>
-		<value xml:lang="en"><![CDATA[You should include the IP of the administrator here.<br />If the access is blocked, you can unbrick this by changing `'use_sitelock' => '<strong>Y</strong>'` to `'use_sitelock' => '<strong>N</strong>'` in './files/config/db.config.php.'<br />The file of site lock design is at './common/tpl/sitelock.html'.<br />You can modify design file by creating './common/tpl/sitelock.user.html'.]]></value>
+		<value xml:lang="en"><![CDATA[You should include the IP of the administrator here.<br />If the access is blocked, you can unbrick this by changing `'use_sitelock' => '<strong>Y</strong>'` to `'use_sitelock' => '<strong>N</strong>'` in './files/config/db.config.php.'<br />The file of site lock design is at './common/tpl/sitelock.html.']]></value>
 		<value xml:lang="jp"><![CDATA[ここに管理者のIPを必ず記入てください。<br />もし接近が遮断された場合、'./files/config/db.config.php' ファイルから `'use_sitelock' => '<strong>Y</strong>'`を `'use_sitelock' => '<strong>N</strong>'`へ変更すれば遮断が解除できます。<br />サイトロックの設計ファイルの場所は、'./commo/tpl/sitelock.html' です。]]></value>
 	</item>
 	<item name="your_ip">

modules/admin/tpl/index.html

@@ -10,12 +10,29 @@
 	<div class="x_page-header">
 		<h1>{$lang->control_panel} <a class="x_icon-question-sign" href="./admin/help/index.html#UMAN_dashboard" target="_blank">{$lang->help}</a></h1>
 	</div>
+
 	<div id="checkBrowserMessage" class="message error" style="display:none;">
 		<h2>{$lang->checkBrowserIE8}</h2>
 	</div>
+
 	<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/index/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 		<p>{$XE_VALIDATOR_MESSAGE}</p>
 	</div>
+
+	<form action="./" method="post" class="message info x_clearfix" cond="!$isLicenseAgreement">
+		<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
+		<input type="hidden" name="module" value="install" />
+		<input type="hidden" name="act" value="procInstallLicenseAggrement" />
+		<input type="hidden" name="license_agreement" value="Y" />
+		<input type="hidden" name="XE_VALIDATOR_ID" value="modules/admin/tpl/index/1">
+
+		<h2>{$lang->license_agreement}</h2>
+		<div>{$lang->license}</div>
+		<div class="x_btn-group x_pull-right" style="margin-bottom:10px">
+			<button type="submit" class="x_btn x_btn-small x_btn-primary" value="">{$lang->cmd_license_agree}</button>
+		</div>
+	</form>
+
 	<form action="./" method="post" class="message info x_clearfix" cond="!$isEnviromentGatheringAgreement">
 		<input type="hidden" name="module" value="admin" />
 		<input type="hidden" name="act" value="procAdminEnviromentGatheringAgreement" />
@@ -27,17 +44,19 @@
 			<button type="submit" name="is_agree" value="true" class="x_btn x_btn-small x_btn-primary">{$lang->agree}</button>
 		</div>
 	</form>
+
 	<div class="message update" cond="$addTables || $needUpdate">
 		<h2 cond="$needUpdate && $addTables">{$lang->need_update_and_table}</h2>
 		<h2 cond="$needUpdate && !$addTables">{$lang->need_update}</h2>
 		<h2 cond="!$needUpdate && $addTables">{$lang->need_table}</h2>
 		<ul>
-		<block loop="$module_list => $key,$value">
+			<block loop="$module_list => $key,$value">
-			<li style="margin:0 0 4px 0" cond="$value->need_install">{$value->module} - <button type="button" onclick="doInstallModule('{$value->module}')" class="x_btn x_btn-small">{$lang->cmd_create_db_table}</button></li>
+				<li style="margin:0 0 4px 0" cond="$value->need_install">{$value->module} - <button type="button" onclick="doInstallModule('{$value->module}')" class="x_btn x_btn-small">{$lang->cmd_create_db_table}</button></li>
-			<li style="margin:0 0 4px 0" cond="$value->need_update">{$value->module} - <button type="button" onclick="doUpdateModule('{$value->module}')" class="x_btn x_btn-small">{$lang->cmd_module_update}</button></li>
+				<li style="margin:0 0 4px 0" cond="$value->need_update">{$value->module} - <button type="button" onclick="doUpdateModule('{$value->module}')" class="x_btn x_btn-small">{$lang->cmd_module_update}</button></li>
-		</block>
+			</block>
 		</ul>
 	</div>
+
 	<div class="message update" cond="count($newVersionList)">
 		<h2>{$lang->available_new_version}</h2>
 		<ul>

modules/editor/tpl/js/uploader.js

@@ -116,7 +116,7 @@ var uploadAutosaveChecker = false;
 
 		if(is_def(window.xeVid)) settings.post_params.vid = xeVid;
 		settings.sessionName = cfg.sessionName;
-		settings.post_params[cfg.sessionName] = getCookie(cfg.sessionName);
+		if(getCookie(cfg.sessionName)) settings.post_params[cfg.sessionName] = getCookie(cfg.sessionName);
 
 		uploaderSettings[seq] = settings;
 
@@ -167,7 +167,7 @@ var uploadAutosaveChecker = false;
 		},
 		onFileDialogComplete : function(numFilesSelected, numFilesQueued) {
 			try {
-				this.addPostParam(this.settings.sessionName, getCookie(this.settings.sessionName));
+				if(getCookie(this.settings.sessionName)) this.addPostParam(this.settings.sessionName, getCookie(this.settings.sessionName));
 				this.startUpload();
 			} catch (e)  {
 				this.debug(e);
@@ -175,7 +175,7 @@ var uploadAutosaveChecker = false;
 		},
 		onUploadStart : _true,
 		onUploadProgress : function(file, bytesLoaded, bytesTotal) {
-			this.addPostParam(this.settings.sessionName, getCookie(this.settings.sessionName));
+			if(getCookie(this.settings.sessionName)) this.addPostParam(this.settings.sessionName, getCookie(this.settings.sessionName));
 			try {
 				var $list, $lastopt, percent, filename;
 

modules/install/conf/module.xml

@@ -4,6 +4,7 @@
     <permissions />
     <actions>
         <action name="dispInstallIntroduce" type="view" index="true" />
+        <action name="dispInstallLicenseAgreement" type="view" />
         <action name="dispInstallCheckEnv" type="view" />
         <action name="dispInstallSelectDB" type="view" />
         <action name="dispInstallDBForm" type="view" />
@@ -17,6 +18,7 @@
         <action name="procSqliteDBSetting" type="controller" ruleset="sqlite" />
         <action name="procConfigSetting" type="controller" ruleset="config" />
         <action name="procInstall" type="controller" ruleset="install" />
+        <action name="procInstallLicenseAggrement" type="controller" />
         <action name="procInstallFTP" type="controller" />
         <action name="procInstallCheckFTP" type="controller" />
         <action name="procInstallAdminInstall" type="controller" />

modules/install/install.controller.php

@@ -9,6 +9,7 @@ class installController extends install
 {
 	var $db_tmp_config_file = '';
 	var $etc_tmp_config_file = '';
+	var $flagLicenseAgreement = './files/env/license_agreement';
 
 	/**
 	 * @brief Initialization
@@ -377,6 +378,33 @@ class installController extends install
 		return $install_enable;
 	}
 
+	/**
+	 * @brief License agreement
+	 */
+	function procInstallLicenseAggrement()
+	{
+		$vars = Context::getRequestVars();
+
+		$license_agreement = ($vars->license_agreement == 'Y') ? true : false;
+
+		if($license_agreement)
+		{
+			$currentTime = $_SERVER['REQUEST_TIME'];
+			FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
+		}
+		else
+		{
+			FileHandler::removeFile($this->flagLicenseAgreement);
+			return new Object(-1, 'msg_must_accept_license_agreement');
+		}
+
+		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		{
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispInstallCheckEnv');
+			$this->setRedirectUrl($returnUrl);
+		}
+	}
+
 	/**
 	 * check this server can use rewrite module
 	 * make a file to files/config and check url approach by ".htaccess" rules
@@ -389,26 +417,26 @@ class installController extends install
 
 		FileHandler::writeFile(_XE_PATH_.$checkFilePath, trim($checkString));
 
-		$scheme = $_SERVER['REQUEST_SCHEME'];
 		$hostname = $_SERVER['SERVER_NAME'];
 		$port = $_SERVER['SERVER_PORT'];
-		$str_port = '';
-		if($port)
-		{
-			$str_port = ':' . $port;
-		}
-
 		$query = "/JUST/CHECK/REWRITE/" . $checkFilePath;
 		$currentPath = str_replace($_SERVER['DOCUMENT_ROOT'], "", _XE_PATH_);
 		if($currentPath != "")
-		{
 			$query = $currentPath . $query;
-		}
 
-		$requestUrl = sprintf('%s://%s%s%s', $scheme, $hostname, $str_port, $query);
+		$fp = @fsockopen($hostname, $port, $errno, $errstr, 5);
-		$requestConfig = array();
+		if(!$fp) return false;
-		$requestConfig['ssl_verify_peer'] = false;
+
-		$buff = FileHandler::getRemoteResource($requestUrl, null, 10, 'POST', 'application/x-www-form-urlencoded', array(), array(), array(), $requestConfig);
+		fputs($fp, "GET {$query} HTTP/1.0\r\n");
+		fputs($fp, "Host: {$hostname}\r\n\r\n");
+
+		$buff = '';
+		while(!feof($fp)) {
+			$str = fgets($fp, 1024);
+			if(trim($str)=='') $start = true;
+			if($start) $buff .= $str;
+		}
+		fclose($fp);
 
 		FileHandler::removeFile(_XE_PATH_.$checkFilePath);
 

modules/install/install.view.php

@@ -79,6 +79,17 @@ class installView extends install
 		$this->setTemplateFile('introduce');
 	}
 
+	/**
+	 * @brief License agreement
+	 */
+	function dispInstallLicenseAgreement()
+	{
+		$this->setTemplateFile('license_agreement');
+
+		$lang_type = Context::getLangType();
+		Context::set('lang_type', $lang_type);
+	}
+
 	/**
 	 * @brief Display messages about installation environment
 	 */
@@ -145,19 +156,6 @@ class installView extends install
 
 		$title = sprintf(Context::getLang('input_dbinfo_by_dbtype'), Context::get('db_type'));
 		Context::set('title', $title);
-
-		$error_return_url = getNotEncodedUrl('', 'act', Context::get('act'), 'db_type', Context::get('db_type'));
-		if($_SERVER['HTTPS'] == 'on')
-		{
-			// Error occured when using https protocol at "ModuleHandler::init() '
-			$parsedUrl = parse_url($error_return_url);
-			$error_return_url = '';
-			if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path'];
-			if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query'];
-			if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment'];
-		}
-		Context::set('error_return_url', $error_return_url);
-
 		$this->setTemplateFile($tpl_filename);
 	}
 

modules/install/lang/lang.xml

@@ -31,6 +31,10 @@
 			<value xml:lang="tr"><![CDATA[Yükleme dilini seçin]]></value>
 			<value xml:lang="vi"><![CDATA[Chọn ngôn ngữ cài đặt]]></value>
 		</item>
+		<item name="license_agreement">
+			<value xml:lang="ko"><![CDATA[사용권 동의]]></value>
+			<value xml:lang="en"><![CDATA[License agreement]]></value>
+		</item>
 		<item name="condition">
 			<value xml:lang="ko"><![CDATA[설치 조건 확인]]></value>
 			<value xml:lang="en"><![CDATA[Check the installation conditions]]></value>

modules/install/tpl/check_env.html

@@ -34,9 +34,10 @@
 				<block cond="$use_nginx == 'Y'"><br> {$lang->about_nginx_rewrite}</block>
 			</p>
 		</div>
+
 		<div class="ibtnArea">
 			<span class="x_pull-left">
-				<a href="{getUrl('')}" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>
+				<a href="{getUrl('', 'act','dispInstallLicenseAgreement')}" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>
 			</span>
 			<span class="x_pull-right">
 				<a cond="$install_enable" class="x_btn x_btn-small x_btn-inverse" id="task-checklist-confirm" href="{getUrl('','act','dispInstallSelectDB')}">{$lang->cmd_install_next} <i class="x_icon-chevron-right x_icon-white"></i></a>

modules/install/tpl/form.cubrid.html

@@ -7,7 +7,7 @@
 				<p>{$XE_VALIDATOR_MESSAGE}</p>
 			</div>
 			<form rule="cubrid" action="./" method="post" class="x_form-horizontal">
-				<input type="hidden" value="{$error_return_url}" name="error_return_url">
+				<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
 				<input type="hidden" name="act" value="procCubridDBSetting" />
 				<input type="hidden" name="db_type" value="{$db_type}" />
 				<h2>{$title}</h2>

modules/install/tpl/form.mssql.html

@@ -7,7 +7,7 @@
 				<p>{$XE_VALIDATOR_MESSAGE}</p>
 			</div>
 			<form rule="mssql" action="./" method="post" class="x_form-horizontal">
-				<input type="hidden" value="{$error_return_url}" name="error_return_url">
+				<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
 				<input type="hidden" name="act" value="procMssqlDBSetting" />
 				<input type="hidden" name="db_type" value="{$db_type}" />
 				<h2>{$title}</h2>

modules/install/tpl/form.mysql.html

@@ -7,7 +7,7 @@
 				<p>{$XE_VALIDATOR_MESSAGE}</p>
 			</div>
 			<form rule="mysql" action="./" method="post" class="x_form-horizontal">
-				<input type="hidden" value="{$error_return_url}" name="error_return_url">
+				<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
 				<input type="hidden" name="act" value="procMysqlDBSetting" />
 				<input type="hidden" name="db_type" value="{$db_type}" />
 				<h2>{$title}</h2>

modules/install/tpl/form.mysql_innodb.html

@@ -7,7 +7,7 @@
 				<p>{$XE_VALIDATOR_MESSAGE}</p>
 			</div>
 			<form rule="mysql" action="./" method="post" class="x_form-horizontal">
-				<input type="hidden" value="{$error_return_url}" name="error_return_url">
+				<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
 				<input type="hidden" name="act" value="procMysqlDBSetting" />
 				<input type="hidden" name="db_type" value="{$db_type}" />
 				<h2>{$title}</h2>

modules/install/tpl/form.mysqli.html

@@ -7,7 +7,7 @@
 				<p>{$XE_VALIDATOR_MESSAGE}</p>
 			</div>
 			<form rule="mysql" action="./" method="post" class="x_form-horizontal">
-				<input type="hidden" value="{$error_return_url}" name="error_return_url">
+				<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
 				<input type="hidden" name="act" value="procMysqlDBSetting" />
 				<input type="hidden" name="db_type" value="{$db_type}" />
 				<h2>{$title}</h2>

modules/install/tpl/form.mysqli_innodb.html

@@ -7,7 +7,7 @@
 				<p>{$XE_VALIDATOR_MESSAGE}</p>
 			</div>
 			<form rule="mysql" action="./" method="post" class="x_form-horizontal">
-				<input type="hidden" value="{$error_return_url}" name="error_return_url">
+				<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
 				<input type="hidden" name="act" value="procMysqlDBSetting" />
 				<input type="hidden" name="db_type" value="{$db_type}" />
 				<h2>{$title}</h2>

modules/install/tpl/introduce.html

@@ -12,7 +12,7 @@
 			</ul>
 			<div class="ibtnArea">
 				<span class="x_pull-right">
-					<a href="{getUrl('', 'act', 'dispInstallCheckEnv')}" class="x_btn x_btn-small x_btn-inverse" id="task-choose-language">{$lang->cmd_next} <i class="x_icon-chevron-right x_icon-white"></i></a>
+					<a href="{getUrl('', 'act', 'dispInstallLicenseAgreement')}" class="x_btn x_btn-small x_btn-inverse" id="task-choose-language">{$lang->cmd_next} <i class="x_icon-chevron-right x_icon-white"></i></a>
 				</span>
 			</div>
 		</div>

modules/install/tpl/license_agreement.html

@@ -0,0 +1,35 @@
+<load target="js/install_admin.js" />
+<include target="header.html" />
+
+<div id="body">
+	<include target="progress_menu.html" />
+	<div id="content">
+		<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+			<p>{$XE_VALIDATOR_MESSAGE}</p>
+		</div>
+		<h2>{$lang->license_agreement}</h2>
+		<form action="./" method="post" class="x_form-horizontal">
+			<input type="hidden" name="act" value="procInstallLicenseAggrement">
+			<input type="hidden" name="module" value="install">
+
+			<div class="content-license">
+				<div>{$lang->license}</div>
+			</div>
+
+			<div>
+				<label><input type="checkbox" name="license_agreement" value="Y" /> <strong>{$lang->cmd_license_agree}</strong></label>
+			</div>
+
+			<div class="ibtnArea">
+				<span class="x_pull-left">
+					<a href="{getUrl('', 'act','')}" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>
+				</span>
+				<span class="x_pull-right">
+					<button type="submit" class="x_btn x_btn-small x_btn-inverse" id="task-license-aggrement" value="">{$lang->cmd_next} <i class="x_icon-chevron-right x_icon-white"></i></button>
+				</span>
+			</div>
+		</form>
+	</div>
+</div>
+
+<include target="footer.html" />

modules/install/tpl/progress_menu.html

@@ -1,6 +1,7 @@
 <div id="progress">
 	<ul>
 		<li class="active"|cond="$act==''">{$lang->install_progress_menu['language']}</li>
+		<li class="active"|cond="$act=='dispInstallLicenseAgreement'">{$lang->install_progress_menu['license_agreement']}</li>
 		<li class="active"|cond="$act=='dispInstallCheckEnv'">{$lang->install_progress_menu['condition']}</li>
 		<li class="active"|cond="$act=='dispInstallSelectDB' && $progressMenu == '3'">{$lang->install_progress_menu['ftp']}</li>
 		<li class="active"|cond="$act=='dispInstallSelectDB' && $progressMenu == '4'">{$lang->install_progress_menu['dbSelect']}</li>

modules/member/lang/lang.xml

@@ -850,6 +850,20 @@
 			<value xml:lang="tr"><![CDATA[Son Giriş Tarihi (basit)]]></value>
 			<value xml:lang="vi"><![CDATA[Đăng nhập ít nhất]]></value>
 		</item>
+		<item name="birthday">
+			<value xml:lang="ko"><![CDATA[생일]]></value>
+			<value xml:lang="en"><![CDATA[Birthday]]></value>
+			<value xml:lang="jp"><![CDATA[誕生日]]></value>
+			<value xml:lang="zh-CN"><![CDATA[生日]]></value>
+			<value xml:lang="zh-TW"><![CDATA[生日]]></value>
+			<value xml:lang="fr"><![CDATA[Anniversaire]]></value>
+			<value xml:lang="de"><![CDATA[Geburtstag]]></value>
+			<value xml:lang="ru"><![CDATA[Дата рождения]]></value>
+			<value xml:lang="es"><![CDATA[Fecha de Nacimiento]]></value>
+			<value xml:lang="tr"><![CDATA[Doğum günü]]></value>
+			<value xml:lang="vi"><![CDATA[Sinh nhật]]></value>
+			<value xml:lang="mn"><![CDATA[Төрсөн өдөр]]></value>
+		</item>
 		<item name="extra_vars">
 			<value xml:lang="ko"><![CDATA[사용자 정의]]></value>
 			<value xml:lang="en"><![CDATA[User Defined]]></value>

modules/member/member.admin.model.php

@@ -98,6 +98,9 @@ class memberAdminModel extends member
 				case 'last_login_less' :
 					$args->s_last_login_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
 					break;
+				case 'birthday' :
+					$args->s_birthday = preg_replace("/[^0-9]/","",$search_keyword);
+					break;
 				case 'extra_vars' :
 					$args->s_extra_vars = $search_keyword;
 					break;

modules/member/member.controller.php

@@ -716,18 +716,29 @@ class memberController extends member
 		// Get a target path to save
 		$target_path = sprintf('files/member_extra_info/profile_image/%s', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
+
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
-		if($type == 3) $ext = 'png';
+		if(IMG_PNG == $type) $ext = 'png';
-		elseif($type == 2) $ext = 'jpg';
+		elseif(IMG_JPG == $type) $ext = 'jpg';
-		else $ext = 'gif';
+		elseif(IMG_GIF == $type) $ext = 'gif';
+		else
+		{
+			return;
+		}
 
 		FileHandler::removeFilesInDir($target_path);
 
 		$target_filename = sprintf('%s%d.%s', $target_path, $member_srl, $ext);
 		// Convert if the image size is larger than a given size or if the format is not a gif
-		if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);
+		if(($width > $max_width || $height > $max_height ) && $type != 1)
-		else @copy($target_file, $target_filename);
+		{
+			FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);
+		}
+		else
+		{
+			@copy($target_file, $target_filename);
+		}
 	}
 
 	/**
@@ -1011,7 +1022,7 @@ class memberController extends member
 		$oMail->setTitle( Context::getLang('msg_find_account_title') );
 		$oMail->setContent($content);
 		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $member_info->nick_name, $member_info->email_address );
+		$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
 		$oMail->send();
 		// Return message
 		$msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
@@ -1183,7 +1194,7 @@ class memberController extends member
 		$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
 		$oMail->setContent($content);
 		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $member_info->nick_name, $member_info->email_address );
+		$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
 		$oMail->send();
 		// Return message
 		$msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
@@ -1266,7 +1277,7 @@ class memberController extends member
 		$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
 		$oMail->setContent($content);
 		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $args->email_address, $args->email_address );
+		$oMail->setReceiptor( $args->user_name, $args->email_address );
 		$oMail->send();
 
 		$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
@@ -1393,7 +1404,7 @@ class memberController extends member
 		$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
 		$oMail->setContent($content);
 		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $member_info->nick_name, $member_info->email_address );
+		$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
 		$oMail->send();
 	}
 
@@ -2275,7 +2286,7 @@ class memberController extends member
 		// Create a model object
 		$oMemberModel = getModel('member');
 		// Bringing the user's information
-		if(!$this->memberInfo)
+		if(!$this->memberInfo || $this->memberInfo->member_srl != $member_srl || !isset($this->memberInfo->is_admin))
 		{
 			$columnList = array('member_srl', 'is_admin');
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
@@ -2462,7 +2473,7 @@ class memberController extends member
 		$oMail->setReceiptor( $member_info->nick_name, $newEmail );
 		$result = $oMail->send();
 
-		$msg = sprintf(Context::getLang('msg_change_mail_sent'), $newEmail);
+		$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $newEmail);
 		$this->setMessage($msg);
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');

modules/member/queries/getMemberList.xml

@@ -15,6 +15,7 @@
             <condition operation="like" column="nick_name" var="s_nick_name" pipe="or" />
             <condition operation="like" column="nick_name" var="html_nick_name" pipe="or" />
             <condition operation="like" column="email_address" var="s_email_address" pipe="or" />
+            <condition operation="like" column="birthday" var="s_birthday" pipe="or" />
             <condition operation="like" column="extra_vars" var="s_extra_vars" pipe="or" />
             <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
             <condition operation="like_prefix" column="last_login" var="s_last_login" pipe="or" />

modules/member/queries/getMemberListWithinGroup.xml

@@ -22,7 +22,8 @@
 			<condition operation="like" column="member.nick_name" var="s_nick_name" pipe="or" />
 			<condition operation="like" column="member.nick_name" var="html_nick_name" pipe="or" />
 			<condition operation="like" column="member.email_address" var="s_email_address" pipe="or" />
-			<condition operation="like" column="extra_vars" var="s_extra_vars" pipe="or" />
+			<condition operation="like" column="member.birthday" var="s_birthday" pipe="or" />
+			<condition operation="like" column="member.extra_vars" var="s_extra_vars" pipe="or" />
 			<condition operation="like_prefix" column="member.regdate" var="s_regdate" pipe="or" />
 			<condition operation="like_prefix" column="member.last_login" var="s_last_login" pipe="or" />
 			<condition operation="more" column="member.regdate" var="s_regdate_more" pipe="or" />

modules/member/tpl/insert_member.html

@@ -1,4 +1,3 @@
-<load target="js/krzip_search.js" />
 <load target="js/member_admin.js" />
 <!--%load_js_plugin("ui.datepicker")-->
 <script>

modules/module/lang/lang.xml

@@ -905,18 +905,6 @@
 		<value xml:lang="tr"><![CDATA[Sayfanın alt kısmında sayfa geçiş linklerinin sayısını ayarlayabilirsiniz.(varsayılan : 10)]]></value>
 		<value xml:lang="vi"><![CDATA[bạn có thể giới hạn số trang liên kết hiển thị phía dưới.(Mặc định là 10)]]></value>
 	</item>
-	<item name="about_mobile_page_count">
-		<value xml:lang="ko"><![CDATA[목록 하단, 페이지를 이동하는 링크 수를 지정할 수 있습니다. (기본 5개)]]></value>
-		<value xml:lang="en"><![CDATA[You can set the number of page links to move pages in a bottom of the page. (default is 5)]]></value>
-		<value xml:lang="jp"><![CDATA[リスト下部、ページ移動可能なリンク数を指定できます（デフォルト5個）。]]></value>
-		<value xml:lang="zh-CN"><![CDATA[可以指定显示在目录下方的页面数(默认为5个)。 ]]></value>
-		<value xml:lang="zh-TW"><![CDATA[可以指定顯示在清單下方的頁面數(預設為 5 個)。 ]]></value>
-		<value xml:lang="fr"><![CDATA[Vous pouvez configurer combien de liens pour les Pages à Bouger en bas de chaque page.(5 par défaut)]]></value>
-		<value xml:lang="ru"><![CDATA[Вы можете установить число страниц внизу. (по умолчанию: 5)]]></value>
-		<value xml:lang="es"><![CDATA[Usted puede definir el número de página enlazada para mover páginas en un botón de la página.(Predefinido es 5)]]></value>
-		<value xml:lang="tr"><![CDATA[Sayfanın alt kısmında sayfa geçiş linklerinin sayısını ayarlayabilirsiniz.(varsayılan : 5)]]></value>
-		<value xml:lang="vi"><![CDATA[bạn có thể giới hạn số trang liên kết hiển thị phía dưới.(Mặc định là 5)]]></value>
-	</item>	
 	<item name="about_admin_id">
 		<value xml:lang="ko"><![CDATA[해당 모듈에 대해 최고 권한을 가지는 관리자를 지정할 수 있습니다.]]></value>
 		<value xml:lang="en"><![CDATA[You can grant a manager to have all permissions to the module.]]></value>

modules/module/module.controller.php

@@ -950,7 +950,7 @@ class moduleController extends module
 			}
 		}
 
-		$oDB->commit();
+		$oDB->commit;
 
 		return new Object();
 	}
@@ -1015,6 +1015,8 @@ class moduleController extends module
 
 		foreach($obj as $key => $val)
 		{
+			if(is_object($val) || is_array($val)) continue;
+
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->name = trim($key);

modules/module/queries/getMidList.xml

@@ -8,7 +8,7 @@
     <conditions>
         <condition operation="equal" column="module_srl" var="module_srl" pipe="and" />
         <condition operation="in" column="module_srl" var="module_srls" pipe="and" />
-        <condition operation="equal" column="site_srl" var="site_srl" />
+        <condition operation="equal" column="site_srl" var="site_srl" pipe="and" />
         <condition operation="equal" column="module" var="module" pipe="and" />
         <condition operation="equal" column="module_category_srl" var="module_category_srl" />
     </conditions>

modules/widget/widget.controller.php

@@ -411,7 +411,7 @@ class widgetController extends widget
 			// cache update and cache renewal of the file mtime
 			if(!$oCacheHandler->isSupport())
 			{
-				touch($cache_file);
+			touch($cache_file);
 			}
 
 			$oWidget = $this->getWidgetObject($widget);
@@ -443,6 +443,7 @@ class widgetController extends widget
 	{
 		// Save for debug run-time widget
 		if(__DEBUG__==3) $start = getMicroTime();
+		$before = microtime(true);
 		// urldecode the value of args haejum
 		$object_vars = get_object_vars($args);
 		if(count($object_vars))
@@ -641,6 +642,17 @@ class widgetController extends widget
 		$output = $widget_content_header . $widget_content_body . $widget_content_footer;
 		// Debug widget creation time information added to the results
 		if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
+
+		$after = microtime(true);
+
+		$elapsed_time = $after - $before;
+
+		$slowlog = new stdClass;
+		$slowlog->caller = "widget.execute";
+		$slowlog->called = $widget;
+		$slowlog->called_extension = $widget;
+		writeSlowlog('widget', $elapsed_time, $slowlog);
+
 		// Return result
 		return $output;
 	}

package.json

@@ -1,14 +1,23 @@
 {
   "name": "XpressEngine",
+  "author": "NAVER",
+  "license": "GNU LGPL",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/xpressengine/xe-core.git"
+  },
+  "bugs": {
+    "url": "https://github.com/xpressengine/xe-core/issues"
+  },
   "devDependencies": {
-    "grunt": ">0.4.0",
+    "grunt": "^0.4.5",
-    "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-clean": "^0.5.0",
-    "grunt-contrib-jshint": "~0.7.1",
+    "grunt-contrib-concat": "^0.3.0",
-    "grunt-contrib-csslint": "*",
+    "grunt-contrib-csslint": "~0.3.0",
-    "grunt-contrib-cssmin": "~0.7.0",
+    "grunt-contrib-cssmin": "^0.7.0",
-    "grunt-contrib-uglify": "~0.2.7",
+    "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-concat": "~0.3.0",
+    "grunt-contrib-uglify": "^0.4.1",
-    "grunt-phplint": "0.0.5"
+    "grunt-phplint": "~0.0.3"
   },
   "main": "Gruntfile.js",
   "scripts": {