Changeset 19938 for branches/version-2_5-dev/data

Timestamp:

2011/01/17 05:47:34 (13 years ago)

Author:

Seasoft

Message:

#627(ソース整形・ソースコメントの改善)

• EC-CUBE標準規約に準拠した定数名とする。

#628(未使用処理・定義などの削除)

Location:

branches/version-2_5-dev/data/class

Files:

• SC_UploadFile.php (modified) (1 diff)
• SC_View.php (modified) (4 diffs)
• graph/SC_GraphBar.php (modified) (1 diff)
• graph/SC_GraphLine.php (modified) (1 diff)
• graph/SC_GraphPie.php (modified) (1 diff)

branches/version-2_5-dev/data/class/SC_UploadFile.php

@@ -22 +22 @@
  */
 
-$SC_UPLOADFILE_DIR = realpath(dirname( __FILE__));
-require_once($SC_UPLOADFILE_DIR . "/../module/gdthumb.php");
+$ownDir = realpath(dirname(__FILE__)) . '/';
+require_once $ownDir . '../module/gdthumb.php';
 
 /* アップロードファイル管理クラス */

branches/version-2_5-dev/data/class/SC_View.php

@@ -22 +22 @@
  */
 
-$SC_VIEW_PHP_DIR = realpath(dirname(__FILE__));
-require_once($SC_VIEW_PHP_DIR . "/../module/Smarty/libs/Smarty.class.php");
-//require_once(CLASS_EX_REALDIR . "util_extends/SC_Utils_Ex.php");
+$viewDir = realpath(dirname(__FILE__)) . '/'; // XXX グローバル変数として流用あり
+require_once $viewDir . '../module/Smarty/libs/Smarty.class.php';
 
 class SC_View {
@@ -33 +32 @@
     // コンストラクタ
     function SC_View($siteinfo = true) {
-        global $SC_VIEW_PHP_DIR;
+        global $viewDir;
 
         $this->_smarty = new Smarty;
@@ -52 +51 @@
         $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", $SC_VIEW_PHP_DIR . "/../smarty_extends");
+        $this->_smarty->plugins_dir=array("plugins", $viewDir . "../smarty_extends");
         $this->_smarty->register_modifier("sf_mb_convert_encoding", array("SC_Utils_Ex", "sf_mb_convert_encoding"));
         $this->_smarty->register_modifier("sfGetEnabled", array("SC_Utils_Ex", "sfGetEnabled"));
@@ -162 +161 @@
     /* サイト初期設定 */
     function initpath() {
-        global $SC_VIEW_PHP_DIR;
-
-        $array['tpl_mainnavi'] = $SC_VIEW_PHP_DIR . '/../Smarty/templates/frontparts/mainnavi.tpl';
+        global $viewDir;
+
+        $array['tpl_mainnavi'] = $viewDir . '../Smarty/templates/frontparts/mainnavi.tpl';
 
         $objDb = new SC_Helper_DB_Ex();

branches/version-2_5-dev/data/class/graph/SC_GraphBar.php

@@ -21 +21 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-$SC_GRAPHBAR_DIR = realpath(dirname( __FILE__));
-require_once($SC_GRAPHBAR_DIR . "/SC_GraphLine.php");
+
+$ownDir = realpath(dirname(__FILE__)) . '/';
+require_once $ownDir . 'SC_GraphLine.php';
 
 // 棒グラフ生成クラス

branches/version-2_5-dev/data/class/graph/SC_GraphLine.php

@@ -21 +21 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-$SC_GRAPHLINE_DIR = realpath(dirname( __FILE__));
-require_once($SC_GRAPHLINE_DIR . "/SC_GraphBase.php");
+
+$ownDir = realpath(dirname(__FILE__)) . '/';
+require_once $ownDir . 'SC_GraphBase.php';
 
 // 折れ線グラフ生成クラス

branches/version-2_5-dev/data/class/graph/SC_GraphPie.php

@@ -21 +21 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-$SC_GRAPHPIE_DIR = realpath(dirname( __FILE__));
-require_once($SC_GRAPHPIE_DIR . "/SC_GraphBase.php");
+
+$ownDir = realpath(dirname(__FILE__)) . '/';
+require_once $ownDir . 'SC_GraphBase.php';
 
 // 円グラフ生成クラス