Changeset 17569 for branches/comu-ver2/data

Timestamp:

2008/08/28 10:33:23 (16 years ago)

Author:

Seasoft

Message:

merge 17227,17229,17234,17238,17250,17251,17254

Location:

branches/comu-ver2/data

Files:

• Smarty/templates/default/bloc/calendar.tpl (modified) (4 diffs)
• class/SC_Initial.php (modified) (1 diff)
• class/pages/LC_Page.php (modified) (2 diffs)
• class/pages/admin/order/LC_Page_Admin_Order_Pdf.php (modified) (1 diff)
• class/pages/admin/products/LC_Page_Admin_Products.php (modified) (2 diffs)
• class/util/SC_Utils.php (modified) (1 diff)

branches/comu-ver2/data/Smarty/templates/default/bloc/calendar.tpl

@@ -21 +21 @@
  *}-->
 <!--▼カレンダーここから-->
-<div id="block-calendar" class="block-contents">
-<h2><img src="<!--{$TPL_DIR}-->img/top/calendar.jpg" width="400" height="29" alt="カレンダー" /></h2>
-
-
+<div id="block-calendar">
 <!--{section name=num loop=$arrCalendar}-->
 <!--{assign var=arrCal value=`$arrCalendar[num]`}-->
 <!--{section name=cnt loop=$arrCal}-->
-
 <!--{if $smarty.section.cnt.first}-->
 <table>
@@ -34 +30 @@
 <thead><tr><th>日</th><th>月</th><th>火</th><th>水</th><th>木</th><th>金</th><th>土</th></tr></thead>
 <!--{/if}-->
-
 <!--{if $arrCal[cnt].first}-->
 <tr>
 <!--{/if}-->
-
 <!--{if !$arrCal[cnt].in_month}-->
 <td></td>
@@ -46 +40 @@
 <td><!--{$arrCal[cnt].day}--></td>
 <!--{/if}-->
-
 <!--{if $arrCal[cnt].last}-->
 </tr>
 <!--{/if}-->
-
 <!--{/section}-->
 <!--{if $smarty.section.cnt.last}-->
@@ -56 +48 @@
 <!--{/if}-->
 <!--{/section}-->
-
-
 </div>
 <!--▲カレンダーここまで-->

branches/comu-ver2/data/class/SC_Initial.php

@@ -39 +39 @@
         /** EC-CUBEのバージョン */
         // XXX SVNのリビジョンを付加できたら良いと思う。(方法が分からない。)
-        define('ECCUBE_VERSION', "2.1.1-comu");
+        define('ECCUBE_VERSION', "2.2.0-comu");
     }
 

branches/comu-ver2/data/class/pages/LC_Page.php

@@ -216 +216 @@
      */
     function getLocation($path, $param = array(), $useSSL = "escape") {
-
-        // $path が / で始まっている場合
-        if (substr($path, 0, 1) == "/") {
-            $realPath = realpath(HTML_PATH . substr_replace($path, "", 0, strlen(URL_DIR))); 
-        // 相対パスの場合
-        } else {
-            $realPath = realpath($path);
-        }
-
-        // FIXME OS依存の処理は別クラスに分ける？
-        // Windowsの場合は, ディレクトリの区切り文字を\から/に変換する
-        if (substr(PHP_OS, 0, 3) == 'WIN') {
-            $realPath = str_replace("\\", "/", $realPath);
-            $htmlPath = str_replace("\\", "/", HTML_PATH);
-            $rootPath = str_replace($htmlPath, "", $realPath);
-        } else {
-            // HTML_PATH を削除した文字列を取得.
-            $rootPath = str_replace(HTML_PATH, "", $realPath);
-        }
-
+        $rootPath = $this->getRootPath($path);
 
         // スキーマを定義
@@ -261 +242 @@
     }
 
+    function getRootPath($path) {
+        // $path が / で始まっている場合
+        if (substr($path, 0, 1) == "/") {
+            $realPath = realpath(HTML_PATH . substr_replace($path, "", 0, strlen(URL_DIR)));
+        // 相対パスの場合
+        } else {
+            $realPath = realpath($path);
+        }
+
+        // HTML_PATH を削除した文字列を取得.
+        // FIXME OS依存の処理は別クラスに分ける？
+        // Windowsの場合は, ディレクトリの区切り文字を\から/に変換する
+        if (substr(PHP_OS, 0, 3) == 'WIN') {
+            $realPath = str_replace("\\", "/", $realPath);
+            $htmlPath = str_replace("\\", "/", HTML_PATH);
+            $rootPath = str_replace($htmlPath, "", $realPath);
+        } else {
+            $htmlPath = rtrim(HTML_PATH, "/");
+            $rootPath = str_replace($htmlPath, "", $realPath);
+            $rootPath = ltrim($rootPath, "/");
+        }
+        
+        return $rootPath;
+    }
+    
     /**
      * ページをリロードする.

branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php

@@ -163 +163 @@
         $this->objFormParam->addParam("ダウンロード方法", "download", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("帳票タイトル", "title", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("帳票メッセージ1行目", "msg1", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("帳票メッセージ2行目", "msg2", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("帳票メッセージ3行目", "msg3", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("帳票メッセージ1行目", "msg1", STEXT_LEN*3/5, "KVa", array("MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("帳票メッセージ2行目", "msg2", STEXT_LEN*3/5, "KVa", array("MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("帳票メッセージ3行目", "msg3", STEXT_LEN*3/5, "KVa", array("MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("備考1行目", "etc1", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("備考2行目", "etc2", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));

branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products.php

@@ -330 +330 @@
 
         // カテゴリの読込
-        $this->arrCatList = $objDb->sfGetCategoryList();
-        $this->arrCatIDName = $this->lfGetIDName($this->arrCatList);
+        list($this->arrCatKey, $this->arrCatVal) = $objDb->sfGetLevelCatList(false);
+        $this->arrCatList = $this->lfGetIDName($this->arrCatKey, $this->arrCatVal);
 
         // 画面の表示
@@ -399 +399 @@
 
     // カテゴリIDをキー、カテゴリ名を値にする配列を返す。
-    function lfGetIDName($arrCatList) {
-        $max = count($arrCatList);
+    function lfGetIDName($arrCatKey, $arrCatVal) {
+        $max = count($arrCatKey);
         for ($cnt = 0; $cnt < $max; $cnt++ ) {
-            $key = isset($arrCatList[$cnt]['category_id']) ? $arrCatList[$cnt]['category_id'] : "";
-            $val = isset($arrCatList[$cnt]['category_name']) ? $arrCatList[$cnt]['category_name'] : "";
+            $key = isset($arrCatKey[$cnt]) ? $arrCatKey[$cnt] : "";
+            $val = isset($arrCatVal[$cnt]) ? $arrCatVal[$cnt] : "";
             $arrRet[$key] = $val;
         }

branches/comu-ver2/data/class/util/SC_Utils.php

@@ -127 +127 @@
         $objPage->return_top = $return_top;
         $objPage->err_msg = $err_msg;
-        $objPage->is_mobile = $is_mobile;
+        $objPage->is_mobile = (defined('MOBILE_SITE')) ? true : false;
         $objPage->process();
         exit;