Changeset 21756
- Timestamp:
- 2012/04/17 16:10:34 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/html/install/index.php
r21741 r21756 209 209 $arrSendData = array(); 210 210 foreach ($_POST as $key => $val) { 211 if ( ereg('^senddata_*', $key)) {211 if (preg_match('/^senddata_*/', $key)) { 212 212 $arrSendDataTmp = array(str_replace('senddata_', '', $key) => $val); 213 213 $arrSendData = array_merge($arrSendData, $arrSendDataTmp); … … 492 492 $normal_url = $objWebParam->getValue('normal_url'); 493 493 // 語尾に'/'をつける 494 if (!ereg('/$', $normal_url)) $normal_url = $normal_url. '/';494 $normal_url = rtrim($normal_url, '/') . '/'; 495 495 496 496 $arrDsn = getArrayDsn($objDBParam); … … 572 572 $secure_url = $objWebParam->getValue('secure_url'); 573 573 // 語尾に'/'をつける 574 if (!ereg('/$', $secure_url)) { 575 $secure_url = $secure_url . '/'; 576 } 574 $secure_url = rtrim($secure_url, '/') . '/'; 577 575 $objPage->tpl_sslurl = $secure_url; 578 576 //EC-CUBEオフィシャルサイトからのお知らせURL … … 588 586 $normal_url = HTTP_URL; 589 587 } else { 590 $dir = ereg_replace('install/.*$', '', $_SERVER['REQUEST_URI']);588 $dir = preg_replace('|install/.*$|', '', $_SERVER['REQUEST_URI']); 591 589 $normal_url = 'http://' . $_SERVER['HTTP_HOST'] . $dir; 592 590 } … … 595 593 $secure_url = HTTPS_URL; 596 594 } else { 597 $dir = ereg_replace('install/.*$', '', $_SERVER['REQUEST_URI']);595 $dir = preg_replace('|install/.*$|', '', $_SERVER['REQUEST_URI']); 598 596 $secure_url = 'http://' . $_SERVER['HTTP_HOST'] . $dir; 599 597 } … … 696 694 697 695 // ディレクトリ名のみ取得する 698 $normal_dir = ereg_replace('^https?://[a-zA-Z0-9_~=&\?\.\-]+', '', $arrRet['normal_url']);699 $secure_dir = ereg_replace('^https?://[a-zA-Z0-9_~=&\?\.\-]+', '', $arrRet['secure_url']);696 $normal_dir = preg_replace('|^https?://[a-zA-Z0-9_~=&\?\.\-]+|', '', $arrRet['normal_url']); 697 $secure_dir = preg_replace('|^https?://[a-zA-Z0-9_~=&\?\.\-]+|', '', $arrRet['secure_url']); 700 698 701 699 if ($normal_dir != $secure_dir) { … … 745 743 $objErr->arrErr['all'] = '>> ' . $objDB->message . '<br />'; 746 744 // エラー文を取得する 747 ereg('\[(.*)\]', $objDB->userinfo, $arrKey);745 preg_match('/\[(.*)\]/', $objDB->userinfo, $arrKey); 748 746 $objErr->arrErr['all'] .= $arrKey[0] . '<br />'; 749 747 GC_Utils_Ex::gfPrintLog($objDB->userinfo, INSTALL_LOG); … … 786 784 $arrErr['all'] = '>> ' . $ret->message . '<br />'; 787 785 // エラー文を取得する 788 ereg('\[(.*)\]', $ret->userinfo, $arrKey);786 preg_match('/\[(.*)\]/', $ret->userinfo, $arrKey); 789 787 $arrErr['all'] .= $arrKey[0] . '<br />'; 790 788 $objPage->update_mess .= '>> テーブル構成の変更に失敗しました。<br />'; … … 895 893 $normal_url = $objWebParam->getValue('normal_url'); 896 894 // 語尾に'/'をつける 897 if (!ereg('/$', $normal_url)) { 898 $normal_url = $normal_url . '/'; 899 } 895 $normal_url = rtrim($normal_url, '/') . '/'; 900 896 901 897 $secure_url = $objWebParam->getValue('secure_url'); 902 898 // 語尾に'/'をつける 903 if (!ereg('/$', $secure_url)) { 904 $secure_url = $secure_url . '/'; 905 } 899 $secure_url = rtrim($secure_url, '/') . '/'; 906 900 907 901 // ディレクトリの取得 908 $url_dir = ereg_replace('^https?://[a-zA-Z0-9_:~=&\?\.\-]+', '', $normal_url);902 $url_dir = preg_replace('|^https?://[a-zA-Z0-9_:~=&\?\.\-]+|', '', $normal_url); 909 903 910 904 //管理機能SSL制限
Note: See TracChangeset
for help on using the changeset viewer.