Index: /branches/version-2_12-dev/data/downloads/KEN_ALL.CSV
===================================================================
--- /branches/version-2_12-dev/data/downloads/KEN_ALL.CSV (revision 22866)
+++ /branches/version-2_12-dev/data/downloads/KEN_ALL.CSV (revision 22876)
@@ -21052,5 +21052,5 @@
07202,"965 ","9650084","̸¼Ï¹Ý","±²ÂÞܶϼ","º³»Þ¼ÏÁ˶޼º³»Þ¼","§","ïÃá¼s","_w¬_w",0,0,0,0,0,0
07202,"965 ","9650086","̸¼Ï¹Ý","±²ÂÞܶϼ","º³»Þ¼ÏÁÎÝÏÙ","§","ïÃá¼s","_w¬{Û",0,0,0,0,0,0
-07202,"965 ","9650859","̸¼Ï¹Ý","±²ÂÞܶϼ","º³»Þ¼ÏÁϸ³Á","§","ïÃá¼s","_w¬à",0,0,0,0,0,0
+07202,"965 ","9650859","̸¼Ï¹Ý","±²ÂÞܶϼ","º³»Þ¼ÏÁϸ³Á","§","ïÃá¼s","_w¬à",0,0,0,0,1,5
07202,"965 ","9650858","̸¼Ï¹Ý","±²ÂÞܶϼ","º³»Þ¼ÏÁÐÅмºÞ³","§","ïÃá¼s","_w¬ìl",0,1,0,0,0,0
07202,"965 ","9650066","̸¼Ï¹Ý","±²ÂÞܶϼ","º³»Þ¼ÏÁÖºÇÏ","§","ïÃá¼s","_w¬¡À",0,0,0,0,0,0
@@ -29466,5 +29466,4 @@
09361,"32102","3210215","ÄÁ·Þ¹Ý","¼Ó¶޸ÞÝÐÌÞÏÁ","ÐÌÞµÂ","Èا","ºsêSp¶¬","p¶³",0,0,0,0,0,0
09361,"32102","3210216","ÄÁ·Þ¹Ý","¼Ó¶޸ÞÝÐÌÞÏÁ","ÐÌÞò","Èا","ºsêSp¶¬","p¶",0,0,0,0,0,0
-09361,"32102","3210238","ÄÁ·Þ¹Ý","¼Ó¶޸ÞÝÐÌÞÏÁ","ÐÌÞÊƳÀ޻ݷޮ³ÀÞÝÁ","Èا","ºsêSp¶¬","ÝÔH¶cYÆcn",0,0,0,0,1,5
09361,"32102","3210223","ÄÁ·Þ¹Ý","¼Ó¶޸ÞÝÐÌÞÏÁ","ÓÄÏÁ","Èا","ºsêSp¶¬","³¬",0,0,0,0,0,0
09361,"32102","3210201","ÄÁ·Þ¹Ý","¼Ó¶޸ÞÝÐÌÞÏÁ","Ô½ÂÞ¶","Èا","ºsêSp¶¬","ÀË",0,0,0,0,0,0
@@ -32070,5 +32069,4 @@
11209,"357 ","3570003","»²ÀϹÝ","ÊÝɳ¼","±µ·","éʧ","Ñ\s","ÂØ",0,0,0,0,0,0
11209,"35701","3570128","»²ÀϹÝ","ÊÝɳ¼","±¶»ÞÜ","éʧ","Ñ\s","Ôò",0,0,0,0,0,0
-11209,"357 ","3570069","»²ÀϹÝ","ÊÝɳ¼","±¶ÈÀÞ²","éʧ","Ñ\s","©ä",0,0,1,0,1,3
11209,"35702","3570216","»²ÀϹÝ","ÊÝɳ¼","±¶ÞÉ","éʧ","Ñ\s","áì",0,0,0,0,0,0
11209,"357 ","3570013","»²ÀϹÝ","ÊÝɳ¼","±¼¶ØÊÞ","éʧ","Ñ\s","°¡ê",0,0,0,0,0,0
@@ -87315,5 +87313,5 @@
27145,"593 ","5900157","µµ»¶Ì","»¶²¼ÐÅи","À¶µ","åã{","äsìæ","ö",0,0,0,0,0,0
27145,"59001","5900117","µµ»¶Ì","»¶²¼ÐÅи","À¶¸×ÀÞ²","åã{","äsìæ","qä",0,0,1,0,0,0
-27145,"59001","5900105","µµ»¶Ì","»¶²¼ÐÅи","À¹¼ÛÀÞ²","åã{","äsìæ","|éä",0,0,1,0,0,0
+27145,"59001","5900105","µµ»¶Ì","»¶²¼ÐÅи","À¹¼ÛÀÞ²","åã{","äsìæ","|éä",0,0,1,0,1,5
27145,"59001","5900115","µµ»¶Ì","»¶²¼ÐÅи","Á¬ÔÏÀÞ²","åã{","äsìæ","Rä",0,0,1,0,0,0
27145,"59001","5900131","µµ»¶Ì","»¶²¼ÐÅи","ĶÞ","åã{","äsìæ","Ì",0,0,0,0,0,0
@@ -87334,5 +87332,5 @@
27145,"59001","5900136","µµ»¶Ì","»¶²¼ÐÅи","зÀ¶Ð","åã{","äsìæ","üؽã",0,0,0,0,0,0
27145,"593 ","5900154","µµ»¶Ì","»¶²¼ÐÅи","зļÞ","åã{","äsìæ","OØÂ",0,0,0,0,0,0
-27145,"59001","5900111","µµ»¶Ì","»¶²¼ÐÅи","ÐÊ×ÀÞ²","åã{","äsìæ","O´ä",0,0,1,0,0,0
+27145,"59001","5900111","µµ»¶Ì","»¶²¼ÐÅи","ÐÊ×ÀÞ²","åã{","äsìæ","O´ä",0,0,1,0,1,5
27145,"59001","5900101","µµ»¶Ì","»¶²¼ÐÅи","ÐÔÔÏÀÞ²","åã{","äsìæ","{Rä",0,0,1,0,0,0
27145,"59001","5900141","µµ»¶Ì","»¶²¼ÐÅи","ÓÓÔÏÀÞ²","åã{","äsìæ","Rä",0,0,1,0,0,0
@@ -92960,5 +92958,4 @@
28214,"665 ","6650852","Ë®³ºÞ¹Ý","À¶×ÂÞ¶¼","ÒÌ","ºÉ§","óËs","z",0,0,1,0,0,0
28214,"665 ","6650855","Ë®³ºÞ¹Ý","À¶×ÂÞ¶¼","ÒÌ·Ö¼¶Þµ¶","ºÉ§","óËs","z«æµKu",0,0,0,0,0,0
-28214,"665 ","6650856","Ë®³ºÞ¹Ý","À¶×ÂÞ¶¼","Ò̼ÞÕ³¶Þµ¶","ºÉ§","óËs","z©RKu",0,0,0,0,1,2
28214,"665 ","6650867","Ë®³ºÞ¹Ý","À¶×ÂÞ¶¼","ÒÌ˶޼ÉÁ®³","ºÉ§","óËs","z̬",0,0,0,0,0,0
28214,"665 ","6650854","Ë®³ºÞ¹Ý","À¶×ÂÞ¶¼","ÒÌÔÏÃÁ®³","ºÉ§","óËs","zRè¬",0,0,0,0,0,0
@@ -122406,7 +122403,7 @@
44203,"871 ","8710057","µµ²À¹Ý","Ŷ¼","»ÝÉÁ®³","媧","Ãs","Om",0,0,0,0,0,0
44203,"871 ","8710073","µµ²À¹Ý","Ŷ¼","¼µÏÁ","媧","Ãs","¬",0,0,0,0,0,0
-44203,"871 ","8710033","µµ²À¹Ý","Ŷ¼","¼ÏÀ","媧","Ãs","c",0,0,0,0,1,5
-44203,"871 ","8710035","µµ²À¹Ý","Ŷ¼","¼ÏÀŶÏÁ","媧","Ãs","c¬",0,0,0,0,1,5
-44203,"871 ","8710036","µµ²À¹Ý","Ŷ¼","¼ÏÀÎÝÏÁ","媧","Ãs","c{¬",0,0,0,0,1,5
+44203,"871 ","8710033","µµ²À¹Ý","Ŷ¼","¼ÏÀÞ","媧","Ãs","c",0,0,0,0,0,0
+44203,"871 ","8710035","µµ²À¹Ý","Ŷ¼","¼ÏÀÞŶÏÁ","媧","Ãs","c¬",0,0,0,0,0,0
+44203,"871 ","8710036","µµ²À¹Ý","Ŷ¼","¼ÏÀÞÎÝÏÁ","媧","Ãs","c{¬",0,0,0,0,0,0
44203,"871 ","8710011","µµ²À¹Ý","Ŷ¼","¼Ó²¹Å¶Þ","媧","Ãs","ºri",0,0,0,0,0,0
44203,"871 ","8710097","µµ²À¹Ý","Ŷ¼","¼Ó¼®³¼Þ","媧","Ãs","º³H",0,0,0,0,0,0
Index: /branches/version-2_12-dev/data/class/SC_CheckError.php
===================================================================
--- /branches/version-2_12-dev/data/class/SC_CheckError.php (revision 22874)
+++ /branches/version-2_12-dev/data/class/SC_CheckError.php (revision 22876)
@@ -1116,8 +1116,7 @@
$this->createParam($value);
$targetStr = $this->arrParam[$value[1]];
-
$prohibitedStr = str_replace(array('|', '/'), array('\|', '\/'), $value[2]);
- $pattern = '/' . join('\b|\b', $prohibitedStr) . '\b/i';
-
+
+ $pattern = '/' . join('|', $prohibitedStr) . '/i';
if (preg_match_all($pattern, $targetStr, $matches = array())) {
$this->arrErr[$value[1]] = '※ ' . $value[0] . 'は入力できません。
';
Index: /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 22871)
+++ /branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 22876)
@@ -284,8 +284,8 @@
function lfInitParam(&$objFormParam) {
- $objFormParam->addParam('お名前(姓)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'KANA_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'KANA_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+ $objFormParam->addParam('お名前(姓)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'KANA_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'KANA_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('郵便番号1', 'order_zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK'));
$objFormParam->addParam('郵便番号2', 'order_zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK'));
@@ -307,8 +307,8 @@
$objFormParam->addParam('職業', 'order_job', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('別のお届け先', 'deliv_check', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
- $objFormParam->addParam('お名前(姓)', 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('お名前(名)', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+ $objFormParam->addParam('お名前(姓)', 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('お名前(名)', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('郵便番号1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
$objFormParam->addParam('郵便番号2', 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
Index: /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (revision 22871)
+++ /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (revision 22876)
@@ -287,8 +287,8 @@
// お客様情報
- $objFormParam->addParam('注文者 お名前(姓)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('注文者 お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('注文者 お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+ $objFormParam->addParam('注文者 お名前(姓)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('注文者 お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('注文者 お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('メールアドレス', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
$objFormParam->addParam('郵便番号1', 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
@@ -355,8 +355,8 @@
$objFormParam->addParam('配送数', 'shipping_quantity', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
$objFormParam->addParam('配送ID', 'shipping_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 0);
- $objFormParam->addParam('お名前(姓)', 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('お名前(名)', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+ $objFormParam->addParam('お名前(姓)', 'shipping_name01', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('お名前(名)', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('郵便番号1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
$objFormParam->addParam('郵便番号2', 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
Index: /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php
===================================================================
--- /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php (revision 22873)
+++ /branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php (revision 22876)
@@ -141,4 +141,5 @@
}
}
+
return $arrForm;
}
@@ -154,8 +155,6 @@
$arrRet = $objFormParam->getHashArray();
- //タイトルが未記入の場合、デフォルトのタイトルを表示
- if($arrRet['title'] == "") $arrRet['title'] = 'お買い上げ明細書(納品書)';
-
- // エラー入力なし
+ $this->arrForm = $arrRet;
+ // エラー入力なし
if (count($arrErr) == 0) {
$objFpdf = new SC_Fpdf_Ex($arrRet['download'], $arrRet['title']);
@@ -166,5 +165,5 @@
}
$objFpdf->createPdf();
- return true;
+ return true;
} else {
return $arrErr;
@@ -193,5 +192,5 @@
$objFormParam->addParam('帳票の種類', 'type', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('ダウンロード方法', 'download', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
- $objFormParam->addParam('帳票タイトル', 'title', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('帳票タイトル', 'title', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('帳票メッセージ1行目', 'msg1', STEXT_LEN*3/5, 'KVa', array('MAX_LENGTH_CHECK'));
$objFormParam->addParam('帳票メッセージ2行目', 'msg2', STEXT_LEN*3/5, 'KVa', array('MAX_LENGTH_CHECK'));
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl (revision 22864)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl (revision 22876)
@@ -111,18 +111,8 @@
-
- -
-
+ value=""
+ maxlength=""
+ style=""
+ class="boxShort text data-role-none" /> - -
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl (revision 22872)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl (revision 22876)
@@ -67,8 +67,8 @@
-
+
-
+
@@ -122,7 +122,7 @@