nanasess · August 3, 2019 02:54
diff --git a/eccube-2.13.5-2.17.patch b/eccube-2.13.5-2.17.patch
 diff -urb 2_13/.coveralls.yml 2_17/.coveralls.yml
 --- 2_13/.coveralls.yml	2019-08-03 11:41:43.000000000 +0900
 +++ 2_17/.coveralls.yml	2019-08-03 09:51:39.000000000 +0900
 @@ -1,5 +1,4 @@
 # for php-coveralls
 # see also. https://coveralls.io
 -src_dir: data
 coverage_clover: reports/coverage/coverage.xml
 json_path: reports/coverage/coveralls-upload.json
 diff -urb 2_13/.gitignore 2_17/.gitignore
 --- 2_13/.gitignore	2019-08-03 11:41:43.000000000 +0900
 +++ 2_17/.gitignore	2019-08-03 09:51:39.000000000 +0900
 @@ -1,7 +1,6 @@
 -!dummy
 !.gitmodule
 composer.phar
 -/vendor/
 +/data/vendor/
 *.cache
 *.log
 /data/config/config.php
 @@ -21,3 +20,5 @@
 /reports/*
 .idea
 vagrant
 +.vagrant/
 +Vagrantfile
 diff -urb 2_13/.travis.yml 2_17/.travis.yml
 --- 2_13/.travis.yml	2019-08-03 11:41:43.000000000 +0900
 +++ 2_17/.travis.yml	2019-08-03 09:51:39.000000000 +0900
 @@ -1,36 +1,106 @@
 # for travis-ci
 # see also. https://travis-ci.org
 +dist: xenial
 language: php
 -sudo: required
 +services:
 +  - docker
 +  - mysql
 +  - postgresql
 +  - xvfb
 php:
 -  - 5.3.3
 -  - 5.3
   - 5.4
   - 5.5
   - 5.6
 +  - 7.0
 +  - 7.1
 +  - 7.2
 +  - 7.3
 +  - 7.4snapshot
 
 -matrix:
 -  fast_finish: true
 +addons:
 +  apt:
 +    sources:
 +      - google-chrome
 +    packages:
 +      - google-chrome-stable
 
 env:
 -  - DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root
 -  - DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres
 +    global:
 +        - DBNAME=myapp_test HTTP_URL=http://localhost:8085/ HTTPS_URL=http://localhost:8085/
 +    matrix:
 +        - DB=mysql USER=root DBPASS=' ' DBUSER=root
 +        - DB=pgsql USER=postgres DBPASS=password DBUSER=postgres
 +        - DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true # Use for coverage report
 +
 +matrix:
 +  fast_finish: true
 +  include:
 +    - php: 5.4
 +      dist: trusty
 +      env: DB=mysql USER=root DBPASS=' ' DBUSER=root DIST=trusty
 +    - php: 5.4
 +      dist: trusty
 +      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres DIST=trusty
 +    - php: 5.5
 +      dist: trusty
 +      env: DB=mysql USER=root DBPASS=' ' DBUSER=root DIST=trusty
 +    - php: 5.5
 +      dist: trusty
 +      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres DIST=trusty
 +  exclude:
 +    - php: 5.4
 +    - php: 5.5
 +    - php: 5.6
 +      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
 +    - php: 7.0
 +      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
 +    - php: 7.1
 +      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
 +    - php: 7.2
 +      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
 +    - php: 7.4snapshot
 +      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
 +  allow_failures:
 +    - php: 7.4snapshot
 +    # Use for coverage report
 +    - php: 7.3
 +      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
 
 before_script:
 +  - if [[ $DB = 'mysql' ]]; then mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION';" ; fi
 +
 +    ## see https://github.com/symfony/symfony/blob/e0bdc0c35e9afdb3bee8af172f90e9648c4012fc/.travis.yml#L92-L97
 +  - phpenv config-rm xdebug.ini || true
 +  - echo "opcache.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 +  - echo "apc.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - composer self-update || true
 -  - if [[ $TRAVIS_PHP_VERSION == '5.3.3' ]]; then composer install --dev --no-interaction --prefer-source ; fi
 -  - if [[ $TRAVIS_PHP_VERSION != '5.3.3' ]]; then composer install --dev --no-interaction ; fi
 +  - composer install --dev --no-interaction -o --apcu-autoloader
   - sh -c "if [ '$DB' = 'mysql' ]; then sh ./eccube_install.sh mysql; fi"
 -  - sh -c "if [ '$DB' = 'pgsql' ]; then sh ./eccube_install.sh pgsql; fi"
 -  - cp tests/require.php.jenkins tests/require.php
 +  - sh -c "if [ '$DB' = 'pgsql' ]; then sh ./eccube_install.sh appveyor; fi"
   - cat ./data/config/config.php
 -  - npm install -g grunt-cli 
 -  - npm install 
 +  - if [[ $DIST = 'trusty' ]]; then export DISPLAY=:99.0 ; fi
 +  - if [[ $DIST = 'trusty' ]]; then sh -e /etc/init.d/xvfb start ; fi
 +  - php -S localhost:8085 -t html/ &
 +  - wget -c -nc --retry-connrefused --tries=0 http://chromedriver.storage.googleapis.com/2.43/chromedriver_linux64.zip
 +  - unzip -o -q chromedriver_linux64.zip
 +  - docker pull schickling/mailcatcher
 +  - docker run -d -p 1080:1080 -p 1025:1025 --name mailcatcher schickling/mailcatcher
 +  - ./chromedriver --url-base=/wd/hub &
 +  - php data/vendor/bin/codecept build
 
 script:
   - mkdir -p reports/coverage
 -  - phpunit -c phpunit.xml.dist
 -  - grunt
 +  - if [ ! $COVERAGE ] ; then php data/vendor/bin/phpunit -c phpunit.xml.dist --exclude-group classloader ; fi
 +  - if [ ! $COVERAGE ] ; then php data/vendor/bin/phpunit -c phpunit.xml.dist --group classloader ; fi
 +  - if [ $COVERAGE ] ; then phpdbg -qrr data/vendor/bin/phpunit -c phpunit.xml.dist --exclude-group classloader ; fi
 +  - if [ ! $COVERAGE ] ; then php data/vendor/bin/codecept run --env chrome --steps ; fi
 
 after_script:
 -  - php vendor/bin/coveralls -v
 +  - if [ $COVERAGE ] ; then php data/vendor/bin/coveralls -v ; fi
 +  - php security-checker security:check
 +  - tail -n 100 ./data/logs/error.log
 +
 +# Cache folder, you can delete cache from Travis CI web interface
 +cache:
 +    directories:
 +        - $HOME/.composer/cache
 Only in 2_13: Gruntfile.js
 diff -urb 2_13/LICENSE.txt 2_17/LICENSE.txt
 --- 2_13/LICENSE.txt	2019-08-03 11:41:43.000000000 +0900
 +++ 2_17/LICENSE.txt	2019-08-03 09:51:39.000000000 +0900
 @@ -25,11 +25,11 @@
 
 ・「EC-CUBE」はデュアルライセンス方式を採用しています。
 あなたにコミットいただいた内容は、GPLライセンスのみならず、
 -株式会社ロックオンが独自に設定するクローズドソースライセンスの下で
 +株式会社イーシーキューブが独自に設定するクローズドソースライセンスの下で
 頒布されることがあります。
 これを可能とするため、あなたがコミットした内容が著作権法上の著作物である場合には、
 -コミットと同時に、あなたの著作権財産権を株式会社ロックオンに移転し、
 +コミットと同時に、あなたの著作権財産権を株式会社イーシーキューブに移転し、
 著作者人格権を行使しないことにご同意いただくこととなります。
 -株式会社ロックオンは、コミット部分の著作権移転後も、GPLライセンスによりあなたに認められることとなるすべての権利を保障します。
 +株式会社イーシーキューブは、コミット部分の著作権移転後も、GPLライセンスによりあなたに認められることとなるすべての権利を保障します。
 
 コミットを行うことにより、上記の「EC-CUBE」のコピーライトポリシーを理解、了承したこととします。
 Only in 2_17: Procfile
 diff -urb 2_13/README.md 2_17/README.md
 --- 2_13/README.md	2019-08-03 11:41:43.000000000 +0900
 +++ 2_17/README.md	2019-08-03 09:51:39.000000000 +0900
 @@ -1,24 +1,48 @@
 -# EC-CUBE 2.13系
 +# EC-CUBE 2.13系 / 2.17系(開発中)
 [![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)
 +[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
 
 -* * * * * * * * * * * * * * * * * * * *
 +---
 
 -===========
 +## EC-CUBE Trac について
 
 -### 開発協力
 +EC-CUBE 2.13系については、2014年10月以前に利用されていた、[EC-CUBE Trac](http://svn.ec-cube.net/open_trac/) と[SVN](http://svn.ec-cube.net/open/)がございますので、合わせてご参照ください。
 +新規のご投稿やコミットはいただけませんが、GitHubに移されていない不具合の情報や過去の経緯などをご確認いただけます。  
 +
 +EC-CUBE Trac にある議論の再開や不具合の修正についても、GitHubにIssueを再作成していただいたり、Pull requestをいただけますと幸いです。
 +
 +## 開発協力
 
 コードの提供・追加、修正・変更その他「EC-CUBE」への開発の御協力（以下「コミット」といいます）を行っていただく場合には、
 -[EC-CUBEのコピーライトポリシー](https://github.com/EC-CUBE/ec-cube/blob/50de4ac511ab5a5577c046b61754d98be96aa328/LICENSE.txt)をご理解いただき、ご了承いただく必要がございます。
 -pull requestを送信する際は、EC-CUBEのコピーライトポリシーに同意したものとみなします。
 +[EC-CUBEのコピーライトポリシー](https://github.com/EC-CUBE/ec-cube/wiki/EC-CUBE%E3%81%AE%E3%82%B3%E3%83%94%E3%83%BC%E3%83%A9%E3%82%A4%E3%83%88%E3%83%9D%E3%83%AA%E3%82%B7%E3%83%BC)をご理解いただき、ご了承いただく必要がございます。
 +Pull requestを送信する際は、EC-CUBEのコピーライトポリシーに同意したものとみなします。
 +
 +## 開発方針
 +
 +本リポジトリでは、以下方針で開発を行っています。
 +
 +### 2.13系
 +
 +* 保守と不具合修正を行います。
 +* 修正時は `master` に対してPull requestを作成してください。
 +
 +### 2.17系(開発中)
 +
 +* EC-CUBE 2.13系に対して、PHP7対応を行うバージョンです。
 +* ブランチ `improve/php7` で開発を行っています。  
 +修正時は `improve/php7` に対してPull requestを作成してください。
 +* 2.17系に関連するIssueについては、[マイルストーン 2.17.0](https://github.com/EC-CUBE/eccube-2_13/milestone/5)を参照してください。
 +
 +##### 2.17系 システム要件の変更
 
 -### 開発方針
 +動作にはPHP5.4以降が必要になります。
 
 -本リポジトリでは、以下の対応を開発方針として定めます。
 +##### 2.17系 インストールについて
 
 -* EC-CUBE2.13系の保守
 -* 不具合修正
 +Composerを導入に伴い、clone後に`composer install`の実行が必要です。
 
 -上記に含まれない新規機能開発や構造の変化を伴う修正等については、
 -[EC-CUBE/ec-cube](https://github.com/EC-CUBE/ec-cube)にて開発を行っております。
 +---
 
 +上記に含まれない新規機能開発や構造の変化を伴う修正等については、[EC-CUBE/ec-cube](https://github.com/EC-CUBE/ec-cube)にて開発を行っております。
 Only in 2_17: app.json
 diff -urb 2_13/appveyor.yml 2_17/appveyor.yml
 --- 2_13/appveyor.yml	2019-08-03 11:41:43.000000000 +0900
 +++ 2_17/appveyor.yml	2019-08-03 09:51:39.000000000 +0900
 @@ -2,7 +2,15 @@
 # http://www.appveyor.com/docs/appveyor-yml
 
 # Set build version format here instead of in the admin panel.
 -version: 2.13-dev-{build}
 +version: 2.17-dev-{build}
 +
 +image: Visual Studio 2017
 +
 +clone_folder: C:\projects\eccube2
 +
 +cache:
 +  - '%LOCALAPPDATA%\Composer\files'
 +  - data\vendor
 
 # Fix line endings in Windows. (runs before repo cloning)
 init:
 @@ -14,6 +22,7 @@
     DBNAME: "myapp_test"
     DBPASS: "Password12!"
     DBUSER: "root"
 +    DBSERVER: "localhost"
     BASE_DIR: "C:/projects/ec-cube"
 
   matrix:
 @@ -26,32 +35,46 @@
 
 # Install scripts. (runs after repo cloning)
 install:
 +  - docker pull nanasess/mailcatcher:windowsservercore
 +  - docker run -d -p 1080:1080 -p 1025:1025 --name mailcatcher nanasess/mailcatcher:windowsservercore
 +  - cinst -y OpenSSL.Light --version 1.1.1
 +  - SET PATH=C:\Program Files\OpenSSL;%PATH%
 +  - sc config wuauserv start= auto
 +  - net start wuauserv
 +  # Set postgresql.
 +  #- SET PGUSER=postgres
 +  #- SET PGPASSWORD=Password12!
 +  #- PATH=C:\Program Files\PostgreSQL\9.3\bin\;%PATH%
   # Set MySQL.
   - cp tests/my.cnf c:\
 -  - SET PATH=C:\Program Files\MySql\MySQL Server 5.6\bin\;%PATH%
 +  - SET PATH=C:\Program Files\MySql\MySQL Server 5.7\bin\;%PATH%
   # Set bash.
   #- cinst mingw-get
   #- set PATH=%PATH%;C:\MinGW\msys\1.0\bin;C:\MinGW\bin
   #- mingw-get install mingw-developer-toolkit
   ## Set PHP.
 -  - cinst php
 -  - 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
 -  - echo extension_dir=ext >> C:\tools\php\php.ini
 -  - echo extension=php_openssl.dll >> C:\tools\php\php.ini
 -  - echo extension=php_gd2.dll >> C:\tools\php\php.ini
 -  - echo extension=php_mbstring.dll >> C:\tools\php\php.ini
 -  - echo extension=php_mysql.dll >> C:\tools\php\php.ini
 -  - echo extension=php_pgsql.dll >> C:\tools\php\php.ini
 -  - echo extension=php_curl.dll >> C:\tools\php\php.ini
 -  - echo output_buffering = Off >> C:\tools\php\php.ini
 -  - echo default_charset = UTF-8 >> C:\tools\php\php.ini
 -  - echo mbstring.language = Japanese >> C:\tools\php\php.ini
 -  - echo mbstring.encoding_translation = On >> C:\tools\php\php.ini
 -  - echo mbstring.http_input = UTF-8 >> C:\tools\php\php.ini
 -  - echo mbstring.http_output = pass >> C:\tools\php\php.ini
 -  - echo mbstring.internal_encoding = UTF-8 >> C:\tools\php\php.ini
 +  - cinst php --allow-empty-checksums --version 7.3
 +  - SET PATH=C:\tools\php73\;%PATH%
 +  - cd c:\tools\php73
 +  - copy php.ini-production php.ini
 +  - echo date.timezone="Asia/Tokyo" >> php.ini
 +  - echo extension_dir=ext >> php.ini
 +  - echo extension=php_openssl.dll >> php.ini
 +  - echo extension=php_gd2.dll >> php.ini
 +  - echo extension=php_mbstring.dll >> php.ini
 +  - echo extension=php_pgsql.dll >> php.ini
 +  - echo extension=php_mysqli.dll >> php.ini
 +  - echo extension=php_pdo_mysql.dll >> php.ini
 +  - echo extension=php_pdo_pgsql.dll >> php.ini
 +  - echo extension=php_curl.dll >> php.ini
 +  - echo output_buffering = Off >> php.ini
 +  - echo default_charset = UTF-8 >> php.ini
 +  - echo mbstring.language = Japanese >> php.ini
 +  - echo mbstring.encoding_translation = On >> php.ini
 +  - echo mbstring.http_input = UTF-8 >> php.ini
 +  - echo mbstring.http_output = pass >> php.ini
 +  - echo mbstring.internal_encoding = UTF-8 >> php.ini
 +  - cd C:\projects\eccube2
   - php -r "readfile('https://getcomposer.org/installer');" | php
   - php composer.phar install
 
 @@ -60,7 +83,6 @@
 
 before_test:
   - bash eccube_install.sh mysql
 -  - cp tests/require.php.jenkins tests/require.php
     
 test_script:
 -  - vendor\bin\phpunit.bat
 +  - data/vendor/bin/phpunit --exclude-group classloader
 Only in 2_17: codeception.yml
 diff -urb 2_13/composer.json 2_17/composer.json
 --- 2_13/composer.json	2019-08-03 11:41:43.000000000 +0900
 +++ 2_17/composer.json	2019-08-03 09:51:39.000000000 +0900
 @@ -1,6 +1,52 @@
 {
 +    "name": "ec-cube/eccube-2_13",
 +    "description": "EC-CUBE 2.13-stable",
 +    "type": "project",
 +    "homepage": "http://www.ec-cube.net/",
 +    "license": [
 +       "GPL-2.0",
 +       "Commercial"
 +    ],
 +    "support": {
 +        "issues": "https://github.com/EC-CUBE/eccube-2_13/issues"
 +    },
 +    "config": {
 +        "vendor-dir": "data/vendor",
 +        "platform": {
 +            "php": "5.4"
 +        },
 +        "optimize-autoloader": true,
 +        "sort-packages": true
 +    },
     "require-dev": {
 -        "satooshi/php-coveralls": "dev-master",
 -        "phpunit/phpunit": "3.7.*"
 +        "captbaritone/mailcatcher-codeception-module": "1.2.1",
 +        "codeception/codeception": "*",
 +        "fzaninotto/faker": "^1.8",
 +        "satooshi/php-coveralls": "1.0"
 +    },
 +    "require": {
 +        "php": ">=5.3.9",
 +        "ext-gd": "*",
 +        "ext-mbstring": "*",
 +        "bondas83/mdb2_driver_mysqli": "^1.5",
 +        "mobiledetect/mobiledetectlib": "^2.8",
 +        "nanasess/mdb2_driver_pgsql": "^1.5",
 +        "pear/archive_tar": "^1.4.3",
 +        "pear/mail": "*",
 +        "pear/pear-core-minimal": "^1.10",
 +        "pear/text_password": "*",
 +        "pear/xml_parser": "*",
 +        "pear/xml_serializer": "*",
 +        "pear/xml_util": "*",
 +        "setasign/fpdf": "1.7",
 +        "setasign/fpdi-fpdf": "1.6",
 +        "silverorange/mdb2": "2.5.2-b.5",
 +        "smarty/smarty": "*"
 +    },
 +    "autoload": {
 +        "classmap": [
 +            "data/class",
 +            "data/class_extends"
 +        ]
     }
 }
 Only in 2_17: composer.lock
 Only in 2_17/data/Smarty/config: .gitkeep
 Only in 2_13/data/Smarty/config: dummy
 diff -urb 2_13/data/Smarty/templates/admin/basis/tax.tpl 2_17/data/Smarty/templates/admin/basis/tax.tpl
 --- 2_13/data/Smarty/templates/admin/basis/tax.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/basis/tax.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -64,23 +64,23 @@
 
                 <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
                 <option value="" selected="selected">------</option>
 -                <!--{html_options options=$arrYear selected=$arrForm[$key1].value|h}-->
 +                <!--{html_options options=$arrYear selected=$arrForm[$key1].value}-->
                 </select>年
                 <select name="<!--{$key2}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->">
                 <option value="" selected="selected">----</option>
 -                <!--{html_options options=$objDate->getMonth() selected=$arrForm[$key2].value|h}-->
 +                <!--{html_options options=$objDate->getMonth() selected=$arrForm[$key2].value}-->
                 </select>月
                 <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->">
                 <option value="" selected="selected">----</option>
 -                <!--{html_options options=$objDate->getDay() selected=$arrForm[$key3].value|h}-->
 +                <!--{html_options options=$objDate->getDay() selected=$arrForm[$key3].value}-->
                 </select>日
                 <select name="<!--{$key4}-->" style="<!--{$arrErr[$key4]|sfGetErrorColor}-->">
                 <option value="" selected="selected">----</option>
 -                <!--{html_options options=$objDate->getHour() selected=$arrForm[$key4].value|h}-->
 +                <!--{html_options options=$objDate->getHour() selected=$arrForm[$key4].value}-->
                 </select>時
                 <select name="<!--{$key5}-->" style="<!--{$arrErr[$key5]|sfGetErrorColor}-->">
                 <option value="" selected="selected">----</option>
 -                <!--{html_options options=$arrMinutes selected=$arrForm[$key5].value|h}-->
 +                <!--{html_options options=$arrMinutes selected=$arrForm[$key5].value}-->
                 </select>分
             </td>
         </tr>
 diff -urb 2_13/data/Smarty/templates/admin/contents/index.tpl 2_17/data/Smarty/templates/admin/contents/index.tpl
 --- 2_13/data/Smarty/templates/admin/contents/index.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/contents/index.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -136,6 +136,8 @@
                 <td><a href="#" onclick="eccube.fnFormModeSubmit('move','delete','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">削除</a></td>
                 <td>
                     <!--{if count($arrNews) != 1}-->
 +                    <!--{assign var=news_id value="`$arrNews[data].news_id`"}-->
 +                    <!--{if $arrErr[$news_id] != ""}--><span class="attention"><!--{$arrErr[$news_id]}--></span><!--{/if}-->
                     <input type="text" name="pos-<!--{$arrNews[data].news_id|h}-->" size="3" class="box3" />番目へ<a href="?" onclick="eccube.fnFormModeSubmit('move', 'moveRankSet','news_id', '<!--{$arrNews[data].news_id|h}-->'); return false;">移動</a><br />
                     <!--{/if}-->
                     <!--{if $smarty.section.data.iteration != 1}-->
 diff -urb 2_13/data/Smarty/templates/admin/contents/recommend_search.tpl 2_17/data/Smarty/templates/admin/contents/recommend_search.tpl
 --- 2_13/data/Smarty/templates/admin/contents/recommend_search.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/contents/recommend_search.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -104,8 +104,8 @@
                 <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arr.main_list_image|sfNoImageMainList|h}-->" style="max-width: 65px;max-height: 65;" alt="" />
             </td>
             <td>
 -                <!--{assign var=codemin value=`$arr.product_code_min`}-->
 -                <!--{assign var=codemax value=`$arr.product_code_max`}-->
 +                <!--{assign var=codemin value="`$arr.product_code_min`"}-->
 +                <!--{assign var=codemax value="`$arr.product_code_max`"}-->
                 <!--{* 商品コード *}-->
                 <!--{if $codemin != $codemax}-->
                     <!--{$codemin|h}-->～<!--{$codemax|h}-->
 diff -urb 2_13/data/Smarty/templates/admin/customer/edit.tpl 2_17/data/Smarty/templates/admin/customer/edit.tpl
 --- 2_13/data/Smarty/templates/admin/customer/edit.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/customer/edit.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -208,7 +208,7 @@
                     </select>月
                     <select name="day" <!--{if $arrErr.year != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
                         <option value="" selected="selected">----</option>
 -                        <!--{html_options options=$arrDay selected=$arrForm.day"}-->
 +                        <!--{html_options options=$arrDay selected=$arrForm.day}-->
                     </select>日
                 </td>
             </tr>
 diff -urb 2_13/data/Smarty/templates/admin/design/bloc.tpl 2_17/data/Smarty/templates/admin/design/bloc.tpl
 --- 2_13/data/Smarty/templates/admin/design/bloc.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/design/bloc.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -58,7 +58,7 @@
             <tr>
                 <td colspan="2">
                     <!--{assign var=key value="bloc_html"}-->
 -                    <textarea class="top" id="<!--{$key}-->" name="<!--{$key}-->" rows="<!--{$text_row}-->" style="width: 99%;"><!--{"\n"}--><!--{$arrForm[$key].value|smarty:nodefaults|h}--></textarea>
 +                    <textarea class="top" id="<!--{$key}-->" name="<!--{$key}-->" rows="<!--{$text_row}-->" style="width: 99%;"><!--{"\n"}--><!--{$arrForm[$key].value|h nofilter}--></textarea>
                     <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
                     <div>
                         <a id="resize-btn" class="btn-normal" href="javascript:;" onclick="eccube.toggleRows('#resize-btn', '#bloc_html', 50, 13); return false;">拡大</a>
 diff -urb 2_13/data/Smarty/templates/admin/design/header.tpl 2_17/data/Smarty/templates/admin/design/header.tpl
 --- 2_13/data/Smarty/templates/admin/design/header.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/design/header.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -39,7 +39,7 @@
         <input type="hidden" name="header_row" value="<!--{$header_row}-->" />
         <input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
 
 -        <textarea id="header-area" class="top" name="header" rows="<!--{$header_row}-->" style="width: 100%;"><!--{"\n"}--><!--{$header_data|h|smarty:nodefaults}--></textarea>
 +        <textarea id="header-area" class="top" name="header" rows="<!--{$header_row}-->" style="width: 100%;"><!--{"\n"}--><!--{$header_data|h}--></textarea>
         <div class="btn">
             <a id="header-area-resize-btn" class="btn-normal" href="javascript:;" onclick="eccube.toggleRows('#header-area-resize-btn', '#header-area', 50, 13); $('input[name=header_row]').val($('#header-area').attr('rows'));return false;"><span>拡大</span></a>
         </div>
 @@ -62,7 +62,7 @@
         <input type="hidden" name="footer_row" value="<!--{$footer_row}-->" />
         <input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
 
 -        <textarea id="footer-area" class="top" name="footer" rows="<!--{$footer_row}-->" style="width: 100%;"><!--{"\n"}--><!--{$footer_data|h|smarty:nodefaults}--></textarea>
 +        <textarea id="footer-area" class="top" name="footer" rows="<!--{$footer_row}-->" style="width: 100%;"><!--{"\n"}--><!--{$footer_data|h}--></textarea>
         <div class="btn">
             <a id="footer-area-resize-btn" class="btn-normal" href="javascript:;" onclick="eccube.toggleRows('#footer-area-resize-btn', '#footer-area', 50, 13); $('input[name=footer_row]').val($('#footer-area').attr('rows'));return false;"><span>拡大</span></a>
         </div>
 diff -urb 2_13/data/Smarty/templates/admin/design/main_edit.tpl 2_17/data/Smarty/templates/admin/design/main_edit.tpl
 --- 2_13/data/Smarty/templates/admin/design/main_edit.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/design/main_edit.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -81,7 +81,7 @@
                 <label for="header-chk"><input type="checkbox" name="header_chk" id="header-chk" value="1" <!--{if $arrForm.header_chk.value == "1"}-->checked="checked"<!--{/if}--> />共通のヘッダーを使用する</label>&nbsp;
                 <label for="footer-chk"><input type="checkbox" name="footer_chk" id="footer-chk" value="1" <!--{if $arrForm.footer_chk.value == "1"}-->checked="checked"<!--{/if}--> />共通のフッターを使用する</label>
                 <div>
 -                    <textarea id="tpl_data" class="top" name="tpl_data" rows="<!--{$text_row}-->" style="width: 98%;"><!--{"\n"}--><!--{$arrForm.tpl_data.value|h|smarty:nodefaults}--></textarea>
 +                    <textarea id="tpl_data" class="top" name="tpl_data" rows="<!--{$text_row}-->" style="width: 98%;"><!--{"\n"}--><!--{$arrForm.tpl_data.value|h}--></textarea>
                     <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" /><br />
                     <a id="resize-btn" class="btn-normal" href="javascript:;" onclick="eccube.toggleRows('#resize-btn', '#tpl_data', 50, 13); return false;"><span>拡大</span></a>
                 </div>
 diff -urb 2_13/data/Smarty/templates/admin/login.tpl 2_17/data/Smarty/templates/admin/login.tpl
 --- 2_13/data/Smarty/templates/admin/login.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/login.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -41,7 +41,7 @@
     </div>
 
 </div>
 -<div id="copyright">Copyright &copy; 2000-<!--{$smarty.now|date_format:"%Y"}--> LOCKON CO.,LTD. All Rights Reserved.</div>
 +<div id="copyright">Copyright &copy; 2000-<!--{$smarty.now|date_format:"%Y"}--> EC-CUBE CO.,LTD. All Rights Reserved.</div>
 
 <script type="text/javascript">//<![CDATA[
 document.form1.login_id.focus();
 diff -urb 2_13/data/Smarty/templates/admin/main_frame.tpl 2_17/data/Smarty/templates/admin/main_frame.tpl
 --- 2_13/data/Smarty/templates/admin/main_frame.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/main_frame.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -61,15 +61,6 @@
         <!--{$tpl_onload}-->
     });
 //]]></script>
 -<!--{* ▼Head COLUMN*}-->
 -<!--{if $arrPageLayout.HeadNavi|@count > 0}-->
 -    <!--{foreach key=HeadNaviKey item=HeadNaviItem from=$arrPageLayout.HeadNavi}-->
 -        <!--{if $HeadNaviItem.php_path != ""}-->
 -            <!--{include_php file=$HeadNaviItem.php_path}-->
 -        <!--{/if}-->
 -    <!--{/foreach}-->
 -<!--{/if}-->
 -<!--{* ▲Head COLUMN*}-->
 </head>
 
 <body class="<!--{if strlen($tpl_authority) >= 1}-->authority_<!--{$tpl_authority}--><!--{/if}-->">
 @@ -159,7 +150,7 @@
 <!--{* ▼FOOTER *}-->
 <div id="footer">
     <div id="footer-contents">
 -        <div id="copyright">Copyright &copy; 2000-<!--{$smarty.now|date_format:"%Y"}--> LOCKON CO.,LTD. All Rights Reserved.</div>
 +        <div id="copyright">Copyright &copy; 2000-<!--{$smarty.now|date_format:"%Y"}--> EC-CUBE CO.,LTD. All Rights Reserved.</div>
         <div id="topagetop">
             <ul class="sites">
                 <li><a href="#top" class="btn-tool-format">PAGE TOP</a></li>
 diff -urb 2_13/data/Smarty/templates/admin/order/disp.tpl 2_17/data/Smarty/templates/admin/order/disp.tpl
 --- 2_13/data/Smarty/templates/admin/order/disp.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/order/disp.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -179,10 +179,10 @@
             <td class="right">
                 <!--{$arrForm.quantity.value[$product_index]|h}-->
             </td>
 -                <!--{assign var=price value=`$arrForm.price.value[$product_index]`}-->
 -                <!--{assign var=quantity value=`$arrForm.quantity.value[$product_index]`}-->
 -                <!--{assign var=tax_rate value=`$arrForm.tax_rate.value[$product_index]`}-->
 -                <!--{assign var=tax_rule value=`$arrForm.tax_rule.value[$product_index]`}-->
 +                <!--{assign var=price value="`$arrForm.price.value[$product_index]`"}-->
 +                <!--{assign var=quantity value="`$arrForm.quantity.value[$product_index]`"}-->
 +                <!--{assign var=tax_rate value="`$arrForm.tax_rate.value[$product_index]`"}-->
 +                <!--{assign var=tax_rule value="`$arrForm.tax_rule.value[$product_index]`"}-->
             <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|n2s}--> 円<br />(税率<!--{$tax_rate|n2s}-->%)</td>
             <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|n2s}-->円</td>
         </tr>
 @@ -382,7 +382,7 @@
                 </td>
             </tr>
 
 -            <!--{if $arrForm.payment_info|@count > 0}-->
 +            <!--{if !empty($arrForm.payment_info)}-->
             <tr>
                 <th><!--{$arrForm.payment_type}-->情報</th>
                 <td>
 diff -urb 2_13/data/Smarty/templates/admin/order/edit.tpl 2_17/data/Smarty/templates/admin/order/edit.tpl
 --- 2_13/data/Smarty/templates/admin/order/edit.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/order/edit.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -422,10 +422,10 @@
                         <span class="attention"><!--{$arrErr[$key][$product_index]}--></span>
                         <input type="text" name="<!--{$key}-->[<!--{$product_index}-->]" value="<!--{$arrForm[$key].value[$product_index]|h}-->" size="3" class="box3" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key][$product_index]|sfGetErrorColor}-->" id="<!--{$key}-->_<!--{$product_index}-->"  onChange="quantityCopyForSingleShipping('<!--{$product_index}-->')" />
                     </td>
 -                    <!--{assign var=price value=`$arrForm.price.value[$product_index]`}-->
 -                    <!--{assign var=quantity value=`$arrForm.quantity.value[$product_index]`}-->
 -                    <!--{assign var=tax_rate value=`$arrForm.tax_rate.value[$product_index]`}-->
 -                    <!--{assign var=tax_rule value=`$arrForm.tax_rule.value[$product_index]`}-->
 +                    <!--{assign var=price value="`$arrForm.price.value[$product_index]`"}-->
 +                    <!--{assign var=quantity value="`$arrForm.quantity.value[$product_index]`"}-->
 +                    <!--{assign var=tax_rate value="`$arrForm.tax_rate.value[$product_index]`"}-->
 +                    <!--{assign var=tax_rule value="`$arrForm.tax_rule.value[$product_index]`"}-->
                     <input type="hidden" name="tax_rule[<!--{$product_index}-->]" value="<!--{$arrForm.tax_rule.value[$product_index]|h}-->" id="tax_rule_<!--{$product_index}-->" />
     
                     <td class="right">
 @@ -769,7 +769,7 @@
                 </td>
             </tr>
 
 -            <!--{if $arrForm.payment_info|@count > 0}-->
 +            <!--{if !empty($arrForm.payment_info)}-->
             <tr>
                 <th><!--{$arrForm.payment_type}-->情報</th>
                 <td>
 diff -urb 2_13/data/Smarty/templates/admin/order/index.tpl 2_17/data/Smarty/templates/admin/order/index.tpl
 --- 2_13/data/Smarty/templates/admin/order/index.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/order/index.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -359,7 +359,7 @@
                     <col width="9%" />
                     <col width="5%" />
                     <!--{* ペイジェントモジュール連携用 *}-->
 -                    <!--{assign var=path value=`$smarty.const.MODULE_REALDIR`mdl_paygent/paygent_order_index.tpl}-->
 +                    <!--{assign var=path value="`$smarty.const.MODULE_REALDIR`mdl_paygent/paygent_order_index.tpl"}-->
                     <!--{if file_exists($path)}-->
                         <!--{include file=$path}-->
                     <!--{else}-->
 diff -urb 2_13/data/Smarty/templates/admin/order/mail.tpl 2_17/data/Smarty/templates/admin/order/mail.tpl
 --- 2_13/data/Smarty/templates/admin/order/mail.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/order/mail.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -64,7 +64,7 @@
                     <span class="attention"><!--{$arrErr[$key]}--></span>
                     <select name="template_id" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" onchange="eccube.setModeAndSubmit('change', '', '');">
                     <option value="" selected="selected">選択してください</option>
 -                    <!--{html_options options=$arrMAILTEMPLATE selected=$arrForm[$key].value|h}-->
 +                    <!--{html_options options=$arrMAILTEMPLATE selected=$arrForm[$key].value}-->
                     </select>
                 </td>
             </tr>
 diff -urb 2_13/data/Smarty/templates/admin/order/mail_view.tpl 2_17/data/Smarty/templates/admin/order/mail_view.tpl
 --- 2_13/data/Smarty/templates/admin/order/mail_view.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/order/mail_view.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -2,7 +2,7 @@
 /*
  * This file is part of EC-CUBE
  *
 - * Copyright(c) LOCKON CO.,LTD. All Rights Reserved.
 + * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
  *
  * http://www.ec-cube.co.jp/
  *
 diff -urb 2_13/data/Smarty/templates/admin/order/pdf_input.tpl 2_17/data/Smarty/templates/admin/order/pdf_input.tpl
 --- 2_13/data/Smarty/templates/admin/order/pdf_input.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/order/pdf_input.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -2,7 +2,7 @@
 /*
  * This file is part of EC-CUBE
  *
 - * Copyright(c) LOCKON CO.,LTD. All Rights Reserved.
 + * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
  *
  * http://www.ec-cube.co.jp/
  *
 diff -urb 2_13/data/Smarty/templates/admin/order/product_select.tpl 2_17/data/Smarty/templates/admin/order/product_select.tpl
 --- 2_13/data/Smarty/templates/admin/order/product_select.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/order/product_select.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -177,8 +177,8 @@
                         <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->" style="max-width: 65px;max-height: 65;" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" />
                     </td>
                     <td>
 -                        <!--{assign var=codemin value=`$arrProducts[cnt].product_code_min`}-->
 -                        <!--{assign var=codemax value=`$arrProducts[cnt].product_code_max`}-->
 +                        <!--{assign var=codemin value="`$arrProducts[cnt].product_code_min`"}-->
 +                        <!--{assign var=codemax value="`$arrProducts[cnt].product_code_max`"}-->
                         <!--{* 商品コード *}-->
                         <!--{if $codemin != $codemax}-->
                             <!--{$codemin|h}-->～<!--{$codemax|h}-->
 @@ -196,7 +196,7 @@
                             <dl>
                                 <dt><!--{$tpl_class_name1[$id]|h}-->：</dt>
                                 <dd>
 -                                    <select name="classcategory_id1" id="<!--{$class1}-->" style="<!--{$arrErr[$class1]|sfGetErrorColor}-->"    onchange="fnSetClassCategories(this.form);">
 +                                    <select name="classcategory_id1" id="<!--{$class1}-->" style="<!--{$arrErr[$class1]|sfGetErrorColor}-->">
                                         <!--{html_options options=$arrClassCat1[$id] selected=$arrForm[$class1]}-->
                                     </select>
                                     <!--{if $arrErr[$class1] != ""}-->
 @@ -212,7 +212,7 @@
                             <dl>
                                 <dt><!--{$tpl_class_name2[$id]|h}-->：</dt>
                                 <dd>
 -                                    <select name="classcategory_id2" id="<!--{$class2}-->" style="<!--{$arrErr[$class2]|sfGetErrorColor}-->" onchange="fnCheckStock(this.form);"></select>
 +                                    <select name="classcategory_id2" id="<!--{$class2}-->" style="<!--{$arrErr[$class2]|sfGetErrorColor}-->"></select>
                                     <!--{if $arrErr[$class2] != ""}-->
                                     <br /><span class="attention">※ <!--{$tpl_class_name2[$id]}-->を入力して下さい。</span>
                                     <!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/admin/order/status.tpl 2_17/data/Smarty/templates/admin/order/status.tpl
 --- 2_13/data/Smarty/templates/admin/order/status.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/order/status.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -93,7 +93,7 @@
                     <td class="center"><a href="#" onclick="eccube.openWindow('./disp.php?order_id=<!--{$arrStatus[cnt].order_id}-->','order_disp','800','900',{resizable:'no',focus:false}); return false;" ><!--{$arrStatus[cnt].order_id}--></a></td>
                     <td class="center"><!--{$arrStatus[cnt].create_date|sfDispDBDate}--></td>
                     <td><!--{$arrStatus[cnt].order_name01|h}--> <!--{$arrStatus[cnt].order_name02|h}--></td>
 -                    <!--{assign var=payment_id value=`$arrStatus[cnt].payment_id`}-->
 +                    <!--{assign var=payment_id value="`$arrStatus[cnt].payment_id`"}-->
                     <td class="center"><!--{$arrPayment[$payment_id]|h}--></td>
                     <td class="right"><!--{$arrStatus[cnt].total|n2s}--></td>
                     <td class="center"><!--{if $arrStatus[cnt].payment_date != ""}--><!--{$arrStatus[cnt].payment_date|sfDispDBDate:false}--><!--{else}-->未入金<!--{/if}--></td>
 diff -urb 2_13/data/Smarty/templates/admin/ownersstore/plugin.tpl 2_17/data/Smarty/templates/admin/ownersstore/plugin.tpl
 --- 2_13/data/Smarty/templates/admin/ownersstore/plugin.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/ownersstore/plugin.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -129,7 +129,7 @@
                 <td>
                     <!--{assign var=key value="plugin_file"}-->
                     <span class="attention"><!--{$arrErr[$key]}--></span>
 -                    <input type="file" name="<!--{ $key }-->" class="box45" size="43"  style="<!--{$arrErr[$key]|sfGetErrorColor}--> <!--{if $arrErr[$key]}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->" />
 +                    <input type="file" name="<!--{$key}-->" class="box45" size="43"  style="<!--{$arrErr[$key]|sfGetErrorColor}--> <!--{if $arrErr[$key]}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->" />
                     <a class="btn-action" href="javascript:;" onclick="install(); return false;"><span class="btn-next">インストール</span></a>
                 </td>
             </tr>
 diff -urb 2_13/data/Smarty/templates/admin/ownersstore/plugin_hookpoint_list.tpl 2_17/data/Smarty/templates/admin/ownersstore/plugin_hookpoint_list.tpl
 --- 2_13/data/Smarty/templates/admin/ownersstore/plugin_hookpoint_list.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/ownersstore/plugin_hookpoint_list.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -78,7 +78,7 @@
     <!--{foreach from=$arrHookPoint item=hookpoint}-->
     <!--{foreach from=$hookpoint item=val name="plugin"}-->
             <tr>
 -                <!--{if $hookpoint|@count > 0 && $smarty.foreach.plugin.iteration == '1'}-->
 +                <!--{if !empty($hookpoint) && $smarty.foreach.plugin.iteration == '1'}-->
                 <td <!--{if in_array($val.hook_point, $arrConflict)}-->bgcolor="pink"<!--{/if}--> rowspan="<!--{$hookpoint|@count}-->">
                     <!--{$val.hook_point}-->
                     <!--{if in_array($val.hook_point, $arrConflict)}--><br /><span class="attention">※ 競合中</span><!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/admin/products/category_tree_fork.tpl 2_17/data/Smarty/templates/admin/products/category_tree_fork.tpl
 --- 2_13/data/Smarty/templates/admin/products/category_tree_fork.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/products/category_tree_fork.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -42,7 +42,7 @@
             <!--{else}-->
                 <!--{assign var=disp_child value=0}-->
             <!--{/if}-->
 -            <!--{if isset($child.children|smarty:nodefaults)}-->
 +            <!--{if isset($child.children)}-->
                 <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/category_tree_fork.tpl" children=$child.children treeID="f`$child.category_id`" display=$disp_child}-->
             <!--{/if}-->
         </li>
 diff -urb 2_13/data/Smarty/templates/admin/products/confirm.tpl 2_17/data/Smarty/templates/admin/products/confirm.tpl
 --- 2_13/data/Smarty/templates/admin/products/confirm.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/products/confirm.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -233,7 +233,7 @@
 
         <!--{* オペビルダー用 *}-->
         <!--{if "sfViewAdminOpe"|function_exists === TRUE}-->
 -            <!--{include file=`$smarty.const.MODULE_REALDIR`mdl_opebuilder/admin_ope_view.tpl}-->
 +            <!--{include file="`$smarty.const.MODULE_REALDIR`mdl_opebuilder/admin_ope_view.tpl"}-->
         <!--{/if}-->
 
         <!--{section name=cnt loop=$smarty.const.PRODUCTSUB_MAX}-->
 diff -urb 2_13/data/Smarty/templates/admin/products/product.tpl 2_17/data/Smarty/templates/admin/products/product.tpl
 --- 2_13/data/Smarty/templates/admin/products/product.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/products/product.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -1,4 +1,4 @@
 -<!--{*
 +    <!--{*
 /*
  * This file is part of EC-CUBE
  *
 @@ -361,7 +361,7 @@
 
     <!--{* オペビルダー用 *}-->
     <!--{if "sfViewAdminOpe"|function_exists === TRUE}-->
 -    <!--{include file=`$smarty.const.MODULE_REALDIR`mdl_opebuilder/admin_ope_view.tpl}-->
 +    <!--{include file="`$smarty.const.MODULE_REALDIR`mdl_opebuilder/admin_ope_view.tpl"}-->
     <!--{/if}-->
 
     <div class="btn">
 diff -urb 2_13/data/Smarty/templates/admin/products/product_class.tpl 2_17/data/Smarty/templates/admin/products/product_class.tpl
 --- 2_13/data/Smarty/templates/admin/products/product_class.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/products/product_class.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -295,7 +295,7 @@
                         <!--{/foreach}-->
                     </td>
                     <td class="center">
 -                        <!--{assign var=key value="down_filename}-->
 +                        <!--{assign var=key value="down_filename"}-->
                         <!--{if $arrErr[$key][$index]}-->
                             <span class="attention"><!--{$arrErr[$key][$index]}--></span>
                         <!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/admin/products/product_rank.tpl 2_17/data/Smarty/templates/admin/products/product_rank.tpl
 --- 2_13/data/Smarty/templates/admin/products/product_rank.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/products/product_rank.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -89,7 +89,7 @@
                                 <!--{* 商品画像 *}-->
                                 <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProductsList[cnt].main_list_image|sfNoImageMainList|h}-->" style="max-width: 65px;max-height: 65;" alt="<!--{$arrProducts[cnt].name|h}-->" />
                             </td>
 -                            <!--{assign var=rank value=`$rank+1`}-->
 +                            <!--{assign var=rank value="`$rank+1`"}-->
                             <td align="center">
                                 <!--{$rank}-->
                                 <!--{if $arrProductsList[cnt].status == "2"}--><br />(非公開)<!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/admin/products/product_rank_tree_fork.tpl 2_17/data/Smarty/templates/admin/products/product_rank_tree_fork.tpl
 --- 2_13/data/Smarty/templates/admin/products/product_rank_tree_fork.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/products/product_rank_tree_fork.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -42,7 +42,7 @@
             <!--{else}-->
                 <!--{assign var=disp_child value=0}-->
             <!--{/if}-->
 -            <!--{if isset($child.children|smarty:nodefaults)}-->
 +            <!--{if isset($child.children)}-->
                 <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/product_rank_tree_fork.tpl" children=$child.children treeID="f`$child.category_id`" display=$disp_child}-->
             <!--{/if}-->
         </li>
 diff -urb 2_13/data/Smarty/templates/admin/products/review.tpl 2_17/data/Smarty/templates/admin/products/review.tpl
 --- 2_13/data/Smarty/templates/admin/products/review.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/products/review.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -51,7 +51,7 @@
                     <!--{assign var=key value=search_recommend_level}-->
                     <select name="<!--{$key}-->">
                         <option value="" selected="selected">選択してください</option>
 -                        <!--{html_options options=$arrRECOMMEND selected=$arrForm[$key].value|h}-->
 +                        <!--{html_options options=$arrRECOMMEND selected=$arrForm[$key].value}-->
                     </select>
                 </td>
             </tr>
 @@ -64,27 +64,27 @@
                     <!--{/if}-->
                     <select name="search_startyear" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
                         <option value="">----</option>
 -                        <!--{html_options options=$arrStartYear selected=$arrForm.search_startyear|h}-->
 +                        <!--{html_options options=$arrStartYear selected=$arrForm.search_startyear}-->
                     </select>年
                     <select name="search_startmonth" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
                         <option value="">--</option>
 -                        <!--{html_options options=$arrStartMonth selected=$arrForm.search_startmonth|h}-->
 +                        <!--{html_options options=$arrStartMonth selected=$arrForm.search_startmonth}-->
                     </select>月
                     <select name="search_startday" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
                         <option value="">--</option>
 -                        <!--{html_options options=$arrStartDay selected=$arrForm.search_startday|h}-->
 +                        <!--{html_options options=$arrStartDay selected=$arrForm.search_startday}-->
                     </select>日～
                     <select name="search_endyear" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
                         <option value="">----</option>
 -                        <!--{html_options options=$arrEndYear selected=$arrForm.search_endyear|h}-->
 +                        <!--{html_options options=$arrEndYear selected=$arrForm.search_endyear}-->
                     </select>年
                     <select name="search_endmonth" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
                         <option value="">--</option>
 -                        <!--{html_options options=$arrEndMonth selected=$arrForm.search_endmonth|h}-->
 +                        <!--{html_options options=$arrEndMonth selected=$arrForm.search_endmonth}-->
                     </select>月
                     <select name="search_endday" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
                         <option value="">--</option>
 -                        <!--{html_options options=$arrEndDay selected=$arrForm.search_endday|h}-->
 +                        <!--{html_options options=$arrEndDay selected=$arrForm.search_endday}-->
                     </select>日
                 </td>
             </tr>
 @@ -97,7 +97,7 @@
                 <span class="attention"><!--{$arrErr[$key]}--></span>
             <!--{/if}-->
             <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
 -            <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max|h}-->
 +            <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max}-->
             </select> 件</p>
             <div class="btn-area">
                 <ul>
 diff -urb 2_13/data/Smarty/templates/admin/system/input.tpl 2_17/data/Smarty/templates/admin/system/input.tpl
 --- 2_13/data/Smarty/templates/admin/system/input.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/system/input.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -71,7 +71,7 @@
                 <!--{if $arrErr.password}--><span class="attention"><!--{$arrErr.password}--><!--{$arrErr.password02}--></span><!--{/if}-->
                 <input type="password" name="password" size="20" class="box20" value="<!--{$arrForm.password}-->" onfocus="<!--{$tpl_onfocus}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" />
                 <span class="attention">※必須入力</span><br />
 -                ※半角英数字<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字（記号可）
 +                ※半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->～<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字（記号可）
                 <br />
                 <input type="password" name="password02" size="20" class="box20" value="<!--{$arrForm.password02}-->" onfocus="<!--{$tpl_onfocus}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.password02|sfGetErrorColor}-->" />
                 <p><span class="attention mini">確認のために2度入力してください。</span></p>
 diff -urb 2_13/data/Smarty/templates/admin/total/index.tpl 2_17/data/Smarty/templates/admin/total/index.tpl
 --- 2_13/data/Smarty/templates/admin/total/index.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/admin/total/index.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -63,27 +63,27 @@
                     <!--{/if}-->
                     <select name="search_startyear"    style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
                         <option value="">----</option>
 -                        <!--{html_options options=$arrYear selected=$arrForm.search_startyear.value|h}-->
 +                        <!--{html_options options=$arrYear selected=$arrForm.search_startyear.value}-->
                     </select>年
                     <select name="search_startmonth" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
                         <option value="">--</option>
 -                        <!--{html_options options=$arrMonth selected=$arrForm.search_startmonth.value|h}-->
 +                        <!--{html_options options=$arrMonth selected=$arrForm.search_startmonth.value}-->
                     </select>月
                     <select name="search_startday" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
                         <option value="">--</option>
 -                        <!--{html_options options=$arrDay selected=$arrForm.search_startday.value|h}-->
 +                        <!--{html_options options=$arrDay selected=$arrForm.search_startday.value}-->
                     </select>日～
                     <select name="search_endyear" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
                         <option value="">----</option>
 -                        <!--{html_options options=$arrYear selected=$arrForm.search_endyear.value|h}-->
 +                        <!--{html_options options=$arrYear selected=$arrForm.search_endyear.value}-->
                     </select>年
                     <select name="search_endmonth" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
                         <option value="">--</option>
 -                        <!--{html_options options=$arrMonth selected=$arrForm.search_endmonth.value|h}-->
 +                        <!--{html_options options=$arrMonth selected=$arrForm.search_endmonth.value}-->
                     </select>月
                     <select name="search_endday" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
                         <option value="">--</option>
 -                        <!--{html_options options=$arrDay selected=$arrForm.search_endday.value|h}-->
 +                        <!--{html_options options=$arrDay selected=$arrForm.search_endday.value}-->
                     </select>日
                     <a class="btn-normal" href="javascript:;" onclick="eccube.fnFormModeSubmit('search_form2', 'search', '', ''); return false;" name="subm">期間で集計する</a>
                 </form>
 diff -urb 2_13/data/Smarty/templates/default/cart/index.tpl 2_17/data/Smarty/templates/default/cart/index.tpl
 --- 2_13/data/Smarty/templates/default/cart/index.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/cart/index.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -38,7 +38,7 @@
             <!--{/if}-->
         <!--{/if}-->
 
 -        <p class="totalmoney_area">
 +        <div class="totalmoney_area">
             <!--{* カゴの中に商品がある場合にのみ表示 *}-->
             <!--{if count($cartKeys) > 1}-->
                 <span class="attentionSt"><!--{foreach from=$cartKeys item=key name=cartKey}--><!--{$arrProductType[$key]|h}--><!--{if !$smarty.foreach.cartKey.last}-->、<!--{/if}--><!--{/foreach}-->は同時購入できません。<br />
 @@ -53,7 +53,7 @@
             <!--{if strlen($tpl_message) != 0}-->
                 <p class="attention"><!--{$tpl_message|h|nl2br}--></p>
             <!--{/if}-->
 -        </p>
 +        </div>
 
         <!--{if count($cartItems) > 0}-->
             <!--{foreach from=$cartKeys item=key}-->
 diff -urb 2_13/data/Smarty/templates/default/contact/index.tpl 2_17/data/Smarty/templates/default/contact/index.tpl
 --- 2_13/data/Smarty/templates/default/contact/index.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/contact/index.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -57,7 +57,7 @@
                             〒&nbsp;
                             <input type="text" name="zip01" class="box60" value="<!--{$arrForm.zip01.value|default:$arrData.zip01|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" style="<!--{$arrErr.zip01|sfGetErrorColor}-->; ime-mode: disabled;" />&nbsp;-&nbsp;
                             <input type="text" name="zip02" class="box60" value="<!--{$arrForm.zip02.value|default:$arrData.zip02|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" style="<!--{$arrErr.zip02|sfGetErrorColor}-->; ime-mode: disabled;" />　
 -                            <a href="http://www.post.japanpost.jp/zipcode/" target="_blank"><span class="mini">郵便番号検索</span></a>
 +                            <a href="https://www.post.japanpost.jp/zipcode/" target="_blank"><span class="mini">郵便番号検索</span></a>
                         </p>
                         <p class="zipimg">
                             <a href="javascript:eccube.getAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'zip01', 'zip02', 'pref', 'addr01');">
 @@ -72,7 +72,7 @@
                         <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
 
                         <select name="pref" style="<!--{$arrErr.pref|sfGetErrorColor}-->">
 -                        <option value="">都道府県を選択</option><!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref|h}--></select>
 +                        <option value="">都道府県を選択</option><!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref}--></select>
 
                         <p>
                             <input type="text" class="box380" name="addr01" value="<!--{$arrForm.addr01.value|default:$arrData.addr01|h}-->" style="<!--{$arrErr.addr01|sfGetErrorColor}-->; ime-mode: active;" /><br />
 diff -urb 2_13/data/Smarty/templates/default/frontparts/bloc/calendar.tpl 2_17/data/Smarty/templates/default/frontparts/bloc/calendar.tpl
 --- 2_13/data/Smarty/templates/default/frontparts/bloc/calendar.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/frontparts/bloc/calendar.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -26,7 +26,7 @@
         <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_calender.gif" alt="カレンダー" /></h2>
             <div class="block_body">
                 <!--{section name=num loop=$arrCalendar}-->
 -                    <!--{assign var=arrCal value=`$arrCalendar[num]`}-->
 +                    <!--{assign var=arrCal value=$arrCalendar[num]}-->
                     <!--{section name=cnt loop=$arrCal}-->
                         <!--{if $smarty.section.cnt.first}-->
                             <table>
 diff -urb 2_13/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl 2_17/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl
 --- 2_13/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -30,7 +30,7 @@
                 <!--{else}-->
                     <!--{assign var=disp_child value=0}-->
                 <!--{/if}-->
 -                <!--{if isset($child.children|smarty:nodefaults)}-->
 +                <!--{if isset($child.children)}-->
                     <!--{include file="`$smarty.const.TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$child.children display=$disp_child}-->
                 <!--{/if}-->
             </li>
 diff -urb 2_13/data/Smarty/templates/default/frontparts/form_personal_input.tpl 2_17/data/Smarty/templates/default/frontparts/form_personal_input.tpl
 --- 2_13/data/Smarty/templates/default/frontparts/form_personal_input.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/frontparts/form_personal_input.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -77,7 +77,7 @@
             <!--{/if}-->
             <select name="<!--{$key6}-->" style="<!--{$arrErr[$key6]|sfGetErrorColor}-->">
                     <option value="" selected="selected">国を選択</option>
 -                    <!--{html_options options=$arrCountry selected=$arrForm[$key6].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
 +                    <!--{html_options options=$arrCountry selected=$arrForm[$key6].value|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
             </select>
         </td>
     </tr>
 @@ -98,7 +98,7 @@
                 <div class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></div>
             <!--{/if}-->
             <p class="top">〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;-&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;
 -            <a href="http://www.post.japanpost.jp/zipcode/" target="_blank"><span class="mini">郵便番号検索</span></a>
 +            <a href="https://www.post.japanpost.jp/zipcode/" target="_blank"><span class="mini">郵便番号検索</span></a>
             </p>
             <p class="zipimg">
                 <a href="<!--{$smarty.const.ROOT_URLPATH}-->input_zip.php" onclick="eccube.getAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', '<!--{$key1}-->', '<!--{$key2}-->', '<!--{$key3}-->', '<!--{$key4}-->'); return false;" target="_blank">
 @@ -115,7 +115,7 @@
             <!--{/if}-->
             <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->">
                     <option value="" selected="selected">都道府県を選択</option>
 -                    <!--{html_options options=$arrPref selected=$arrForm[$key3].value|h}-->
 +                    <!--{html_options options=$arrPref selected=$arrForm[$key3].value}-->
             </select>
             <p class="top"><input type="text" name="<!--{$key4}-->" value="<!--{$arrForm[$key4].value|h}-->" class="box300" style="<!--{$arrErr[$key4]|sfGetErrorColor}-->; ime-mode: active;" /><br />
                 <!--{$smarty.const.SAMPLE_ADDRESS1}--></p>
 diff -urb 2_13/data/Smarty/templates/default/header.tpl 2_17/data/Smarty/templates/default/header.tpl
 --- 2_13/data/Smarty/templates/default/header.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/header.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -31,12 +31,12 @@
             <div id="header_utility">
                 <div id="headerInternalColumn">
                 <!--{* ▼HeaderInternal COLUMN *}-->
 -                <!--{if $arrPageLayout.HeaderInternalNavi|@count > 0}-->
 +                <!--{if !empty($arrPageLayout.HeaderInternalNavi)}-->
                     <!--{* ▼上ナビ *}-->
                     <!--{foreach key=HeaderInternalNaviKey item=HeaderInternalNaviItem from=$arrPageLayout.HeaderInternalNavi}-->
                         <!-- ▼<!--{$HeaderInternalNaviItem.bloc_name}--> -->
                         <!--{if $HeaderInternalNaviItem.php_path != ""}-->
 -                            <!--{include_php file=$HeaderInternalNaviItem.php_path items=$HeaderInternalNaviItem}-->
 +                            <!--{include_php_ex file=$HeaderInternalNaviItem.php_path items=$HeaderInternalNaviItem}-->
                         <!--{else}-->
                             <!--{include file=$HeaderInternalNaviItem.tpl_path items=$HeaderInternalNaviItem}-->
                         <!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/default/mypage/favorite.tpl 2_17/data/Smarty/templates/default/mypage/favorite.tpl
 --- 2_13/data/Smarty/templates/default/mypage/favorite.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/mypage/favorite.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -27,7 +27,7 @@
     <!--{if $tpl_navi != ""}-->
         <!--{include file=$tpl_navi}-->
     <!--{else}-->
 -        <!--{include file=`$smarty.const.TEMPLATE_REALDIR`mypage/navi.tpl}-->
 +        <!--{include file="`$smarty.const.TEMPLATE_REALDIR`mypage/navi.tpl"}-->
     <!--{/if}-->
     <div id="mycontents_area">
         <form name="form1" id="form1" method="post" action="?">
 diff -urb 2_13/data/Smarty/templates/default/mypage/index.tpl 2_17/data/Smarty/templates/default/mypage/index.tpl
 --- 2_13/data/Smarty/templates/default/mypage/index.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/mypage/index.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -27,7 +27,7 @@
     <!--{if $tpl_navi != ""}-->
         <!--{include file=$tpl_navi}-->
     <!--{else}-->
 -        <!--{include file=`$smarty.const.TEMPLATE_REALDIR`mypage/navi.tpl}-->
 +        <!--{include file="`$smarty.const.TEMPLATE_REALDIR`mypage/navi.tpl"}-->
     <!--{/if}-->
     <div id="mycontents_area">
         <form name="form1" id="form1" method="post" action="?">
 diff -urb 2_13/data/Smarty/templates/default/products/detail.tpl 2_17/data/Smarty/templates/default/products/detail.tpl
 --- 2_13/data/Smarty/templates/default/products/detail.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/products/detail.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -67,7 +67,7 @@
             <div id="detailrightbloc">
                 <!--▼商品ステータス-->
                 <!--{assign var=ps value=$productStatus[$tpl_product_id]}-->
 -                <!--{if count($ps) > 0}-->
 +                <!--{if !empty($ps)}-->
                     <ul class="status_icon clearfix">
                         <!--{foreach from=$ps item=status}-->
                         <li>
 @@ -357,8 +357,8 @@
                         <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrItem.product_id|u}-->">
                             <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrItem.main_list_image|sfNoImageMainList|h}-->" style="max-width: 65px;max-height: 65px;" alt="<!--{$arrItem.name|h}-->" /></a>
                     </div>
 -                    <!--{assign var=price02_min value=`$arrItem.price02_min_inctax`}-->
 -                    <!--{assign var=price02_max value=`$arrItem.price02_max_inctax`}-->
 +                    <!--{assign var=price02_min value="`$arrItem.price02_min_inctax`"}-->
 +                    <!--{assign var=price02_max value="`$arrItem.price02_max_inctax`"}-->
                     <div class="productContents">
                         <h3><a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrItem.product_id|u}-->"><!--{$arrItem.name|h}--></a></h3>
                         <p class="sale_price"><!--{$smarty.const.SALE_PRICE_TITLE}-->(税込)：<span class="price">
 diff -urb 2_13/data/Smarty/templates/default/products/list.tpl 2_17/data/Smarty/templates/default/products/list.tpl
 --- 2_13/data/Smarty/templates/default/products/list.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/products/list.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -133,7 +133,7 @@
             <!--▼ページナビ(上部)-->
             <form name="page_navi_top" id="page_navi_top" action="?">
                 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 -                <!--{if $tpl_linemax > 0}--><!--{$smarty.capture.page_navi_body|smarty:nodefaults}--><!--{/if}-->
 +                <!--{if $tpl_linemax > 0}--><!--{$smarty.capture.page_navi_body nofilter}--><!--{/if}-->
             </form>
             <!--▲ページナビ(上部)-->
         <!--{/if}-->
 @@ -155,7 +155,7 @@
 
                 <div class="listrightbloc">
                     <!--▼商品ステータス-->
 -                    <!--{if count($productStatus[$id]) > 0}-->
 +                    <!--{if !empty($productStatus[$id])}-->
                         <ul class="status_icon clearfix">
                             <!--{foreach from=$productStatus[$id] item=status}-->
                                 <li>
 @@ -258,7 +258,7 @@
             <!--▼ページナビ(下部)-->
             <form name="page_navi_bottom" id="page_navi_bottom" action="?">
                 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 -                <!--{if $tpl_linemax > 0}--><!--{$smarty.capture.page_navi_body|smarty:nodefaults}--><!--{/if}-->
 +                <!--{if $tpl_linemax > 0}--><!--{$smarty.capture.page_navi_body nofilter}--><!--{/if}-->
             </form>
             <!--▲ページナビ(下部)-->
         <!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/default/shopping/confirm.tpl 2_17/data/Smarty/templates/default/shopping/confirm.tpl
 --- 2_13/data/Smarty/templates/default/shopping/confirm.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/shopping/confirm.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -115,7 +115,7 @@
                     <tr>
                         <th colspan="4" class="alignR" scope="row">値引き（ポイントご使用時）</th>
                         <td class="alignR">
 -                            <!--{assign var=discount value=`$arrForm.use_point*$smarty.const.POINT_VALUE`}-->
 +                            <!--{assign var=discount value="`$arrForm.use_point*$smarty.const.POINT_VALUE`"}-->
                             -<!--{$discount|n2s|default:0}-->円</td>
                     </tr>
                     <!--{/if}-->
 @@ -158,7 +158,7 @@
                         <td>+<!--{$arrForm.add_point|n2s|default:0}-->Pt</td>
                     </tr>
                     <tr>
 -                    <!--{assign var=total_point value=`$tpl_user_point-$arrForm.use_point+$arrForm.add_point`}-->
 +                    <!--{assign var=total_point value="`$tpl_user_point-$arrForm.use_point+$arrForm.add_point`"}-->
                         <th scope="row">加算後のポイント</th>
                         <td><!--{$total_point|n2s}-->Pt</td>
                     </tr>
 diff -urb 2_13/data/Smarty/templates/default/site_frame.tpl 2_17/data/Smarty/templates/default/site_frame.tpl
 --- 2_13/data/Smarty/templates/default/site_frame.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/site_frame.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -76,12 +76,12 @@
 
 <!--{strip}-->
     <!--{* ▼Head COLUMN*}-->
 -    <!--{if $arrPageLayout.HeadNavi|@count > 0}-->
 +    <!--{if !empty($arrPageLayout.HeadNavi)}-->
         <!--{* ▼上ナビ *}-->
         <!--{foreach key=HeadNaviKey item=HeadNaviItem from=$arrPageLayout.HeadNavi}-->
             <!--{* ▼<!--{$HeadNaviItem.bloc_name}--> *}-->
             <!--{if $HeadNaviItem.php_path != ""}-->
 -                <!--{include_php file=$HeadNaviItem.php_path items=$HeadNaviItem}-->
 +                <!--{include_php_ex file=$HeadNaviItem.php_path items=$HeadNaviItem}-->
             <!--{else}-->
                 <!--{include file=$HeadNaviItem.tpl_path}-->
             <!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/default/site_main.tpl 2_17/data/Smarty/templates/default/site_main.tpl
 --- 2_13/data/Smarty/templates/default/site_main.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/default/site_main.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -31,13 +31,13 @@
             <a name="top" id="top"></a>
 
             <!--{* ▼HeaderHeaderTop COLUMN*}-->
 -            <!--{if $arrPageLayout.HeaderTopNavi|@count > 0}-->
 +            <!--{if !empty($arrPageLayout.HeaderTopNavi)}-->
                 <div id="headertopcolumn">
                     <!--{* ▼上ナビ *}-->
                     <!--{foreach key=HeaderTopNaviKey item=HeaderTopNaviItem from=$arrPageLayout.HeaderTopNavi}-->
                         <!-- ▼<!--{$HeaderTopNaviItem.bloc_name}--> -->
                         <!--{if $HeaderTopNaviItem.php_path != ""}-->
 -                            <!--{include_php file=$HeaderTopNaviItem.php_path items=$HeaderTopNaviItem}-->
 +                            <!--{include_php_ex file=$HeaderTopNaviItem.php_path items=$HeaderTopNaviItem}-->
                         <!--{else}-->
                             <!--{include file=$HeaderTopNaviItem.tpl_path items=$HeaderTopNaviItem}-->
                         <!--{/if}-->
 @@ -56,13 +56,13 @@
             <div id="container" class="clearfix">
 
                 <!--{* ▼TOP COLUMN*}-->
 -                <!--{if $arrPageLayout.TopNavi|@count > 0}-->
 +                <!--{if !empty($arrPageLayout.TopNavi)}-->
                     <div id="topcolumn">
                         <!--{* ▼上ナビ *}-->
                         <!--{foreach key=TopNaviKey item=TopNaviItem from=$arrPageLayout.TopNavi}-->
                             <!-- ▼<!--{$TopNaviItem.bloc_name}--> -->
                             <!--{if $TopNaviItem.php_path != ""}-->
 -                                <!--{include_php file=$TopNaviItem.php_path items=$TopNaviItem}-->
 +                                <!--{include_php_ex file=$TopNaviItem.php_path items=$TopNaviItem}-->
                             <!--{else}-->
                                 <!--{include file=$TopNaviItem.tpl_path items=$TopNaviItem}-->
                             <!--{/if}-->
 @@ -74,13 +74,13 @@
                 <!--{* ▲TOP COLUMN*}-->
 
                 <!--{* ▼LEFT COLUMN *}-->
 -                <!--{if $arrPageLayout.LeftNavi|@count > 0}-->
 +                <!--{if !empty($arrPageLayout.LeftNavi)}-->
                     <div id="leftcolumn" class="side_column">
                         <!--{* ▼左ナビ *}-->
                         <!--{foreach key=LeftNaviKey item=LeftNaviItem from=$arrPageLayout.LeftNavi}-->
                             <!-- ▼<!--{$LeftNaviItem.bloc_name}--> -->
                             <!--{if $LeftNaviItem.php_path != ""}-->
 -                                <!--{include_php file=$LeftNaviItem.php_path items=$LeftNaviItem}-->
 +                                <!--{include_php_ex file=$LeftNaviItem.php_path items=$LeftNaviItem}-->
                             <!--{else}-->
                                 <!--{include file=$LeftNaviItem.tpl_path items=$LeftNaviItem}-->
                             <!--{/if}-->
 @@ -95,16 +95,16 @@
                 <div id="main_column" <!--{**}-->
                     class="colnum<!--{$tpl_column_num|h}-->
                         <!--{if $tpl_column_num == 2}-->
 -                            <!--{" "}--><!--{if $arrPageLayout.LeftNavi|@count == 0}-->left<!--{else}-->right<!--{/if}-->
 +                            <!--{" "}--><!--{if empty($arrPageLayout.LeftNavi)}-->left<!--{else}-->right<!--{/if}-->
                         <!--{/if}-->
                     "
                 >
                     <!--{* ▼メイン上部 *}-->
 -                    <!--{if $arrPageLayout.MainHead|@count > 0}-->
 +                    <!--{if !empty($arrPageLayout.MainHead)}-->
                         <!--{foreach key=MainHeadKey item=MainHeadItem from=$arrPageLayout.MainHead}-->
                             <!-- ▼<!--{$MainHeadItem.bloc_name}--> -->
                             <!--{if $MainHeadItem.php_path != ""}-->
 -                                <!--{include_php file=$MainHeadItem.php_path items=$MainHeadItem}-->
 +                                <!--{include_php_ex file=$MainHeadItem.php_path items=$MainHeadItem}-->
                             <!--{else}-->
                                 <!--{include file=$MainHeadItem.tpl_path items=$MainHeadItem}-->
                             <!--{/if}-->
 @@ -118,11 +118,11 @@
                     <!-- ▲メイン -->
 
                     <!--{* ▼メイン下部 *}-->
 -                    <!--{if $arrPageLayout.MainFoot|@count > 0}-->
 +                    <!--{if !empty($arrPageLayout.MainFoot)}-->
                         <!--{foreach key=MainFootKey item=MainFootItem from=$arrPageLayout.MainFoot}-->
                             <!-- ▼<!--{$MainFootItem.bloc_name}--> -->
                             <!--{if $MainFootItem.php_path != ""}-->
 -                                <!--{include_php file=$MainFootItem.php_path items=$MainFootItem}-->
 +                                <!--{include_php_ex file=$MainFootItem.php_path items=$MainFootItem}-->
                             <!--{else}-->
                                 <!--{include file=$MainFootItem.tpl_path items=$MainFootItem}-->
                             <!--{/if}-->
 @@ -134,13 +134,13 @@
                 <!--{* ▲CENTER COLUMN *}-->
 
                 <!--{* ▼RIGHT COLUMN *}-->
 -                <!--{if $arrPageLayout.RightNavi|@count > 0}-->
 +                <!--{if !empty($arrPageLayout.RightNavi)}-->
                     <div id="rightcolumn" class="side_column">
                         <!--{* ▼右ナビ *}-->
                         <!--{foreach key=RightNaviKey item=RightNaviItem from=$arrPageLayout.RightNavi}-->
                             <!-- ▼<!--{$RightNaviItem.bloc_name}--> -->
                             <!--{if $RightNaviItem.php_path != ""}-->
 -                                <!--{include_php file=$RightNaviItem.php_path items=$RightNaviItem}-->
 +                                <!--{include_php_ex file=$RightNaviItem.php_path items=$RightNaviItem}-->
                             <!--{else}-->
                                 <!--{include file=$RightNaviItem.tpl_path items=$RightNaviItem}-->
                             <!--{/if}-->
 @@ -152,13 +152,13 @@
                 <!--{* ▲RIGHT COLUMN *}-->
 
                 <!--{* ▼BOTTOM COLUMN*}-->
 -                <!--{if $arrPageLayout.BottomNavi|@count > 0}-->
 +                <!--{if !empty($arrPageLayout.BottomNavi)}-->
                     <div id="bottomcolumn">
                         <!--{* ▼下ナビ *}-->
                         <!--{foreach key=BottomNaviKey item=BottomNaviItem from=$arrPageLayout.BottomNavi}-->
                             <!-- ▼<!--{$BottomNaviItem.bloc_name}--> -->
                             <!--{if $BottomNaviItem.php_path != ""}-->
 -                                <!--{include_php file=$BottomNaviItem.php_path items=$BottomNaviItem}-->
 +                                <!--{include_php_ex file=$BottomNaviItem.php_path items=$BottomNaviItem}-->
                             <!--{else}-->
                                 <!--{include file=$BottomNaviItem.tpl_path items=$BottomNaviItem}-->
                             <!--{/if}-->
 @@ -177,13 +177,13 @@
             <!--{/if}-->
             <!--{* ▲FOOTER *}-->
             <!--{* ▼FooterBottom COLUMN*}-->
 -            <!--{if $arrPageLayout.FooterBottomNavi|@count > 0}-->
 +            <!--{if !empty($arrPageLayout.FooterBottomNavi)}-->
                 <div id="footerbottomcolumn">
                     <!--{* ▼上ナビ *}-->
                     <!--{foreach key=FooterBottomNaviKey item=FooterBottomNaviItem from=$arrPageLayout.FooterBottomNavi}-->
                         <!-- ▼<!--{$FooterBottomNaviItem.bloc_name}--> -->
                         <!--{if $FooterBottomNaviItem.php_path != ""}-->
 -                            <!--{include_php file=$FooterBottomNaviItem.php_path items=$FooterBottomNaviItem}-->
 +                            <!--{include_php_ex file=$FooterBottomNaviItem.php_path items=$FooterBottomNaviItem}-->
                         <!--{else}-->
                             <!--{include file=$FooterBottomNaviItem.tpl_path items=$FooterBottomNaviItem}-->
                         <!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/mobile/header.tpl 2_17/data/Smarty/templates/mobile/header.tpl
 --- 2_13/data/Smarty/templates/mobile/header.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/mobile/header.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -23,12 +23,12 @@
 <!--{strip}-->
     <!--▼HEADER-->
     <!--{* ▼HeaderInternal COLUMN*}-->
 -    <!--{if $arrPageLayout.HeaderInternalNavi|@count > 0}-->
 +    <!--{if !empty($arrPageLayout.HeaderInternalNavi)}-->
         <!--{* ▼上ナビ *}-->
         <!--{foreach key=HeaderInternalNaviKey item=HeaderInternalNaviItem from=$arrPageLayout.HeaderInternalNavi}-->
             <!-- ▼<!--{$HeaderInternalNaviItem.bloc_name}--> -->
             <!--{if $HeaderInternalNaviItem.php_path != ""}-->
 -                <!--{include_php file=$HeaderInternalNaviItem.php_path items=$HeaderInternalNaviItem}-->
 +                <!--{include_php_ex file=$HeaderInternalNaviItem.php_path items=$HeaderInternalNaviItem}-->
             <!--{else}-->
                 <!--{include file=$HeaderInternalNaviItem.tpl_path items=$HeaderInternalNaviItem}-->
             <!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/mobile/mypage/history.tpl 2_17/data/Smarty/templates/mobile/mypage/history.tpl
 --- 2_13/data/Smarty/templates/mobile/mypage/history.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/mobile/mypage/history.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -59,10 +59,10 @@
             <!--{$arrProductType[$orderDetail.product_type_id]}--><br>
         <!--{/if}-->
         単価：
 -        <!--{assign var=price value=`$orderDetail.price`}-->
 -        <!--{assign var=quantity value=`$orderDetail.quantity`}-->
 -        <!--{assign var=tax_rate value=`$orderDetail.tax_rate`}-->
 -        <!--{assign var=tax_rule value=`$orderDetail.tax_rule`}-->
 +        <!--{assign var=price value="`$orderDetail.price`"}-->
 +        <!--{assign var=quantity value="`$orderDetail.quantity`"}-->
 +        <!--{assign var=tax_rate value="`$orderDetail.tax_rate`"}-->
 +        <!--{assign var=tax_rule value="`$orderDetail.tax_rule`"}-->
         <!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|n2s|h}-->円<br>
         数量：<!--{$quantity|h}--><br>
         小計：<!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|n2s}-->円<br>
 diff -urb 2_13/data/Smarty/templates/mobile/shopping/confirm.tpl 2_17/data/Smarty/templates/mobile/shopping/confirm.tpl
 --- 2_13/data/Smarty/templates/mobile/shopping/confirm.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/mobile/shopping/confirm.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -46,7 +46,7 @@
         【購入金額】<br>
         商品合計：<!--{$tpl_total_inctax[$cartKey]|n2s}-->円<br>
         <!--{if $smarty.const.USE_POINT !== false}-->
 -            <!--{assign var=discount value=`$arrForm.use_point*$smarty.const.POINT_VALUE`}-->
 +            <!--{assign var=discount value="`$arrForm.use_point*$smarty.const.POINT_VALUE`"}-->
             ポイント値引き：-<!--{$discount|n2s|default:0}-->円<br>
         <!--{/if}-->
         送料：<!--{$arrForm.deliv_fee|n2s}-->円<br>
 @@ -62,7 +62,7 @@
             ご使用ポイント：-<!--{$arrForm.use_point|n2s|default:0}-->Pt<br>
             <!--{if $arrForm.birth_point > 0}-->お誕生月ポイント：+<!--{$arrForm.birth_point|n2s|default:0}-->Pt<br><!--{/if}-->
             今回加算予定のポイント：+<!--{$arrForm.add_point|n2s|default:0}-->Pt<br>
 -            <!--{assign var=total_point value=`$tpl_user_point-$arrForm.use_point+$arrForm.add_point`}-->
 +            <!--{assign var=total_point value="`$tpl_user_point-$arrForm.use_point+$arrForm.add_point`"}-->
             加算後のポイント：<!--{$total_point|n2s}-->Pt<br>
 
             <br>
 diff -urb 2_13/data/Smarty/templates/mobile/site_frame.tpl 2_17/data/Smarty/templates/mobile/site_frame.tpl
 --- 2_13/data/Smarty/templates/mobile/site_frame.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/mobile/site_frame.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -40,12 +40,12 @@
                 <meta name="robots" content="<!--{$arrPageLayout.meta_robots|h}-->">
             <!--{/if}-->
             <!--{* ▼Head COLUMN *}-->
 -            <!--{if $arrPageLayout.HeadNavi|@count > 0}-->
 +            <!--{if !empty($arrPageLayout.HeadNavi)}-->
                 <!--{* ▼上ナビ *}-->
                 <!--{foreach key=HeadNaviKey item=HeadNaviItem from=$arrPageLayout.HeadNavi}-->
                     <!-- ▼「<!--{$HeadNaviItem.bloc_name|h}-->」ブロック -->
                     <!--{if $HeadNaviItem.php_path != ""}-->
 -                        <!--{include_php file=$HeadNaviItem.php_path items=$HeadNaviItem}-->
 +                        <!--{include_php_ex file=$HeadNaviItem.php_path items=$HeadNaviItem}-->
                     <!--{else}-->
                         <!--{include file=$HeadNaviItem.tpl_path items=$HeadNaviItem}-->
                     <!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/mobile/site_main.tpl 2_17/data/Smarty/templates/mobile/site_main.tpl
 --- 2_13/data/Smarty/templates/mobile/site_main.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/mobile/site_main.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -27,16 +27,16 @@
         <a name="top" id="top"></a>
         <!--{* Moba8リクエスト用 *}-->
         <!--{if "sfRequestMoba8"|function_exists === TRUE}-->
 -            <!--{include file=`$smarty.const.MODULE_REALDIR`mdl_moba8/request_moba8.tpl}-->
 +            <!--{include file="`$smarty.const.MODULE_REALDIR`mdl_moba8/request_moba8.tpl"}-->
         <!--{/if}-->
 
         <!--{* ▼HeaderHeaderTop COLUMN *}-->
 -        <!--{if $arrPageLayout.HeaderTopNavi|@count > 0}-->
 +        <!--{if !empty($arrPageLayout.HeaderTopNavi)}-->
             <!--{* ▼上ナビ *}-->
             <!--{foreach key=HeaderTopNaviKey item=HeaderTopNaviItem from=$arrPageLayout.HeaderTopNavi}-->
                 <!-- ▼<!--{$HeaderTopNaviItem.bloc_name}--> -->
                 <!--{if $HeaderTopNaviItem.php_path != ""}-->
 -                    <!--{include_php file=$HeaderTopNaviItem.php_path items=$HeaderTopNaviItem}-->
 +                    <!--{include_php_ex file=$HeaderTopNaviItem.php_path items=$HeaderTopNaviItem}-->
                 <!--{else}-->
                     <!--{include file=$HeaderTopNaviItem.tpl_path items=$HeaderTopNaviItem}-->
                 <!--{/if}-->
 @@ -53,12 +53,12 @@
         <!--{* ▲HEADER *}-->
 
         <!--{* ▼TOP COLUMN *}-->
 -        <!--{if $arrPageLayout.TopNavi|@count > 0}-->
 +        <!--{if !empty($arrPageLayout.TopNavi)}-->
             <!--{* ▼上ナビ *}-->
             <!--{foreach key=TopNaviKey item=TopNaviItem from=$arrPageLayout.TopNavi}-->
                 <!-- ▼<!--{$TopNaviItem.bloc_name}--> -->
                 <!--{if $TopNaviItem.php_path != ""}-->
 -                    <!--{include_php file=$TopNaviItem.php_path items=$TopNaviItem}-->
 +                    <!--{include_php_ex file=$TopNaviItem.php_path items=$TopNaviItem}-->
                 <!--{else}-->
                     <!--{include file=$TopNaviItem.tpl_path items=$TopNaviItem}-->
                 <!--{/if}-->
 @@ -69,11 +69,11 @@
         <!--{* ▲TOP COLUMN *}-->
 
         <!--{* ▼メイン上部 *}-->
 -        <!--{if $arrPageLayout.MainHead|@count > 0}-->
 +        <!--{if !empty($arrPageLayout.MainHead)}-->
             <!--{foreach key=MainHeadKey item=MainHeadItem from=$arrPageLayout.MainHead}-->
                 <!-- ▼<!--{$MainHeadItem.bloc_name}--> -->
                 <!--{if $MainHeadItem.php_path != ""}-->
 -                    <!--{include_php file=$MainHeadItem.php_path items=$MainHeadItem}-->
 +                    <!--{include_php_ex file=$MainHeadItem.php_path items=$MainHeadItem}-->
                 <!--{else}-->
                     <!--{include file=$MainHeadItem.tpl_path items=$MainHeadItem}-->
                 <!--{/if}-->
 @@ -87,11 +87,11 @@
         <!--▲MAIN-->
 
         <!--{* ▼メイン下部 *}-->
 -        <!--{if $arrPageLayout.MainFoot|@count > 0}-->
 +        <!--{if !empty($arrPageLayout.MainFoot)}-->
             <!--{foreach key=MainFootKey item=MainFootItem from=$arrPageLayout.MainFoot}-->
                 <!-- ▼<!--{$MainFootItem.bloc_name}--> -->
                 <!--{if $MainFootItem.php_path != ""}-->
 -                    <!--{include_php file=$MainFootItem.php_path items=$MainFootItem}-->
 +                    <!--{include_php_ex file=$MainFootItem.php_path items=$MainFootItem}-->
                 <!--{else}-->
                     <!--{include file=$MainFootItem.tpl_path items=$MainFootItem}-->
                 <!--{/if}-->
 @@ -101,12 +101,12 @@
         <!--{* ▲メイン下部 *}-->
 
         <!--{* ▼BOTTOM COLUMN*}-->
 -        <!--{if $arrPageLayout.BottomNavi|@count > 0}-->
 +        <!--{if !empty($arrPageLayout.BottomNavi)}-->
             <!--{* ▼下ナビ *}-->
             <!--{foreach key=BottomNaviKey item=BottomNaviItem from=$arrPageLayout.BottomNavi}-->
                 <!-- ▼<!--{$BottomNaviItem.bloc_name}--> -->
                 <!--{if $BottomNaviItem.php_path != ""}-->
 -                    <!--{include_php file=$BottomNaviItem.php_path items=$BottomNaviItem}-->
 +                    <!--{include_php_ex file=$BottomNaviItem.php_path items=$BottomNaviItem}-->
                 <!--{else}-->
                     <!--{include file=$BottomNaviItem.tpl_path items=$BottomNaviItem}-->
                 <!--{/if}-->
 @@ -123,12 +123,12 @@
         <!--{* ▲FOOTER *}-->
 
         <!--{* ▼FooterBottom COLUMN *}-->
 -        <!--{if $arrPageLayout.FooterBottomNavi|@count > 0}-->
 +        <!--{if !empty($arrPageLayout.FooterBottomNavi)}-->
             <!--{* ▼上ナビ *}-->
             <!--{foreach key=FooterBottomNaviKey item=FooterBottomNaviItem from=$arrPageLayout.FooterBottomNavi}-->
                 <!-- ▼<!--{$FooterBottomNaviItem.bloc_name}--> -->
                 <!--{if $FooterBottomNaviItem.php_path != ""}-->
 -                    <!--{include_php file=$FooterBottomNaviItem.php_path items=$BottomNaviItem}-->
 +                    <!--{include_php_ex file=$FooterBottomNaviItem.php_path items=$BottomNaviItem}-->
                 <!--{else}-->
                     <!--{include file=$FooterBottomNaviItem.tpl_path items=$FooterBottomNaviItem}-->
                 <!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/sphone/contact/index.tpl 2_17/data/Smarty/templates/sphone/contact/index.tpl
 --- 2_13/data/Smarty/templates/sphone/contact/index.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/contact/index.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -82,7 +82,7 @@
                         style="<!--{$arrErr.zip01|sfGetErrorColor}-->;" class="boxShort text data-role-none" />&nbsp;－&nbsp;<input type="tel" name="zip02"
                         value="<!--{$arrForm.zip02.value|default:$arrData.zip02|h}-->"
                         maxlength="<!--{$smarty.const.ZIP02_LEN}-->"
 -                        style="<!--{$arrErr.zip02|sfGetErrorColor}-->;" class="boxShort text data-role-none" />&nbsp;&nbsp;<a href="http://www.post.japanpost.jp/zipcode/" target="_blank" rel="external"><span class="fn">郵便番号検索</span></a>
 +                        style="<!--{$arrErr.zip02|sfGetErrorColor}-->;" class="boxShort text data-role-none" />&nbsp;&nbsp;<a href="https://www.post.japanpost.jp/zipcode/" target="_blank" rel="external"><span class="fn">郵便番号検索</span></a>
                 </p>
 
                 <a href="javascript:eccube.getAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', '<!--{$key1}-->', '<!--{$key2}-->', '<!--{$key3}-->', '<!--{$key4}-->');" class="btn_sub btn_inputzip" rel="external">郵便番号から住所自動入力</a>
 @@ -93,7 +93,7 @@
                 <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
                 <select name="pref" style="<!--{$arrErr.pref|sfGetErrorColor}-->" class="boxHarf top data-role-none">
                     <option value="" selected="selected">都道府県</option>
 -                    <!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref|h}-->
 +                    <!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref}-->
                 </select>
 
                 <input type="text" name="addr01"
 diff -urb 2_13/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl 2_17/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl
 --- 2_13/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -29,7 +29,7 @@
             <!--{else}-->
                 <!--{assign var=disp_child value=0}-->
             <!--{/if}-->
 -            <!--{if isset($child.children|smarty:nodefaults)}-->
 +            <!--{if isset($child.children)}-->
                 <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$child.children treeID="" display=$disp_child level=$child.level}-->
             <!--{/if}-->
         </li>
 diff -urb 2_13/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl 2_17/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl
 --- 2_13/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -89,7 +89,7 @@
     <!--{if $arrErr[$key1] || $arrErr[$key2]}-->
         <div class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></div>
     <!--{/if}-->
 -    <p><input type="tel" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" class="boxShort text data-role-none" />&nbsp;－&nbsp;<input type="tel" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" class="boxShort text data-role-none" />&nbsp;&nbsp;<a href="http://www.post.japanpost.jp/zipcode/" target="_blank" rel="external"><span class="fn">郵便番号検索</span></a></p>
 +    <p><input type="tel" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" class="boxShort text data-role-none" />&nbsp;－&nbsp;<input type="tel" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" class="boxShort text data-role-none" />&nbsp;&nbsp;<a href="https://www.post.japanpost.jp/zipcode/" target="_blank" rel="external"><span class="fn">郵便番号検索</span></a></p>
 
     <a href="javascript:eccube.getAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', '<!--{$key1}-->', '<!--{$key2}-->', '<!--{$key3}-->', '<!--{$key4}-->');" class="btn_sub btn_inputzip">郵便番号から住所自動入力</a>
 </dd>
 diff -urb 2_13/data/Smarty/templates/sphone/header.tpl 2_17/data/Smarty/templates/sphone/header.tpl
 --- 2_13/data/Smarty/templates/sphone/header.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/header.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -27,11 +27,11 @@
         </div>
         <div class="header_utility">
             <!--{* ▼HeaderInternal COLUMN *}-->
 -            <!--{if $arrPageLayout.HeaderInternalNavi|@count > 0}-->
 +            <!--{if !empty($arrPageLayout.HeaderInternalNavi)}-->
                 <!--{foreach key=HeaderInternalNaviKey item=HeaderInternalNaviItem from=$arrPageLayout.HeaderInternalNavi}-->
                     <!-- ▼<!--{$HeaderInternalNaviItem.bloc_name}--> -->
                     <!--{if $HeaderInternalNaviItem.php_path != ""}-->
 -                        <!--{include_php file=$HeaderInternalNaviItem.php_path items=$HeaderInternalNaviItem}-->
 +                        <!--{include_php_ex file=$HeaderInternalNaviItem.php_path items=$HeaderInternalNaviItem}-->
                     <!--{else}-->
                         <!--{include file=$HeaderInternalNaviItem.tpl_path items=$HeaderInternalNaviItem}-->
                     <!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/sphone/mypage/favorite.tpl 2_17/data/Smarty/templates/sphone/mypage/favorite.tpl
 --- 2_13/data/Smarty/templates/sphone/mypage/favorite.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/mypage/favorite.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -27,7 +27,7 @@
     <!--{if $tpl_navi != ""}-->
         <!--{include file=$tpl_navi}-->
     <!--{else}-->
 -        <!--{include file=`$smarty.const.TEMPLATE_REALDIR`mypage/navi.tpl}-->
 +        <!--{include file="`$smarty.const.TEMPLATE_REALDIR`mypage/navi.tpl"}-->
     <!--{/if}-->
 
     <h3 class="title_mypage"><!--{$tpl_subtitle|h}--></h3>
 diff -urb 2_13/data/Smarty/templates/sphone/mypage/history.tpl 2_17/data/Smarty/templates/sphone/mypage/history.tpl
 --- 2_13/data/Smarty/templates/sphone/mypage/history.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/mypage/history.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -100,8 +100,8 @@
                                 <p><em><!--→商品名--><a<!--{if $orderDetail.enable}--> href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$orderDetail.product_id|u}-->"<!--{/if}--> rel="external"><!--{$orderDetail.product_name|h}--></a><!--←商品名--></em></p>
                                 <p>
                                     <!--→金額-->
 -                                    <!--{assign var=price value=`$orderDetail.price`}-->
 -                                    <!--{assign var=quantity value=`$orderDetail.quantity`}-->
 +                                    <!--{assign var=price value="`$orderDetail.price`"}-->
 +                                    <!--{assign var=quantity value="`$orderDetail.quantity`"}-->
                                     <span class="mini">価格:</span><!--{$price|n2s|h}-->円<!--←金額-->
                                 </p>
 
 @@ -121,8 +121,8 @@
                                 <!--{/if}-->
                                 <!--←商品種別-->
                             </div>
 -                            <!--{assign var=tax_rate value=`$orderDetail.tax_rate`}-->
 -                            <!--{assign var=tax_rule value=`$orderDetail.tax_rule`}-->
 +                            <!--{assign var=tax_rate value="`$orderDetail.tax_rate`"}-->
 +                            <!--{assign var=tax_rule value="`$orderDetail.tax_rule`"}-->
                             <ul>
                                 <li><span class="mini">数量：</span><!--{$quantity|h}--></li>
                                 <li class="result"><span class="mini">小計：</span><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|n2s}-->円</li>
 diff -urb 2_13/data/Smarty/templates/sphone/mypage/index.tpl 2_17/data/Smarty/templates/sphone/mypage/index.tpl
 --- 2_13/data/Smarty/templates/sphone/mypage/index.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/mypage/index.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -28,7 +28,7 @@
         <!--{if $tpl_navi != ""}-->
             <!--{include file=$tpl_navi}-->
         <!--{else}-->
 -            <!--{include file=`$smarty.const.TEMPLATE_REALDIR`mypage/navi.tpl}-->
 +            <!--{include file="`$smarty.const.TEMPLATE_REALDIR`mypage/navi.tpl"}-->
         <!--{/if}-->
 
         <form name="form1" id="form1" method="post" action="<!--{$smarty.const.ROOT_URLPATH}-->mypage/index.php">
 diff -urb 2_13/data/Smarty/templates/sphone/products/detail.tpl 2_17/data/Smarty/templates/sphone/products/detail.tpl
 --- 2_13/data/Smarty/templates/sphone/products/detail.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/products/detail.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -88,7 +88,7 @@
 
             <!--{* 画像の縦横倍率を算出 *}-->
             <!--{assign var=detail_image_size value=200}-->
 -            <!--{assign var=main_image_factor value=`$arrFile[$key].width/$detail_image_size`}-->
 +            <!--{assign var=main_image_factor value=$arrFile[$key].width/$detail_image_size}-->
             <!--{if $arrProduct.main_large_image|strlen >= 1}-->
                 <a rel="external" class="expansion" href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct.main_large_image|h}-->" target="_blank">
                     <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct.main_image|h}-->" alt="<!--{$arrProduct.name|h}-->" width="<!--{$arrFile.main_image.width/$main_image_factor}-->" height="<!--{$arrFile.main_image.height/$main_image_factor}-->" /></a>
 @@ -99,7 +99,7 @@
             <!--★サブ画像★-->
             <!--{section name=cnt loop=$smarty.const.PRODUCTSUB_MAX}-->
             <!--{assign var=key value="sub_image`$smarty.section.cnt.index+1`"}-->
 -            <!--{assign var=sub_image_factor value=`$arrFile[$key].width/$detail_image_size`}-->
 +            <!--{assign var=sub_image_factor value="`$arrFile[$key].width/$detail_image_size`"}-->
             <!--{assign var=lkey value="sub_large_image`$smarty.section.cnt.index+1`"}-->
             <!--{if $arrFile[$key].filepath != ""}-->
                 <li id="mainImage<!--{$smarty.section.cnt.index+1}-->">
 @@ -124,7 +124,7 @@
             <div id="detailrightblock">
                 <!--▼商品ステータス-->
                 <!--{assign var=ps value=$productStatus[$tpl_product_id]}-->
 -                <!--{if count($ps) > 0}-->
 +                <!--{if !empty($ps)}-->
                     <ul class="status_icon">
                     <!--{foreach from=$ps item=status}-->
                         <li><!--{$arrSTATUS[$status]}--></li>
 @@ -329,7 +329,7 @@
                         <!--{assign var=key value="sub_image`$smarty.section.cnt.index+1`"}-->
                         <!--{assign var=lkey value="sub_large_image`$smarty.section.cnt.index+1`"}-->
                         <!--{assign var=ckey value="sub_comment`$smarty.section.cnt.index+1`"}-->
 -                        <!--{assign var=sub_image_factor value=`$arrFile[$key].width/$sub_image_size`}-->
 +                        <!--{assign var=sub_image_factor value="`$arrFile[$key].width/$sub_image_size`"}-->
                         <!--{if $arrProduct[$key]|strlen >= 1}-->
                             <p class="subphotoimg">
                                 <!--{if $arrProduct[$lkey]|strlen >= 1}-->
 @@ -396,8 +396,8 @@
                     <!--{if $arrRecommend[cnt].product_id}-->
                         <li id="mainImage1<!--{$smarty.section.cnt.index}-->">
                             <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|h}-->" style="max-width: 65px;max-height: 65px;" alt="!--{$arrRecommend[cnt].name|h}-->" />
 -                            <!--{assign var=price02_min value=`$arrRecommend[cnt].price02_min_inctax`}-->
 -                            <!--{assign var=price02_max value=`$arrRecommend[cnt].price02_max_inctax`}-->
 +                            <!--{assign var=price02_min value="`$arrRecommend[cnt].price02_min_inctax`"}-->
 +                            <!--{assign var=price02_max value="`$arrRecommend[cnt].price02_max_inctax`"}-->
                             <h3><a rel="external" href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrRecommend[cnt].product_id|u}-->"><!--{$arrRecommend[cnt].name|h}--></a></h3>
                             <p class="sale_price"><span class="price">
                                 <!--{if $price02_min == $price02_max}-->
 @@ -421,4 +421,3 @@
 </section>
 
 <!--{include file= 'frontparts/search_area.tpl'}-->
 -
 diff -urb 2_13/data/Smarty/templates/sphone/products/list.tpl 2_17/data/Smarty/templates/sphone/products/list.tpl
 --- 2_13/data/Smarty/templates/sphone/products/list.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/products/list.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -78,7 +78,7 @@
             <div class="listrightblock">
                 <div class="statusArea">
                     <!--▼商品ステータス-->
 -                    <!--{if count($productStatus[$id]) > 0}-->
 +                    <!--{if !empty($productStatus[$id])}-->
                         <ul class="status_icon">
                             <!--{foreach from=$productStatus[$id] item=status}-->
                                 <li><!--{$arrSTATUS[$status]}--></li>
 diff -urb 2_13/data/Smarty/templates/sphone/shopping/confirm.tpl 2_17/data/Smarty/templates/sphone/shopping/confirm.tpl
 --- 2_13/data/Smarty/templates/sphone/shopping/confirm.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/shopping/confirm.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -125,7 +125,7 @@
                         <ul>
                             <li><span class="mini">小計 ：</span><!--{$tpl_total_inctax[$cartKey]|n2s}--> 円</li>
                             <!--{if $smarty.const.USE_POINT !== false}-->
 -                                <li><span class="mini">値引き（ポイントご使用時）： </span><!--{assign var=discount value=`$arrForm.use_point*$smarty.const.POINT_VALUE`}-->
 +                                <li><span class="mini">値引き（ポイントご使用時）： </span><!--{assign var=discount value="`$arrForm.use_point*$smarty.const.POINT_VALUE`"}-->
                                 -<!--{$discount|n2s|default:0}--> 円</li>
                             <!--{/if}-->
                             <li><span class="mini">送料 ：</span><!--{$arrForm.deliv_fee|n2s}--> 円</li>
 @@ -158,7 +158,7 @@
                             <dt>今回加算予定のポイント</dt><dd>+<!--{$arrForm.add_point|n2s|default:0}-->Pt</dd>
                         </dl>
                         <dl>
 -                            <!--{assign var=total_point value=`$tpl_user_point-$arrForm.use_point+$arrForm.add_point`}-->
 +                            <!--{assign var=total_point value="`$tpl_user_point-$arrForm.use_point+$arrForm.add_point`"}-->
                             <dt>加算後のポイント</dt><dd><!--{$total_point|n2s}-->Pt</dd>
                         </dl>
                     </div><!-- /.formBox -->
 diff -urb 2_13/data/Smarty/templates/sphone/shopping/nonmember_input.tpl 2_17/data/Smarty/templates/sphone/shopping/nonmember_input.tpl
 --- 2_13/data/Smarty/templates/sphone/shopping/nonmember_input.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/shopping/nonmember_input.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -103,7 +103,7 @@
                 <div class="attention"><!--{$arrErr[$key1]}--></div>
                 <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
                     <option value="" selected="selected">国を選択</option>
 -                    <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
 +                    <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
                 </select>
             </dd>
 
 @@ -129,7 +129,7 @@
                         value="<!--{$arrForm[$key2].value|h}-->"
                         maxlength="<!--{$arrForm[$key2].length}-->"
                         style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" class="boxShort text data-role-none" />&nbsp;
 -                    <a href="http://www.post.japanpost.jp/zipcode/" target="_blank"><span class="fn">郵便番号検索</span></a>
 +                    <a href="https://www.post.japanpost.jp/zipcode/" target="_blank"><span class="fn">郵便番号検索</span></a>
                 </p>
 
                 <a href="javascript:eccube.getAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'order_zip01', 'order_zip02', 'order_pref', 'order_addr01');" class="btn_sub btn_inputzip">郵便番号から住所自動入力</a>
 @@ -323,7 +323,7 @@
                     <div class="attention"><!--{$arrErr[$key1]}--></div>
                     <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
                         <option value="" selected="selected">国を選択</option>
 -                        <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
 +                        <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
                     </select>
                 </dd>
 
 @@ -349,7 +349,7 @@
                             value="<!--{$arrForm[$key2].value|h}-->"
                             maxlength="<!--{$arrForm[$key2].length}-->"
                             style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" class="boxShort text data-role-none" />&nbsp;
 -                        <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="fn">郵便番号検索</span></a>
 +                        <a href="https://www.post.japanpost.jp/zipcode/" target="_blank"><span class="fn">郵便番号検索</span></a>
                     </p>
 
                     <a href="javascript:eccube.getAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'shipping_zip01', 'shipping_zip02', 'shipping_pref', 'shipping_addr01');" class="btn_sub btn_inputzip">郵便番号から住所自動入力</a>
 diff -urb 2_13/data/Smarty/templates/sphone/site_frame.tpl 2_17/data/Smarty/templates/sphone/site_frame.tpl
 --- 2_13/data/Smarty/templates/sphone/site_frame.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/site_frame.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -85,11 +85,11 @@
         //]]></script>
 
         <!--{* ▼Head COLUMN *}-->
 -            <!--{if $arrPageLayout.HeadNavi|@count > 0}-->
 +            <!--{if !empty($arrPageLayout.HeadNavi)}-->
                 <!--{foreach key=HeadNaviKey item=HeadNaviItem from=$arrPageLayout.HeadNavi}-->
                     <!--{* ▼<!--{$HeadNaviItem.bloc_name}--> *}-->
                         <!--{if $HeadNaviItem.php_path != ""}-->
 -                            <!--{include_php file=$HeadNaviItem.php_path items=$HeadNaviItem}-->
 +                            <!--{include_php_ex file=$HeadNaviItem.php_path items=$HeadNaviItem}-->
                         <!--{else}-->
                             <!--{include file=$HeadNaviItem.tpl_path items=$HeadNaviItem}-->
                         <!--{/if}-->
 diff -urb 2_13/data/Smarty/templates/sphone/site_main.tpl 2_17/data/Smarty/templates/sphone/site_main.tpl
 --- 2_13/data/Smarty/templates/sphone/site_main.tpl	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/Smarty/templates/sphone/site_main.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -24,13 +24,13 @@
     <div data-role="page" data-keep-native=".data-role-none" data-theme="f">
 
         <!--{* ▼HeaderHeaderTop COLUMN*}-->
 -        <!--{if $arrPageLayout.HeaderTopNavi|@count > 0}-->
 +        <!--{if !empty($arrPageLayout.HeaderTopNavi)}-->
             <div class="header_utility">
                 <!--{* ▼上ナビ *}-->
                 <!--{foreach key=HeaderTopNaviKey item=HeaderTopNaviItem from=$arrPageLayout.HeaderTopNavi}-->
                     <!-- ▼<!--{$HeaderTopNaviItem.bloc_name}--> -->
                     <!--{if $HeaderTopNaviItem.php_path != ""}-->
 -                        <!--{include_php file=$HeaderTopNaviItem.php_path items=$HeaderTopNaviItem}-->
 +                        <!--{include_php_ex file=$HeaderTopNaviItem.php_path items=$HeaderTopNaviItem}-->
                     <!--{else}-->
                         <!--{include file=$HeaderTopNaviItem.tpl_path items=$HeaderTopNaviItem}-->
                     <!--{/if}-->
 @@ -49,13 +49,13 @@
 
 
         <!--{* ▼TOP COLUMN*}-->
 -        <!--{if $arrPageLayout.TopNavi|@count > 0}-->
 +        <!--{if !empty($arrPageLayout.TopNavi)}-->
             <div class="header_utility">
                 <!--{* ▼上ナビ *}-->
                 <!--{foreach key=TopNaviKey item=TopNaviItem from=$arrPageLayout.TopNavi}-->
                     <!-- ▼<!--{$TopNaviItem.bloc_name}--> -->
                     <!--{if $TopNaviItem.php_path != ""}-->
 -                        <!--{include_php file=$TopNaviItem.php_path items=$TopNaviItem}-->
 +                        <!--{include_php_ex file=$TopNaviItem.php_path items=$TopNaviItem}-->
                     <!--{else}-->
                         <!--{include file=$TopNaviItem.tpl_path items=$TopNaviItem}-->
                     <!--{/if}-->
 @@ -69,11 +69,11 @@
         <!--{* ▼CENTER COLUMN *}-->
         <div id="main-content">
             <!--{* ▼メイン上部 *}-->
 -            <!--{if $arrPageLayout.MainHead|@count > 0}-->
 +            <!--{if !empty($arrPageLayout.MainHead)}-->
                 <!--{foreach key=MainHeadKey item=MainHeadItem from=$arrPageLayout.MainHead}-->
                     <!-- ▼<!--{$MainHeadItem.bloc_name}--> -->
                     <!--{if $MainHeadItem.php_path != ""}-->
 -                        <!--{include_php file=$MainHeadItem.php_path items=$MainHeadItem}-->
 +                        <!--{include_php_ex file=$MainHeadItem.php_path items=$MainHeadItem}-->
                     <!--{else}-->
                         <!--{include file=$MainHeadItem.tpl_path items=$MainHeadItem}-->
                     <!--{/if}-->
 @@ -87,11 +87,11 @@
             <!-- ▲メイン -->
 
             <!--{* ▼メイン下部 *}-->
 -            <!--{if $arrPageLayout.MainFoot|@count > 0}-->
 +            <!--{if !empty($arrPageLayout.MainFoot)}-->
                 <!--{foreach key=MainFootKey item=MainFootItem from=$arrPageLayout.MainFoot}-->
                     <!-- ▼<!--{$MainFootItem.bloc_name}--> -->
                     <!--{if $MainFootItem.php_path != ""}-->
 -                        <!--{include_php file=$MainFootItem.php_path items=$MainFootItem}-->
 +                        <!--{include_php_ex file=$MainFootItem.php_path items=$MainFootItem}-->
                     <!--{else}-->
                         <!--{include file=$MainFootItem.tpl_path items=$MainFootItem}-->
                     <!--{/if}-->
 @@ -103,13 +103,13 @@
         <!--{* ▲CENTER COLUMN *}-->
 
         <!--{* ▼BOTTOM COLUMN*}-->
 -        <!--{if $arrPageLayout.BottomNavi|@count > 0}-->
 +        <!--{if !empty($arrPageLayout.BottomNavi)}-->
             <div id="footer_utility">
                 <!--{* ▼下ナビ *}-->
                 <!--{foreach key=BottomNaviKey item=BottomNaviItem from=$arrPageLayout.BottomNavi}-->
                     <!-- ▼<!--{$BottomNaviItem.bloc_name}--> -->
                     <!--{if $BottomNaviItem.php_path != ""}-->
 -                        <!--{include_php file=$BottomNaviItem.php_path items=$BottomNaviItem}-->
 +                        <!--{include_php_ex file=$BottomNaviItem.php_path items=$BottomNaviItem}-->
                     <!--{else}-->
                         <!--{include file=$BottomNaviItem.tpl_path items=$BottomNaviItem}-->
                     <!--{/if}-->
 @@ -128,13 +128,13 @@
         <!--{* ▲FOOTER *}-->
 
         <!--{* ▼FooterBottom COLUMN*}-->
 -        <!--{if $arrPageLayout.FooterBottomNavi|@count > 0}-->
 +        <!--{if !empty($arrPageLayout.FooterBottomNavi)}-->
             <div id="footerbottomcolumn">
                 <!--{* ▼上ナビ *}-->
                 <!--{foreach key=FooterBottomNaviKey item=FooterBottomNaviItem from=$arrPageLayout.FooterBottomNavi}-->
                     <!-- ▼<!--{$FooterBottomNaviItem.bloc_name}--> -->
                     <!--{if $FooterBottomNaviItem.php_path != ""}-->
 -                        <!--{include_php file=$FooterBottomNaviItem.php_path items=$FooterBottomNaviItem}-->
 +                        <!--{include_php_ex file=$FooterBottomNaviItem.php_path items=$FooterBottomNaviItem}-->
                     <!--{else}-->
                         <!--{include file=$FooterBottomNaviItem.tpl_path items=$FooterBottomNaviItem}-->
                     <!--{/if}-->
 Only in 2_17/data/Smarty/templates_c: .gitkeep
 Only in 2_13/data/Smarty/templates_c: dummy
 diff -urb 2_13/data/app_initial.php 2_17/data/app_initial.php
 --- 2_13/data/app_initial.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/app_initial.php	2019-08-03 09:51:39.000000000 +0900
 @@ -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'] = 'on';
 +    $_SERVER['SERVER_PORT'] = 443;
 +}
 +
 if (!defined('CLASS_REALDIR')) {
     /** クラスパス */
     define('CLASS_REALDIR', DATA_REALDIR . "class/");
 @@ -41,7 +47,7 @@
 
 // クラスのオートローディングを定義する
 require_once(CLASS_EX_REALDIR . 'SC_ClassAutoloader_Ex.php');
 -spl_autoload_register(array('SC_ClassAutoloader_Ex', 'autoload'));
 +spl_autoload_register(array('SC_ClassAutoloader_Ex', 'autoload'), true, true);
 
 SC_Helper_HandleError_Ex::load();
 
 Only in 2_17/data/cache: .gitkeep
 Only in 2_13/data/cache: dummy
 Only in 2_13/data/class: SC_Cache.php
 diff -urb 2_13/data/class/SC_CartSession.php 2_17/data/class/SC_CartSession.php
 --- 2_13/data/class/SC_CartSession.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_CartSession.php	2019-08-03 09:51:39.000000000 +0900
 @@ -54,7 +54,7 @@
     {
         $this->key_tmp = 'savecart_' . $key_tmp;
         // すでに情報がなければ現状のカート情報を記録しておく
 -        if (count($_SESSION[$this->key_tmp]) == 0) {
 +        if (!isset($_SESSION[$this->key_tmp])) {
             $_SESSION[$this->key_tmp] = $this->cartSession[$productTypeId];
         }
         // 1世代古いコピー情報は、削除しておく
 @@ -140,7 +140,8 @@
     public function getMax($productTypeId)
     {
         $max = 0;
 -        if (count($this->cartSession[$productTypeId]) > 0) {
 +        if (is_array($this->cartSession[$productTypeId])
 +            && count($this->cartSession[$productTypeId]) > 0) {
             foreach ($this->cartSession[$productTypeId] as $key => $value) {
                 if (is_numeric($key)) {
                     if ($max < $key) {
 @@ -159,7 +160,7 @@
         $total = 0;
         $max = $this->getMax($productTypeId);
         for ($i = 0; $i <= $max; $i++) {
 -            $total+= $this->cartSession[$productTypeId][$i]['quantity'];
 +            $total+= (int)$this->cartSession[$productTypeId][$i]['quantity'];
         }
 
         return $total;
 @@ -187,7 +188,7 @@
                 $this->cartSession[$productTypeId][$i]['productsClass']['product_class_id'],
                 $pref_id, $country_id);
 
 -            $total+= ($incTax * $quantity);
 +            $total += ($incTax * (int) $quantity);
         }
 
         return $total;
 @@ -207,7 +208,7 @@
                 $this->cartSession[$productTypeId][$i]['productsClass']['product_class_id'],
                 $pref_id, $country_id);
 
 -            $total+= ($tax * $quantity);
 +            $total += ($tax * (int) $quantity);
         }
 
         return $total;
 @@ -233,11 +234,8 @@
                 }
                 $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);
 +                $total += ($point * (int) $quantity);
             }
         }
 
 @@ -297,10 +295,13 @@
     }
 
     // キーが一致した商品の削除
 +    /**
 +     * @deprecated 本体では使用していないメソッドです
 +     */
     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]);
             }
 @@ -355,7 +356,7 @@
      * @param  integer $productTypeId 商品種別ID
      * @param  integer $key
      * @return void
 -     *
 +     * @deprecated 本体では使用していないメソッドです
      * MEMO: せっかく一回だけ読み込みにされてますが、税率対応の関係でちょっと保留
      */
     public function setCartSession4getCartList($productTypeId, $key)
 @@ -374,7 +375,7 @@
         $quantity = $this->cartSession[$productTypeId][$key]['quantity'];
         $incTax = SC_Helper_TaxRule_Ex::sfCalcIncTax($price,
             $this->cartSession[$productTypeId][$key]['productsClass']['product_id'],
 -            $this->cartSession[$productTypeId][$key]['id'][0]);
 +            $this->cartSession[$productTypeId][$key]['id']);
 
         $total = $incTax * $quantity;
 
 @@ -581,6 +582,7 @@
      * @param  integer $cart_no       カート番号
      * @param  integer $productTypeId 商品種別ID
      * @return integer 商品規格ID
 +     * @deprecated 本体では使用していないメソッドです
      */
     public function getProductClassId($cart_no, $productTypeId)
     {
 @@ -641,7 +643,7 @@
                         $this->setProductValue($arrItem['id'], 'quantity', $limit, $productTypeId);
                         $total_inctax = $limit * SC_Helper_TaxRule_Ex::sfCalcIncTax($arrItem['price'],
                             $product['product_id'],
 -                            $arrItem['id'][0]);
 +                            $arrItem['id']);
                         $this->setProductValue($arrItem['id'], 'total_inctax', $total_inctax, $productTypeId);
                         $tpl_message .= '※「' . $product['name'] . '」は販売制限(または在庫が不足)しております。';
                         $tpl_message .= "一度に数量{$limit}を超える購入はできません。\n";
 diff -urb 2_13/data/class/SC_CheckError.php 2_17/data/class/SC_CheckError.php
 --- 2_13/data/class/SC_CheckError.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_CheckError.php	2019-08-03 09:51:39.000000000 +0900
 @@ -74,7 +74,7 @@
 
         // HTMLに含まれているタグを抽出する
         $match = array();
 -        preg_match_all('/<\/?([a-z]+)/i', $this->arrParam[$keyname], $match);
 +        preg_match_all('/<\/?([a-z\d]+)/i', $this->arrParam[$keyname], $match);
         $arrTagIncludedHtml = $match[1];
         // 抽出結果を小文字に変換
         foreach ($arrTagIncludedHtml as $key => $matchedTag) {
 @@ -364,7 +364,7 @@
             $this->arrErr[$keyname1] = sprintf(
                 '※ %sは%sより大きい値を入力できません。<br />',
                 $disp_name1,
 -                $disp_name1
 +                $disp_name2
             );
         }
     }
 @@ -432,9 +432,9 @@
     }
 
     /**
 -     * 最大文字数制限の判定
 +     * 最大数制限の判定
      *
 -     * 入力が最大数以上ならエラーを返す
 +     * 入力が最大数より大きければエラーを返す
      * @param  array $value value[0] = 項目名
      *                      value[1] = 判定対象文字列
      *                      value[2] = 最大数
 @@ -862,6 +862,37 @@
         }
     }
 
 +    /**
 +     * パスワードに使用可能な文字列のチェック
 +     *
 +     * 半角英数字をそれぞれ1種類以上含む PASSWORD_MIN_LEN 文字以上 PASSWORD_MAX_LEN 文字以下の文字列ではない場合エラーとする
 +     * PASSWORD_MIN_LEN が8未満の場合は E_USER_WARNING を出力する
 +     *
 +     * @param array $value $value[0] = 項目名 $value[1] = チェック対象のパスワード文字列
 +     */
 +    public function PASSWORD_CHAR_CHECK($value)
 +    {
 +        if (PASSWORD_MIN_LEN < 8) {
 +            trigger_error('PASSWORD_MIN_LEN が8未満に設定されています。', E_USER_WARNING);
 +        }
 +        $disp_name = $value[0];
 +        $keyname = $value[1];
 +
 +        if (isset($this->arrErr[$keyname])) {
 +            return;
 +        }
 +
 +        $this->createParam($value);
 +
 +        $input_var = $this->arrParam[$keyname];
 +        // see https://qiita.com/mpyw/items/886218e7b418dfed254b
 +        $pattern = '/\A(?=.*?[a-z])(?=.*?\d)[!-~]{'.PASSWORD_MIN_LEN.','.PASSWORD_MAX_LEN.'}+\z/i';
 +        if (strlen($input_var) > 0 && !preg_match($pattern, $input_var)) {
 +            $this->arrErr[$keyname] =
 +                "※ {$disp_name}は英数字をそれぞれ1種類使用し、".PASSWORD_MIN_LEN."文字以上で入力してください。<br />";
 +        }
 +    }
 +
     /*　必須選択の判定　*/
     // 入力値で0が許されない場合エラーを返す
     // value[0] = 項目名 value[1] = 判定対象
 @@ -1239,7 +1270,7 @@
             if (!(strlen($input_year) > 0 && strlen($input_month) > 0 && strlen($input_day) > 0)) {
                 $this->arrErr[$keyname] =
                     "※ {$disp_name}は全ての項目を入力して下さい。<br />";
 -            } elseif (!checkdate($input_month, $input_day, $input_year)) {
 +            } elseif (!checkdate((int) $input_month, (int) $input_day, (int) $input_year)) {
                 $this->arrErr[$keyname] =
                     "※ {$disp_name}が正しくありません。<br />";
             }
 @@ -1277,7 +1308,7 @@
             if (!(strlen($input_year) > 0 && strlen($input_month) > 0 && strlen($input_day) > 0 && strlen($input_hour) > 0 && strlen($input_minute) > 0)) {
                 $this->arrErr[$keyname] =
                     "※ {$disp_name}は全ての項目を入力して下さい。<br />";
 -            } elseif (! checkdate($input_month, $input_day, $input_year)) {
 +            } elseif (! checkdate((int) $input_month, (int) $input_day, (int) $input_year)) {
                 $this->arrErr[$keyname] =
                     "※ {$disp_name}が正しくありません。<br />";
             }
 @@ -1307,7 +1338,7 @@
             if (!(strlen($input_year) > 0 && strlen($input_month) > 0)) {
                 $this->arrErr[$keyname] =
                     "※ {$disp_name}は全ての項目を入力して下さい。<br />";
 -            } elseif (! checkdate($input_month, 1, $input_year)) {
 +            } elseif (! checkdate((int) $input_month, 1, (int) $input_year)) {
                 $this->arrErr[$keyname] =
                     "※ {$disp_name}が正しくありません。<br />";
             }
 @@ -1341,7 +1372,7 @@
             }
 
             // 年の最大数値制限チェック
 -            $current_year = date('Y', strtotime('now'));
 +            $current_year = date('Y');
             $this->doFunc(array("{$disp_name}(年)", $keyname, $current_year),
                 array('MAX_CHECK'));
             // 上のチェックでエラーある場合、中断する。
 @@ -1392,13 +1423,13 @@
         $end_month = $this->arrParam[$value[6]];
         $end_day = $this->arrParam[$value[7]];
         if ((strlen($start_year) > 0 || strlen($start_month) > 0 || strlen($start_day) > 0)
 -            && ! checkdate($start_month, $start_day, $start_year)
 +            && ! checkdate((int) $start_month, (int) $start_day, (int) $start_year)
         ) {
             $this->arrErr[$keyname1] =
                 "※ {$disp_name1}を正しく指定してください。<br />";
         }
         if ((strlen($end_year) > 0 || strlen($end_month) > 0 || strlen($end_day) > 0)
 -            && ! checkdate($end_month, $end_day, $end_year)
 +            && ! checkdate((int) $end_month, (int) $end_day, (int) $end_year)
         ) {
             $this->arrErr[$keyname2] =
                 "※ {$disp_name2}を正しく指定してください。<br />";
 @@ -1469,13 +1500,13 @@
         $end_minute = $this->arrParam[$value[12]];
         $end_second = $this->arrParam[$value[13]];
         if ((strlen($start_year) > 0 || strlen($start_month) > 0 || strlen($start_day) > 0 || strlen($start_hour) > 0)
 -            && ! checkdate($start_month, $start_day, $start_year)
 +            && ! checkdate((int) $start_month, (int) $start_day, (int) $start_year)
         ) {
             $this->arrErr[$keyname1] =
                 "※ {$disp_name1}を正しく指定してください。<br />";
         }
         if ((strlen($end_year) > 0 || strlen($end_month) > 0 || strlen($end_day) > 0 || strlen($end_hour) > 0)
 -            && ! checkdate($end_month, $end_day, $end_year)
 +            && ! checkdate((int) $end_month, (int) $end_day, (int) $end_year)
         ) {
             $this->arrErr[$keyname2] =
                 "※ {$disp_name2}を正しく指定してください。<br />";
 @@ -1536,13 +1567,13 @@
         $end_year = $this->arrParam[$value[4]];
         $end_month = $this->arrParam[$value[5]];
         if ((strlen($start_year) > 0 || strlen($start_month) > 0)
 -            && ! checkdate($start_month, 1, $start_year)
 +            && ! checkdate((int) $start_month, 1, (int) $start_year)
         ) {
             $this->arrErr[$keyname1] =
                 "※ {$disp_name1}を正しく指定してください。<br />";
         }
         if ((strlen($end_year) > 0 || strlen($end_month) > 0)
 -            && ! checkdate($end_month, 1, $end_year)
 +            && ! checkdate((int) $end_month, 1, (int) $end_year)
         ) {
             $this->arrErr[$keyname2] =
                 "※ {$disp_name2}を正しく指定してください。<br />";
 @@ -1733,7 +1764,7 @@
             if ($val_key != 0 && (is_string($key) || is_int($key))) {
                 if (!is_numeric($key) && preg_match('/^[a-z0-9_]+$/i', $key)) {
                     if (!isset($this->arrParam[$key])) $this->arrParam[$key] = '';
 -                    if (strlen($this->arrParam[$key]) > 0
 +                    if (!is_array($this->arrParam[$key]) && strlen($this->arrParam[$key]) > 0
                           && (preg_match('/^[[:alnum:]\-\_]*[\.\/\\\\]*\.\.(\/|\\\\)/', $this->arrParam[$key]) || !preg_match('/\A[^\x00-\x08\x0b\x0c\x0e-\x1f\x7f]+\z/u', $this->arrParam[$key]))) {
                         $this->arrErr[$value[1]] = '※ ' . $value[0] . 'に禁止された記号の並びまたは制御文字が入っています。<br />';
                     }
 @@ -1749,7 +1780,7 @@
      *
      * @access private
      * @param  string  $string チェックする文字列
 -     * @return boolean 値が10進数の数値表現のみの場合 true
 +     * @return boolean 値が10進数の数値表現以外の場合 true
      */
     public function numelicCheck($string)
     {
 @@ -1762,4 +1793,18 @@
 
         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 . 'が不正な値です。<br />';
 +        }
 +    }
 }
 diff -urb 2_13/data/class/SC_Customer.php 2_17/data/class/SC_Customer.php
 --- 2_13/data/class/SC_Customer.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_Customer.php	2019-08-03 09:51:39.000000000 +0900
 @@ -68,6 +68,7 @@
      * FIXME
      * @return boolean 該当する会員が存在する場合は true、それ以外の場合
      *                 は false を返す。
 +     * @deprecated
      */
     public function checkMobilePhoneId()
     {
 diff -urb 2_13/data/class/SC_CustomerList.php 2_17/data/class/SC_CustomerList.php
 --- 2_13/data/class/SC_CustomerList.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_CustomerList.php	2019-08-03 09:51:39.000000000 +0900
 @@ -371,8 +371,8 @@
         return $this->getSql(2);
     }
 
 -    public function getWhere()
 +    public function getWhere($with_where = false)
     {
 -        return array(parent::getWhere(), $this->arrVal);
 +        return array(parent::getWhere($with_where), $this->arrVal);
     }
 }
 diff -urb 2_13/data/class/SC_Display.php 2_17/data/class/SC_Display.php
 --- 2_13/data/class/SC_Display.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_Display.php	2019-08-03 09:51:39.000000000 +0900
 @@ -151,11 +151,9 @@
     public static function detectDevice($reset = FALSE)
     {
         if (is_null(SC_Display_Ex::$device) || $reset) {
 -            $nu = new Net_UserAgent_Mobile();
 +            //$nu = new Net_UserAgent_Mobile();
             $su = new SC_SmartphoneUserAgent_Ex();
 -            if ($nu->isMobile()) {
 -                SC_Display_Ex::$device = DEVICE_TYPE_MOBILE;
 -            } elseif ($su->isSmartphone()) {
 +            if ($su->isSmartphone()) {
                 SC_Display_Ex::$device = DEVICE_TYPE_SMARTPHONE;
             } else {
                 SC_Display_Ex::$device = DEVICE_TYPE_PC;
 diff -urb 2_13/data/class/SC_FormParam.php 2_17/data/class/SC_FormParam.php
 --- 2_13/data/class/SC_FormParam.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_FormParam.php	2019-08-03 09:51:39.000000000 +0900
 @@ -70,8 +70,7 @@
         $backtraces = debug_backtrace();
         // 呼び出し元のクラスを取得
         $class = $backtraces[1]['class'];
 -        $objPage = $backtraces[1]['object'];
 -        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($objPage->plugin_activate_flg);
 +        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         if (is_object($objPlugin)) {
             $objPlugin->doAction('SC_FormParam_construct', array($class, $this));
         }
 @@ -207,6 +206,7 @@
                     case 'NUM_CHECK':
                     case 'EMAIL_CHECK':
                     case 'EMAIL_CHAR_CHECK':
 +                    case 'PASSWORD_CHAR_CHECK':
                     case 'ALNUM_CHECK':
                     case 'GRAPH_CHECK':
                     case 'KANA_CHECK':
 @@ -229,6 +229,7 @@
                     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 -urb 2_13/data/class/SC_Initial.php 2_17/data/class/SC_Initial.php
 --- 2_13/data/class/SC_Initial.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_Initial.php	2019-08-03 09:51:39.000000000 +0900
 @@ -35,7 +35,7 @@
     public function __construct()
     {
         /** EC-CUBEのバージョン */
 -        define('ECCUBE_VERSION', '2.13.5');
 +        define('ECCUBE_VERSION', '2.17.0-RC');
     }
 
     /**
 @@ -71,7 +71,15 @@
         define('CONFIG_REALFILE', realpath(dirname(__FILE__)) . '/../config/config.php');
         if (file_exists(CONFIG_REALFILE)) {
             require_once CONFIG_REALFILE;
 +
 +            // heroku用
 +        } else if (getenv('DATABASE_URL')) {
 +            ini_set( 'display_errors', 1 );
 +            copy(realpath(dirname(__FILE__)) . '/../../tests/config.php', CONFIG_REALFILE);
 +
 +            require_once CONFIG_REALFILE;
         }
 +
     }
 
     /**
 @@ -134,11 +142,18 @@
         //ロケールを明示的に設定
         $res = setlocale(LC_ALL, LOCALE);
         if ($res === FALSE) {
 +            if ('\\' === DIRECTORY_SEPARATOR && PHP_VERSION_ID >= 70000) {
 +                // Windows 版 PHP7 以降の fgetcsv 関数は、日本語のロケールで
 +                // UTF-8 のファイルを正常にパースできないため、ロケールを英語に設定する
 +                // see https://github.com/EC-CUBE/ec-cube/issues/1780#issuecomment-248557386
 +                setlocale(LC_ALL, 'English_United States.1252');
 +            } else {
             // TODO: Windows上のロケール設定が正常に働かない場合があることに暫定的に対応
             // ''を指定するとApache実行環境の環境変数が使われる
             // See also: http://php.net/manual/ja/function.setlocale.php
             setlocale(LC_ALL, '');
         }
 +        }
 
         // #1849 (文字エンコーディングの検出を制御する)
         mb_detect_order(array('UTF-8', 'SJIS-win', 'eucJP-win'));
 diff -urb 2_13/data/class/SC_MobileEmoji.php 2_17/data/class/SC_MobileEmoji.php
 --- 2_13/data/class/SC_MobileEmoji.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_MobileEmoji.php	2019-08-03 09:51:39.000000000 +0900
 @@ -29,6 +29,7 @@
 
 /**
  * 携帯端末の絵文字を扱うクラス
 + * @deprecated
  */
 class SC_MobileEmoji
 {
 diff -urb 2_13/data/class/SC_MobileImage.php 2_17/data/class/SC_MobileImage.php
 --- 2_13/data/class/SC_MobileImage.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_MobileImage.php	2019-08-03 09:51:39.000000000 +0900
 @@ -28,6 +28,7 @@
 
 /**
  * 画像変換クラス
 + * @deprecated
  */
 class SC_MobileImage
 {
 diff -urb 2_13/data/class/SC_MobileUserAgent.php 2_17/data/class/SC_MobileUserAgent.php
 --- 2_13/data/class/SC_MobileUserAgent.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_MobileUserAgent.php	2019-08-03 09:51:39.000000000 +0900
 @@ -26,6 +26,7 @@
  *
  * 対象とする携帯端末は $_SERVER から決定する。
  * 全てのメソッドはクラスメソッド。
 + * @deprecated
  */
 class SC_MobileUserAgent
 {
 @@ -36,28 +37,14 @@
      *
      * @return string|false 携帯端末のキャリアを表す文字列を返す。
      *                      携帯端末ではない場合は false を返す。
 +     * @deprecated
      */
     public function getCarrier()
     {
 -        $objAgent =& Net_UserAgent_Mobile::singleton();
 -        if (Net_UserAgent_Mobile::isError($objAgent)) {
 +        trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED);
             return false;
         }
 
 -        switch ($objAgent->getCarrierShortName()) {
 -            case 'I':
 -                return 'docomo';
 -            case 'E':
 -                return 'ezweb';
 -            case 'V':
 -                return 'softbank';
 -            case 'S':
 -                return 'softbank';
 -            default:
 -                return false;
 -        }
 -    }
 -
     /**
      * 勝手サイトで利用可能な携帯端末/利用者のIDを取得する。
      *
 @@ -66,20 +53,13 @@
      * + ezweb    ... EZ番号
      * + softbank ... 端末シリアル番号
      *
 +     * @deprecated
      * @return string|false 取得したIDを返す。取得できなかった場合は false を返す。
      */
     public function getId()
     {
 -        $objAgent =& Net_UserAgent_Mobile::singleton();
 -        if (Net_UserAgent_Mobile::isError($objAgent)) {
 +        trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED);
             return false;
 -        } elseif ($objAgent->isDoCoMo() || $objAgent->isVodafone()) {
 -            $id = $objAgent->getSerialNumber();
 -        } elseif ($objAgent->isEZweb()) {
 -            $id = @$_SERVER['HTTP_X_UP_SUBNO'];
 -        }
 -
 -        return isset($id) ? $id : false;
     }
 
     /**
 @@ -90,14 +70,8 @@
      */
     public function getModel()
     {
 -        $objAgent =& Net_UserAgent_Mobile::singleton();
 -        if (Net_UserAgent_Mobile::isError($objAgent)) {
 -            return 'Unknown';
 -        } elseif ($objAgent->isNonMobile()) {
 -            return $objAgent->getName();
 -        } else {
 -            return $objAgent->getModel();
 -        }
 +        trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED);
 +        return false;
     }
 
     /**
 @@ -114,30 +88,10 @@
      */
     public function isSupported()
     {
 -        $objAgent =& Net_UserAgent_Mobile::singleton();
 -
 -        // 携帯端末だと認識されたが、User-Agent の形式が未知の場合
 -        if (Net_UserAgent_Mobile::isError($objAgent)) {
 -            GC_Utils_Ex::gfPrintLog($objAgent->toString());
 -
 +        trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED);
             return false;
         }
 
 -        if ($objAgent->isDoCoMo()) {
 -            $arrUnsupportedSeries = array('501i', '502i', '209i', '210i');
 -            $arrUnsupportedModels = array('SH821i', 'N821i', 'P821i ', 'P651ps', 'R691i', 'F671i', 'SH251i', 'SH251iS');
 -
 -            return !in_array($objAgent->getSeries(), $arrUnsupportedSeries) && !in_array($objAgent->getModel(), $arrUnsupportedModels);
 -        } elseif ($objAgent->isEZweb()) {
 -            return $objAgent->isWAP2();
 -        } elseif ($objAgent->isVodafone()) {
 -            return $objAgent->isPacketCompliant();
 -        } else {
 -            // 携帯端末ではない場合はサポートしていることにする。
 -            return true;
 -        }
 -    }
 -
     /**
      * EC-CUBE がサポートする携帯キャリアかどうかを判別する。
      *
 @@ -147,11 +101,7 @@
      */
     public function isMobile()
     {
 -        $objAgent =& Net_UserAgent_Mobile::singleton();
 -        if (Net_UserAgent_Mobile::isError($objAgent)) {
 +        trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED);
             return false;
 -        } else {
 -            return $objAgent->isDoCoMo() || $objAgent->isEZweb() || $objAgent->isVodafone();
 -        }
     }
 }
 diff -urb 2_13/data/class/SC_MobileView.php 2_17/data/class/SC_MobileView.php
 --- 2_13/data/class/SC_MobileView.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_MobileView.php	2019-08-03 09:51:39.000000000 +0900
 @@ -21,6 +21,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
 +/**
 + * @deprecated
 + */
 class SC_MobileView extends SC_SiteView_Ex
 {
     public function __construct($setPrevURL = true)
 diff -urb 2_13/data/class/SC_PageNavi.php 2_17/data/class/SC_PageNavi.php
 --- 2_13/data/class/SC_PageNavi.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_PageNavi.php	2019-08-03 09:51:39.000000000 +0900
 @@ -47,9 +47,9 @@
     public $strnavi;       // ページ送り文字列
     public $arrPagenavi = array(); // ページ
 
 -    // コンストラクタ
 -
     /**
 +     * コンストラクタ
 +     *
      * @param string $func_name
      */
     public function __construct($now_page, $all_row, $page_row, $func_name, $navi_max = NAVI_PMAX, $urlParam = '', $display_number = true)
 diff -urb 2_13/data/class/SC_Product.php 2_17/data/class/SC_Product.php
 --- 2_13/data/class/SC_Product.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_Product.php	2019-08-03 09:51:39.000000000 +0900
 @@ -38,9 +38,9 @@
     public $classCategories = array();
     public $stock_find;
     /** 規格1クラス名 */
 -    public $className1 = '';
 +    public $className1 = [];
     /** 規格2クラス名 */
 -    public $className2 = '';
 +    public $className2 = [];
     /** 規格1が設定されている */
     public $classCat1_find;
     /** 規格2が設定されている */
 @@ -82,12 +82,12 @@
             $o_table = $this->arrOrderData['table'];
             $o_order = $this->arrOrderData['order'];
             $objQuery->setOrder("T2.$o_col $o_order");
 -            $sub_sql = $objQuery->getSql($o_col, "$o_table AS T2", 'T2.product_id = alldtl.product_id');
 +            $sub_sql = $objQuery->getSql($o_col, "$o_table AS T2", 'T2.product_id = alldtl.product_id AND T2.del_flg = 0');
             $sub_sql = $objQuery->dbFactory->addLimitOffset($sub_sql, 1);
 
             $objQuery->setOrder("($sub_sql) $o_order, product_id");
         }
 -        $arrReturn = $objQuery->getCol('alldtl.product_id', $table, '', $arrVal);
 +        $arrReturn = $objQuery->getCol('alldtl.product_id', $table, $objQuery->where ? '' : 'alldtl.del_flg = 0', $arrVal);
 
         return $arrReturn;
     }
 @@ -698,7 +698,8 @@
      * @param bool $include_hidden
      * @return array
      */
 -    public function getCategoryIds($product_id, $include_hidden = false) {
 +    public function getCategoryIds($product_id, $include_hidden = false)
 +    {
         if ($this->isValidProductId($product_id, $include_hidden)) {
             $objQuery = SC_Query_Ex::getSingletonInstance();
             $category_id = $objQuery->getCol('category_id', 'dtb_product_categories', 'product_id = ?', array($product_id));
 @@ -718,7 +719,8 @@
      * @param bool $include_deleted
      * @return bool
      */
 -    public function isValidProductId($product_id, $include_hidden = false, $include_deleted = false) {
 +    public function isValidProductId($product_id, $include_hidden = false, $include_deleted = false)
 +    {
         $where = '';
         if (!$include_hidden) {
             $where .= 'status = 1';
 diff -urb 2_13/data/class/SC_Query.php 2_17/data/class/SC_Query.php
 --- 2_13/data/class/SC_Query.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_Query.php	2019-08-03 09:51:39.000000000 +0900
 @@ -73,6 +73,14 @@
             'result_buffering' => false,
         );
 
 +        //  fix for PHP7.2
 +        if (!array_key_exists('_MDB2_dsninfo_default', $GLOBALS)) {
 +            $GLOBALS['_MDB2_dsninfo_default'] = [];
 +        }
 +        if (!array_key_exists('_MDB2_databases', $GLOBALS)) {
 +            $GLOBALS['_MDB2_databases'] = [];
 +        }
 +
         if ($new) {
             $this->conn = MDB2::connect($dsn, $options);
         } else {
 @@ -1040,7 +1048,7 @@
         // #1658 (SC_Query の各種メソッドでプレースホルダの数に誤りがあるとメモリリークが発生する) 対応
         // TODO 現状は PEAR 内のバックトレースを抑制することで、メモリーリークの影響を小さくしている。
         //      根本的には、そのバックトレースが、どこに居座っているかを特定して、対策すべき。
 -        $pear_property =& PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
 +        $pear_property =& PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
         $bak = $pear_property;
         $pear_property = true;
 
 diff -urb 2_13/data/class/SC_Response.php 2_17/data/class/SC_Response.php
 --- 2_13/data/class/SC_Response.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_Response.php	2019-08-03 09:51:39.000000000 +0900
 @@ -95,7 +95,7 @@
     public function actionExit()
     {
         // ローカルフックポイント処理
 -        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
 +        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
 
         if (is_object($objPlugin)) {
             $arrBacktrace = debug_backtrace();
 @@ -130,7 +130,7 @@
     public function sendRedirect($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null)
     {
         // ローカルフックポイント処理
 -        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
 +        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
 
         if (is_object($objPlugin)) {
             $arrBacktrace = debug_backtrace();
 diff -urb 2_13/data/class/SC_Session.php 2_17/data/class/SC_Session.php
 --- 2_13/data/class/SC_Session.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_Session.php	2019-08-03 09:51:39.000000000 +0900
 @@ -157,6 +157,9 @@
      */
     public function regenerateSID()
     {
 +        if (session_status() === PHP_SESSION_ACTIVE) {
         return session_regenerate_id(true);
     }
 +        return false;
 +    }
 }
 diff -urb 2_13/data/class/SC_UploadFile.php 2_17/data/class/SC_UploadFile.php
 --- 2_13/data/class/SC_UploadFile.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_UploadFile.php	2019-08-03 09:51:39.000000000 +0900
 @@ -196,6 +196,9 @@
     }
 
     // 画像を削除する。
 +    /**
 +     * @deprecated 本体で使用されていないため非推奨
 +     */
     public function deleteKikakuFile($keyname)
     {
         $objImage = new SC_Image_Ex($this->temp_dir);
 @@ -307,6 +310,9 @@
         }
     }
 
 +    /**
 +     * @deprecated 本体で使用されていないため非推奨
 +     */
     public function setHiddenKikakuFileList($arrPOST)
     {
         $cnt = 0;
 @@ -378,6 +384,10 @@
 
         return $arrRet;
     }
 +
 +    /**
 +     * @deprecated 本体で使用されていないため非推奨
 +     */
     public function getFormKikakuDownFile()
     {
         $arrRet = array();
 @@ -432,6 +442,9 @@
     }
 
     // DBで保存されたダウンロードファイル名をセットする(setDBDownFileと統合予定)
 +    /**
 +     * @deprecated 本体で使用されていないため非推奨
 +     */
     public function setPostFileList($arrPost)
     {
         for ($cnt = 0;$cnt < count($this->keyname); $cnt++) {
 @@ -442,6 +455,9 @@
     }
 
     // 画像をセットする
 +    /**
 +     * @deprecated 本体で使用されていないため非推奨
 +     */
     public function setDBImageList($arrVal)
     {
         $cnt = 0;
 @@ -454,6 +470,9 @@
     }
 
     // DB上のファイルの内削除要求があったファイルを削除する。
 +    /**
 +     * @deprecated 本体で使用されていないため非推奨
 +     */
     public function deleteDBFile($arrVal)
     {
         $objImage = new SC_Image_Ex($this->temp_dir);
 @@ -505,6 +524,9 @@
     }
 
     // 拡大率を指定して画像保存
 +    /**
 +     * @deprecated 本体で使用されていないため非推奨
 +     */
     public function saveResizeImage($keyname, $to_w, $to_h)
     {
         $path = '';
 diff -urb 2_13/data/class/SC_View.php 2_17/data/class/SC_View.php
 --- 2_13/data/class/SC_View.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/SC_View.php	2019-08-03 09:51:39.000000000 +0900
 @@ -21,12 +21,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
 -require_once realpath(dirname(__FILE__)) . '/../module/Smarty/libs/Smarty.class.php';
 -
 class SC_View
 {
 +    /** @var SmartyBC */
     public $_smarty;
 
 +    /** @var LC_Page */
     public $objPage;
 
     // コンストラクタ
 @@ -37,27 +37,29 @@
 
     public function init()
     {
 -        $this->_smarty = new Smarty;
 +        // include_phpの利用のためSmartyBCを呼び出す、ホントはinclude_phpをなくしたいそうすれば、blank.tplもなくせる
 +        $this->_smarty = new SmartyBC;
 +
         $this->_smarty->left_delimiter = '<!--{';
         $this->_smarty->right_delimiter = '}-->';
 -        $this->_smarty->register_modifier('sfDispDBDate', array('SC_Utils_Ex', 'sfDispDBDate'));
 -        $this->_smarty->register_modifier('sfGetErrorColor', array('SC_Utils_Ex', 'sfGetErrorColor'));
 -        $this->_smarty->register_modifier('sfTrim', array('SC_Utils_Ex', 'sfTrim'));
 -        $this->_smarty->register_modifier('sfCalcIncTax', array('SC_Helper_DB_Ex', 'sfCalcIncTax'));
 -        $this->_smarty->register_modifier('sfPrePoint', array('SC_Utils_Ex', 'sfPrePoint'));
 -        $this->_smarty->register_modifier('sfGetChecked', array('SC_Utils_Ex', 'sfGetChecked'));
 -        $this->_smarty->register_modifier('sfTrimURL', array('SC_Utils_Ex', 'sfTrimURL'));
 -        $this->_smarty->register_modifier('sfMultiply', array('SC_Utils_Ex', 'sfMultiply'));
 -        $this->_smarty->register_modifier('sfRmDupSlash', array('SC_Utils_Ex', 'sfRmDupSlash'));
 -        $this->_smarty->register_modifier('sfCutString', array('SC_Utils_Ex', 'sfCutString'));
 -        $this->_smarty->plugins_dir=array('plugins', realpath(dirname(__FILE__)) . '/../smarty_extends');
 -        $this->_smarty->register_modifier('sfMbConvertEncoding', array('SC_Utils_Ex', 'sfMbConvertEncoding'));
 -        $this->_smarty->register_modifier('sfGetEnabled', array('SC_Utils_Ex', 'sfGetEnabled'));
 -        $this->_smarty->register_modifier('sfNoImageMainList', array('SC_Utils_Ex', 'sfNoImageMainList'));
 +        $this->_smarty->registerPlugin('modifier', 'sfDispDBDate', array('SC_Utils_Ex', 'sfDispDBDate'));
 +        $this->_smarty->registerPlugin('modifier', 'sfGetErrorColor', array('SC_Utils_Ex', 'sfGetErrorColor'));
 +        $this->_smarty->registerPlugin('modifier', 'sfTrim', array('SC_Utils_Ex', 'sfTrim'));
 +        $this->_smarty->registerPlugin('modifier', 'sfCalcIncTax', array('SC_Helper_DB_Ex', 'sfCalcIncTax'));
 +        $this->_smarty->registerPlugin('modifier', 'sfPrePoint', array('SC_Utils_Ex', 'sfPrePoint'));
 +        $this->_smarty->registerPlugin('modifier', 'sfGetChecked',array('SC_Utils_Ex', 'sfGetChecked'));
 +        $this->_smarty->registerPlugin('modifier', 'sfTrimURL', array('SC_Utils_Ex', 'sfTrimURL'));
 +        $this->_smarty->registerPlugin('modifier', 'sfMultiply', array('SC_Utils_Ex', 'sfMultiply'));
 +        $this->_smarty->registerPlugin('modifier', 'sfRmDupSlash', array('SC_Utils_Ex', 'sfRmDupSlash'));
 +        $this->_smarty->registerPlugin('modifier', 'sfCutString', array('SC_Utils_Ex', 'sfCutString'));
 +        $this->_smarty->addPluginsDir(array('plugins', realpath(dirname(__FILE__)) . '/../smarty_extends'));
 +        $this->_smarty->registerPlugin('modifier', 'sfMbConvertEncoding', array('SC_Utils_Ex', 'sfMbConvertEncoding'));
 +        $this->_smarty->registerPlugin('modifier', 'sfGetEnabled', array('SC_Utils_Ex', 'sfGetEnabled'));
 +        $this->_smarty->registerPlugin('modifier', 'sfNoImageMainList', array('SC_Utils_Ex', 'sfNoImageMainList'));
         // XXX register_function で登録すると if で使用できないのではないか？
 -        $this->_smarty->register_function('sfIsHTTPS', array('SC_Utils_Ex', 'sfIsHTTPS'));
 -        $this->_smarty->register_function('sfSetErrorStyle', array('SC_Utils_Ex', 'sfSetErrorStyle'));
 -        $this->_smarty->register_function('printXMLDeclaration', array('GC_Utils_Ex', 'printXMLDeclaration'));
 +        $this->_smarty->registerPlugin('function','sfIsHTTPS', array('SC_Utils_Ex', 'sfIsHTTPS'));
 +        $this->_smarty->registerPlugin('function','sfSetErrorStyle', array('SC_Utils_Ex', 'sfSetErrorStyle'));
 +        $this->_smarty->registerPlugin('function','printXMLDeclaration', array('GC_Utils_Ex', 'printXMLDeclaration'));
         $this->_smarty->default_modifiers = array('script_escape');
 
         if (ADMIN_MODE == '1') {
 @@ -67,6 +69,8 @@
         $this->_smarty->force_compile = SMARTY_FORCE_COMPILE_MODE === true;
         // 各filterをセットします.
         $this->registFilter();
 +        // smarty:nodefaultsの後方互換を維持
 +        $this->_smarty->registerFilter('pre', array($this, 'lower_compatibility_smarty'));
     }
 
     // テンプレートに値を割り当てる
 @@ -128,23 +132,23 @@
      */
     public function registFilter()
     {
 -        $this->_smarty->register_prefilter(array(&$this, 'prefilter_transform'));
 -        $this->_smarty->register_outputfilter(array(&$this, 'outputfilter_transform'));
 +        $this->_smarty->registerFilter('pre', array(&$this, 'prefilter_transform'));
 +        $this->_smarty->registerFilter('output', array(&$this, 'outputfilter_transform'));
     }
 
     /**
      * prefilter用のフィルタ関数。プラグイン用のフックポイント処理を実行
      * @param  string          $source ソース
 -     * @param  Smarty_Compiler $smarty Smartyのコンパイラクラス
 +     * @param  Smarty_Internal_Template $smarty Smartyのコンパイラクラス
      * @return string          $source ソース
      */
 -    public function prefilter_transform($source, &$smarty)
 +    public function prefilter_transform($source, Smarty_Internal_Template $template)
     {
         if (!is_null($this->objPage)) {
             // フックポイントを実行.
 -            $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->objPage->plugin_activate_flg);
 -            if (is_object($objPlugin)) {
 -                $objPlugin->doAction('prefilterTransform', array(&$source, $this->objPage, $smarty->_current_file));
 +            $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
 +            if ($objPlugin) {
 +                $objPlugin->doAction('prefilterTransform', array(&$source, $this->objPage, $template->smarty->_current_file));
             }
         }
 
 @@ -154,23 +158,27 @@
     /**
      * outputfilter用のフィルタ関数。プラグイン用のフックポイント処理を実行
      * @param  string          $source ソース
 -     * @param  Smarty_Compiler $smarty Smartyのコンパイラクラス
 +     * @param  Smarty_Internal_Template $smarty Smartyのコンパイラクラス
      * @return string          $source ソース
      */
 -    public function outputfilter_transform($source, &$smarty)
 +    public function outputfilter_transform($source, Smarty_Internal_Template $template)
     {
         if (!is_null($this->objPage)) {
             // フックポイントを実行.
 -            $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->objPage->plugin_activate_flg);
 -            if (is_object($objPlugin)) {
 -                $objPlugin->doAction('outputfilterTransform', array(&$source, $this->objPage, $smarty->_current_file));
 +            $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
 +            if ($objPlugin) {
 +                $objPlugin->doAction('outputfilterTransform', array(&$source, $this->objPage, $template->smarty->_current_file));
             }
         }
 
         return $source;
     }
 
 -    // テンプレートの処理結果を表示
 +    /**
 +     * テンプレートの処理結果を表示
 +     * @param string $template
 +     * @param bool $no_error
 +     */
     public function display($template, $no_error = false)
     {
         if (!$no_error) {
 @@ -190,7 +198,10 @@
         }
     }
 
 -    // オブジェクト内の変数を全て割り当てる。
 +    /**
 +     * オブジェクト内の変数を全て割り当てる。
 +     * @param object $obj
 +     */
     public function assignobj($obj)
     {
         $data = get_object_vars($obj);
 @@ -200,7 +211,10 @@
         }
     }
 
 -    // 連想配列内の変数を全て割り当てる。
 +    /**
 +     * 連想配列内の変数を全て割り当てる。
 +     * @param array $array
 +     */
     public function assignarray($array)
     {
         foreach ($array as $key => $val) {
 @@ -227,9 +241,29 @@
         $this->assign('footer_tpl', $footer_tpl);
     }
 
 -    // デバッグ
 +    /**
 +     * デバッグ
 +     * @param bool $var
 +     */
     public function debug($var = true)
     {
         $this->_smarty->debugging = $var;
     }
 +
 +
 +    /**
 +     * 2.13のテンプレートのまま動作するためにsmartyの後方互換処理
 +     *
 +     * @param mixed $tpl_source
 +     * @param mixed $smarty
 +     * @return array|string|null
 +     */
 +    public function lower_compatibility_smarty($tpl_source, $smarty)
 +    {
 +        $pattern = array("/\|smarty:nodefaults/", "/include_php /", "/=`(.+?)`/");
 +        $replace = array(' ', 'include_php_ex ', "=$1");
 +
 +        return preg_replace($pattern, $replace, $tpl_source);
 +    }
 +
 }
 diff -urb 2_13/data/class/db/SC_DB_DBFactory.php 2_17/data/class/db/SC_DB_DBFactory.php
 --- 2_13/data/class/db/SC_DB_DBFactory.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/db/SC_DB_DBFactory.php	2019-08-03 09:51:39.000000000 +0900
 @@ -40,6 +40,7 @@
     {
         switch ($db_type) {
             case 'mysql':
 +            case 'mysqli':
                 return new SC_DB_DBFactory_MYSQL();
 
             case 'pgsql':
 diff -urb 2_13/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 2_17/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
 --- 2_13/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php	2019-08-03 09:51:39.000000000 +0900
 @@ -70,7 +70,8 @@
         $sql = $this->sfChangeTrunc($sql);
         // ARRAY_TO_STRINGをGROUP_CONCATに変換する
         $sql = $this->sfChangeArrayToString($sql);
 -
 +        // rank に引用符をつける
 +        $sql = $this->sfChangeReservedWords($sql);
         return $sql;
     }
 
 @@ -343,6 +344,15 @@
     }
 
     /**
 +     * 予約語に引用符を付与する.
 +     */
 +    public function sfChangeReservedWords($sql)
 +    {
 +        $changesql = preg_replace('/(^|[^\w])RANK([^\w]|$)/i', '$1`RANK`$2', $sql);
 +        return $changesql;
 +    }
 +
 +    /**
      * 擬似表を表すSQL文(FROM 句)を取得する
      *
      * @return string
 @@ -360,7 +370,11 @@
      */
     public function initObjQuery(SC_Query &$objQuery)
     {
 +        if ($objQuery->conn->getConnection()->server_version >= 50705) {
 +            $objQuery->exec('SET SESSION default_storage_engine = InnoDB');
 +        } else {
         $objQuery->exec('SET SESSION storage_engine = InnoDB');
 +        }
         $objQuery->exec("SET SESSION sql_mode = 'ANSI'");
     }
 }
 diff -urb 2_13/data/class/graph/SC_Graph_Base.php 2_17/data/class/graph/SC_Graph_Base.php
 --- 2_13/data/class/graph/SC_Graph_Base.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/graph/SC_Graph_Base.php	2019-08-03 09:51:39.000000000 +0900
 @@ -338,7 +338,7 @@
     public function drawLegend($legend_max = '', $clabelbg = true)
     {
         // 凡例が登録されていなければ中止
 -        if (count($this->arrLegend) <= 0) {
 +        if (empty($this->arrLegend)) {
             return;
         }
 
 diff -urb 2_13/data/class/graph/SC_Graph_Pie.php 2_17/data/class/graph/SC_Graph_Pie.php
 --- 2_13/data/class/graph/SC_Graph_Pie.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/graph/SC_Graph_Pie.php	2019-08-03 09:51:39.000000000 +0900
 @@ -45,8 +45,8 @@
     // データを360°値に変換する
     public function getCircleData($array)
     {
 -        $total = '';
 -        $new_total = '';
 +        $total = 0;
 +        $new_total = 0;
         if (!is_array($array)) {
             return;
         }
 diff -urb 2_13/data/class/helper/SC_Helper_CSV.php 2_17/data/class/helper/SC_Helper_CSV.php
 --- 2_13/data/class/helper/SC_Helper_CSV.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/helper/SC_Helper_CSV.php	2019-08-03 09:51:39.000000000 +0900
 @@ -206,11 +206,16 @@
      */
     public function cbOutputCSV($data)
     {
 +        // mb_convert_variablesで変換できない文字は"?"にする
 +        mb_substitute_character(SUBSTITUTE_CHAR);
         // 1行目のみヘッダーを出力する
         if ($this->output_header) {
 -            fputcsv($this->fpOutput, array_keys($data));
 +            $header = array_keys($data);
 +            mb_convert_variables('cp932', CHAR_CODE, $header);
 +            fputcsv($this->fpOutput, $header);
             $this->output_header = false;
         }
 +        mb_convert_variables('cp932', CHAR_CODE, $data);
         fputcsv($this->fpOutput, $data);
         SC_Utils_Ex::extendTimeOut();
 
 @@ -237,9 +242,12 @@
 
         $this->fpOutput =& SC_Helper_CSV_Ex::fopen_for_output_csv();
 
 +        // mb_convert_variablesで変換できない文字は"?"にする
 +        mb_substitute_character(SUBSTITUTE_CHAR);
         // ヘッダー構築
         $this->output_header = false;
         if (is_array($arrHeader)) {
 +            mb_convert_variables('cp932', CHAR_CODE, $arrHeader);
             fputcsv($this->fpOutput, $arrHeader);
         } elseif (is_null($arrHeader)) {
             // ループバック内でヘッダーを出力する
 @@ -359,7 +367,6 @@
     {
         $fp = fopen($filename, 'w');
 
 -        stream_filter_append($fp, 'convert.iconv.utf-8/cp932');
         stream_filter_append($fp, 'convert.eccube_lf2crlf');
 
         return $fp;
 diff -urb 2_13/data/class/helper/SC_Helper_Customer.php 2_17/data/class/helper/SC_Helper_Customer.php
 --- 2_13/data/class/helper/SC_Helper_Customer.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/helper/SC_Helper_Customer.php	2019-08-03 09:51:39.000000000 +0900
 @@ -238,7 +238,12 @@
         $objQuery       = SC_Query_Ex::getSingletonInstance();
 
         // 会員情報DB取得
 -        $ret        = $objQuery->select('*', 'dtb_customer', 'customer_id=?', array($customer_id));
 +        $ret        = $objQuery->select('*', 'dtb_customer', 'customer_id=? AND del_flg = 0', array($customer_id));
 +
 +        if (empty($ret)) {
 +            trigger_error('存在しない会員IDです。', E_USER_ERROR);
 +        }
 +
         $arrForm    = $ret[0];
 
         // 確認項目に複製
 @@ -248,7 +253,7 @@
         // 誕生日を年月日に分ける
         if (isset($arrForm['birth'])) {
             $birth = explode(' ', $arrForm['birth']);
 -            list($arrForm['year'], $arrForm['month'], $arrForm['day']) = explode('-', $birth[0]);
 +            list($arrForm['year'], $arrForm['month'], $arrForm['day']) = array_map("intval",explode('-', $birth[0]));
         }
 
         if ($mask_flg) {
 @@ -276,7 +281,7 @@
         $objQuery   = SC_Query_Ex::getSingletonInstance();
 
         if ($add_where == '') {
 -            $where = 'customer_id = ?';
 +            $where = 'customer_id = ? AND del_flg = 0';
             $arrData = $objQuery->getRow('*', 'dtb_customer', $where, array($customer_id));
         } else {
             $where = $add_where;
 @@ -394,7 +399,7 @@
             $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'));
 @@ -425,7 +430,7 @@
      */
     public function sfCustomerRegisterParam(&$objFormParam, $isAdmin = false, $is_mypage = false, $prefix = '')
     {
 -        $objFormParam->addParam('パスワード', $prefix . 'password', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'SPTAB_CHECK', 'GRAPH_CHECK'));
 +        $objFormParam->addParam('パスワード', $prefix . 'password', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'SPTAB_CHECK', 'PASSWORD_CHAR_CHECK'));
         $objFormParam->addParam('パスワード確認用の質問の答え', $prefix . 'reminder_answer', STEXT_LEN, '', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('パスワード確認用の質問', $prefix . 'reminder', STEXT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('性別', $prefix . 'sex', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
 @@ -438,7 +443,7 @@
 
         if (SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE) {
             $objFormParam->addParam('メールアドレス', $prefix . 'email', null, 'a', array('NO_SPTAB', 'EXIST_CHECK', 'EMAIL_CHECK', 'SPTAB_CHECK', 'EMAIL_CHAR_CHECK'));
 -            $objFormParam->addParam('パスワード(確認)', $prefix . 'password02', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'SPTAB_CHECK', 'GRAPH_CHECK'), '', false);
 +            $objFormParam->addParam('パスワード(確認)', $prefix . 'password02', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'SPTAB_CHECK', 'PASSWORD_CHAR_CHECK'), '', false);
             if (!$isAdmin) {
                 $objFormParam->addParam('メールアドレス(確認)', $prefix . 'email02', null, 'a', array('NO_SPTAB', 'EXIST_CHECK', 'EMAIL_CHECK', 'SPTAB_CHECK', 'EMAIL_CHAR_CHECK'), '', false);
             }
 diff -urb 2_13/data/class/helper/SC_Helper_FPDI.php 2_17/data/class/helper/SC_Helper_FPDI.php
 --- 2_13/data/class/helper/SC_Helper_FPDI.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/helper/SC_Helper_FPDI.php	2019-08-03 09:51:39.000000000 +0900
 @@ -1,5 +1,5 @@
 <?php
 -require DATA_REALDIR . 'module/fpdf/fpdf.php';
 +#require DATA_REALDIR . 'module/fpdf/fpdf.php';
 require DATA_REALDIR . 'module/fpdi/japanese.php';
 
 // japanese.php のバグ回避
 diff -urb 2_13/data/class/helper/SC_Helper_HandleError.php 2_17/data/class/helper/SC_Helper_HandleError.php
 --- 2_13/data/class/helper/SC_Helper_HandleError.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/helper/SC_Helper_HandleError.php	2019-08-03 09:51:39.000000000 +0900
 @@ -200,21 +200,6 @@
 
         ob_clean();
 
 -        // 絵文字変換・除去フィルターが有効か評価する。
 -        $loaded_ob_emoji = false;
 -        $arrObs = ob_get_status(true);
 -        foreach ($arrObs as $arrOb) {
 -            if ($arrOb['name'] === 'SC_MobileEmoji::handler') {
 -                $loaded_ob_emoji = true;
 -                break;
 -            }
 -        }
 -
 -        // 絵文字変換・除去フィルターが無効で、利用できる場合、有効にする。
 -        if (!$loaded_ob_emoji && class_exists('SC_MobileEmoji')) {
 -            ob_start(array('SC_MobileEmoji', 'handler'));
 -        }
 -
         require_once CLASS_EX_REALDIR . 'page_extends/error/LC_Page_Error_SystemError_Ex.php';
         $objPage = new LC_Page_Error_SystemError_Ex();
         $objPage->init();
 diff -urb 2_13/data/class/helper/SC_Helper_Mobile.php 2_17/data/class/helper/SC_Helper_Mobile.php
 --- 2_13/data/class/helper/SC_Helper_Mobile.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/helper/SC_Helper_Mobile.php	2019-08-03 09:51:39.000000000 +0900
 @@ -27,6 +27,7 @@
  * @package Helper
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
 + * @deprecated
  */
 class SC_Helper_Mobile
 {
 diff -urb 2_13/data/class/helper/SC_Helper_PageLayout.php 2_17/data/class/helper/SC_Helper_PageLayout.php
 --- 2_13/data/class/helper/SC_Helper_PageLayout.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/helper/SC_Helper_PageLayout.php	2019-08-03 09:51:39.000000000 +0900
 @@ -377,9 +377,9 @@
         // メインは確定
         $col_num = 1;
         // LEFT NAVI
 -        if (count($arrPageLayout['LeftNavi']) > 0) $col_num++;
 +        if (!empty($arrPageLayout['LeftNavi'])) $col_num++;
         // RIGHT NAVI
 -        if (count($arrPageLayout['RightNavi']) > 0) $col_num++;
 +        if (!empty($arrPageLayout['RightNavi'])) $col_num++;
         return $col_num;
     }
 }
 diff -urb 2_13/data/class/helper/SC_Helper_Plugin.php 2_17/data/class/helper/SC_Helper_Plugin.php
 --- 2_13/data/class/helper/SC_Helper_Plugin.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/helper/SC_Helper_Plugin.php	2019-08-03 09:51:39.000000000 +0900
 @@ -42,6 +42,7 @@
      * 有効なプラグインのロード. プラグインエンジンが有効になっていない場合は
      * プラグインエンジン自身のインストール処理を起動する
      *
 +     * @param bool $plugin_activate_flg プラグインを有効化する場合 true
      * @return void
      */
     public function load($plugin_activate_flg = true)
 @@ -86,9 +87,10 @@
     /**
      * SC_Helper_Plugin オブジェクトを返す（Singletonパターン）
      *
 -     * @return object SC_Helper_Pluginオブジェクト
 +     * @param bool $plugin_activate_flg プラグインを有効化する場合 true
 +     * @return SC_Helper_Plugin SC_Helper_Pluginオブジェクト
      */
 -    public static function getSingletonInstance($plugin_activate_flg = true)
 +    public static function getSingletonInstance($plugin_activate_flg = PLUGIN_ACTIVATE_FLAG)
     {
         if (!isset($GLOBALS['_SC_Helper_Plugin_instance'])) {
             // プラグインのローダーがDB接続を必要とするため、
 diff -urb 2_13/data/class/helper/SC_Helper_Purchase.php 2_17/data/class/helper/SC_Helper_Purchase.php
 --- 2_13/data/class/helper/SC_Helper_Purchase.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/helper/SC_Helper_Purchase.php	2019-08-03 09:51:39.000000000 +0900
 @@ -176,8 +176,8 @@
         $uniqid = $objSiteSession->getUniqId();
         
         if (!empty($arrOrderTemp)) {
 -            
 -            $_SESSION = array_merge($_SESSION, unserialize($arrOrderTemp['session']));
 +            $tempSession = unserialize($arrOrderTemp['session']);
 +            $_SESSION = array_merge($_SESSION, $tempSession === false ? [] : $tempSession);
 
             $objCartSession = new SC_CartSession_Ex();
             $objCustomer = new SC_Customer_Ex();
 @@ -324,7 +324,7 @@
         if ($has_shipment_item) {
             $arrReturn = array();
             foreach ($_SESSION['shipping'] as $key => $arrVal) {
 -                if (count($arrVal['shipment_item']) == 0) continue;
 +                if (is_array($arrVal['shipment_item']) && count($arrVal['shipment_item']) == 0) continue;
                 $arrReturn[$key] = $arrVal;
             }
 
 @@ -588,19 +588,19 @@
             case '3':
                 $start_day = 5;
                 break;
 -                //1週間以内
 +                //1週間以降
             case '4':
                 $start_day = 8;
                 break;
 -                //2週間以内
 +                //2週間以降
             case '5':
                 $start_day = 15;
                 break;
 -                //3週間以内
 +                //3週間以降
             case '6':
                 $start_day = 22;
                 break;
 -                //1ヶ月以内
 +                //1ヶ月以降
             case '7':
                 $start_day = 32;
                 break;
 @@ -759,7 +759,7 @@
      * @param array          $orderParams    登録する受注情報の配列
      * @param SC_CartSession $objCartSession カート情報のインスタンス
      * @param integer        $cartKey        登録を行うカート情報のキー
 -     * @param integer 受注ID
 +     * @return integer 受注ID
      */
     public function registerOrderComplete($orderParams, &$objCartSession, $cartKey)
     {
 diff -urb 2_13/data/class/helper/SC_Helper_Session.php 2_17/data/class/helper/SC_Helper_Session.php
 --- 2_13/data/class/helper/SC_Helper_Session.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/helper/SC_Helper_Session.php	2019-08-03 09:51:39.000000000 +0900
 @@ -24,12 +24,14 @@
     public function __construct()
     {
         $this->objDb = new SC_Helper_DB_Ex();
 +        if (session_status() !== PHP_SESSION_ACTIVE) {
         session_set_save_handler(array(&$this, 'sfSessOpen'),
                                  array(&$this, 'sfSessClose'),
                                  array(&$this, 'sfSessRead'),
                                  array(&$this, 'sfSessWrite'),
                                  array(&$this, 'sfSessDestroy'),
                                  array(&$this, 'sfSessGc'));
 +        }
 
         // 通常よりも早い段階(オブジェクトが破棄される前)でセッションデータを書き込んでセッションを終了する
         // XXX APC による MDB2 の破棄タイミングによる不具合を回避する目的
 diff -urb 2_13/data/class/helper/SC_Helper_TaxRule.php 2_17/data/class/helper/SC_Helper_TaxRule.php
 --- 2_13/data/class/helper/SC_Helper_TaxRule.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/helper/SC_Helper_TaxRule.php	2019-08-03 09:51:39.000000000 +0900
 @@ -42,7 +42,7 @@
      */
     public static function sfCalcIncTax($price, $product_id = 0, $product_class_id = 0, $pref_id =0, $country_id = 0)
     {
 -        return $price + SC_Helper_TaxRule_Ex::sfTax($price, $product_id, $product_class_id, $pref_id, $country_id);
 +        return (int) $price + SC_Helper_TaxRule_Ex::sfTax($price, $product_id, $product_class_id, $pref_id, $country_id);
     }
 
     /**
 @@ -103,7 +103,7 @@
     public static function calcTax ($price, $tax, $calc_rule, $tax_adjust = 0)
     {
         $real_tax = $tax / 100;
 -        $ret = $price * $real_tax;
 +        $ret = (int)$price * $real_tax;
         $ret = self::roundByCalcRule($ret, $calc_rule);
 
         return $ret + $tax_adjust;
 diff -urb 2_13/data/class/pages/LC_Page.php 2_17/data/class/pages/LC_Page.php
 --- 2_13/data/class/pages/LC_Page.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/LC_Page.php	2019-08-03 09:51:39.000000000 +0900
 @@ -67,7 +67,10 @@
     /** 店舗基本情報 */
     public $arrSiteInfo;
 
 -    /** プラグインを実行フラグ */
 +    /**
 +     * プラグインを実行フラグ
 +     * @deprecated 定数 PLUGIN_ACTIVATE_FLAG を使用してください
 +     */
     public $plugin_activate_flg = PLUGIN_ACTIVATE_FLAG;
 
     /** POST に限定する mode */
 @@ -89,6 +92,7 @@
      */
     public function init()
     {
 +        $this->sendAdditionalHeader();
         // 開始時刻を設定する。
         $this->timeStart = microtime(true);
 
 @@ -104,7 +108,7 @@
         }
 
         // スーパーフックポイントを実行.
 -        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
 +        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         $objPlugin->doAction('LC_Page_preProcess', array($this));
 
         // 店舗基本情報取得
 @@ -136,7 +140,7 @@
      */
     public function sendResponse()
     {
 -        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
 +        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         // ローカルフックポイントを実行.
         $this->doLocalHookpointAfter($objPlugin);
 
 @@ -166,7 +170,6 @@
      */
     public function sendResponseCSV($file_name, $data)
     {
 -        $this->objDisplay->prepare($this);
         $this->objDisplay->addHeader('Content-disposition', "attachment; filename=${file_name}");
         $this->objDisplay->addHeader('Content-type', "application/octet-stream; name=${file_name}");
         $this->objDisplay->addHeader('Cache-Control', '');
 @@ -432,7 +435,7 @@
      * ページによって検証タイミングなどを制御する必要がある場合は, この関数を
      * オーバーライドし, 個別に設定を行うこと.
      *
 -     * @access protected
 +     * @access public
      * @param  boolean $is_admin 管理画面でエラー表示をする場合 true
      * @return void
      */
 @@ -511,4 +514,16 @@
             trigger_error($msg, E_USER_ERROR);
         }
     }
 +
 +    /**
 +     * 追加の HTTP ヘッダを送信する.
 +     *
 +     * 主にセキュリティ関連のヘッダを送信する.
 +     */
 +    public function sendAdditionalHeader()
 +    {
 +        header('X-XSS-Protection: 1; mode=block');
 +        header('X-Content-Type-Options: nosniff');
 +        header('X-Frame-Options: DENY');
 +    }
 }
 diff -urb 2_13/data/class/pages/admin/LC_Page_Admin.php 2_17/data/class/pages/admin/LC_Page_Admin.php
 --- 2_13/data/class/pages/admin/LC_Page_Admin.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/LC_Page_Admin.php	2019-08-03 09:51:39.000000000 +0900
 @@ -43,6 +43,7 @@
      */
     public function init()
     {
 +        $this->sendAdditionalHeader();
         $this->template = MAIN_FRAME;
 
         //IP制限チェック
 @@ -66,7 +67,7 @@
         $this->objDisplay = new SC_Display_Ex();
 
         // スーパーフックポイントを実行.
 -        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
 +        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         $objPlugin->doAction('LC_Page_preProcess', array($this));
 
         // トランザクショントークンの検証と生成
 @@ -98,7 +99,7 @@
      */
     public function sendResponse()
     {
 -        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
 +        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         // ローカルフックポイントを実行
         $parent_class_name = get_parent_class($this);
         $objPlugin->doAction($parent_class_name . '_action_after', array($this));
 diff -urb 2_13/data/class/pages/admin/LC_Page_Admin_Index.php 2_17/data/class/pages/admin/LC_Page_Admin_Index.php
 --- 2_13/data/class/pages/admin/LC_Page_Admin_Index.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/LC_Page_Admin_Index.php	2019-08-03 09:51:39.000000000 +0900
 @@ -100,7 +100,7 @@
     public function lfInitParam(&$objFormParam)
     {
         $objFormParam->addParam('ID', 'login_id', ID_MAX_LEN, '', array('EXIST_CHECK', 'ALNUM_CHECK' ,'MAX_LENGTH_CHECK'));
 -        $objFormParam->addParam('PASSWORD', 'password', ID_MAX_LEN, '', array('EXIST_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
 +        $objFormParam->addParam('PASSWORD', 'password', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
     }
 
     /**
 diff -urb 2_13/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php 2_17/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php
 --- 2_13/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php	2019-08-03 09:51:39.000000000 +0900
 @@ -151,11 +151,11 @@
                 $TaxRule = $objTaxRule->getTaxRuleData($tax_rule_id);
 
                 $tmp = explode(" ", $TaxRule['apply_date']);
 -                $tmp_ymd = explode("-", $tmp[0]);
 +                $tmp_ymd = array_map("intval",explode('-', $tmp[0]));
                 $TaxRule['apply_date_year'] = $tmp_ymd[0];
                 $TaxRule['apply_date_month'] = $tmp_ymd[1];
                 $TaxRule['apply_date_day'] = $tmp_ymd[2];
 -                $tmp_hm = explode(":", $tmp[1]);
 +                $tmp_hm = array_map("intval",explode(":", $tmp[1]));                
                 $TaxRule['apply_date_hour'] = $tmp_hm[0];
                 $TaxRule['apply_date_minutes'] = $tmp_hm[1];
 
 diff -urb 2_13/data/class/pages/admin/contents/LC_Page_Admin_Contents.php 2_17/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
 --- 2_13/data/class/pages/admin/contents/LC_Page_Admin_Contents.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/contents/LC_Page_Admin_Contents.php	2019-08-03 09:51:39.000000000 +0900
 @@ -145,8 +145,13 @@
                 $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] = "※ 移動先は数字で入力してください。<br>";
 +                    $this->arrNews = $objNews->getList();
 +                    $this->line_max = count($this->arrNews);
 +                    return;
 +                }
                 break;
 
             default:
 @@ -240,7 +245,7 @@
      */
     public function splitNewsDate($news_date)
     {
 -        return explode('-', $news_date);
 +        return array_map("intval",explode('-', $news_date));
     }
 
     /**
 diff -urb 2_13/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php 2_17/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php
 --- 2_13/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php	2019-08-03 09:51:39.000000000 +0900
 @@ -117,7 +117,8 @@
 
         $objNavi = new SC_PageNavi_Ex($search_pageno,
                                     $linemax,
 -                                    SEARCH_PMAX);
 +                                    SEARCH_PMAX,
 +                                    'eccube.moveNaviPage', NAVI_PMAX);
 
         return array($linemax, $arrResult, $objNavi->arrPagenavi);
     }
 diff -urb 2_13/data/class/pages/admin/order/LC_Page_Admin_Order.php 2_17/data/class/pages/admin/order/LC_Page_Admin_Order.php
 --- 2_13/data/class/pages/admin/order/LC_Page_Admin_Order.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/order/LC_Page_Admin_Order.php	2019-08-03 09:51:39.000000000 +0900
 @@ -93,6 +93,8 @@
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam);
         $objFormParam->setParam($_POST);
 +        $objFormParam->convParam();
 +        $objFormParam->trimParam();
         $this->arrHidden = $objFormParam->getSearchArray();
         $this->arrForm = $objFormParam->getFormParamList();
 
 diff -urb 2_13/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2_17/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
 --- 2_13/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	2019-08-03 09:51:39.000000000 +0900
 @@ -109,7 +109,7 @@
         $this->arrMonthShippingDate = $objShippingDate->getMonth(true);
         $this->arrDayShippingDate = $objShippingDate->getDay(true);
 
 -        $objBirthDate = new SC_Date_Ex(BIRTH_YEAR, date('Y', strtotime('now')));
 +        $objBirthDate = new SC_Date_Ex(BIRTH_YEAR, date('Y'));
         $this->arrBirthYear = $objBirthDate->getYear('', START_BIRTH_YEAR, '');
         $this->arrBirthMonth = $objBirthDate->getMonth(true);
         $this->arrBirthDay = $objBirthDate->getDay(true);
 @@ -1116,18 +1116,6 @@
             $objFormParam->setParam($arrAddProducts);
         }
         $objFormParam->setParam($arrShipmentProducts);
 -
 -        foreach ($arrNewShipmentProducts['shipment_product_class_id'] as $shipping_id => $arrShipmentProductClassIds) {
 -            if (in_array($pre_shipment_product_class_id, $arrShipmentProductClassIds)) {
 -                $is_product_delete = false;
 -                break;
 -            }
 -        }
 -
 -        //商品情報から削除
 -        if ($is_product_delete) {
 -            $this->checkDeleteProducts($objFormParam, $arrPreProductClassIds, $pre_shipment_product_class_id, $this->arrProductKeys);
 -        }
     }
 
     /**
 diff -urb 2_13/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php 2_17/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php
 --- 2_13/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php	2019-08-03 09:51:39.000000000 +0900
 @@ -88,7 +88,7 @@
 
         //メール本文の確認例は初めの1受注とする
         if (!SC_Utils_Ex::isBlank($this->order_id_array)) {
 -            $order_id_array = split(',', $this->order_id_array);
 +            $order_id_array = explode(',', $this->order_id_array);
             $post['order_id'] = intval($order_id_array[0]);
             $this->order_id_count = count($order_id_array);
         }
 diff -urb 2_13/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php 2_17/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php
 --- 2_13/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php	2019-08-03 09:51:39.000000000 +0900
 @@ -216,7 +216,7 @@
         $objError->doFunc(array('発行日', 'year', 'month', 'day'), array('CHECK_DATE'));
         $arrErr = array_merge($arrErr, $objError->arrErr);
 
 -        $objQuery = new SC_Query();
 +        $objQuery = SC_Query_Ex::getSingletonInstance();
 
         $order_temp = $_POST['order_id'];
         $order_max = max($order_temp);
 diff -urb 2_13/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php 2_17/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php
 --- 2_13/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php	2019-08-03 09:51:39.000000000 +0900
 @@ -150,18 +150,17 @@
                 rank =
                     (
                         SELECT COUNT(*)
 -                        FROM dtb_product_categories t_in
 -                        WHERE t_in.category_id = dtb_product_categories.category_id
 -                            AND (
 +                        FROM (SELECT product_id,rank FROM dtb_product_categories WHERE category_id = dtb_product_categories.category_id) t_in
 +                        WHERE
                                 t_in.rank < dtb_product_categories.rank
                                 OR (
                                     t_in.rank = dtb_product_categories.rank
                                     AND t_in.product_id < dtb_product_categories.product_id
                                 )
 -                            )
                     ) + 1
             WHERE dtb_product_categories.category_id = ?
 __EOS__;
 +
         $arrRet = $objQuery->query($sql, array($parent_category_id));
 
         return $arrRet;
 diff -urb 2_13/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 2_17/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
 --- 2_13/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	2019-08-03 09:51:39.000000000 +0900
 @@ -349,7 +349,7 @@
             $objFormParam->addParam(
                     $item['disp_name'],
                     $col,
 -                    constant($item['size_const_type']),
 +                    defined($item['size_const_type']) ? constant($item['size_const_type']) : $item['size_const_type'],
                     $item['mb_convert_kana_option'],
                     $arrErrorCheckTypes,
                     $item['default'],
 @@ -566,6 +566,7 @@
                     break;
                 case 'stock_unlimited':
                     $arrCSVFrame[$key]['default'] = UNLIMITED_FLG_LIMITED;
 +                    break;
                 default:
                     break;
             }
 diff -urb 2_13/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php 2_17/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
 --- 2_13/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	2019-08-03 09:51:39.000000000 +0900
 @@ -307,7 +307,7 @@
             $objFormParam->addParam(
                     $item['disp_name'],
                     $col,
 -                    constant($item['size_const_type']),
 +                    defined($item['size_const_type']) ? constant($item['size_const_type']) : $item['size_const_type'],
                     $item['mb_convert_kana_option'],
                     $arrErrorCheckTypes,
                     $item['default'],
 diff -urb 2_13/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php 2_17/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php
 --- 2_13/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php	2019-08-03 09:51:39.000000000 +0900
 @@ -136,9 +136,12 @@
 
         $installData = file(CONFIG_REALFILE, FILE_IGNORE_NEW_LINES);
         foreach ($installData as $key=>$line) {
 -            if (strpos($line, 'ADMIN_DIR') !== false and ADMIN_DIR != $admin_dir) {
 +            if (strpos($line, 'ADMIN_DIR') !== false && ADMIN_DIR != $admin_dir) {
 +                if ($admin_dir == 'admin/') {
 +                    $arrErr['admin_dir'] .= '別のディレクトリ名を指定してください。';
 +                }
                 //既存ディレクトリのチェック
 -                if (file_exists(HTML_REALDIR . $admin_dir) and $admin_dir != 'admin/') {
 +                if (file_exists(HTML_REALDIR . $admin_dir) && $admin_dir != 'admin/') {
                     $arrErr['admin_dir'] .= ROOT_URLPATH . $admin_dir . 'は既に存在しています。別のディレクトリ名を指定してください。';
                 }
                 //権限チェック
 diff -urb 2_13/data/class/pages/admin/system/LC_Page_Admin_System_Input.php 2_17/data/class/pages/admin/system/LC_Page_Admin_System_Input.php
 --- 2_13/data/class/pages/admin/system/LC_Page_Admin_System_Input.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/system/LC_Page_Admin_System_Input.php	2019-08-03 09:51:39.000000000 +0900
 @@ -189,8 +189,8 @@
             $objFormParam->addParam('パスワード', 'password', '', '', array('EXIST_CHECK'));
             $objFormParam->addParam('パスワード(確認)', 'password02', '', '', array('EXIST_CHECK'));
         } else {
 -            $objFormParam->addParam('パスワード', 'password', '', '', array('EXIST_CHECK', 'GRAPH_CHECK'));
 -            $objFormParam->addParam('パスワード(確認)', 'password02', '', '', array('EXIST_CHECK', 'GRAPH_CHECK'));
 +            $objFormParam->addParam('パスワード', 'password', '', '', array('EXIST_CHECK', 'PASSWORD_CHAR_CHECK'));
 +            $objFormParam->addParam('パスワード(確認)', 'password02', '', '', array('EXIST_CHECK', 'PASSWORD_CHAR_CHECK'));
         }
         $objFormParam->addParam('権限', 'authority', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('稼働/非稼働', 'work', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
 @@ -216,10 +216,10 @@
         // ログインID・パスワードの文字数チェック
         $objErr = new SC_CheckError_Ex();
         if ($mode == 'new') {
 -            $objErr->doFunc(array('パスワード', 'password', ID_MIN_LEN, ID_MAX_LEN), array('NUM_RANGE_CHECK'));
 +            $objErr->doFunc(array('パスワード', 'password', PASSWORD_MIN_LEN, PASSWORD_MAX_LEN), array('NUM_RANGE_CHECK'));
             $objErr->doFunc(array('ログインID', 'login_id', ID_MIN_LEN, ID_MAX_LEN), array('NUM_RANGE_CHECK'));
         } elseif ($mode == 'edit') {
 -            $objErr->doFunc(array('パスワード', 'password', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
 +            $objErr->doFunc(array('パスワード', 'password', PASSWORD_MIN_LEN, PASSWORD_MAX_LEN), array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
             $objErr->doFunc(array('ログインID', 'login_id', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
         }
         $objErr->doFunc(array('パスワード', 'パスワード(確認)', 'password', 'password02'), array('EQUAL_CHECK'));
 diff -urb 2_13/data/class/pages/admin/system/LC_Page_Admin_System_System.php 2_17/data/class/pages/admin/system/LC_Page_Admin_System_System.php
 --- 2_13/data/class/pages/admin/system/LC_Page_Admin_System_System.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/system/LC_Page_Admin_System_System.php	2019-08-03 09:51:39.000000000 +0900
 @@ -128,4 +128,14 @@
 
         return $arrSystemInfo;
     }
 +
 +    /**
 +     * {@inheritdoc}
 +     */
 +    public function sendAdditionalHeader()
 +    {
 +        header('X-XSS-Protection: 1; mode=block');
 +        header('X-Content-Type-Options: nosniff');
 +        header('X-Frame-Options: SAMEORIGIN');
 +    }
 }
 diff -urb 2_13/data/class/pages/admin/total/LC_Page_Admin_Total.php 2_17/data/class/pages/admin/total/LC_Page_Admin_Total.php
 --- 2_13/data/class/pages/admin/total/LC_Page_Admin_Total.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/admin/total/LC_Page_Admin_Total.php	2019-08-03 09:51:39.000000000 +0900
 @@ -167,7 +167,7 @@
         $month = date('m');
         $day = date('d');
 
 -        $list = isset($_SESSION['total']) ? $_SESSION['total'] : '';
 +        $list = isset($_SESSION['total']) ? $_SESSION['total'] : [];
 
         // セッション情報に開始月度が保存されていない。
         if (empty($_SESSION['total']['startyear_m'])) {
 @@ -486,7 +486,7 @@
     /**
      * @param string $col_date
      */
 -    public function lfGetWhereMember($col_date, $sdate, $edate, $type, $col_member = 'customer_id')
 +    public function lfGetWhereMember($col_date, $sdate, $edate, $type = NULL, $col_member = 'customer_id')
     {
         $where = '';
         // 取得日付の指定
 @@ -683,7 +683,7 @@
     {
         $objQuery   = SC_Query_Ex::getSingletonInstance();
 
 -        list($where, $arrWhereVal) = $this->lfGetWhereMember('create_date', $sdate, $edate);
 +        list($where, $arrWhereVal) = $this->lfGetWhereMember('create_date', $sdate, $edate, null, null);
         $where .= ' AND del_flg = 0 AND status <> ?';
         $arrWhereVal[] = ORDER_CANCEL;
 
 @@ -740,6 +740,8 @@
     {
         $arrDateList = $this->lfDateTimeArray($type, $st, $ed);
 
 +        $arrDateResults = array();
 +        $arrRet = array();
         foreach ($arrResults as $arrResult) {
             $strdate                = $arrResult['str_date'];
             $arrDateResults[$strdate] = $arrResult;
 @@ -809,11 +811,14 @@
             // 合計の計算
             foreach ($arrResults as $arrResult) {
                 foreach ($arrResult as $key => $value) {
 -                    $arrTotal[$key] += $arrResult[$key];
 +                    $arrTotal[$key] += (int) $arrResult[$key];
                 }
             }
             // 平均値の計算
             $arrTotal['total_average'] = $arrTotal['total'] / $arrTotal['total_order'];
 +            if (is_nan($arrTotal['total_average'])) {
 +                $arrTotal['total_average'] = 0;
 +            }
             $arrResults[] = $arrTotal;
         }
 
 diff -urb 2_13/data/class/pages/api/LC_Page_Api.php 2_17/data/class/pages/api/LC_Page_Api.php
 --- 2_13/data/class/pages/api/LC_Page_Api.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/api/LC_Page_Api.php	2019-08-03 09:51:39.000000000 +0900
 @@ -63,7 +63,7 @@
     {
         $arrParam = $_REQUEST;
 
 -        list($response_outer, $arrResponse) = SC_Api_Operation::doApiAction($arrParam);
 +        list($response_outer, $arrResponse) = SC_Api_Operation_Ex::doApiAction($arrParam);
         SC_Api_Operation_Ex::sendApiResponse('xml', $response_outer, $arrResponse);
         SC_Response_Ex::actionExit();
     }
 diff -urb 2_13/data/class/pages/api/LC_Page_Api_Json.php 2_17/data/class/pages/api/LC_Page_Api_Json.php
 --- 2_13/data/class/pages/api/LC_Page_Api_Json.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/api/LC_Page_Api_Json.php	2019-08-03 09:51:39.000000000 +0900
 @@ -63,7 +63,7 @@
     {
         $arrParam = $_REQUEST;
 
 -        list($response_outer, $arrResponse) = SC_Api_Operation::doApiAction($arrParam);
 +        list($response_outer, $arrResponse) = SC_Api_Operation_Ex::doApiAction($arrParam);
 
         if (isset($arrParam["callback"])) {
             $arrResponse["callback"] = $arrParam["callback"];
 diff -urb 2_13/data/class/pages/api/LC_Page_Api_Php.php 2_17/data/class/pages/api/LC_Page_Api_Php.php
 --- 2_13/data/class/pages/api/LC_Page_Api_Php.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/api/LC_Page_Api_Php.php	2019-08-03 09:51:39.000000000 +0900
 @@ -63,7 +63,7 @@
     {
         $arrParam = $_REQUEST;
 
 -        list($response_outer, $arrResponse) = SC_Api_Operation::doApiAction($arrParam);
 +        list($response_outer, $arrResponse) = SC_Api_Operation_Ex::doApiAction($arrParam);
         SC_Api_Operation_Ex::sendApiResponse('php', $response_outer, $arrResponse);
         SC_Response_Ex::actionExit();
     }
 diff -urb 2_13/data/class/pages/api/LC_Page_Api_Xml.php 2_17/data/class/pages/api/LC_Page_Api_Xml.php
 --- 2_13/data/class/pages/api/LC_Page_Api_Xml.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/api/LC_Page_Api_Xml.php	2019-08-03 09:51:39.000000000 +0900
 @@ -63,7 +63,7 @@
     {
         $arrParam = $_REQUEST;
 
 -        list($response_outer, $arrResponse) = SC_Api_Operation::doApiAction($arrParam);
 +        list($response_outer, $arrResponse) = SC_Api_Operation_Ex::doApiAction($arrParam);
         SC_Api_Operation_Ex::sendApiResponse('xml', $response_outer, $arrResponse);
         SC_Response_Ex::actionExit();
     }
 diff -urb 2_13/data/class/pages/contact/LC_Page_Contact.php 2_17/data/class/pages/contact/LC_Page_Contact.php
 --- 2_13/data/class/pages/contact/LC_Page_Contact.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/contact/LC_Page_Contact.php	2019-08-03 09:51:39.000000000 +0900
 @@ -77,7 +77,7 @@
     {
         $objFormParam = new SC_FormParam_Ex();
 
 -        $this->arrData = isset($_SESSION['customer']) ? $_SESSION['customer'] : '';
 +        $this->arrData = isset($_SESSION['customer']) ? $_SESSION['customer'] : [];
 
         switch ($this->getMode()) {
             case 'confirm':
 diff -urb 2_13/data/class/pages/contact/LC_Page_Contact_Complete.php 2_17/data/class/pages/contact/LC_Page_Contact_Complete.php
 --- 2_13/data/class/pages/contact/LC_Page_Contact_Complete.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/contact/LC_Page_Contact_Complete.php	2019-08-03 09:51:39.000000000 +0900
 @@ -42,6 +42,7 @@
         parent::init();
         $this->tpl_title = 'お問い合わせ(完了ページ)';
         $this->tpl_mainno = 'contact';
 +        $this->httpCacheControl('nocache');
     }
 
     /**
 @@ -64,6 +65,5 @@
     public function action()
     {
         // do nothing...
 -
     }
 }
 diff -urb 2_13/data/class/pages/entry/LC_Page_Entry.php 2_17/data/class/pages/entry/LC_Page_Entry.php
 --- 2_13/data/class/pages/entry/LC_Page_Entry.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/entry/LC_Page_Entry.php	2019-08-03 09:51:39.000000000 +0900
 @@ -48,7 +48,7 @@
         $this->arrMAILMAGATYPE = $masterData->getMasterData('mtb_mail_magazine_type');
 
         // 生年月日選択肢の取得
 -        $objDate            = new SC_Date_Ex(BIRTH_YEAR, date('Y', strtotime('now')));
 +        $objDate            = new SC_Date_Ex(BIRTH_YEAR, date('Y'));
         $this->arrYear      = $objDate->getYear('', START_BIRTH_YEAR, '');
         $this->arrMonth     = $objDate->getMonth(true);
         $this->arrDay       = $objDate->getDay(true);
 @@ -147,7 +147,8 @@
                     }
 
                     // 完了ページに移動させる。
 -                    SC_Response_Ex::sendRedirect('complete.php', array('ci' => SC_Helper_Customer_Ex::sfGetCustomerId($uniqid)));
 +                    $_SESSION['registered_customer_id'] = SC_Helper_Customer_Ex::sfGetCustomerId($uniqid);
 +                    SC_Response_Ex::sendRedirect('complete.php');
                 }
                 break;
             case 'return':
 diff -urb 2_13/data/class/pages/entry/LC_Page_Entry_Complete.php 2_17/data/class/pages/entry/LC_Page_Entry_Complete.php
 --- 2_13/data/class/pages/entry/LC_Page_Entry_Complete.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/entry/LC_Page_Entry_Complete.php	2019-08-03 09:51:39.000000000 +0900
 @@ -62,8 +62,9 @@
      */
     public function action()
     {
 -        // カートが空かどうかを確認する。
         $objCartSess            = new SC_CartSession_Ex();
 +
 +        // カートが空かどうかを確認する。
         $arrCartKeys = $objCartSess->getKeys();
         $this->tpl_cart_empty = true;
         foreach ($arrCartKeys as $cart_key) {
 @@ -73,14 +74,18 @@
             }
         }
 
 -        // メインテンプレートを設定
 -        if (CUSTOMER_CONFIRM_MAIL == true) {
             // 仮会員登録完了
 +        if (CUSTOMER_CONFIRM_MAIL == true) {
 +            // 登録された会員ID
 +            $this->tpl_customer_id = $_SESSION['registered_customer_id'];
 +            unset($_SESSION['registered_customer_id']);
 +
 +            // メインテンプレートを設定
             $this->tpl_mainpage     = 'entry/complete.tpl';
 -        } else {
 +        }
             // 本会員登録完了
 +        else {
             SC_Response_Ex::sendRedirectFromUrlPath('regist/complete.php');
         }
 -
     }
 }
 diff -urb 2_13/data/class/pages/error/LC_Page_Error.php 2_17/data/class/pages/error/LC_Page_Error.php
 --- 2_13/data/class/pages/error/LC_Page_Error.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/error/LC_Page_Error.php	2019-08-03 09:51:39.000000000 +0900
 @@ -63,7 +63,7 @@
         // ディスプレイクラス生成
         $this->objDisplay = new SC_Display_Ex();
 
 -        $objHelperPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
 +        $objHelperPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         if (is_object($objHelperPlugin)) {
             // transformでフックしている場合に, 再度エラーが発生するため, コールバックを無効化.
             $objHelperPlugin->arrRegistedPluginActions = array();
 @@ -175,9 +175,11 @@
 
     /**
      * エラーページではトランザクショントークンの自動検証は行わない
 +     *
 +     * @param  boolean $is_admin 管理画面でエラー表示をする場合 true
      */
 -    public function doValidToken()
 +    public function doValidToken($is_admin = false)
     {
 -        // queit.
 +        // nothing.
     }
 }
 diff -urb 2_13/data/class/pages/error/LC_Page_Error_DispError.php 2_17/data/class/pages/error/LC_Page_Error_DispError.php
 --- 2_13/data/class/pages/error/LC_Page_Error_DispError.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/error/LC_Page_Error_DispError.php	2019-08-03 09:51:39.000000000 +0900
 @@ -50,7 +50,7 @@
         $this->objDisplay = new SC_Display_Ex();
 
         // transformでフックしている場合に, 再度エラーが発生するため, コールバックを無効化.
 -        $objHelperPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
 +        $objHelperPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         $objHelperPlugin->arrRegistedPluginActions = array();
 
         // キャッシュから店舗情報取得（DBへの接続は行わない）
 @@ -100,9 +100,11 @@
 
     /**
      * エラーページではトランザクショントークンの自動検証は行わない
 +     *
 +     * @param  boolean $is_admin 管理画面でエラー表示をする場合 true
      */
 -    public function doValidToken()
 +    public function doValidToken($is_admin = false)
     {
 -        // queit.
 +        // nothing.
     }
 }
 diff -urb 2_13/data/class/pages/error/LC_Page_Error_SystemError.php 2_17/data/class/pages/error/LC_Page_Error_SystemError.php
 --- 2_13/data/class/pages/error/LC_Page_Error_SystemError.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/error/LC_Page_Error_SystemError.php	2019-08-03 09:51:39.000000000 +0900
 @@ -109,9 +109,12 @@
 
     /**
      * トランザクショントークンに関して処理しないようにオーバーライド
 +     *
 +     * @param  boolean $is_admin 管理画面でエラー表示をする場合 true
      */
 -    public function doValidToken()
 +    public function doValidToken($is_admin = false)
     {
 +        // nothing.
     }
 
     /**
 diff -urb 2_13/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php 2_17/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php
 --- 2_13/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php	2019-08-03 09:51:39.000000000 +0900
 @@ -53,7 +53,7 @@
         $this->setTokenTo();
 
         // ローカルフックポイントを実行.
 -        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
 +        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         $this->doLocalHookpointBefore($objPlugin);
     }
 
 diff -urb 2_13/data/class/pages/mypage/LC_Page_Mypage_Change.php 2_17/data/class/pages/mypage/LC_Page_Mypage_Change.php
 --- 2_13/data/class/pages/mypage/LC_Page_Mypage_Change.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/mypage/LC_Page_Mypage_Change.php	2019-08-03 09:51:39.000000000 +0900
 @@ -53,7 +53,7 @@
         $this->httpCacheControl('nocache');
 
         // 生年月日選択肢の取得
 -        $objDate            = new SC_Date_Ex(BIRTH_YEAR, date('Y', strtotime('now')));
 +        $objDate            = new SC_Date_Ex(BIRTH_YEAR, date('Y'));
         $this->arrYear      = $objDate->getYear('', START_BIRTH_YEAR, '');
         $this->arrMonth     = $objDate->getMonth(true);
         $this->arrDay       = $objDate->getDay(true);
 diff -urb 2_13/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php 2_17/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php
 --- 2_13/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php	2019-08-03 09:51:39.000000000 +0900
 @@ -104,7 +104,7 @@
     public function sendResponse()
     {
         // TODO sendResponseをオーバーライドしている為、afterフックポイントが実行されない.直接実行する.(#1790)
 -        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
 +        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         $objPlugin->doAction('LC_Page_Mypage_DownLoad_action_after', array($this));
 
         $this->objDisplay->noAction();
 diff -urb 2_13/data/class/pages/mypage/LC_Page_Mypage_History.php 2_17/data/class/pages/mypage/LC_Page_Mypage_History.php
 --- 2_13/data/class/pages/mypage/LC_Page_Mypage_History.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/mypage/LC_Page_Mypage_History.php	2019-08-03 09:51:39.000000000 +0900
 @@ -99,8 +99,11 @@
         // 受注商品明細の取得
         $this->tpl_arrOrderDetail = $objPurchase->getOrderDetail($order_id);
         foreach ($this->tpl_arrOrderDetail as $product_index => $arrOrderProductDetail) {
 +            //
 +            if (SC_Helper_DB_Ex::sfDataExists('dtb_products_class', 'product_class_id = ?', array($arrOrderProductDetail['product_class_id']))) {
             //必要なのは商品の販売金額のみなので、遅い場合は、別途SQL作成した方が良い
             $arrTempProductDetail = $objProduct->getProductsClass($arrOrderProductDetail['product_class_id']);
 +            }
             // 税計算
             $this->tpl_arrOrderDetail[$product_index]['price_inctax'] = $this->tpl_arrOrderDetail[$product_index]['price']  +
                 SC_Helper_TaxRule_Ex::calcTax(
 diff -urb 2_13/data/class/pages/products/LC_Page_Products_Detail.php 2_17/data/class/pages/products/LC_Page_Products_Detail.php
 --- 2_13/data/class/pages/products/LC_Page_Products_Detail.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/products/LC_Page_Products_Detail.php	2019-08-03 09:51:39.000000000 +0900
 @@ -291,7 +291,7 @@
         $this->arrRelativeCat = SC_Helper_DB_Ex::sfGetMultiCatTree($product_id);
 
         // 商品ステータスを取得
 -        $this->productStatus = $objProduct->getProductStatus($product_id);
 +        $this->productStatus = $objProduct->getProductStatus(array($product_id));
 
         // 画像ファイル指定がない場合の置換処理
         $this->arrProduct['main_image']
 @@ -652,7 +652,7 @@
                 if (!$this->lfRegistFavoriteProduct($this->objFormParam->getValue('favorite_product_id'), $objCustomer->getValue('customer_id'))) {
                     SC_Response_Ex::actionExit(); 
                 }
 -                $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
 +                $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
                 $objPlugin->doAction('LC_Page_Products_Detail_action_add_favorite', array($this));
             }
         }
 @@ -671,7 +671,7 @@
             $this->arrErr = $this->lfCheckError($this->mode, $this->objFormParam);
             if (count($this->arrErr) == 0) {
                 if ($this->lfRegistFavoriteProduct($this->objFormParam->getValue('favorite_product_id'), $objCustomer->getValue('customer_id'))) {
 -                    $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
 +                    $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
                     $objPlugin->doAction('LC_Page_Products_Detail_action_add_favorite_sphone', array($this));
                     print 'true';
                     SC_Response_Ex::actionExit();
 diff -urb 2_13/data/class/pages/regist/LC_Page_Regist.php 2_17/data/class/pages/regist/LC_Page_Regist.php
 --- 2_13/data/class/pages/regist/LC_Page_Regist.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/regist/LC_Page_Regist.php	2019-08-03 09:51:39.000000000 +0900
 @@ -72,7 +72,8 @@
                 $registSecretKey    = $this->lfRegistData($_GET);   //本会員登録（フラグ変更）
                 $this->lfSendRegistMail($registSecretKey);          //本会員登録完了メール送信
 
 -                SC_Response_Ex::sendRedirect('complete.php', array('ci' => SC_Helper_Customer_Ex::sfGetCustomerId($registSecretKey)));
 +                $_SESSION['registered_customer_id'] = SC_Helper_Customer_Ex::sfGetCustomerId($registSecretKey);
 +                SC_Response_Ex::sendRedirect('complete.php');
                 break;
             //--　それ以外のアクセスは無効とする
             default:
 diff -urb 2_13/data/class/pages/regist/LC_Page_Regist_Complete.php 2_17/data/class/pages/regist/LC_Page_Regist_Complete.php
 --- 2_13/data/class/pages/regist/LC_Page_Regist_Complete.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/regist/LC_Page_Regist_Complete.php	2019-08-03 09:51:39.000000000 +0900
 @@ -41,6 +41,7 @@
     {
         parent::init();
         $this->tpl_title = '会員登録(完了ページ)';
 +        $this->httpCacheControl('nocache');
     }
 
     /**
 @@ -62,5 +63,8 @@
      */
     public function action()
     {
 +        // 登録された会員ID
 +        $this->tpl_customer_id = $_SESSION['registered_customer_id'];
 +        unset($_SESSION['registered_customer_id']);
     }
 }
 diff -urb 2_13/data/class/pages/shopping/LC_Page_Shopping.php 2_17/data/class/pages/shopping/LC_Page_Shopping.php
 --- 2_13/data/class/pages/shopping/LC_Page_Shopping.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/shopping/LC_Page_Shopping.php	2019-08-03 09:51:39.000000000 +0900
 @@ -48,7 +48,7 @@
         $this->arrJob = $masterData->getMasterData('mtb_job');
         $this->tpl_onload = 'eccube.toggleDeliveryForm();';
 
 -        $objDate = new SC_Date_Ex(BIRTH_YEAR, date('Y', strtotime('now')));
 +        $objDate = new SC_Date_Ex(BIRTH_YEAR, date('Y'));
         $this->arrYear = $objDate->getYear('', START_BIRTH_YEAR, '');
         $this->arrMonth = $objDate->getMonth(true);
         $this->arrDay = $objDate->getDay(true);
 diff -urb 2_13/data/class/pages/shopping/LC_Page_Shopping_Complete.php 2_17/data/class/pages/shopping/LC_Page_Shopping_Complete.php
 --- 2_13/data/class/pages/shopping/LC_Page_Shopping_Complete.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/shopping/LC_Page_Shopping_Complete.php	2019-08-03 09:51:39.000000000 +0900
 @@ -41,6 +41,7 @@
     {
         parent::init();
         $this->tpl_title = 'ご注文完了';
 +        $this->httpCacheControl('nocache');
     }
 
     /**
 @@ -65,12 +66,15 @@
     public function action()
     {
         $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
 +        $this->tpl_order_id = $_SESSION['order_id'];
     }
 
     /**
      * 決済モジュールから遷移する場合があるため, トークンチェックしない.
 +     *
 +     * @param  boolean $is_admin 管理画面でエラー表示をする場合 true
      */
 -    public function doValidToken()
 +    public function doValidToken($is_admin = false)
     {
         // nothing.
     }
 diff -urb 2_13/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2_17/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
 --- 2_13/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	2019-08-03 09:51:39.000000000 +0900
 @@ -146,9 +146,7 @@
                 SC_Response_Ex::actionExit();
                 break;
             case 'confirm':
 -                /*
 -                 * 決済モジュールで必要なため, 受注番号を取得
 -                 */
 +                // 注文番号を取得
                 $this->arrForm['order_id'] = $objPurchase->getNextOrderID();
                 $_SESSION['order_id'] = $this->arrForm['order_id'];
 
 diff -urb 2_13/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php 2_17/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php
 --- 2_13/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php	2019-08-03 09:51:39.000000000 +0900
 @@ -151,8 +151,10 @@
 
     /**
      * 決済モジュールから遷移する場合があるため, トークンチェックしない.
 +     *
 +     * @param  boolean $is_admin 管理画面でエラー表示をする場合 true
      */
 -    public function doValidToken()
 +    public function doValidToken($is_admin = false)
     {
         // nothing.
     }
 diff -urb 2_13/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2_17/data/class/pages/shopping/LC_Page_Shopping_Payment.php
 --- 2_13/data/class/pages/shopping/LC_Page_Shopping_Payment.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/shopping/LC_Page_Shopping_Payment.php	2019-08-03 09:51:39.000000000 +0900
 @@ -370,13 +370,19 @@
             $arrForm['use_point'] = 0;
         }
 
 +        $find = false;
         foreach ($arrPayment as $payment) {
             if ($arrForm['payment_id'] == $payment['payment_id']) {
                 $arrForm['charge'] = $payment['charge'];
                 $arrForm['payment_method'] = $payment['payment_method'];
 +                $find = true;
                 break;
             }
         }
 +        if (!$find) {
 +            trigger_error('無効な支払方法: ' . var_export($arrForm['payment_id'], true), E_USER_ERROR);
 +        }
 +
         $objPurchase->saveOrderTemp($uniqid, $arrForm);
     }
 
 diff -urb 2_13/data/class/pages/upgrade/LC_Page_Upgrade_Base.php 2_17/data/class/pages/upgrade/LC_Page_Upgrade_Base.php
 --- 2_13/data/class/pages/upgrade/LC_Page_Upgrade_Base.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/upgrade/LC_Page_Upgrade_Base.php	2019-08-03 09:51:39.000000000 +0900
 @@ -105,8 +105,10 @@
 
     /**
      * オーナーズストアからの POST のため, トークンチェックしない.
 +     *
 +     * @param  boolean $is_admin 管理画面でエラー表示をする場合 true
      */
 -    public function doValidToken()
 +    public function doValidToken($is_admin = false)
     {
         // nothing.
     }
 diff -urb 2_13/data/class/pages/upgrade/LC_Page_Upgrade_Download.php 2_17/data/class/pages/upgrade/LC_Page_Upgrade_Download.php
 --- 2_13/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	2019-08-03 09:51:39.000000000 +0900
 @@ -228,7 +228,7 @@
             $this->fileExecute($objRet->data->product_code);
 
             // 配信サーバーへ通知
 -            $objLog->log('* notify to lockon server start');
 +            $objLog->log('* notify to ec-cube server start');
             $objReq = $this->notifyDownload($mode, $objReq->getResponseCookies());
 
             $objLog->log('* dl commit result:' . serialize($objReq));
 diff -urb 2_13/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php 2_17/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php
 --- 2_13/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php	2019-08-03 09:51:39.000000000 +0900
 @@ -3,7 +3,7 @@
  * Enter description here...
  *
  */
 -class LC_Upgrade_Helper_Json extends Services_JSON
 +class LC_Upgrade_Helper_Json
 {
     /** */
     public $arrData = array(
 @@ -20,7 +20,6 @@
      */
     public function __construct()
     {
 -        parent::Services_JSON();
     }
 
     /**
 @@ -77,7 +76,7 @@
     public function display()
     {
         header('Content-Type: text/javascript; charset=UTF-8');
 -        echo $this->encode($this->arrData);
 +        echo json_encode($this->arrData);
     }
 
     /**
 @@ -93,6 +92,6 @@
      */
     public function decode($str)
     {
 -        return SC_Utils_Ex::jsonDecode($str);
 +        return json_decode($str);
     }
 }
 diff -urb 2_13/data/class/sessionfactory/SC_SessionFactory_UseRequest.php 2_17/data/class/sessionfactory/SC_SessionFactory_UseRequest.php
 --- 2_13/data/class/sessionfactory/SC_SessionFactory_UseRequest.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/sessionfactory/SC_SessionFactory_UseRequest.php	2019-08-03 09:51:39.000000000 +0900
 @@ -31,6 +31,7 @@
  * @package SC_SessionFactory
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
 + * @deprecated
  */
 class SC_SessionFactory_UseRequest extends SC_SessionFactory_Ex
 {
 @@ -163,7 +164,7 @@
             // キャリアがAUで、動画、音声ファイルをダウンロードする際に
             // SESSIONIDの後に余計なパラメータが付与され、セッションが無効になるケースがある
             if (SC_MobileUserAgent::getCarrier() == 'ezweb') {
 -                $idArray = split("\?", $sessionId);
 +                $idArray = explode("?", $sessionId);
                 $sessionId = $idArray[0];
             }
         }
 diff -urb 2_13/data/class/util/SC_Utils.php 2_17/data/class/util/SC_Utils.php
 --- 2_13/data/class/util/SC_Utils.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/class/util/SC_Utils.php	2019-08-03 09:51:39.000000000 +0900
 @@ -188,12 +188,11 @@
             // TODO 警告表示させる？
             // sfErrorHeader('>> referrerが無効になっています。');
         } else {
 -            $domain  = SC_Utils_Ex::sfIsHTTPS() ? HTTPS_URL : HTTP_URL;
 -            $pattern = sprintf('|^%s.*|', $domain);
 -            $referer = $_SERVER['HTTP_REFERER'];
 +            $domain  = parse_url(HTTP_URL);
 +            $referer = parse_url($_SERVER['HTTP_REFERER']);
 
             // 管理画面から以外の遷移の場合はエラー画面を表示
 -            if (!preg_match($pattern, $referer)) {
 +            if ($domain['host'] !== $referer['host']) {
                 if ($disp_error) SC_Utils_Ex::sfDispError(INVALID_MOVE_ERRORR);
                 return false;
             }
 @@ -658,6 +657,10 @@
         return $default;
     }
 
 +    /**
 +     * エラー時のカラー(CSS)を設定
 +     * @param string $val
 +     */
     public function sfGetErrorColor($val)
     {
         if ($val != '') {
 @@ -751,15 +754,15 @@
     /**
      * ポイント付与
      * $product_id が使われていない。
 -     * @param  int   $price
 +     * @param  float   $price
      * @param  float $point_rate
      * @param  int   $rule
      * @return double
      */
     public static function sfPrePoint($price, $point_rate, $rule = POINT_RULE)
     {
 -        $real_point = $point_rate / 100;
 -        $ret = $price * $real_point;
 +        $real_point = (float) $point_rate / 100;
 +        $ret = (float) $price * $real_point;
         $ret = SC_Helper_TaxRule_Ex::roundByCalcRule($ret, $rule);
 
         return $ret;
 @@ -1761,9 +1764,7 @@
     /**
      * 値を JSON 形式にして返す.
      *
 -     * この関数は, json_encode() 又は Services_JSON::encode() のラッパーです.
 -     * json_encode() 関数が使用可能な場合は json_encode() 関数を使用する.
 -     * 使用できない場合は, Services_JSON::encode() 関数を使用する.
 +     * この関数は, json_encode() のラッパーです.
      *
      * @param  mixed  $value JSON 形式にエンコードする値
      * @return string JSON 形式にした文字列
 @@ -1772,22 +1773,13 @@
      */
     public static function jsonEncode($value)
     {
 -        if (function_exists('json_encode')) {
             return json_encode($value);
 -        } else {
 -            GC_Utils_Ex::gfPrintLog(' *use Services_JSON::encode(). faster than using the json_encode!');
 -            $objJson = new Services_JSON();
 -
 -            return $objJson->encode($value);
 -        }
     }
 
     /**
      * JSON 文字列をデコードする.
      *
 -     * この関数は, json_decode() 又は Services_JSON::decode() のラッパーです.
 -     * json_decode() 関数が使用可能な場合は json_decode() 関数を使用する.
 -     * 使用できない場合は, Services_JSON::decode() 関数を使用する.
 +     * この関数は, json_decode() のラッパーです.
      *
      * @param  string $json JSON 形式にエンコードされた文字列
      * @return mixed  デコードされた PHP の型
 @@ -1796,14 +1788,7 @@
      */
     public static function jsonDecode($json)
     {
 -        if (function_exists('json_decode')) {
             return json_decode($json);
 -        } else {
 -            GC_Utils_Ex::gfPrintLog(' *use Services_JSON::decode(). faster than using the json_decode!');
 -            $objJson = new Services_JSON();
 -
 -            return $objJson->decode($json);
 -        }
     }
 
     /**
 @@ -1899,7 +1884,8 @@
      */
     public static function copyDirectory($source_path, $dest_path)
     {
 -        $handle=opendir($source_path);
 +        if (!is_dir($source_path)) return;
 +        $handle = opendir($source_path);
         while ($filename = readdir($handle)) {
             if ($filename === '.' || $filename === '..') continue;
             $cur_path = $source_path . $filename;
 @@ -1919,12 +1905,15 @@
     /**
      * 文字列を区切り文字を挟み反復する
      * @param  string $input      繰り返す文字列。
 -     * @param  string $multiplier input を繰り返す回数。
 +     * @param  int $multiplier input を繰り返す回数。
      * @param  string $separator  区切り文字
      * @return string
      */
     public static function repeatStrWithSeparator($input, $multiplier, $separator = ',')
     {
 +        if ($multiplier < 1) {
 +            return '';
 +        }
         return implode($separator, array_fill(0, $multiplier, $input));
     }
 
 diff -urb 2_13/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php 2_17/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php
 --- 2_13/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php	2019-08-03 09:51:39.000000000 +0900
 @@ -44,6 +44,7 @@
     {
         switch ($db_type) {
             case 'mysql':
 +            case 'mysqli':
                 return new SC_DB_DBFactory_MYSQL_Ex();
 
             case 'pgsql':
 Only in 2_17/data/config: .gitkeep
 Only in 2_13/data/config: dummy
 Only in 2_17/data/download/save: .gitkeep
 Only in 2_13/data/download/save: dummy
 Only in 2_17/data/download/temp: .gitkeep
 Only in 2_13/data/download/temp: dummy
 Only in 2_17/data/downloads: .gitkeep
 Only in 2_13/data/downloads: KEN_ALL.CSV
 Only in 2_17/data/downloads/api: .gitkeep
 Only in 2_13/data/downloads/api: dummy
 Only in 2_17/data/downloads/backup: .gitkeep
 Only in 2_13/data/downloads/backup: dummy
 Only in 2_13/data/downloads: dummy
 Only in 2_17/data/downloads/module: .gitkeep
 Only in 2_13/data/downloads/module: dummy
 Only in 2_17/data/downloads/plugin: .gitkeep
 Only in 2_13/data/downloads/plugin: dummy
 Only in 2_17/data/downloads/tmp: .gitkeep
 Only in 2_13/data/downloads/tmp: dummy
 Only in 2_17/data/downloads/tmp/plugin_install: .gitkeep
 Only in 2_13/data/downloads/tmp/plugin_install: dummy
 Only in 2_17/data/downloads/tmp/plugin_update: .gitkeep
 Only in 2_13/data/downloads/tmp/plugin_update: dummy
 Only in 2_17/data/downloads/update: .gitkeep
 Only in 2_13/data/downloads/update: dummy
 diff -urb 2_13/data/include/image_converter.inc 2_17/data/include/image_converter.inc
 --- 2_13/data/include/image_converter.inc	2019-08-03 11:41:43.000000000 +0900
 +++ 2_17/data/include/image_converter.inc	2019-08-03 09:51:39.000000000 +0900
 @@ -1,6 +1,7 @@
 <?php
 /**
  * 画像ファイルの変換を行う
 + * @deprecated
  */
 class ImageConverter
 {
 Only in 2_17/data/logs: .gitkeep
 Only in 2_13/data/logs: dummy
 Only in 2_13/data/module: Archive
 Only in 2_13/data/module: Cache
 diff -urb 2_13/data/module/Calendar/Calendar.php 2_17/data/module/Calendar/Calendar.php
 --- 2_13/data/module/Calendar/Calendar.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/module/Calendar/Calendar.php	2019-08-03 09:51:39.000000000 +0900
 @@ -401,7 +401,7 @@
     {
         if (!isset($this->validator)) {
             require_once CALENDAR_ROOT.'Validator.php';
 -            $this->validator = & new Calendar_Validator($this);
 +            $this->validator = new Calendar_Validator($this);
         }
         return $this->validator;
     }
 diff -urb 2_13/data/module/Calendar/Decorator/Uri.php 2_17/data/module/Calendar/Decorator/Uri.php
 --- 2_13/data/module/Calendar/Decorator/Uri.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/module/Calendar/Decorator/Uri.php	2019-08-03 09:51:39.000000000 +0900
 @@ -88,7 +88,7 @@
      * @access public
      */
     function setFragments($y, $m=null, $d=null, $h=null, $i=null, $s=null) {
 -        $this->Uri = & new Calendar_Util_Uri($y, $m, $d, $h, $i, $s);
 +        $this->Uri = new Calendar_Util_Uri($y, $m, $d, $h, $i, $s);
     }
 
     /**
 diff -urb 2_13/data/module/Calendar/Decorator/Wrapper.php 2_17/data/module/Calendar/Decorator/Wrapper.php
 --- 2_13/data/module/Calendar/Decorator/Wrapper.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/module/Calendar/Decorator/Wrapper.php	2019-08-03 09:51:39.000000000 +0900
 @@ -65,7 +65,7 @@
     {
         $Calendar = parent::fetch();
         if ($Calendar) {
 -            $ret =& new $decorator($Calendar);
 +            $ret = new $decorator($Calendar);
         } else {
             $ret = false;
         }
 @@ -82,7 +82,7 @@
     {
         $children = parent::fetchAll();
         foreach ($children as $key => $Calendar) {
 -            $children[$key] = & new $decorator($Calendar);
 +            $children[$key] = new $decorator($Calendar);
         }
         return $children;
     }
 diff -urb 2_13/data/module/Calendar/Month/Weekdays.php 2_17/data/module/Calendar/Month/Weekdays.php
 --- 2_13/data/module/Calendar/Month/Weekdays.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/module/Calendar/Month/Weekdays.php	2019-08-03 09:51:39.000000000 +0900
 @@ -107,7 +107,7 @@
     function build($sDates=array())
     {
         require_once CALENDAR_ROOT.'Table/Helper.php';
 -        $this->tableHelper = & new Calendar_Table_Helper($this, $this->firstDay);
 +        $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
         Calendar_Month::build($sDates);
         $this->buildEmptyDaysBefore();
         $this->shiftDays();
 diff -urb 2_13/data/module/Calendar/Month/Weeks.php 2_17/data/module/Calendar/Month/Weeks.php
 --- 2_13/data/module/Calendar/Month/Weeks.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/module/Calendar/Month/Weeks.php	2019-08-03 09:51:39.000000000 +0900
 @@ -94,7 +94,7 @@
     function build($sDates=array())
     {
         require_once CALENDAR_ROOT.'Table/Helper.php';
 -        $this->tableHelper = & new Calendar_Table_Helper($this, $this->firstDay);
 +        $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
         require_once CALENDAR_ROOT.'Week.php';
         $numWeeks = $this->tableHelper->getNumWeeks();
         for ($i=1, $d=1; $i<=$numWeeks; $i++,
 diff -urb 2_13/data/module/Calendar/Week.php 2_17/data/module/Calendar/Week.php
 --- 2_13/data/module/Calendar/Week.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/module/Calendar/Week.php	2019-08-03 09:51:39.000000000 +0900
 @@ -120,7 +120,7 @@
         require_once CALENDAR_ROOT.'Table/Helper.php';
         Calendar::Calendar($y, $m, $d);
         $this->firstDay = $this->defineFirstDayOfWeek($firstDay);
 -        $this->tableHelper = & new Calendar_Table_Helper($this, $this->firstDay);
 +        $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
         $this->thisWeek = $this->tableHelper->getWeekStart($y, $m, $d, $this->firstDay);
         $this->prevWeek = $this->tableHelper->getWeekStart($y, $m, $d - $this->cE->getDaysInWeek(
             $this->thisYear(),
 Only in 2_13/data/module/Calendar: docs
 Only in 2_13/data/module/Calendar: tests
 Only in 2_13/data/module: Compat
 diff -urb 2_13/data/module/HTTP/Request.php 2_17/data/module/HTTP/Request.php
 --- 2_13/data/module/HTTP/Request.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/module/HTTP/Request.php	2019-08-03 09:51:39.000000000 +0900
 @@ -409,7 +409,7 @@
     */
     function setURL($url)
     {
 -        $this->_url = &new Net_URL($url, $this->_useBrackets);
 +        $this->_url = new Net_URL($url, $this->_useBrackets);
 
         if (!empty($this->_url->user) || !empty($this->_url->pass)) {
             $this->setBasicAuth($this->_url->user, $this->_url->pass);
 @@ -740,7 +740,7 @@
             $err = null;
         } else {
             $this->_notify('connect');
 -            $this->_sock =& new Net_Socket();
 +            $this->_sock = new Net_Socket();
             $err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
         }
         PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
 @@ -753,7 +753,7 @@
             $this->_notify('sentRequest');
 
             // Read the response
 -            $this->_response = &new HTTP_Response($this->_sock, $this->_listeners);
 +            $this->_response = new HTTP_Response($this->_sock, $this->_listeners);
             $err = $this->_response->process(
                 $this->_saveBody && $saveBody,
                 HTTP_REQUEST_METHOD_HEAD != $this->_method
 @@ -798,7 +798,7 @@
 
             // Absolute URL
             if (preg_match('/^https?:\/\//i', $redirect)) {
 -                $this->_url = &new Net_URL($redirect);
 +                $this->_url = new Net_URL($redirect);
                 $this->addHeader('Host', $this->_generateHostHeader());
             // Absolute path
             } elseif ($redirect{0} == '/') {
 Only in 2_13/data/module: MDB2
 Only in 2_13/data/module: MDB2.php
 Only in 2_13/data/module: Mail
 Only in 2_13/data/module: Mail.php
 Only in 2_13/data/module: Mobile
 Only in 2_13/data/module/Net: UserAgent
 Only in 2_13/data/module: PEAR.php
 Only in 2_13/data/module: PEAR5.php
 diff -urb 2_13/data/module/SOAP/Server/TCP.php 2_17/data/module/SOAP/Server/TCP.php
 --- 2_13/data/module/SOAP/Server/TCP.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/module/SOAP/Server/TCP.php	2019-08-03 09:51:39.000000000 +0900
 @@ -64,7 +64,7 @@
             echo $server->getMessage()."\n";
         }
         
 -        $handler = &new SOAP_Server_TCP_Handler;
 +        $handler = new SOAP_Server_TCP_Handler;
         $handler->setSOAPServer($this);
         
         // hand over the object that handles server events
 Only in 2_13/data/module: SearchReplace.php
 Only in 2_13/data/module: Services
 Only in 2_13/data/module: Smarty
 Only in 2_13/data/module: Text
 Only in 2_13/data/module: XML
 Only in 2_13/data/module: fpdf
 diff -urb 2_13/data/mtb_constants_init.php 2_17/data/mtb_constants_init.php
 --- 2_13/data/mtb_constants_init.php	2019-08-03 11:43:41.000000000 +0900
 +++ 2_17/data/mtb_constants_init.php	2019-08-03 09:51:39.000000000 +0900
 @@ -255,9 +255,9 @@
 /** 電話番号総数 */
 define('TEL_LEN', 12);
 /** フロント画面用：パスワードの最小文字数 */
 -define('PASSWORD_MIN_LEN', 4);
 +define('PASSWORD_MIN_LEN', 8);
 /** フロント画面用：パスワードの最大文字数 */
 -define('PASSWORD_MAX_LEN', STEXT_LEN);
 +define('PASSWORD_MAX_LEN', SMTEXT_LEN);
 /** 検査数値用桁数(INT) */
 define('INT_LEN', 9);
 /** クレジットカードの文字数 (*モジュールで使用) */
 @@ -457,7 +457,7 @@
 /** 外部サイトHTTP取得タイムアウト時間(秒) */
 define('HTTP_REQUEST_TIMEOUT', "5");
 /** 郵便番号CSVのZIPアーカイブファイルの取得元 */
 -define('ZIP_DOWNLOAD_URL', "http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip");
 +define('ZIP_DOWNLOAD_URL', "https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip");
 /** フックポイント(プレプロセス) */
 define('HOOK_POINT_PREPROCESS', "LC_Page_preProcess");
 /** フックポイント(プロセス) */
 @@ -486,3 +486,5 @@
 define('PENDING_ORDER_CANCEL_FLAG', true);
 /** API機能を有効にする(true:する false:しない) */
 define('API_ENABLE_FLAG', false);
 +/** UTF-8依存文字が入力された際に表示する文字(Unicode値の整数 デフォルト: ?) */
 +define('SUBSTITUTE_CHAR', 63);
 diff -urb 2_13/data/require_base.php 2_17/data/require_base.php
 --- 2_13/data/require_base.php	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/data/require_base.php	2019-08-03 09:51:39.000000000 +0900
 @@ -24,8 +24,6 @@
 if (!defined('DATA_REALDIR')) {
     define('DATA_REALDIR', HTML_REALDIR . HTML2DATA_DIR);
 }
 -// PHP4互換用関数読み込み(PHP_Compat)
 -require_once DATA_REALDIR . 'require_compat.php';
 
 // アプリケーション初期化処理
 require_once DATA_REALDIR . 'app_initial.php';
 Only in 2_13/data: require_compat.php
 diff -urb 2_13/data/smarty_extends/function.from_to.php 2_17/data/smarty_extends/function.from_to.php
 --- 2_13/data/smarty_extends/function.from_to.php	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/data/smarty_extends/function.from_to.php	2019-08-03 09:51:39.000000000 +0900
 @@ -32,7 +32,9 @@
  */
 function smarty_function_from_to($params, &$smarty)
 {
 -    require_once $smarty->_get_plugin_filepath('shared', 'escape_special_chars');
 +    if (!is_callable('smarty_function_escape_special_chars')) {
 +        require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
 +    }
 
     $from = null;
     $to = null;
 diff -urb 2_13/data/smarty_extends/function.html_checkboxes_ex.php 2_17/data/smarty_extends/function.html_checkboxes_ex.php
 --- 2_13/data/smarty_extends/function.html_checkboxes_ex.php	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/data/smarty_extends/function.html_checkboxes_ex.php	2019-08-03 09:51:39.000000000 +0900
 @@ -40,7 +40,9 @@
  */
 function smarty_function_html_checkboxes_ex($params, &$smarty)
 {
 -    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
 +    if (!is_callable('smarty_function_escape_special_chars')) {
 +        require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
 +    }
 
     $name = 'checkbox';
     $values = null;
 @@ -56,7 +58,7 @@
     foreach ($params as $_key => $_val) {
         switch ($_key) {
     case 'tags':
 -    $$_key = split("\|", $_val);
 +                $$_key = explode("|", $_val);
     break;
             case 'name':
             case 'separator':
 diff -urb 2_13/data/smarty_extends/function.html_radios_ex.php 2_17/data/smarty_extends/function.html_radios_ex.php
 --- 2_13/data/smarty_extends/function.html_radios_ex.php	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/data/smarty_extends/function.html_radios_ex.php	2019-08-03 09:51:39.000000000 +0900
 @@ -40,7 +40,9 @@
  */
 function smarty_function_html_radios_ex($params, &$smarty)
 {
 -    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
 +    if (!is_callable('smarty_function_escape_special_chars')) {
 +        require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
 +    }
 
     $name = 'radio';
     $values = null;
 @@ -55,7 +57,7 @@
     foreach ($params as $_key => $_val) {
         switch ($_key) {
     case 'tags':
 -    $$_key = split("\|", $_val);
 +                $$_key = explode("|", $_val);
     break;
             case 'name':
             case 'separator':
 Only in 2_17/data/smarty_extends: function.include_php_ex.php
 Only in 2_17/data/upload/csv: .gitkeep
 Only in 2_13/data/upload/csv: dummy
 diff -urb 2_13/eccube_install.sh 2_17/eccube_install.sh
 --- 2_13/eccube_install.sh	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/eccube_install.sh	2019-08-03 09:51:39.000000000 +0900
 @@ -30,7 +30,7 @@
 CONFIG_PHP="data/config/config.php"
 ADMIN_MAIL=${ADMIN_MAIL:-"[email protected]"}
 SHOP_NAME=${SHOP_NAME:-"EC-CUBE SHOP"}
 -HTTP_URL=${HTTP_URL:-"http://test.local"}
 +HTTP_URL=${HTTP_URL:-"http://test.local/"}
 HTTPS_URL=${HTTPS_URL:-"http://test.local/"}
 ROOT_URLPATH=${ROOT_URLPATH:-"/"}
 DOMAIN_NAME=${DOMAIN_NAME:-""}
 @@ -41,12 +41,33 @@
 DBUSER=${DBUSER:-"cube213_dev_user"}
 DBPASS=${DBPASS:-"password"}
 
 +MAIL_BACKEND=${MAIL_BACKEND-"smtp"}
 +SMTP_HOST=${SMTP_HOST-"127.0.0.1"}
 +SMTP_PORT=${SMTP_PORT-"1025"}
 +SMTP_USER=${SMTP_USER-""}
 +SMTP_PASSWORD=${SMTP_PASSWORD-""}
 +
 ADMINPASS="f6b126507a5d00dbdbb0f326fe855ddf84facd57c5603ffdf7e08fbb46bd633c"
 AUTH_MAGIC="droucliuijeanamiundpnoufrouphudrastiokec"
 
 DBTYPE=$1;
 
 case "${DBTYPE}" in
 +"heroku" )
 +    #-- DB Seting Postgres
 +    PSQL="psql -h ${DBSERVER}"
 +    export PGPASSWORD=${DBPASS}
 +    PGUSER=postgres
 +    DBPORT=5432
 +;;
 +"appveyor" )
 +    #-- DB Seting Postgres
 +    PSQL=psql
 +    PGUSER=postgres
 +    DROPDB=dropdb
 +    CREATEDB=createdb
 +    DBPORT=5432
 +;;
 "pgsql" )
     #-- DB Seting Postgres
     PSQL=psql
 @@ -54,6 +75,7 @@
     DROPDB=dropdb
     CREATEDB=createdb
     DBPORT=5432
 +    DB=$1;
 ;;
 "mysql" )
     #-- DB Seting MySQL
 @@ -62,6 +84,7 @@
     ROOTPASS=$DBPASS
     DBSERVER="127.0.0.1"
     DBPORT=3306
 +    DB=mysqli;
 ;;
 * ) echo "ERROR:: argument is invaid"
 exit
 @@ -131,6 +154,12 @@
     comb_sql="";
     for S in $SEQUENCES; do
         case ${DBTYPE} in
 +            heroku)
 +                sql=$(echo "CREATE SEQUENCE ${S} START 10000;")
 +            ;;
 +            appveyor)
 +                sql=$(echo "CREATE SEQUENCE ${S} START 10000;")
 +            ;;
             pgsql)
                 sql=$(echo "CREATE SEQUENCE ${S} START 10000;")
             ;;
 @@ -149,6 +178,12 @@
     done;
 
     case ${DBTYPE} in
 +        heroku)
 +            echo ${comb_sql} | ${PSQL} -U ${DBUSER} ${DBNAME}
 +        ;;
 +        appveyor)
 +            echo ${comb_sql} | ${PSQL} -U ${DBUSER} ${DBNAME}
 +        ;;
         pgsql)
             echo ${comb_sql} | sudo -u ${PGUSER} ${PSQL} -U ${DBUSER} ${DBNAME}
         ;;
 @@ -160,7 +195,7 @@
 
 get_optional_sql()
 {
 -    echo "INSERT INTO dtb_member (member_id, login_id, password, salt, work, del_flg, authority, creator_id, rank, update_date) VALUES (2, 'admin', '${ADMINPASS}', '${AUTH_MAGIC}', '1', '0', '0', '0', '1', current_timestamp);"
 +    echo "INSERT INTO dtb_member (member_id, login_id, password, name, salt, work, del_flg, authority, creator_id, rank, update_date) VALUES (2, 'admin', '${ADMINPASS}', '管理者', '${AUTH_MAGIC}', '1', '0', '0', '0', '1', current_timestamp);"
     echo "INSERT INTO dtb_baseinfo (id, shop_name, email01, email02, email03, email04, top_tpl, product_tpl, detail_tpl, mypage_tpl, update_date) VALUES (1, '${SHOP_NAME}', '${ADMIN_MAIL}', '${ADMIN_MAIL}', '${ADMIN_MAIL}', '${ADMIN_MAIL}', 'default1', 'default1', 'default1', 'default1', current_timestamp);"
 }
 
 @@ -173,7 +208,7 @@
 define('HTTPS_URL', '${HTTPS_URL}');
 define('ROOT_URLPATH', '${ROOT_URLPATH}');
 define('DOMAIN_NAME', '${DOMAIN_NAME}');
 -define('DB_TYPE', '${DBTYPE}');
 +define('DB_TYPE', '${DB}');
 define('DB_USER', '${DBUSER}');
 define('DB_PASSWORD', '${CONFIGPASS:-$DBPASS}');
 define('DB_SERVER', '${DBSERVER}');
 @@ -184,13 +219,15 @@
 define('ADMIN_ALLOW_HOSTS', 'a:0:{}');
 define('AUTH_MAGIC', '${AUTH_MAGIC}');
 define('PASSWORD_HASH_ALGOS', 'sha256');
 -define('MAIL_BACKEND', 'mail');
 -define('SMTP_HOST', '');
 -define('SMTP_PORT', '');
 -define('SMTP_USER', '');
 -define('SMTP_PASSWORD', '');
 +define('MAIL_BACKEND', '${MAIL_BACKEND}');
 +define('SMTP_HOST', '${SMTP_HOST}');
 +define('SMTP_PORT', '${SMTP_PORT}');
 +define('SMTP_USER', '${SMTP_USER}');
 +define('SMTP_PASSWORD', '${SMTP_PASSWORD}');
 
 __EOF__
 +
 +    cat "./${CONFIG_PHP}"
 }
 
 
 @@ -205,6 +242,34 @@
 SQL_DIR="./html/install/sql"
 
 case "${DBTYPE}" in
 +"heroku" )
 +    # PostgreSQL
 +    echo "create table..."
 +    ${PSQL} -U ${DBUSER} -f ${SQL_DIR}/create_table_pgsql.sql ${DBNAME}
 +    echo "insert data..."
 +    ${PSQL} -U ${DBUSER} -f ${SQL_DIR}/insert_data.sql ${DBNAME}
 +    echo "create sequence table..."
 +    create_sequence_tables
 +    echo "execute optional SQL..."
 +    get_optional_sql | ${PSQL} -h ${DBSERVER} -U ${DBUSER} ${DBNAME}
 +	DBTYPE="pgsql"
 +;;
 +"appveyor" )
 +   # PostgreSQL
 +    echo "dropdb..."
 +    ${DROPDB} ${DBNAME}
 +    echo "createdb..."
 +    ${CREATEDB} -U ${DBUSER} ${DBNAME} 
 +    echo "create table..."
 +    ${PSQL} -U ${DBUSER} -f ${SQL_DIR}/create_table_pgsql.sql ${DBNAME}
 +    echo "insert data..."
 +    ${PSQL} -U ${DBUSER} -f ${SQL_DIR}/insert_data.sql ${DBNAME}
 +    echo "create sequence table..."
 +    create_sequence_tables
 +    echo "execute optional SQL..."
 +    get_optional_sql | ${PSQL} -h ${DBSERVER} -U ${DBUSER} ${DBNAME}
 +	DBTYPE="pgsql"
 +;;
 "pgsql" )
     # PostgreSQL
     echo "dropdb..."
 @@ -230,12 +295,12 @@
     echo "dropdb..."
     ${MYSQL} -u ${ROOTUSER} ${PASSOPT} -e "drop database \`${DBNAME}\`"
     echo "createdb..."
 -    ${MYSQL} -u ${ROOTUSER} ${PASSOPT} -e "create database \`${DBNAME}\`"
 +    ${MYSQL} -u ${ROOTUSER} ${PASSOPT} -e "create database \`${DBNAME}\` DEFAULT COLLATE=utf8_general_ci;"
     #echo "grant user..."
     #${MYSQL} -u ${ROOTUSER} ${PASSOPT} -e "GRANT ALL ON \`${DBNAME}\`.* TO '${DBUSER}'@'%' IDENTIFIED BY '${DBPASS}'"
     echo "create table..."
 -    echo "SET SESSION storage_engine = InnoDB;" |
 -        cat - ${SQL_DIR}/create_table_mysql.sql |
 +    echo "SET SESSION default_storage_engine = InnoDB;" |
 +        cat - ${SQL_DIR}/create_table_mysqli.sql |
         ${MYSQL} -u ${DBUSER} ${PASSOPT} ${DBNAME}
     echo "insert data..."
     ${MYSQL} -u ${DBUSER} ${PASSOPT} ${DBNAME} < ${SQL_DIR}/insert_data.sql
 @@ -247,7 +312,6 @@
 esac
 
 #-- Setup Initial Data
 -
 echo "copy images..."
 cp -rv "./html/install/save_image" "./html/upload/"
 
 diff -urb 2_13/html/.htaccess 2_17/html/.htaccess
 --- 2_13/html/.htaccess	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/html/.htaccess	2019-08-03 09:51:39.000000000 +0900
 @@ -1,5 +1,5 @@
 # 基本は SC_Initial.php で設定するが、ini_setで反映されないものはここで設定する
 -
 +<IfModule mod_php5.c>
 php_value mbstring.language Japanese
 php_flag mbstring.encoding_translation off
 php_value output_handler none
 @@ -13,3 +13,5 @@
 php_value upload_max_filesize 5M
 #php_value post_max_size 8M
 php_flag register_globals off
 +</IfModule>
 +
 Only in 2_17/html/admin: .htaccess
 diff -urb 2_13/html/admin/css/common.css 2_17/html/admin/css/common.css
 --- 2_13/html/admin/css/common.css	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/html/admin/css/common.css	2019-08-03 09:51:39.000000000 +0900
 @@ -1,9 +1,9 @@
 /*
  * This file is part of EC-CUBE
  *
 - * Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
 + * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
  *
 - * http://www.lockon.co.jp/
 + * http://www.ec-cube.co.jp/
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
 diff -urb 2_13/html/admin/css/install.css 2_17/html/admin/css/install.css
 --- 2_13/html/admin/css/install.css	2019-08-03 11:41:44.000000000 +0900
 diff -urb 2_13/html/admin/load_module_config.php 2_17/html/admin/load_module_config.php
 --- 2_13/html/admin/load_module_config.php	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/html/admin/load_module_config.php	2019-08-03 09:51:39.000000000 +0900
 @@ -39,7 +39,7 @@
 if (!empty($module_id) && is_numeric($module_id)) {
     GC_Utils_Ex::gfPrintLog('loading module ====> module_id = ' . $module_id);
 
 -    $objQuery = SC_Query_Ex::getSingletonInstance();
 +    $objQuery =& SC_Query_Ex::getSingletonInstance();
     $arrRet = $objQuery->select('module_code', 'dtb_module', 'module_id = ?', array($module_id));
 
     if (isset($arrRet[0]['module_code'])) {
 diff -urb 2_13/html/admin/require.php 2_17/html/admin/require.php
 --- 2_13/html/admin/require.php	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/html/admin/require.php	2019-08-03 09:51:39.000000000 +0900
 @@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 -
 // rtrim は PHP バージョン依存対策
 $GLOBALS['_realdir'] = rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/';
 $GLOBALS['_realdir'] = str_replace('\\', '/', $GLOBALS['_realdir']);
 diff -urb 2_13/html/define.php 2_17/html/define.php
 --- 2_13/html/define.php	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/html/define.php	2019-08-03 09:51:39.000000000 +0900
 @@ -12,6 +12,7 @@
  * ※ IIS は、POST 時にファイル名を使用しないと不具合が発生する。(http://support.microsoft.com/kb/247536/ja)
  */
 define('USE_FILENAME_DIR_INDEX', null);
 +require_once HTML_REALDIR . HTML2DATA_DIR . 'vendor/autoload.php';
 
 // bufferを初期化する
 while (ob_get_level() > 0 && ob_get_level() > 0) {
 diff -urb 2_13/html/install/index.php 2_17/html/install/index.php
 --- 2_13/html/install/index.php	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/html/install/index.php	2019-08-03 09:51:39.000000000 +0900
 @@ -43,13 +43,14 @@
 ini_set('max_execution_time', 300);
 
 $objPage = new StdClass;
 +$objPage->arrErr = array();
 $objPage->arrDB_TYPE = array(
     'pgsql' => 'PostgreSQL',
 -    'mysql' => 'MySQL',
 +    'mysqli' => 'MySQL',
 );
 $objPage->arrDB_PORT = array(
     'pgsql' => '',
 -    'mysql' => '',
 +    'mysqli' => '',
 );
 $objPage->arrMailBackend = array('mail' => 'mail',
                                  'smtp' => 'SMTP',
 @@ -700,8 +701,8 @@
 
     $objWebParam->addParam('店名', 'shop_name', MTEXT_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'), $shop_name);
     $objWebParam->addParam('管理者：メールアドレス', 'admin_mail', null, '', array('EXIST_CHECK', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'), $admin_mail);
 -    $objWebParam->addParam('管理者：ログインID', 'login_id', ID_MAX_LEN, '', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'));
 -    $objWebParam->addParam('管理者：パスワード', 'login_pass', ID_MAX_LEN, '', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'));
 +    $objWebParam->addParam('管理者：ログインID', 'login_id', ID_MAX_LEN, '', array('EXIST_CHECK', 'SPTAB_CHECK', 'GRAPH_CHECK'));
 +    $objWebParam->addParam('管理者：パスワード', 'login_pass', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'SPTAB_CHECK', 'PASSWORD_CHAR_CHECK'));
     $objWebParam->addParam('管理機能：ディレクトリ', 'admin_dir', ID_MAX_LEN, 'a', array('EXIST_CHECK', 'SPTAB_CHECK', 'ALNUM_CHECK'), $oldAdminDir);
     $objWebParam->addParam('管理機能：SSL制限', 'admin_force_ssl', 1, 'n', array('SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'), $admin_force_ssl);
     $objWebParam->addParam('管理機能：IP制限', 'admin_allow_hosts', LTEXT_LEN, 'an', array('IP_CHECK', 'MAX_LENGTH_CHECK'), $admin_allow_hosts);
 @@ -781,7 +782,7 @@
     $objErr->doFunc(array('管理者：ログインID', 'login_id', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
 
     // パスワードのチェック
 -    $objErr->doFunc(array('管理者：パスワード', 'login_pass', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
 +    $objErr->doFunc(array('管理者：パスワード', 'login_pass', PASSWORD_MIN_LEN, PASSWORD_MAX_LEN), array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
 
     // 管理機能ディレクトリのチェック
     $objErr->doFunc(array('管理機能：ディレクトリ', 'admin_dir', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK', 'NUM_RANGE_CHECK'));
 @@ -789,7 +790,10 @@
     $oldAdminDir = SC_Utils_Ex::sfTrimURL(ADMIN_DIR);
     $newAdminDir = $objWebParam->getValue('admin_dir');
     if ($newAdminDir) {
 -        if ($oldAdminDir !== $newAdminDir AND file_exists(HTML_REALDIR . $newAdminDir) and $newAdminDir != 'admin') {
 +        if ($newAdminDir == 'admin') { // admin を禁止する
 +            $objErr->arrErr['admin_dir'] = '※ 別の名前を指定してください。';
 +
 +        } else if ($oldAdminDir !== $newAdminDir AND file_exists(HTML_REALDIR . $newAdminDir) and $newAdminDir != 'admin') {
             $objErr->arrErr['admin_dir'] = '※ 指定した管理機能ディレクトリは既に存在しています。別の名前を指定してください。';
         }
     }
 @@ -850,15 +854,24 @@
 
             // MySQL 用の初期化
             // XXX SC_Query を使うようにすれば、この処理は不要となる
 -            if ($arrDsn['phptype'] === 'mysql') {
 +            if ($arrDsn['phptype'] === 'mysqli') {
 +                if ($objDB->getConnection()->server_version >= 50705) {
 +                    $objDB->exec('SET SESSION defaut_storage_engine = InnoDB');
 +                } else {
                 $objDB->exec('SET SESSION storage_engine = InnoDB');
 +                }
                 $objDB->exec("SET SESSION sql_mode = 'ANSI'");
             }
 
 -            $sql_split = split(';', $sql);
 +            $sql_split = explode(';', $sql);
             foreach ($sql_split as $key => $val) {
                 SC_Utils::sfFlush(true);
                 if (trim($val) != '') {
 +                    if ($arrDsn['phptype'] === 'mysqli') {
 +                        // rank は予約語なので MySQL8 から引用符をつけないとエラーになる
 +                        $dbFactory = SC_DB_DBFactory_Ex::getInstance($arrDsn['phptype']);
 +                        $val = $dbFactory->sfChangeReservedWords($val);
 +                    }
                     $ret = $objDB->query($val);
                     if (PEAR::isError($ret) && $disp_err) {
                         $arrErr['all'] = '>> ' . $ret->message . '<br />';
 @@ -1023,6 +1036,12 @@
         define('AUTH_MAGIC', $auth_magic);
     }
 
 +    if ($objDBParam->getValue('db_type') == 'mysqli' && $objDBParam->getValue('db_port') == '') {
 +        $db_port = 'FALSE';
 +    } else {
 +        $db_port = "'".$objDBParam->getValue('db_port')."'";
 +    }
 +
     // FIXME 変数出力はエスケープすべき
     $config_data = "<?php\n"
                  . "define('ECCUBE_INSTALL', 'ON');\n"
 @@ -1035,7 +1054,7 @@
                  . "define('DB_PASSWORD', '"           . $objDBParam->getValue('db_password') . "');\n"
                  . "define('DB_SERVER', '"             . $objDBParam->getValue('db_server') . "');\n"
                  . "define('DB_NAME', '"               . $objDBParam->getValue('db_name') . "');\n"
 -                 . "define('DB_PORT', '"               . $objDBParam->getValue('db_port') . "');\n"
 +                 . "define('DB_PORT', "                . $db_port . ");\n"
                  . "define('ADMIN_DIR', '"             . $objWebParam->getValue('admin_dir') . "/');\n"
                  . "define('ADMIN_FORCE_SSL', "        . $force_ssl . ");\n"
                  . "define('ADMIN_ALLOW_HOSTS', '"     . serialize($allow_hosts) . "');\n"
 @@ -1095,7 +1114,6 @@
 {
     return array(
         array('dtb_best_products', 'best_id'),
 -        array('dtb_bloc', 'bloc_id'),
         array('dtb_category', 'category_id'),
         array('dtb_class', 'class_id'),
         array('dtb_classcategory', 'classcategory_id'),
 @@ -1113,7 +1131,6 @@
         array('dtb_order', 'order_id'),
         array('dtb_order_detail', 'order_detail_id'),
         array('dtb_other_deliv', 'other_deliv_id'),
 -        array('dtb_pagelayout', 'page_id'),
         array('dtb_payment', 'payment_id'),
         array('dtb_products_class', 'product_class_id'),
         array('dtb_products', 'product_id'),
 @@ -1165,7 +1182,7 @@
         'username'  => $arrRet['db_user'],
         'password'  => $arrRet['db_password'],
         'database'  => $arrRet['db_name'],
 -        'port'      => $arrRet['db_port'],
 +        'port'      => ($arrRet['db_port'] == '' && $arrRet['db_type'] == 'mysqli')?false:$arrRet['db_port'], // mysqliはfalseにしないとつながらない
     );
 
     // 文字列形式の DSN との互換処理
 Only in 2_13/html/install/sql: create_table_mysql.sql
 Only in 2_17/html/install/sql: create_table_mysqli.sql
 diff -urb 2_13/html/install/sql/create_table_pgsql.sql 2_17/html/install/sql/create_table_pgsql.sql
 --- 2_13/html/install/sql/create_table_pgsql.sql	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/html/install/sql/create_table_pgsql.sql	2019-08-03 09:51:39.000000000 +0900
 @@ -676,7 +676,7 @@
     create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
     update_date timestamp NOT NULL,
     del_flg smallint NOT NULL DEFAULT 0,
 -    PRIMARY KEY (shipping_id, order_id)
 +    PRIMARY KEY (order_id, shipping_id)
 );
 
 CREATE TABLE dtb_shipment_item (
 @@ -689,7 +689,7 @@
     classcategory_name2 text,
     price numeric,
     quantity numeric,
 -    PRIMARY KEY (shipping_id, product_class_id, order_id)
 +    PRIMARY KEY (order_id,shipping_id, product_class_id)
 );
 
 CREATE TABLE dtb_other_deliv (
 @@ -1232,7 +1232,8 @@
     update_date timestamp NOT NULL,
     PRIMARY KEY (tax_rule_id)
 );
 -
 +CREATE INDEX dtb_order_customer_id_key ON dtb_order(customer_id);
 +CREATE INDEX dtb_order_detail_order_id_key ON dtb_order_detail(order_id);
 CREATE INDEX dtb_customer_mobile_phone_id_key ON dtb_customer (mobile_phone_id);
 CREATE INDEX dtb_order_detail_product_id_key ON dtb_order_detail(product_id);
 CREATE INDEX dtb_send_customer_customer_id_key ON dtb_send_customer(customer_id);
 diff -urb 2_13/html/install/sql/insert_data.sql 2_17/html/install/sql/insert_data.sql
 --- 2_13/html/install/sql/insert_data.sql	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/html/install/sql/insert_data.sql	2019-08-03 09:51:39.000000000 +0900
 @@ -737,7 +737,7 @@
 INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (6, 'br', 6);
 INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (7, 'center', 7);
 INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (8, 'font', 8);
 -INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (9, 'h', 9);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (9, 'span', 9);
 INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (10, 'hr', 10);
 INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (11, 'img', 11);
 INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (12, 'li', 12);
 @@ -747,6 +747,21 @@
 INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (16, 'i', 16);
 INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (17, 'u', 17);
 INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (18, 's', 18);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (19, 'h1', 19);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (20, 'h2', 20);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (21, 'h3', 21);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (22, 'h4', 22);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (23, 'h5', 23);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (24, 'h6', 24);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (25, 'tbody', 25);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (26, 'thead', 26);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (27, 'tfoot', 27);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (28, 'th', 28);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (29, 'ul', 29);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (30, 'ol', 30);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (31, 'dl', 31);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (32, 'dt', 32);
 +INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (33, 'dd', 33);
 
 INSERT INTO mtb_authority (id, name, rank) VALUES (0, 'システム管理者', 0);
 INSERT INTO mtb_authority (id, name, rank) VALUES (1, '店舗オーナー', 1);
 @@ -837,6 +852,7 @@
 INSERT INTO mtb_mobile_domain (id, name, rank) VALUES (8, 'emnet.ne.jp', 7);
 INSERT INTO mtb_mobile_domain (id, name, rank) VALUES (9, 'i.softbank.jp', 8);
 INSERT INTO mtb_mobile_domain (id, name, rank) VALUES (10, 'emobile.ne.jp', 9);
 +INSERT INTO mtb_mobile_domain (id, name, rank) VALUES (11, 'au.com', 10);
 
 INSERT INTO mtb_order_status (id, name, rank) VALUES (7, '決済処理中', 0);
 INSERT INTO mtb_order_status (id, name, rank) VALUES (1, '新規受付', 1);
 @@ -1154,8 +1170,8 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ZIP02_LEN', '4', 201, '郵便番号2');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEL_ITEM_LEN', '6', 202, '電話番号各項目制限');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEL_LEN', '12', 203, '電話番号総数');
 -INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PASSWORD_MIN_LEN', '4', 204, 'フロント画面用：パスワードの最小文字数');
 -INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PASSWORD_MAX_LEN', 'STEXT_LEN', 205, 'フロント画面用：パスワードの最大文字数');
 +INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PASSWORD_MIN_LEN', '8', 204, 'フロント画面用：パスワードの最小文字数');
 +INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PASSWORD_MAX_LEN', 'SMTEXT_LEN', 205, 'フロント画面用：パスワードの最大文字数');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('INT_LEN', '9', 206, '検査数値用桁数(INT)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CREDIT_NO_LEN', '4', 207, 'クレジットカードの文字数 (*モジュールで使用)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SEARCH_CATEGORY_LEN', '18', 208, '検索カテゴリ最大表示文字数(byte)');
 @@ -1255,7 +1271,7 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DEVICE_TYPE_ADMIN', '99', 1103, '端末種別: 管理画面');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ECCUBE_INFO', 'true', 1218, 'EC-CUBE更新情報取得 (true:取得する false:取得しない)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('HTTP_REQUEST_TIMEOUT', '"5"', 1219, '外部サイトHTTP取得タイムアウト時間(秒)');
 -INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ZIP_DOWNLOAD_URL', '"http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip"', 1224, '郵便番号CSVのZIPアーカイブファイルの取得元');
 +INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ZIP_DOWNLOAD_URL', '"https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip"', 1224, '郵便番号CSVのZIPアーカイブファイルの取得元');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('HOOK_POINT_PREPROCESS', '"LC_Page_preProcess"', 1301, 'フックポイント(プレプロセス)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('HOOK_POINT_PROCESS', '"LC_Page_process"', 1302, 'フックポイント(プロセス)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PLUGIN_ACTIVATE_FLAG', 'true', 1303, 'プラグインのロード可否フラグ)');
 @@ -1270,6 +1286,7 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PENDING_ORDER_CANCEL_TIME', '900', 1418, '決済処理中ステータスのロールバックを行う時間の設定(秒) ');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PENDING_ORDER_CANCEL_FLAG', 'true', 1419, '決済処理中ステータスのロールバックをするか(true:する false:しない)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('API_ENABLE_FLAG', 'false', 1420, 'API機能を有効にする(true:する false:しない)');
 +INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SUBSTITUTE_CHAR', '63', 1421, 'UTF-8依存文字が入力された際に表示する文字(Unicode値の整数 デフォルト: ?)');
 
 INSERT INTO dtb_index_list (table_name, column_name, recommend_flg, recommend_comment) VALUES ('dtb_customer', 'email_mobile', 0, '会員数増加時のログイン処理速度を向上させたいときに試してみてください');
 INSERT INTO dtb_index_list (table_name, column_name, recommend_flg, recommend_comment) VALUES ('dtb_products', 'name', 2, '商品名検索速度を向上させたいときに試してみてください');
 Only in 2_17/html/install/temp: .gitkeep
 Only in 2_13/html/install/temp: dummy
 diff -urb 2_13/html/install/templates/agreement.tpl 2_17/html/install/templates/agreement.tpl
 --- 2_13/html/install/templates/agreement.tpl	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/html/install/templates/agreement.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -58,7 +58,7 @@
                     <div id="agreement">
                         ===ソフトウェア使用許諾書にご同意下さい===<br/>
                         <br/>
 -                        株式会社ロックオン(以下「弊社」という)では、お客様が本ソフトウェアをご利用になるためには、下記「ソフトウェア使用契約書」の内容を承諾して頂くことが条件になって<br/>
 +                        株式会社イーシーキューブ(以下「弊社」という)では、お客様が本ソフトウェアをご利用になるためには、下記「ソフトウェア使用契約書」の内容を承諾して頂くことが条件になって<br/>
                         おります。本ソフトウェアをインストールまたはコピー、ご使用になった時点で下記「ソフトウェア使用許諾書」にご同意いただいたものとみなします。<br/><br/>
                         --------------------- ソフトウェア使用許諾書 ---------------------<br/><br/>
                         1.ライセンス<br/><br/>
 diff -urb 2_13/html/install/templates/step1.tpl 2_17/html/install/templates/step1.tpl
 --- 2_13/html/install/templates/step1.tpl	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/html/install/templates/step1.tpl	2019-08-03 09:51:39.000000000 +0900
 @@ -75,7 +75,7 @@
                     </td>
                 </tr>
                 <tr>
 -                    <th>ログインID<span class="attention">※</span><br/>半角英数字<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字</th>
 +                    <th>ログインID<span class="attention">※</span><br/>半角英数字記号<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字</th>
                     <td>
                     <!--{assign var=key value="login_id"}-->
                     <span class="attention"><!--{$arrErr[$key]}--></span>
 @@ -84,7 +84,7 @@
                     </td>
                 </tr>
                 <tr>
 -                    <th>パスワード<span class="attention">※</span><br/>半角英数字<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字</th>
 +                    <th>パスワード<span class="attention">※</span><br/>半角英数字記号<!--{$smarty.const.PASSWORD_MIN_LEN}-->～<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字</th>
                     <td>
                     <!--{assign var=key value="login_pass"}-->
                     <span class="attention"><!--{$arrErr[$key]}--></span>
 diff -urb 2_13/html/js/eccube.js 2_17/html/js/eccube.js
 --- 2_13/html/js/eccube.js	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/html/js/eccube.js	2019-08-03 09:51:39.000000000 +0900
 @@ -1,9 +1,9 @@
 /*
 * This file is part of EC-CUBE
 *
 -* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
 +* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
 *
 -* http://www.lockon.co.jp/
 +* http://www.ec-cube.co.jp/
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 diff -urb 2_13/html/js/eccube.legacy.js 2_17/html/js/eccube.legacy.js
 --- 2_13/html/js/eccube.legacy.js	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/html/js/eccube.legacy.js	2019-08-03 09:51:39.000000000 +0900
 @@ -1,9 +1,9 @@
 /*
  * This file is part of EC-CUBE
  *
 - * Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
 + * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
  *
 - * http://www.lockon.co.jp/
 + * http://www.ec-cube.co.jp/
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
 Only in 2_17/html/plugin: .gitkeep
 Only in 2_13/html/plugin: dummy
 diff -urb 2_13/html/require.php 2_17/html/require.php
 --- 2_13/html/require.php	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/html/require.php	2019-08-03 09:51:39.000000000 +0900
 @@ -33,14 +33,3 @@
 
 require_once HTML_REALDIR . 'define.php';
 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';
 -
 -// 絵文字変換 (除去) フィルターを組み込む。
 -ob_start(array('SC_MobileEmoji', 'handler'));
 -
 -if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
 -    // resize_image.phpは除外
 -    if (stripos($_SERVER['REQUEST_URI'], ROOT_URLPATH . 'resize_image.php') === FALSE) {
 -        $objMobile = new SC_Helper_Mobile_Ex();
 -        $objMobile->sfMobileInit();
 -    }
 -}
 Only in 2_17/html/test: .gitkeep
 Only in 2_13/html/test: dummy
 diff -urb 2_13/html/test/upgrade/index.php 2_17/html/test/upgrade/index.php
 --- 2_13/html/test/upgrade/index.php	2019-08-03 11:43:40.000000000 +0900
 +++ 2_17/html/test/upgrade/index.php	2019-08-03 09:51:39.000000000 +0900
 @@ -106,7 +106,7 @@
 {
     $table = 'dtb_module';
     $where = 'module_id = ?';
 -    $objQuery = SC_Query_Ex::getSingletonInstance();
 +    $objQuery =& SC_Query_Ex::getSingletonInstance();
 
     $objQuery->begin();
     foreach ($arrProductsList as $arrProduct) {
 Only in 2_17/html/upload: .gitkeep
 Only in 2_13/html/upload: dummy
 Only in 2_17/html/upload/graph_image: .gitkeep
 Only in 2_13/html/upload/graph_image: dummy
 Only in 2_17/html/upload/mobile_image: .gitkeep
 Only in 2_13/html/upload/mobile_image: dummy
 Only in 2_17/html/upload/temp_image: .gitkeep
 Only in 2_13/html/upload/temp_image: dummy
 Only in 2_17/html/upload/temp_plugin: .gitkeep
 Only in 2_13/html/upload/temp_plugin: dummy
 Only in 2_17/html/upload/temp_template: .gitkeep
 Only in 2_13/html/upload/temp_template: dummy
 Only in 2_17/html/user_data: .gitkeep
 Only in 2_13/html/user_data: dummy
 Only in 2_17/html/user_data/include: .gitkeep
 Only in 2_13/html/user_data/include: dummy
 Only in 2_17/html/user_data/include/preview: .gitkeep
 Only in 2_13/html/user_data/include/preview: dummy
 diff -urb 2_13/html/user_data/packages/admin/js/breadcrumbs.js 2_17/html/user_data/packages/admin/js/breadcrumbs.js
 --- 2_13/html/user_data/packages/admin/js/breadcrumbs.js	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/html/user_data/packages/admin/js/breadcrumbs.js	2019-08-03 09:51:39.000000000 +0900
 @@ -1,9 +1,9 @@
 /*
  * This file is part of EC-CUBE
  *
 - * Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
 + * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
  *
 - * http://www.lockon.co.jp/
 + * http://www.ec-cube.co.jp/
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
 diff -urb 2_13/html/user_data/packages/admin/js/eccube.admin.js 2_17/html/user_data/packages/admin/js/eccube.admin.js
 --- 2_13/html/user_data/packages/admin/js/eccube.admin.js	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/html/user_data/packages/admin/js/eccube.admin.js	2019-08-03 09:51:39.000000000 +0900
 @@ -1,9 +1,9 @@
 /*
  * This file is part of EC-CUBE
  *
 - * Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
 + * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
  *
 - * http://www.lockon.co.jp/
 + * http://www.ec-cube.co.jp/
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
 diff -urb 2_13/html/user_data/packages/admin/js/eccube.admin.legacy.js 2_17/html/user_data/packages/admin/js/eccube.admin.legacy.js
 --- 2_13/html/user_data/packages/admin/js/eccube.admin.legacy.js	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/html/user_data/packages/admin/js/eccube.admin.legacy.js	2019-08-03 09:51:39.000000000 +0900
 @@ -1,9 +1,9 @@
 /*
  * This file is part of EC-CUBE
  *
 - * Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
 + * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
  *
 - * http://www.lockon.co.jp/
 + * http://www.ec-cube.co.jp/
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
 diff -urb 2_13/html/user_data/packages/admin/js/layout_design.js 2_17/html/user_data/packages/admin/js/layout_design.js
 --- 2_13/html/user_data/packages/admin/js/layout_design.js	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/html/user_data/packages/admin/js/layout_design.js	2019-08-03 09:51:39.000000000 +0900
 @@ -1,9 +1,9 @@
 /*
  * This file is part of EC-CUBE
  *
 - * Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
 + * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
  *
 - * http://www.lockon.co.jp/
 + * http://www.ec-cube.co.jp/
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
 Only in 2_17/html/user_data/packages/default/js: .gitkeep
 Only in 2_13/html/user_data/packages/default/js: dummy
 diff -urb 2_13/html/user_data/packages/sphone/js/eccube.sphone.js 2_17/html/user_data/packages/sphone/js/eccube.sphone.js
 --- 2_13/html/user_data/packages/sphone/js/eccube.sphone.js	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/html/user_data/packages/sphone/js/eccube.sphone.js	2019-08-03 09:51:40.000000000 +0900
 @@ -1,9 +1,9 @@
 /*
  * This file is part of EC-CUBE
  *
 - * Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
 + * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
  *
 - * http://www.lockon.co.jp/
 + * http://www.ec-cube.co.jp/
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
 diff -urb 2_13/html/user_data/packages/sphone/js/eccube.sphone.legacy.js 2_17/html/user_data/packages/sphone/js/eccube.sphone.legacy.js
 --- 2_13/html/user_data/packages/sphone/js/eccube.sphone.legacy.js	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/html/user_data/packages/sphone/js/eccube.sphone.legacy.js	2019-08-03 09:51:40.000000000 +0900
 @@ -1,9 +1,9 @@
 /*
  * This file is part of EC-CUBE
  *
 - * Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
 + * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
  *
 - * http://www.lockon.co.jp/
 + * http://www.ec-cube.co.jp/
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
 Only in 2_17/html/user_data/templates: .gitkeep
 Only in 2_13/html/user_data/templates: dummy
 Only in 2_17/html/user_data/templates/preview: .gitkeep
 Only in 2_13/html/user_data/templates/preview: dummy
 Only in 2_13: package.json
 diff -urb 2_13/phpunit.xml.dist 2_17/phpunit.xml.dist
 --- 2_13/phpunit.xml.dist	2019-08-03 11:41:44.000000000 +0900
 +++ 2_17/phpunit.xml.dist	2019-08-03 09:51:40.000000000 +0900
 @@ -3,7 +3,8 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
     colors="true"
 -    bootstrap="./data/config/config.php"
 +    bootstrap="./tests/require.php"
 +    backupGlobals="true"
     >
 
     <!-- テストの場所 -->
 Only in 2_17: security-checker.phar
 Only in 2_17: setup_heroku.php