fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-17 17:32:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/new-config-format

Browse source 
Conflicts:
	common/legacy.php
This commit is contained in:
Kijin Sung 2016-02-07 22:15:27 +09:00
commit e55504e1f4
7 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
common/js/xml_handler.js
View file

@ -32,13 +32,6 @@
// Fill in the XE vid.
if (typeof(xeVid) != "undefined") params.vid = xeVid;
// Add 'error' and 'message' to response tags.
if (typeof(return_fields) == "undefined" || return_fields.length < 1) {
return_fields = ["error", "message"];
} else {
return_fields.push("error", "message");
}
// Decide whether or not to use SSL.
var url = request_uri;
if ($.isArray(ssl_actions) && params.act && $.inArray(params.act, ssl_actions) >= 0) {
@ -75,7 +68,7 @@
// Copy data to the result object.
var result = {};
$.each(data, function(key, val) {
if (key == "act" || key == "redirect_url" || $.inArray(key, return_fields)) {
if ($.inArray(key, ["error", "message", "act", "redirect_url"]) >= 0 || $.inArray(key, return_fields) >= 0) {
if ($.isArray(val)) {
result[key] = { item: val };
} else {
@ -250,7 +243,7 @@
if (typeof(xeVid) != "undefined") params.vid = xeVid;
// Determine the request type.
if(!$.inArray(type, ["html", "append", "prepend"])) type = "html";
if($.inArray(type, ["html", "append", "prepend"]) < 0) type = "html";
var self = $(this);
// Delay the waiting message for 1 second to prevent rapid blinking.

10
common/legacy.php
View file

@ -580,7 +580,7 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = true)
{
$format = $convtable[$lang_type][$format];
}
elseif(isset($convtable[$convtable[$lang_type]][$format]))
elseif(is_string($convtable[$lang_type]) && isset($convtable[$convtable[$lang_type]][$format]))
{
$format = $convtable[$convtable[$lang_type]][$format];
}
@ -593,10 +593,10 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = true)
// change day and am/pm for each language
if(preg_match('/[MFAa]/', $format))
{
$unit_week = Context::getLang('unit_week');
$unit_meridiem = Context::getLang('unit_meridiem');
$string = str_replace(array('Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'), $unit_week, $result);
$string = str_replace(array('am', 'pm', 'AM', 'PM'), $unit_meridiem, $result);
$unit_week = (Array)Context::getLang('unit_week');
$unit_meridiem = (Array)Context::getLang('unit_meridiem');
$result = str_replace(array('Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'), $unit_week, $result);
$result = str_replace(array('am', 'pm', 'AM', 'PM'), $unit_meridiem, $string);
}
return $result;
}

2
modules/layout/tpl/header.html
View file

@ -57,7 +57,7 @@
'modules/layout/tpl/layout_all_instance_list/1' => 1,
'modules/autoinstall/tpl/uninstall/1' => 1,
'modules/layouts/tpl/layout_edit/1' => 1,
'modules/layout/tpl/lyaout_info_view/1' => 1,
'modules/layout/tpl/layout_info_view/1' => 1,
'modules/layout/tpl/layout_instance_list/1' => 1,
'modules/layout/tpl/layout_instance_list/2' => 1
);

2
modules/layout/tpl/js/layout_modify.js
View file

@ -1,6 +1,6 @@
function doSubmitConfig()
{
var $forms = jQuery('#layout_config').find('input[name][type="hidden"], input[name][type="text"], input[name][type="checkbox"]:checked, select[name], textarea[name], input[name][type="radio"]:checked');
var $forms = jQuery('#layout_config').find('input[name][type="hidden"], input[name][type="text"], input[name][type="color"], input[name][type="checkbox"]:checked, select[name], textarea[name], input[name][type="radio"]:checked');
var $configForm = jQuery('#config_form');
var $container = $configForm.children('div');
$container.empty();

4
modules/layout/tpl/layout_info_view.html
View file

@ -5,8 +5,8 @@
<input type="hidden" name="layout_srl" value="{$layout_srl}" />
<input type="hidden" name="layout" value="{$selected_layout->layout}" />
<input type="hidden" name="_layout_type" value="{$selected_layout->layout_type}" />
<input type="hidden" name="xe_validator_id" value="modules/layout/tpl/lyaout_info_view/1" />
<!--// For submit config. Do not delete this division. -->
<input type="hidden" name="xe_validator_id" value="modules/layout/tpl/layout_info_view/1" />
<!--// For submit config. Do not delete this division. - TODO: Remove unusual form submit. by misol 2016.02.07- -->
<div></div>
</form>

4
modules/layout/tpl/layout_modify.html
View file

@ -1,3 +1,3 @@
<include target="header.html" />
<load target="js/layout_modify.js" />
{$content}
<include target="header.html" />
{$content}

1
modules/module/module.model.php
View file

@ -966,6 +966,7 @@ class moduleModel extends module
$info->action->{$name}->check_csrf = $check_csrf;
if($action->attrs->menu_name)
{
$info->menu->{$action->attrs->menu_name} = new stdClass();
if($menu_index == 'true')
{
$info->menu->{$action->attrs->menu_name}->index = $name;