diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index 7be45098c..00b7d7152 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -294,7 +294,7 @@ $allowed_attach_size = $config->allowed_attach_size * 1024 * 1024; // 한 파일당 허용 용량 초과시 오류 출력 - if($allowed_filesize > filesize($file_info['tmp_name'])) return new Object(-1, 'msg_exceeds_limit_size'); + if($allowed_filesize < filesize($file_info['tmp_name'])) return new Object(-1, 'msg_exceeds_limit_size'); // 해당 문서에 첨부된 모든 파일의 용량을 가져옴 (DB에서 가져옴) diff --git a/modules/file/file.model.php b/modules/file/file.model.php index c039679de..4a4ab1554 100644 --- a/modules/file/file.model.php +++ b/modules/file/file.model.php @@ -80,11 +80,6 @@ * @brief 파일 설정 정보를 구함 **/ function getFileConfig($module_srl = null) { - // module_srl이 없으면 현재 모듈 - if(!$module_srl) { - $current_module_info = Context::get('current_module_info'); - $module_srl = $current_module_info->module_srl; - } // 설정 정보를 받아옴 (module model 객체를 이용) $oModuleModel = &getModel('module'); @@ -171,6 +166,11 @@ $file_config->allowed_filetypes = '*.*'; } else { $module_srl = Context::get('module_srl'); + // module_srl이 없으면 현재 모듈 + if(!$module_srl) { + $current_module_info = Context::get('current_module_info'); + $module_srl = $current_module_info->module_srl; + } $file_config = $this->getFileConfig($module_srl); } return $file_config; diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php index 21ddbb5dc..345fb29be 100644 --- a/widgets/content/content.class.php +++ b/widgets/content/content.class.php @@ -415,8 +415,16 @@ if ($URL_parsed["query"] != '') $path .= "?".$URL_parsed["query"]; + // $buff = FileHandler::readFile('./widgets/content/conf/info.xml'); + // $buff = str_replace('','',$buff); + + // $oXmlParser = new XmlParser(); + // $info_xml = $oXmlParser->parse($buff); + $oReqeust = new HTTP_Request($rss_url); $oReqeust->addHeader('Content-Type', 'application/xml'); + // $oReqeust->addHeader('User-agent', 'Content Widget/'.$info_xml->widget->version->body.' (XpressEngine '.__ZBXE_VERSION__.' ( http://www.xpressengine.com ); PEAR HTTP_Request class ( http://pear.php.net/ );)'); + $oReqeust->addHeader('User-agent', 'Content Widget (XE '.__ZBXE_VERSION__.' ( http://www.xpressengine.com ); PEAR HTTP_Request class ( http://pear.php.net/ );)'); $oReqeust->setMethod('GET'); $user = $URL_parsed["user"];