From 16c2694c1950e9cdb495b2d2d2e343a148331ceb Mon Sep 17 00:00:00 2001 From: akasima Date: Tue, 29 Jul 2014 17:57:34 +0900 Subject: [PATCH 1/3] #869 installController::checkRewriteUsable() modified to support HTTPS --- modules/install/install.controller.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index e62f5961d..d880f890b 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -388,26 +388,26 @@ class installController extends install FileHandler::writeFile(_XE_PATH_.$checkFilePath, trim($checkString)); + $scheme = $_SERVER['REQUEST_SCHEME']; $hostname = $_SERVER['SERVER_NAME']; $port = $_SERVER['SERVER_PORT']; + $str_port = ''; + if($port) + { + $str_port = ':' . $port; + } + $query = "/JUST/CHECK/REWRITE/" . $checkFilePath; $currentPath = str_replace($_SERVER['DOCUMENT_ROOT'], "", _XE_PATH_); if($currentPath != "") + { $query = $currentPath . $query; - - $fp = @fsockopen($hostname, $port, $errno, $errstr, 5); - if(!$fp) return false; - - fputs($fp, "GET {$query} HTTP/1.0\r\n"); - fputs($fp, "Host: {$hostname}\r\n\r\n"); - - $buff = ''; - while(!feof($fp)) { - $str = fgets($fp, 1024); - if(trim($str)=='') $start = true; - if($start) $buff .= $str; } - fclose($fp); + + $requestUrl = sprintf('%s://%s%s%s', $scheme, $hostname, $str_port, $query); + $requestConfig = array(); + $requestConfig['ssl_verify_peer'] = false; + $buff = FileHandler::getRemoteResource($requestUrl, null, 10, 'POST', 'application/x-www-form-urlencoded', array(), array(), array(), $requestConfig); FileHandler::removeFile(_XE_PATH_.$checkFilePath); From 272ac061d606a8f80b301ae367a879aef42f5a5e Mon Sep 17 00:00:00 2001 From: izuzero Date: Tue, 29 Jul 2014 23:51:04 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B3=84?= =?UTF-8?q?=EC=A0=95=EC=9D=B8=EB=8D=B0=EB=8F=84=20=EB=AC=B8=EC=84=9C?= =?UTF-8?q?=EC=B2=A8=EB=B6=80=EC=A0=9C=ED=95=9C=EC=9D=B4=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=EB=90=98=EB=8A=94=20=EC=98=A4=EB=A5=98=20=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/file/file.model.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/file/file.model.php b/modules/file/file.model.php index bf2295ad8..713ce080a 100644 --- a/modules/file/file.model.php +++ b/modules/file/file.model.php @@ -238,7 +238,9 @@ class fileModel extends file if($logged_info->is_admin == 'Y') { - $file_config->allowed_filesize = preg_replace("/[a-z]/is","",ini_get('upload_max_filesize')); + $size = preg_replace('/[a-z]/is', '', ini_get('upload_max_filesize')); + $file_config->allowed_attach_size = $size; + $file_config->allowed_filesize = $size; $file_config->allowed_filetypes = '*.*'; } return $file_config; From 7acee1050db4235afdc4351d2e4afaaecd0031dd Mon Sep 17 00:00:00 2001 From: akasima Date: Wed, 30 Jul 2014 10:00:35 +0900 Subject: [PATCH 3/3] #861 modified, https install error --- modules/install/install.view.php | 13 +++++++++++++ modules/install/tpl/form.cubrid.html | 2 +- modules/install/tpl/form.mssql.html | 2 +- modules/install/tpl/form.mysql.html | 2 +- modules/install/tpl/form.mysql_innodb.html | 2 +- modules/install/tpl/form.mysqli.html | 2 +- modules/install/tpl/form.mysqli_innodb.html | 2 +- 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/modules/install/install.view.php b/modules/install/install.view.php index 38e34fdaa..e8b79ef45 100644 --- a/modules/install/install.view.php +++ b/modules/install/install.view.php @@ -124,6 +124,19 @@ class installView extends install $title = sprintf(Context::getLang('input_dbinfo_by_dbtype'), Context::get('db_type')); Context::set('title', $title); + + $error_return_url = getNotEncodedUrl('', 'act', Context::get('act'), 'db_type', Context::get('db_type')); + if($_SERVER['HTTPS'] == 'on') + { + // Error occured when using https protocol at "ModuleHandler::init() ' + $parsedUrl = parse_url($error_return_url); + $error_return_url = ''; + if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path']; + if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query']; + if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment']; + } + Context::set('error_return_url', $error_return_url); + $this->setTemplateFile($tpl_filename); } diff --git a/modules/install/tpl/form.cubrid.html b/modules/install/tpl/form.cubrid.html index 50285bf91..f3495114f 100644 --- a/modules/install/tpl/form.cubrid.html +++ b/modules/install/tpl/form.cubrid.html @@ -7,7 +7,7 @@

{$XE_VALIDATOR_MESSAGE}

- +

{$title}

diff --git a/modules/install/tpl/form.mssql.html b/modules/install/tpl/form.mssql.html index cf757236d..97d2288cd 100644 --- a/modules/install/tpl/form.mssql.html +++ b/modules/install/tpl/form.mssql.html @@ -7,7 +7,7 @@

{$XE_VALIDATOR_MESSAGE}

- +

{$title}

diff --git a/modules/install/tpl/form.mysql.html b/modules/install/tpl/form.mysql.html index c1a93a304..7946b98c9 100644 --- a/modules/install/tpl/form.mysql.html +++ b/modules/install/tpl/form.mysql.html @@ -7,7 +7,7 @@

{$XE_VALIDATOR_MESSAGE}

- +

{$title}

diff --git a/modules/install/tpl/form.mysql_innodb.html b/modules/install/tpl/form.mysql_innodb.html index c1a93a304..7946b98c9 100644 --- a/modules/install/tpl/form.mysql_innodb.html +++ b/modules/install/tpl/form.mysql_innodb.html @@ -7,7 +7,7 @@

{$XE_VALIDATOR_MESSAGE}

- +

{$title}

diff --git a/modules/install/tpl/form.mysqli.html b/modules/install/tpl/form.mysqli.html index 358e962f5..2a008984d 100644 --- a/modules/install/tpl/form.mysqli.html +++ b/modules/install/tpl/form.mysqli.html @@ -7,7 +7,7 @@

{$XE_VALIDATOR_MESSAGE}

- +

{$title}

diff --git a/modules/install/tpl/form.mysqli_innodb.html b/modules/install/tpl/form.mysqli_innodb.html index 358e962f5..2a008984d 100644 --- a/modules/install/tpl/form.mysqli_innodb.html +++ b/modules/install/tpl/form.mysqli_innodb.html @@ -7,7 +7,7 @@

{$XE_VALIDATOR_MESSAGE}

- +

{$title}