mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-25 21:32:51 +09:00
Merge branch 'release/1.7.8' into develop
Conflicts: classes/context/Context.class.php config/config.inc.php
This commit is contained in:
bnu
commit
4506ea440e
50 changed files with 4086 additions and 126 deletions
|
|
@ -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[] = 'ModuleHandler::triggerCall("XE.writeSlowlog", "after", $addon_time_log);';
|
||||
$buff[] = 'writeSlowlog("addon",$after_time-$before_time,$addon_time_log);';
|
||||
}
|
||||
$addon_path = _XE_PATH_ . 'files/cache/addons/';
|
||||
FileHandler::makeDir($addon_path);
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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']);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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="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="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.']]></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">
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
<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>
|
||||
</block>
|
||||
<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_update">{$value->module} - <button type="button" onclick="doUpdateModule('{$value->module}')" class="x_btn x_btn-small">{$lang->cmd_module_update}</button></li>
|
||||
</block>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="message update" cond="count($newVersionList)">
|
||||
<h2>{$lang->available_new_version}</h2>
|
||||
<ul>
|
||||
|
|
@ -46,7 +65,7 @@
|
|||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="dashboard">
|
||||
<block cond="$counterAddonActivated">
|
||||
<include target="./_dashboard_counter.html" />
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
2
modules/editor/tpl/js/uploader.min.js
vendored
2
modules/editor/tpl/js/uploader.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
$requestConfig = array();
|
||||
$requestConfig['ssl_verify_peer'] = false;
|
||||
$buff = FileHandler::getRemoteResource($requestUrl, null, 10, 'POST', 'application/x-www-form-urlencoded', array(), array(), array(), $requestConfig);
|
||||
$fp = @fsockopen($hostname, $port, $errno, $errstr, 5);
|
||||
if(!$fp) return false;
|
||||
|
||||
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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
35
modules/install/tpl/license_agreement.html
Normal file
35
modules/install/tpl/license_agreement.html
Normal file
|
|
@ -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" />
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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';
|
||||
elseif($type == 2) $ext = 'jpg';
|
||||
else $ext = 'gif';
|
||||
if(IMG_PNG == $type) $ext = 'png';
|
||||
elseif(IMG_JPG == $type) $ext = 'jpg';
|
||||
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);
|
||||
else @copy($target_file, $target_filename);
|
||||
if(($width > $max_width || $height > $max_height ) && $type != 1)
|
||||
{
|
||||
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', '');
|
||||
|
|
|
|||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<load target="js/krzip_search.js" />
|
||||
<load target="js/member_admin.js" />
|
||||
<!--%load_js_plugin("ui.datepicker")-->
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue