view class: fiexed modifiers

diff --git a/class/View/403.php b/class/View/403.php
index 1d4814b..2af5fe8 100644 (file)
--- a/class/View/403.php
+++ b/class/View/403.php
@@ -32,7 +32,7 @@ class Ethna_View_403 extends Ethna_ViewClass
      *  @access public
      *  @param  array  $param  出力に必要なユーザー定義パラメータ
      */
-    function preforward($param = array())
+    public function preforward($param = array())
     {
         $this->error(403);
     }

diff --git a/class/View/404.php b/class/View/404.php
index 8df2891..4a5508e 100644 (file)
--- a/class/View/404.php
+++ b/class/View/404.php
@@ -32,7 +32,7 @@ class Ethna_View_404 extends Ethna_ViewClass
      *  @access public
      *  @param  array  $param  出力に必要なユーザー定義パラメータ
      */
-    function preforward($param = array())
+    public function preforward($param = array())
     {
         $this->error(404);
     }

diff --git a/class/View/500.php b/class/View/500.php
index 7ed8787..3ff0ec0 100644 (file)
--- a/class/View/500.php
+++ b/class/View/500.php
@@ -32,7 +32,7 @@ class Ethna_View_500 extends Ethna_ViewClass
      *  @access public
      *  @param  array  $param  出力に必要なユーザー定義パラメータ
      */
-    function preforward($param = array())
+    public function preforward($param = array())
     {
         $this->error(500);
     }

diff --git a/class/View/Info.php b/class/View/Info.php
index 4f4de6e..b17fc44 100644 (file)
--- a/class/View/Info.php
+++ b/class/View/Info.php
@@ -24,7 +24,7 @@ class Ethna_View_Info extends Ethna_ViewClass
      */
 
     /** @var boolean  レイアウトテンプレートの使用フラグ       */
-    var $use_layout = false;
+    public $use_layout = false;
 
     /**#@-*/
 
@@ -33,7 +33,7 @@ class Ethna_View_Info extends Ethna_ViewClass
      *
      *  @access public
      */
-    function preforward()
+    public function preforward()
     {
         $ctl = Ethna_Controller::getInstance();
         $em = new Ethna_InfoManager($this->backend);

diff --git a/class/View/Json.php b/class/View/Json.php
index cf564ce..4b65d6d 100644 (file)
--- a/class/View/Json.php
+++ b/class/View/Json.php
@@ -31,7 +31,7 @@ class Ethna_View_Json extends Ethna_ViewClass
      *  @access public
      *  @param  array  $encode_param  出力するJSONにエンコードする値
      */
-    function preforward($encode_param = array())
+    public function preforward($encode_param = array())
     {
         $client_enc = $this->ctl->getClientEncoding();
         if (mb_enabled() && strcasecmp('UTF-8', $client_enc) != 0) {
@@ -43,7 +43,7 @@ class Ethna_View_Json extends Ethna_ViewClass
         echo $encoded_param;
     }
 
-    function forward()
+    public function forward()
     {
         // do nothing.
     }

diff --git a/class/View/List.php b/class/View/List.php
index 48ab5ff..9fb9c5e 100644 (file)
--- a/class/View/List.php
+++ b/class/View/List.php
@@ -20,23 +20,23 @@
 class Ethna_View_List extends Ethna_ViewClass
 {
     /**#@+
-     *  @access private
+     *  @access protected
      */
 
-    /** @var    int     表示開始オフセット */
-    var $offset = 0;
+    /** @protected    int     表示開始オフセット */
+    protected $offset = 0;
 
-    /** @var    int     表示件数 */
-    var $count = 25;
+    /** @protected    int     表示件数 */
+    protected $count = 25;
 
-    /** @var    array   検索対象項目一覧 */
-    var $search_list = array();
+    /** @protected    array   検索対象項目一覧 */
+    protected $search_list = array();
 
-    /** @var    string  検索マネージャクラス名 */
-    var $manager_name = null;
+    /** @protected    string  検索マネージャクラス名 */
+    protected $manager_name = null;
 
-    /** @var    string  表示対象クラス名 */
-    var $class_name = null;
+    /** @protected    string  表示対象クラス名 */
+    protected $class_name = null;
 
     /**#@-*/
 
@@ -104,7 +104,7 @@ class Ethna_View_List extends Ethna_ViewClass
      *
      *  @access protected
      */
-    function _fixNameObject($value, $obj)
+    protected function _fixNameObject($value, $obj)
     {
         return $value;
     }
@@ -117,7 +117,7 @@ class Ethna_View_List extends Ethna_ViewClass
      *  @param  array   $list       検索結果
      *  @return array   ナビゲーション情報を格納した配列
      */
-    function _getNavigation($total, &$list)
+    protected function _getNavigation($total, &$list)
     {
         $nav = array();
         $nav['offset'] = $this->offset;
@@ -148,7 +148,7 @@ class Ethna_View_List extends Ethna_ViewClass
      *
      *  @access protected
      */
-    function _setQueryOption()
+    protected function _setQueryOption()
     {
     }
 
@@ -159,7 +159,7 @@ class Ethna_View_List extends Ethna_ViewClass
      *  @param  array   $search_list    検索対象一覧
      *  @return string  検索内容を格納したGET引数
      */
-    function _getQueryParameter()
+    protected function _getQueryParameter()
     {
         $query = "";
 

diff --git a/class/View/Redirect.php b/class/View/Redirect.php
index ff88c24..36a2fd0 100644 (file)
--- a/class/View/Redirect.php
+++ b/class/View/Redirect.php
@@ -60,7 +60,7 @@ class Ethna_View_Redirect extends Ethna_ViewClass
         }
     }
 
-    function isAbsoluteUrl($url)
+    public function isAbsoluteUrl($url)
     {
         if (preg_match("@^(https?|ftp)://.+@", $url)) {
             return true;
@@ -75,7 +75,7 @@ class Ethna_View_Redirect extends Ethna_ViewClass
      *
      *  @access public
      */
-    function forward()
+    public function forward()
     {
          // do nothing.
     }

diff --git a/class/View/UnitTest.php b/class/View/UnitTest.php
index cbf16a3..3095f45 100644 (file)
--- a/class/View/UnitTest.php
+++ b/class/View/UnitTest.php
@@ -22,7 +22,7 @@ class Ethna_View_UnitTest extends Ethna_ViewClass
      */
 
     /** @var boolean  レイアウトテンプレートの使用フラグ       */
-    var $use_layout = false;
+    public $use_layout = false;
 
     /**#@-*/
 
@@ -31,7 +31,7 @@ class Ethna_View_UnitTest extends Ethna_ViewClass
      *
      *  @access public
      */
-    function preforward()
+    public function preforward()
     {
         // タイムアウトしないように変更
         if (!ini_get('safe_mode')) {