fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-05 09:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-08-19 15:41:14 +09:00
commit 9782c30654
14 changed files with 42 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
classes/context/Context.class.php
View file

@ -2395,7 +2395,7 @@ class Context
*/
public static function addHtmlHeader($header)
{
self::$_instance->html_header .= "\n" . $header;
self::$_instance->html_header .= (self::$_instance->html_header ? "\n" : '') . $header;
}
public static function clearHtmlHeader()
@ -2442,7 +2442,7 @@ class Context
*/
public static function addBodyHeader($header)
{
self::$_instance->body_header .= "\n" . $header;
self::$_instance->body_header .= (self::$_instance->body_header ? "\n" : '') . $header;
}
/**
@ -2462,7 +2462,7 @@ class Context
*/
public static function addHtmlFooter($footer)
{
self::$_instance->html_footer .= (self::$_instance->Htmlfooter ? "\n" : '') . $footer;
self::$_instance->html_footer .= (self::$_instance->html_footer ? "\n" : '') . $footer;
}
/**

6
classes/display/DisplayHandler.class.php
View file

@ -274,7 +274,7 @@ class DisplayHandler extends Handler
$data = Rhymix\Framework\Debug::getDebugData();
$display_content = array_fill_keys(config('debug.display_content'), true);
include RX_BASEDIR . 'common/tpl/debug_comment.html';
$content = preg_replace('/\n{2,}/', "\n\n", trim(ob_get_clean())) . PHP_EOL;
$content = preg_replace('/\n{2,}/', "\n\n", trim(ob_get_clean())) . "\n";
if ($display_type === 'file')
{
$log_filename = config('debug.log_filename') ?: 'files/debug/YYYYMMDD.php';
@ -293,12 +293,12 @@ class DisplayHandler extends Handler
{
$phpheader = '';
}
FileHandler::writeFile($log_filename, $phpheader . $content . PHP_EOL, 'a');
FileHandler::writeFile($log_filename, $phpheader . $content . "\n", 'a');
$debug_output .= '';
}
else
{
$debug_output .= '<!--' . PHP_EOL . $content . PHP_EOL . '-->' . PHP_EOL;
$debug_output .= '<!--' . "\n" . $content . "\n" . '-->' . "\n";
}
}
}

2
classes/display/VirtualXMLDisplayHandler.php
View file

@ -61,7 +61,7 @@ class VirtualXMLDisplayHandler
$html[] = '</script>';
$html[] = '</head><body></body></html>';
return join(PHP_EOL, $html);
return join("\n", $html);
}
}

2
classes/extravar/Extravar.class.php
View file

@ -488,7 +488,7 @@ class ExtraItem
$buff[] = '<p>' . escape($this->desc, false) . '</p>';
}
return join(PHP_EOL, $buff);
return join("\n", $buff);
}
}

2
classes/frontendfile/FrontEndFileHandler.class.php
View file

@ -688,7 +688,7 @@ class FrontEndFileHandler extends Handler
$tmp = array_first(explode('/', strtr($dirname, '\\.', '//')));
$cssSortList = array('common' => -100000, 'layouts' => -90000, 'modules' => -80000, 'widgets' => -70000, 'addons' => -60000);
$file->index = $cssSortList[$tmp[0]];
$file->index = $cssSortList[$tmp];
}
/**

2
classes/template/TemplateHandler.class.php
View file

@ -367,7 +367,7 @@ class TemplateHandler
// Insert template path comment tag.
if(Rhymix\Framework\Debug::isEnabledForCurrentUser() && Context::getResponseMethod() === 'HTML' && !starts_with('<!DOCTYPE', $contents) && !starts_with('<?xml', $contents))
{
$sign = PHP_EOL . '<!-- Template %s : ' . $this->web_path . $this->filename . ' -->' . PHP_EOL;
$sign = "\n" . '<!-- Template %s : ' . $this->web_path . $this->filename . ' -->' . "\n";
$contents = sprintf($sign, 'start') . $contents . sprintf($sign, 'end');
}

3
modules/admin/tpl/css/admin.bootstrap.css
View file

@ -89,6 +89,9 @@
.x .x_input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
.x a{color:#1a87ff;text-decoration:none}
.x a:hover{color:#005580;text-decoration:underline}
.x a [class^="x_icon-"], .x a [class*=" x_icon-"] {
position: relative; top: 2px;
}
.x .x_img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}
.x .x_img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.1)}
.x .x_img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}

6
modules/board/tpl/index.html
View file

@ -33,9 +33,9 @@
<td><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}">{$val->browser_title}</a></td>
<td>{zdate($val->regdate,"Y-m-d")}</td>
<td>
<a href="{getUrl('act','dispBoardAdminBoardInfo','module_srl',$val->module_srl)}" class="x_icon-cog" title="{$lang->cmd_setup}">{$lang->cmd_setup}</a>
<a href="{getUrl('','module','module','act','dispModuleAdminCopyModule','module_srl',$val->module_srl)}" class="x_icon-plus" onclick="popopen(this.href);return false;" title="{$lang->cmd_copy}">{$lang->cmd_copy}</a>
<a href="{getUrl('act','dispBoardAdminDeleteBoard','module_srl', $val->module_srl)}" class="x_icon-remove" title="{$lang->cmd_delete}">{$lang->cmd_delete}</a>
<a href="{getUrl('act','dispBoardAdminBoardInfo','module_srl',$val->module_srl)}"><i class="x_icon-cog"></i> {$lang->cmd_setup}</a> &nbsp;
<a href="{getUrl('','module','module','act','dispModuleAdminCopyModule','module_srl',$val->module_srl)}" onclick="popopen(this.href);return false;"><i class="x_icon-plus"></i> {$lang->cmd_copy}</a> &nbsp;
<a href="{getUrl('act','dispBoardAdminDeleteBoard','module_srl', $val->module_srl)}"><i class="x_icon-remove"></i> {$lang->cmd_delete}</a>
</td>
<td><input type="checkbox" name="cart" value="{$val->module_srl}" class="selectedModule" data-mid="{$val->mid}" data-browser_title="{$val->browser_title}" /></td>
</tr>

1
modules/editor/skins/ckeditor/css/default.less
View file

@ -53,6 +53,7 @@ html {
}
body.cke_editable {
min-height: 100vh;
box-sizing: border-box;
padding: 10px;
.light_dark(@colorset);
}

20
modules/file/file.class.php
View file

@ -93,10 +93,18 @@ class file extends ModuleObject
{
return true;
}
if($oDB->getColumnInfo('files', 'mime_type')->size < 100)
{
return true;
}
if(!$oDB->isColumnExists('files', 'original_type'))
{
return true;
}
if($oDB->getColumnInfo('files', 'original_type')->size < 100)
{
return true;
}
if(!$oDB->isColumnExists('files', 'width'))
{
return true;
@ -190,7 +198,11 @@ class file extends ModuleObject
}
if(!$oDB->isColumnExists('files', 'mime_type'))
{
$oDB->addColumn('files', 'mime_type', 'varchar', '60', '', true, 'file_size');
$oDB->addColumn('files', 'mime_type', 'varchar', '100', '', true, 'file_size');
}
if($oDB->getColumnInfo('files', 'mime_type')->size < 100)
{
$oDB->modifyColumn('files', 'mime_type', 'varchar', 100, '', true);
}
if(!$oDB->isIndexExists('files', 'idx_mime_type'))
{
@ -198,7 +210,11 @@ class file extends ModuleObject
}
if(!$oDB->isColumnExists('files', 'original_type'))
{
$oDB->addColumn('files', 'original_type', 'varchar', '60', null, false, 'mime_type');
$oDB->addColumn('files', 'original_type', 'varchar', '100', null, false, 'mime_type');
}
if($oDB->getColumnInfo('files', 'original_type')->size < 100)
{
$oDB->modifyColumn('files', 'original_type', 'varchar', 100, '', false);
}
if(!$oDB->isColumnExists('files', 'width'))
{

4
modules/file/schemas/files.xml
View file

@ -11,8 +11,8 @@
<column name="uploaded_filename" type="varchar" size="250" />
<column name="thumbnail_filename" type="varchar" size="250" />
<column name="file_size" type="number" size="11" default="0" notnull="notnull" index="idx_file_size" />
<column name="mime_type" type="varchar" size="60" notnull="notnull" index="idx_mime_type" />
<column name="original_type" type="varchar" size="60" />
<column name="mime_type" type="varchar" size="100" notnull="notnull" index="idx_mime_type" />
<column name="original_type" type="varchar" size="100" />
<column name="width" type="number" size="11" />
<column name="height" type="number" size="11" />
<column name="duration" type="number" size="11" />

2
modules/menu/lang/en.php
View file

@ -76,6 +76,8 @@ $lang->module_type = 'Select Page';
$lang->create_menu_url = 'Create Page ID';
$lang->select_menu_url = 'Select Page ID';
$lang->exposure_limits = 'Exposure limits';
$lang->msg_empty_menu_item = 'Menu item is empty.';
$lang->msg_url_is_required = 'Please enter a valid URL.';
$lang->copy = 'Copy';
$lang->cut = 'Cut';
$lang->paste = 'Paste';

1
modules/menu/lang/ko.php
View file

@ -77,6 +77,7 @@ $lang->create_menu_url = '페이지 아이디 생성';
$lang->select_menu_url = '페이지 아이디 선택';
$lang->exposure_limits = '노출 제한';
$lang->msg_empty_menu_item = '선택된 메뉴의 정보가 없습니다.';
$lang->msg_url_is_required = 'URL을 입력해 주십시오.';
$lang->copy = '복사';
$lang->cut = '잘라내기';
$lang->paste = '붙여넣기';

3
modules/menu/tpl/sitemap.html
View file

@ -663,6 +663,7 @@
xe.lang.msg_no_root = xe.msg_no_root = "{$lang->msg_no_root}";
xe.lang.msg_no_shortcut = xe.msg_no_shortcut = "{$lang->msg_no_shortcut}";
xe.lang.msg_target_is_sub_of_origin = '{$lang->msg_target_is_sub_of_origin}';
xe.lang.msg_url_is_required = '{$lang->msg_url_is_required}';
xe.lang.confirm_sitemap_delete = '{$lang->confirm_sitemap_delete}';
xe.lang.confirm_menu_delete = '{$lang->confirm_menu_delete}';
xe.lang.confirm_delete_all_contents = '{$lang->confirm_delete_all_contents}';
@ -1825,7 +1826,7 @@ jQuery(function($){
if(nSelectedTabIdx === 0){
sUrl = $('#add_menu .x_active ._linkUrl').val();
if(!sUrl || sUrl === "http://" || sUrl === "https://"){
$.xeMsgBox.alert('URL is required');
$.xeMsgBox.alert(xe.lang.msg_url_is_required);
return;
}
//if(!sUrl.match(/^http:\/\//)){