[Svn-src-all:1517] [version-2_5-dev 20413] refs #1057

[shutta]

Subversion committed to /home/svn/open 20413
http://svn.ec-cube.net/open_trac/changeset/20413
┌────────────────────────────┐
│更新者　:  shutta                                       │
│更新日時:  2011-02-25 23:07:43 +0900 (金, 25  2月 2011)│
└────────────────────────────┘

Log:
--------------------------------------------------------
refs #1057
r20313,r20315 の管理画面の認証周りの変更による影響を修正。


Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl
U   branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
U   branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php

変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl	2011-02-25 13:31:31 UTC (rev 20412)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl	2011-02-25 14:07:43 UTC (rev 20413)
@@ -38,7 +38,6 @@
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="" />
 <input type="hidden" name="template_code_temp" value="" />
-<input type="hidden" name="uniqid" value="<!--{$uniqid}-->" />
 <input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
 <div id="design" class="contents-main">
   <p class="remark">

変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl	2011-02-25 13:31:31 UTC (rev 20412)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl	2011-02-25 14:07:43 UTC (rev 20413)
@@ -37,7 +37,6 @@
 <form name="form1" method="post" action="?" enctype="multipart/form-data">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="" />
-<input type="hidden" name="uniqid" value="<!--{$uniqid}-->" />
 <input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
 <div id="disign" class="contents-main">
   <p class="remark">

変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php	2011-02-25 13:31:31 UTC (rev 20412)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php	2011-02-25 14:07:43 UTC (rev 20413)
@@ -83,19 +83,12 @@
 
         $this->tpl_select = $this->getTemplateName($device_type_id);
 
-        // uniqidをテンプレートへ埋め込み
-        $this->uniqid = $objSession->getUniqId();
-
         $objView = new SC_AdminView_Ex();
 
         switch($this->getMode()) {
 
             // 登録ボタン押下時
         case 'register':
-            // 画面遷移の正当性チェック
-            if (!SC_Utils::sfIsValidTransition($objSession)) {
-                sfDispError('');
-            }
             // パラメータ検証
             $objForm = $this->lfInitRegister();
             if ($objForm->checkError()) {
@@ -124,10 +117,6 @@
 
             // 削除ボタン押下時
         case 'delete':
-            // 画面遷移の正当性チェック
-            if (!SC_Utils::sfIsValidTransition($objSession)) {
-                SC_Utils::sfDispError('');
-            }
             // パラメータ検証
             $objForm = $this->lfInitDelete();
             if ($objForm->checkError()) {
@@ -146,10 +135,6 @@
 
             // downloadボタン押下時
         case 'download':
-            // 画面遷移の正当性チェック
-            if (!SC_Utils::sfIsValidTransition($objSession)) {
-                SC_Utils::sfDispError('');
-            }
             // パラメータ検証
             $objForm = $this->lfInitDownload();
             $template_code = $objForm->getValue('template_code_temp');

変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php	2011-02-25 13:31:31 UTC (rev 20412)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php	2011-02-25 14:07:43 UTC (rev 20413)
@@ -81,9 +81,6 @@
             $device_type_id = DEVICE_TYPE_PC;
         }
 
-        // uniqidをテンプレートへ埋め込み
-        $this->uniqid = $objSession->getUniqId();
-
         switch($this->getMode()) {
 
             // ダウンロードボタン押下時の処理
@@ -91,10 +88,6 @@
             break;
             // アップロードボタン押下時の処理
         case 'upload':
-            // 画面遷移の正当性チェック
-            if (!SC_Utils::sfIsValidTransition($objSession)) {
-                SC_Utils::sfDispError('');
-            }
             // フォームパラメータ初期化
             $objForm = $this->lfInitUpload();
             // エラーチェック