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

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/importer/importer.admin.controller.php
View file

@ -6,7 +6,7 @@
**/
@set_time_limit(0);
@require_once('./modules/importer/extract.class.php');
require_once('./modules/importer/extract.class.php');
class importerAdminController extends importer {
@ -925,7 +925,7 @@
$path = sprintf("./files/attach/images/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
$ext = substr(strrchr($file_info['name'],'.'),1);
$ext = substr(strrchr($file_obj->source_filename,'.'),1);
$_filename = md5(crypt(rand(1000000, 900000), rand(0, 100))).'.'.$ext;
$filename = $path.$_filename;

8
modules/importer/tpl/js/importer_admin.js
View file

@ -44,12 +44,14 @@ $('.checkxml')
return restore();
}
restore();
$message.attr('class', 'desc success').fadeIn(300);
$form.find(':submit').removeAttr('disabled');
$syncmember = $form.find('.syncmember:hidden');
$input.prop('disabled', false).removeClass('loading');
$this.prop('disabled', false);
if(data.type == 'XML') {
$xml.not(':visible').add($syncmember).slideDown(300);
} else if(data.type == 'TTXML') {
@ -119,7 +121,7 @@ function doPreProcessing(form, formId) {
);
function on_complete(ret) {
var $reload, $cont, fo_proc, elems, i, c, key, to_copy;
var $reload, $cont, fo_proc, elems, i, c, key, to_copy, fo_import;
prepared = true;
@ -162,7 +164,7 @@ function doImport(formId) {
}
function on_complete(ret, response_tags) {
var i, c, key;
var i, c, key, fo_import;
for(i=0,c=resp.length; i < c; i++) {
key = resp[i];