From f0fc9dce29e8e680b8922c589f90d3fcb2af951d Mon Sep 17 00:00:00 2001 From: conory Date: Wed, 4 May 2016 18:35:45 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EB=A9=98=EC=85=98=20=EC=A0=91=EB=AF=B8?= =?UTF-8?q?=EC=82=AC=20=EC=84=A4=EC=A0=95=EC=9D=B4=20=EB=90=98=EC=A7=80?= =?UTF-8?q?=EC=95=8A=EC=95=98=EB=8D=98=20=EB=AC=B8=EC=A0=9C=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ncenterlite/ncenterlite.admin.controller.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index f66440954..97a438ae3 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -41,11 +41,15 @@ class ncenterliteAdminController extends ncenterlite { $config->use = array(); } + } + + if ($obj->disp_act == 'dispNcenterliteAdminAdvancedconfig') + { if (!$config->mention_suffixes) { $config->mention_suffixes = array(); } - if (!is_array($config->mention_suffixes)) + else if (!is_array($config->mention_suffixes)) { $config->mention_suffixes = array_map('trim', explode(',', $config->mention_suffixes)); } From cfa151b8c2208ff80a196135b2230b55f1b04deb Mon Sep 17 00:00:00 2001 From: conory Date: Wed, 4 May 2016 20:18:46 +0900 Subject: [PATCH 2/5] =?UTF-8?q?Context=20=EB=B3=80=EC=88=98=20html=5Ffoote?= =?UTF-8?q?r=20=EC=B6=A9=EB=8F=8C=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EC=97=90=EC=84=9C=EB=8A=94=20photoswipe=20=EA=BA=BC?= =?UTF-8?q?=EB=91=90=EA=B8=B0=20=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=EC=9D=98=20redirect=5Furl=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/photoswipe/photoswipe.addon.php | 2 +- modules/admin/admin.admin.controller.php | 12 ++++++------ modules/admin/admin.admin.view.php | 2 +- modules/admin/tpl/config_general.html | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/photoswipe/photoswipe.addon.php b/addons/photoswipe/photoswipe.addon.php index 288452b79..4a1afbf86 100644 --- a/addons/photoswipe/photoswipe.addon.php +++ b/addons/photoswipe/photoswipe.addon.php @@ -11,7 +11,7 @@ if(!defined('RX_VERSION')) * @author MinSoo Kim * @brief Add-on to highlight an activated image. */ -if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML" && !isCrawler()) +if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML" && Context::get('module') != 'admin' && !isCrawler()) { Context::loadFile(array('./addons/photoswipe/PhotoSwipe/photoswipe.css', '', '', null), true); Context::loadFile(array('./addons/photoswipe/PhotoSwipe/default-skin/default-skin.css', '', '', null), true); diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index a0d287b68..ed2c67c37 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -550,7 +550,7 @@ class adminAdminController extends admin Rhymix\Framework\Config::save(); $this->setMessage('success_updated'); - $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral')); + $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigGeneral')); } /** @@ -617,7 +617,7 @@ class adminAdminController extends admin Rhymix\Framework\Config::save(); $this->setMessage('success_updated'); - $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'act', 'dispAdminConfigSecurity')); + $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigSecurity')); } /** @@ -705,7 +705,7 @@ class adminAdminController extends admin Rhymix\Framework\Config::save(); $this->setMessage('success_updated'); - $this->setRedirectUrl(Context::get('success_return_url') ?: $default_url . 'index.php?act=dispAdminConfigAdvanced'); + $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigAdvanced')); } /** @@ -763,7 +763,7 @@ class adminAdminController extends admin Rhymix\Framework\Config::save(); $this->setMessage('success_updated'); - $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'act', 'dispAdminConfigDebug')); + $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigDebug')); } /** @@ -802,7 +802,7 @@ class adminAdminController extends admin Rhymix\Framework\Config::save(); $this->setMessage('success_updated'); - $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'act', 'dispAdminConfigSitelock')); + $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigSitelock')); } /** @@ -874,7 +874,7 @@ class adminAdminController extends admin Rhymix\Framework\Config::save(); $this->setMessage('success_updated'); - $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'act', 'dispAdminConfigFtp')); + $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigFtp')); } /** diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 7bc617e75..afbf68412 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -417,7 +417,7 @@ class adminAdminView extends admin $oModuleModel = getModel('module'); $config = $oModuleModel->getModuleConfig('module'); Context::set('site_title', escape($config->siteTitle)); - Context::set('html_footer', escape($config->htmlFooter)); + Context::set('all_html_footer', escape($config->htmlFooter)); // Index module $columnList = array('modules.mid', 'modules.browser_title', 'sites.index_module_srl'); diff --git a/modules/admin/tpl/config_general.html b/modules/admin/tpl/config_general.html index 3837dc106..76f7bc620 100644 --- a/modules/admin/tpl/config_general.html +++ b/modules/admin/tpl/config_general.html @@ -25,7 +25,7 @@
- +
From e379d037a4f4a9cc6d9557655a249bb5808596d2 Mon Sep 17 00:00:00 2001 From: conory Date: Wed, 4 May 2016 20:27:42 +0900 Subject: [PATCH 3/5] Creating default object --- modules/trash/trash.admin.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php index 459a24bea..a3c6e561d 100644 --- a/modules/trash/trash.admin.view.php +++ b/modules/trash/trash.admin.view.php @@ -78,7 +78,6 @@ class trashAdminView extends trash } - // Trash View - sejin7940 function dispTrashAdminView() { @@ -103,6 +102,7 @@ class trashAdminView extends trash Context::set('module_info', $module_info); if($originObject) { + $args_extra = new stdClass; $args_extra->module_srl = $originObject->module_srl; $args_extra->document_srl = $originObject->document_srl; $output_extra = executeQueryArray('trash.getDocumentExtraVars', $args_extra); From 5c64fec92095754c8441dc68764a9c0d122a006e Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 5 May 2016 15:17:35 +0900 Subject: [PATCH 4/5] Auto-detect inherited style in editor if no font is specified --- modules/editor/skins/ckeditor/editor.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html index 0abe555bf..b485c7a71 100755 --- a/modules/editor/skins/ckeditor/editor.html +++ b/modules/editor/skins/ckeditor/editor.html @@ -46,9 +46,23 @@ var auto_saved_msg = "{$lang->msg_auto_saved}"; $(function(){ CKEDITOR.config.customConfig = ''; + // Import CSS content from PHP. + var css_content = {json_encode($css_content)}; + // Get default font name and list of other supported fonts. var default_font_name = {json_encode($content_font ? trim(array_first(explode(',', $content_font)), '\'" ') : null)}; var default_font_fullname = {json_encode($content_font ?: null)}; + if (default_font_fullname === null && window.getComputedStyle) { + var test_content = $('
').hide().appendTo($(document.body)); + var test_styles = window.getComputedStyle(test_content[0], null); + if (test_styles && test_styles.getPropertyValue) { + default_font_fullname = test_styles.getPropertyValue("font-family"); + if (default_font_fullname) { + default_font_name = $.trim(default_font_fullname.split(',')[0].replace(/['"]/g, '')); + css_content = ".xe_content.editable { font-family:" + default_font_fullname + "; } " + css_content; + } + } + } var font_list = []; font_list.push({json_encode($fontname)}); if (default_font_fullname !== null && !$.inArray(default_font_fullname, font_list)) { @@ -115,7 +129,7 @@ var auto_saved_msg = "{$lang->msg_auto_saved}"; settings.ckeconfig.removeButtons = 'Save,Preview,Print,Cut,Copy,Paste,Source'; - CKEDITOR.addCss('{$css_content}'); + CKEDITOR.addCss(css_content); var ckeApp = $('#ckeditor_instance_{$editor_sequence}').XeCkEditor(settings); From 9d3c69120c9cc80e102cd748afa9f6640352592c Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 5 May 2016 15:39:15 +0900 Subject: [PATCH 5/5] Fix #475, Fix #484, not clearing cache group if dummy driver is used --- common/framework/drivers/cache/file.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/framework/drivers/cache/file.php b/common/framework/drivers/cache/file.php index c351ce808..bd1d5d62a 100644 --- a/common/framework/drivers/cache/file.php +++ b/common/framework/drivers/cache/file.php @@ -161,7 +161,7 @@ class File implements \Rhymix\Framework\Drivers\CacheInterface public function incr($key, $amount) { $value = intval($this->get($key)); - $success = $this->set($key, $value + $amount, 0); + $success = $this->set($key, $value + $amount, 0, true); return $success ? ($value + $amount) : false; }