From a95ff4cc68907a1d3417f25e84f15da878decf71 Mon Sep 17 00:00:00 2001 From: migarashi Date: Fri, 1 Jan 2016 16:38:43 +0900 Subject: [PATCH 01/14] Fix issue of #63 --- data/Smarty/templates/admin/contents/index.tpl | 2 ++ data/class/pages/admin/contents/LC_Page_Admin_Contents.php | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/data/Smarty/templates/admin/contents/index.tpl b/data/Smarty/templates/admin/contents/index.tpl index d53c41b5cc..ccf543aafb 100644 --- a/data/Smarty/templates/admin/contents/index.tpl +++ b/data/Smarty/templates/admin/contents/index.tpl @@ -136,6 +136,8 @@ 削除 + + 番目へ移動
diff --git a/data/class/pages/admin/contents/LC_Page_Admin_Contents.php b/data/class/pages/admin/contents/LC_Page_Admin_Contents.php index fef419d505..6bf4fdaff8 100644 --- a/data/class/pages/admin/contents/LC_Page_Admin_Contents.php +++ b/data/class/pages/admin/contents/LC_Page_Admin_Contents.php @@ -145,8 +145,13 @@ public function action() $input_pos = $this->getPostRank($news_id); if (SC_Utils_Ex::sfIsInt($input_pos)) { $objNews->moveRank($news_id, $input_pos); + SC_Response_Ex::reload(); + } else { + $this->arrErr[$news_id] = "※ 移動先は数字で入力してください。
"; + $this->arrNews = $objNews->getList(); + $this->line_max = count($this->arrNews); + return; } - SC_Response_Ex::reload(); break; default: From 27c5ebf4f8973b9d66793d8b23003bc94a6b08ac Mon Sep 17 00:00:00 2001 From: migarashi Date: Wed, 6 Jan 2016 22:52:05 +0900 Subject: [PATCH 02/14] fix issue of #54 --- data/class/SC_CheckError.php | 14 ++++++++++++++ data/class/SC_FormParam.php | 1 + data/class/helper/SC_Helper_Customer.php | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/data/class/SC_CheckError.php b/data/class/SC_CheckError.php index 24c979ba03..e07292d525 100644 --- a/data/class/SC_CheckError.php +++ b/data/class/SC_CheckError.php @@ -1762,4 +1762,18 @@ public function numelicCheck($string) return strlen($string) > 0 && !ctype_digit($string); } + + // 都道府県マスタに存在する値かチェック + public function PREF_CHECK($value) + { + $disp = $value[0]; + $key = $value[1]; + + $pref_id = $this->arrParam[$key]; + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $exists = $objQuery->exists('mtb_pref', 'id = ?', array($pref_id)); + if (!$exists) { + $this->arrErr[$key] = '※ ' . $disp . 'が不正な値です。
'; + } + } } diff --git a/data/class/SC_FormParam.php b/data/class/SC_FormParam.php index 4593481a88..d12da67177 100644 --- a/data/class/SC_FormParam.php +++ b/data/class/SC_FormParam.php @@ -229,6 +229,7 @@ public function checkError($br = true) case 'SELECT_CHECK': case 'FILE_NAME_CHECK_BY_NOUPLOAD': case 'NUM_POINT_CHECK': + case 'PREF_CHECK': $this->recursionCheck($this->disp_name[$index], $func, $value, $arrErr[$key], $this->length[$index]); if (SC_Utils_Ex::isBlank($arrErr[$key])) { diff --git a/data/class/helper/SC_Helper_Customer.php b/data/class/helper/SC_Helper_Customer.php index 8eee97d78b..f5cabadd76 100644 --- a/data/class/helper/SC_Helper_Customer.php +++ b/data/class/helper/SC_Helper_Customer.php @@ -394,7 +394,7 @@ public function sfCustomerCommonParam(&$objFormParam, $prefix = '') $objFormParam->addParam('郵便番号1', $prefix . 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK')); $objFormParam->addParam('郵便番号2', $prefix . 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK')); $objFormParam->addParam('国', $prefix . 'country_id', INT_LEN, 'n', array('NUM_CHECK')); - $objFormParam->addParam('都道府県', $prefix . 'pref', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK')); + $objFormParam->addParam('都道府県', $prefix . 'pref', INT_LEN, 'n', array('PREF_CHECK', 'EXIST_CHECK', 'NUM_CHECK')); } else { $objFormParam->addParam('お名前(フリガナ・姓)', $prefix . 'kana01', STEXT_LEN, 'CKV', array('NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'KANA_CHECK')); $objFormParam->addParam('お名前(フリガナ・名)', $prefix . 'kana02', STEXT_LEN, 'CKV', array('NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'KANA_CHECK')); From 49d3bcf6ecbb126f6c60a2ff76b2510945dad446 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Fri, 12 Feb 2016 10:42:25 +0900 Subject: [PATCH 03/14] =?UTF-8?q?SC=5FCartSession::getAllProductsPoint()?= =?UTF-8?q?=20=E3=81=A7=20Warning=20=E7=99=BA=E7=94=9F=20#85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/class/SC_CartSession.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/class/SC_CartSession.php b/data/class/SC_CartSession.php index 7e89c3e962..100e6d01ac 100644 --- a/data/class/SC_CartSession.php +++ b/data/class/SC_CartSession.php @@ -233,9 +233,6 @@ public function getAllProductsPoint($productTypeId) } $point_rate = $this->cartSession[$productTypeId][$i]['point_rate']; - if (!isset($this->cartSession[$productTypeId][$i]['id'][0])) { - $this->cartSession[$productTypeId][$i]['id'][0] = ''; - } $point = SC_Utils_Ex::sfPrePoint($price, $point_rate); $total+= ($point * $quantity); } From bb8abe5058bc138cb79a160963bafb3d5dd85b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= Date: Mon, 29 Feb 2016 18:53:30 +0900 Subject: [PATCH 04/14] =?UTF-8?q?Flexible=20SSL=E3=81=B8=E3=81=AE=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/app_initial.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/app_initial.php b/data/app_initial.php index 51398aff3b..1a9b55daca 100644 --- a/data/app_initial.php +++ b/data/app_initial.php @@ -21,6 +21,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +// Flexible SSLへの対応 +if( isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && 'https' == $_SERVER['HTTP_X_FORWARDED_PROTO'] ){ + $_SERVER['HTTPS'] = 1; + $_SERVER['SERVER_PORT'] = 443; +} + if (!defined('CLASS_REALDIR')) { /** クラスパス */ define('CLASS_REALDIR', DATA_REALDIR . "class/"); From f5e2a658f81e5bea23dc80570e638f50818ee015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= Date: Mon, 16 May 2016 13:23:41 +0900 Subject: [PATCH 05/14] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A9?= =?UTF-8?q?=E3=83=A0=E3=82=88=E3=82=8A=20see=20http://xoops.ec-cube.net/mo?= =?UTF-8?q?dules/newbb/viewtopic.php=3Ftopic=5Fid=3D17426&forum=3D9&post?= =?UTF-8?q?=5Fid=3D75948#forumpost75948?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/class/pages/admin/order/LC_Page_Admin_Order.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/class/pages/admin/order/LC_Page_Admin_Order.php b/data/class/pages/admin/order/LC_Page_Admin_Order.php index a873ce0710..a18ff23505 100644 --- a/data/class/pages/admin/order/LC_Page_Admin_Order.php +++ b/data/class/pages/admin/order/LC_Page_Admin_Order.php @@ -93,6 +93,8 @@ public function action() $objFormParam = new SC_FormParam_Ex(); $this->lfInitParam($objFormParam); $objFormParam->setParam($_POST); + $objFormParam->convParam(); + $objFormParam->trimParam(); $this->arrHidden = $objFormParam->getSearchArray(); $this->arrForm = $objFormParam->getFormParamList(); From 240be35e8020100c8343f3ed57d1543d001b0319 Mon Sep 17 00:00:00 2001 From: kurozumi Date: Thu, 1 Dec 2016 17:28:22 +0900 Subject: [PATCH 06/14] Update SC_CartSession.php --- data/class/SC_CartSession.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/class/SC_CartSession.php b/data/class/SC_CartSession.php index 7e89c3e962..2dd4202baa 100644 --- a/data/class/SC_CartSession.php +++ b/data/class/SC_CartSession.php @@ -300,7 +300,7 @@ public function getPrevURL() public function delProductKey($keyname, $val, $productTypeId) { $max = $this->getMax($productTypeId); - for ($i = 0; $i < $max; $i++) { + for ($i = 0; $i <= $max; $i++) { if ($this->cartSession[$productTypeId][$i][$keyname] == $val) { unset($this->cartSession[$productTypeId][$i]); } From 27f3037149c48d8c8abcce7a019df52a312ef038 Mon Sep 17 00:00:00 2001 From: Ryo Endo Date: Thu, 26 Oct 2017 08:13:06 +0900 Subject: [PATCH 07/14] =?UTF-8?q?Travis-ci=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0f4c79b778..16565bb8e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: php sudo: required php: - - 5.3.3 +# - 5.3.3 - 5.3 - 5.4 - 5.5 @@ -12,6 +12,8 @@ php: matrix: fast_finish: true +dist: precise + env: - DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root - DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres From 1bbc5c1359e91f1098d2a8cdcc8fc38594e62d20 Mon Sep 17 00:00:00 2001 From: Ryo Endo Date: Thu, 26 Oct 2017 09:04:03 +0900 Subject: [PATCH 08/14] =?UTF-8?q?AppVeyor=E8=A8=AD=E5=AE=9A=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8ed6d2aeab..1ceb3b024a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,7 +41,7 @@ install: #- set PATH=%PATH%;C:\MinGW\msys\1.0\bin;C:\MinGW\bin #- mingw-get install mingw-developer-toolkit ## Set PHP. - - cinst php -version 5.6.17 + - cinst php -version 5.6.17 --allow-empty-checksums - SET PATH=C:\tools\php\;%PATH% - copy C:\tools\php\php.ini-production C:\tools\php\php.ini - echo date.timezone="Asia/Tokyo" >> C:\tools\php\php.ini From 32385f9c208794276715163e088958d4d13592d5 Mon Sep 17 00:00:00 2001 From: Ryo Endo Date: Thu, 26 Oct 2017 09:28:22 +0900 Subject: [PATCH 09/14] =?UTF-8?q?Readme=E3=81=ABAppVeyor=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=83=E3=82=B8=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2077f73050..e14d0afebd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # EC-CUBE 2.13系 [![Build Status](https://travis-ci.org/EC-CUBE/eccube-2_13.svg)](https://travis-ci.org/EC-CUBE/eccube-2_13) +[![Build status](https://ci.appveyor.com/api/projects/status/4k58ucq2smwc4h7n/branch/master?svg=true)](https://ci.appveyor.com/project/ECCUBE/eccube-2-13/branch/master) [![Coverage Status](https://coveralls.io/repos/EC-CUBE/eccube-2_13/badge.png)](https://coveralls.io/r/EC-CUBE/eccube-2_13) * * * * * * * * * * * * * * * * * * * * From 7805983189a5998ab48aad875c3a1b445f03f74a Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 1 Jan 2018 03:35:59 +0900 Subject: [PATCH 10/14] Use Trusty on travis-ci --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10ce71bdd6..91e3ce43a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ # for travis-ci # see also. https://travis-ci.org language: php -sudo: required +sudo: false php: - 5.4 - 5.5 @@ -12,8 +12,6 @@ php: matrix: fast_finish: true -dist: precise - env: global: - DBNAME=myapp_test HTTP_URL=http://localhost:8085/ HTTPS_URL=https://localhost:8085/ From 18bb8b710b569405e67f0956885c735ddc2b8fbd Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 1 Jan 2018 03:39:58 +0900 Subject: [PATCH 11/14] Display error.log using tail --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 91e3ce43a9..0ab425d7e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ script: after_script: - php data/vendor/bin/coveralls -v - - cat ./data/logs/error.log + - tail -n 100 ./data/logs/error.log # Cache folder, you can delete cache from Travis CI web interface cache: From 579fc97d0ceb0ff29023a1a81acddfe77724ef9d Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 1 Jan 2018 03:45:59 +0900 Subject: [PATCH 12/14] Add PHP7.2 --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0ab425d7e4..a91b76a2c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,19 @@ # for travis-ci # see also. https://travis-ci.org language: php -sudo: false +sudo: required php: - 5.4 - 5.5 - 5.6 - 7.0 - 7.1 + - 7.2 matrix: fast_finish: true - + allow_failures: + - php: 7.2 env: global: - DBNAME=myapp_test HTTP_URL=http://localhost:8085/ HTTPS_URL=https://localhost:8085/ From f59782b652a96ae4b8d022a4f58675d95d2fa3d2 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 1 Jan 2018 14:12:32 +0900 Subject: [PATCH 13/14] Fix composer install --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a91b76a2c8..df824dbe18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ env: before_script: - composer self-update || true + - composer install --dev --no-interaction - sh -c "if [ '$DB' = 'mysql' ]; then sh ./eccube_install.sh mysql; fi" - sh -c "if [ '$DB' = 'pgsql' ]; then sh ./eccube_install.sh appveyor; fi" - cp tests/require.php.jenkins tests/require.php From bfc2e601a5c8d693f7414d6d76d82fdae2839a32 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 1 Jan 2018 14:33:55 +0900 Subject: [PATCH 14/14] Use sudo: false --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index df824dbe18..5f52afce70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ # for travis-ci # see also. https://travis-ci.org language: php -sudo: required +sudo: false php: - 5.4 - 5.5