- Ethna_Controller::getCLI()(CLIで実行中かどうかを返すメソッド)を追加

- ethna_error_handlerがphp.iniの設定に応じてPHPログも出力するように変更
- Smartyプラグイン(truncate_i18n)を追加
- その他、ログ出力周辺を改善
- ethna_error_handlerのtypoを修正
- Ethna_Sessionクラスでログが正しく出力されない問題を修正

diff --git a/CHANGES b/CHANGES
index 81b7cad..4b059de 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
 *** features
 
+- Ethna_Controller::getCLI()(CLI¤Ç¼Â¹ÔÃ椫¤É¤¦¤«¤òÊÖ¤¹¥á¥½¥Ã¥É)¤òÄɲÃ
+- ethna_error_handler¤¬php.ini¤ÎÀßÄê¤Ë±þ¤¸¤ÆPHP¥í¥°¤â½ÐÎϤ¹¤ë¤è¤¦¤ËÊѹ¹
+- Smarty¥×¥é¥°¥¤¥ó(truncate_i18n)¤òÄɲÃ
 - Ethna_AppObject/Ethna_AppManager¤Ë¥­¥ã¥Ã¥·¥åµ¡¹½¤òÄɲÃ(experimental)
 - ¥á¡¼¥ë¥Æ¥ó¥×¥ì¡¼¥È¥¨¥ó¥¸¥ó¤Î¥Õ¥Ã¥¯¥á¥½¥Ã¥É¤òÄɲÃ
 - MIME¥¨¥ó¥³¡¼¥ÉÍѥ桼¥Æ¥£¥ê¥Æ¥£¥á¥½¥Ã¥É¤òÄɲÃ
@@ -11,6 +14,9 @@
 
 *** bug fixes
 
+- ethna_error_handler¤Îtypo¤ò½¤Àµ
+- Ethna_Session¥¯¥é¥¹¤Ç¥í¥°¤¬Àµ¤·¤¯½ÐÎϤµ¤ì¤Ê¤¤ÌäÂê¤ò½¤Àµ
+
 ** [2005/01/14] 0.1.4
 
 *** features

diff --git a/class/Ethna_AppObject.php b/class/Ethna_AppObject.php
index 2f029c8..86eac69 100644 (file)
--- a/class/Ethna_AppObject.php
+++ b/class/Ethna_AppObject.php
@@ -451,10 +451,7 @@ class Ethna_AppObject
 
                // ¥Ð¥Ã¥¯¥¢¥Ã¥×/¥­¥ã¥Ã¥·¥å¹¹¿·
                $this->prop_backup = $this->prop;
-               unset($GLOBALS['_ETHNA_APP_OBJECT_CACHE'][strtolower(get_class($this))]);
-               unset($GLOBALS['_ETHNA_APP_MANAGER_OL_CACHE'][strtolower(get_class($this))]);
-               unset($GLOBALS['_ETHNA_APP_MANAGER_OPL_CACHE'][strtolower(get_class($this))]);
-               unset($GLOBALS['_ETHNA_APP_MANAGER_OP_CACHE'][strtolower(get_class($this))]);
+               $this->_clearPropCache();
 
                return 0;
        }
@@ -511,10 +508,7 @@ class Ethna_AppObject
 
                // ¥×¥í¥Ñ¥Æ¥£/¥Ð¥Ã¥¯¥¢¥Ã¥×/¥­¥ã¥Ã¥·¥å¥¯¥ê¥¢
                $this->id = $this->prop = $this->prop_backup = null;
-               unset($GLOBALS['_ETHNA_APP_OBJECT_CACHE'][strtolower(get_class($this))]);
-               unset($GLOBALS['_ETHNA_APP_MANAGER_OL_CACHE'][strtolower(get_class($this))]);
-               unset($GLOBALS['_ETHNA_APP_MANAGER_OPL_CACHE'][strtolower(get_class($this))]);
-               unset($GLOBALS['_ETHNA_APP_MANAGER_OP_CACHE'][strtolower(get_class($this))]);
+               $this->_clearPropCache();
 
                return 0;
        }
@@ -779,7 +773,15 @@ class Ethna_AppObject
        function _getSQL_Select($key_type, $key)
        {
                $key_type = to_array($key_type);
-               $key = to_array($key);
+               if (is_null($key)) {
+                       // add()Á°
+                       $key = array();
+                       for ($i = 0; $i < count($key_type); $i++) {
+                               $key[$i] = null;
+                       }
+               } else {
+                       $key = to_array($key);
+               }
 
                // SQL¥¨¥¹¥±¡¼¥×
                Ethna_AppSQL::escapeSQL($key);
@@ -1257,6 +1259,21 @@ class Ethna_AppObject
                }
                return false;
        }
+
+       /**
+        *      ¥­¥ã¥Ã¥·¥å¥Ç¡¼¥¿¤òºï½ü¤¹¤ë
+        *
+        *      @access private
+        */
+       function _clearPropCache()
+       {
+               $class_name = strtolower(get_class($this));
+               foreach (array('_ETHNA_APP_OBJECT_CACHE', '_ETHNA_APP_MANAGER_OL_CACHE', '_ETHNA_APP_MANAGER_OPL_CACHE', '_ETHNA_APP_MANAGER_OP_CACHE') as $key) {
+                       if (array_key_exists($key, $GLOBALS) && array_key_exists($class_name, $GLOBALS[$key])) {
+                               unset($GLOBALS[$key][$class_name]);
+                       }
+               }
+       }
 }
 // }}}
 ?>

diff --git a/class/Ethna_Controller.php b/class/Ethna_Controller.php
index 0c9b1f1..ba25b0e 100644 (file)
--- a/class/Ethna_Controller.php
+++ b/class/Ethna_Controller.php
@@ -136,6 +136,9 @@ class Ethna_Controller
        /**     @var    object  Ethna_Logger            ¥í¥°¥ª¥Ö¥¸¥§¥¯¥È */
        var     $logger = null;
 
+       /**     @var    bool    CLI¥¢¥¯¥·¥ç¥ó¼Â¹ÔÃæ¥Õ¥é¥° */
+       var     $cli    = false;
+
        /**#@-*/
 
 
@@ -518,6 +521,28 @@ class Ethna_Controller
        }
 
        /**
+        *      CLI¼Â¹ÔÃæ¥Õ¥é¥°¤ò¼èÆÀ¤¹¤ë
+        *
+        *      @access public
+        *      @return bool    CLI¼Â¹ÔÃæ¥Õ¥é¥°
+        */
+       function getCLI()
+       {
+               return $this->cli;
+       }
+
+       /**
+        *      CLI¼Â¹ÔÃæ¥Õ¥é¥°¤òÀßÄꤹ¤ë
+        *
+        *      @access public
+        *      @param  bool    CLI¼Â¹ÔÃæ¥Õ¥é¥°
+        */
+       function setCLI($cli)
+       {
+               $this->cli = $cli;
+       }
+
+       /**
         *      ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¨¥ó¥È¥ê¥Ý¥¤¥ó¥È
         *
         *      @access public
@@ -543,6 +568,7 @@ class Ethna_Controller
        function main_CLI($class_name, $action_name)
        {
                $c =& new $class_name;
+               $c->setCLI(true);
                $c->action[$action_name] = array();
                $c->trigger('www', $action_name);
        }
@@ -634,7 +660,7 @@ class Ethna_Controller
                                $action_obj =& $this->_getAction($fallback_action_name);
                        }
                        if ($action_obj == null) {
-                               return Ethna::raiseError(E_APP_UNDEFINED_ACTION, "undefined action [%s]", $action_name);
+                               return Ethna::raiseError("undefined action [%s]", E_APP_UNDEFINED_ACTION, $action_name);
                        } else {
                                $action_name = $fallback_action_name;
                        }
@@ -756,7 +782,7 @@ class Ethna_Controller
                // ¥í¥°½ÐÎÏ
                list ($log_level, $dummy) = $this->logger->errorLevelToLogLevel($error->getLevel());
                $message = $error->getMessage();
-               $this->logger->log($log_level, sprintf("[APP(%d)] %s", $error->getCode(), $message));
+               $this->logger->log($log_level, sprintf("%s [ERROR CODE(%d)]", $message, $error->getCode()));
        }
 
        /**
@@ -1367,6 +1393,7 @@ class Ethna_Controller
                $smarty->register_modifier('filter', 'smarty_modifier_filter');
                $smarty->register_modifier('unique', 'smarty_modifier_unique');
                $smarty->register_modifier('wordwrap_i18n', 'smarty_modifier_wordwrap_i18n');
+               $smarty->register_modifier('truncate_i18n', 'smarty_modifier_truncate_i18n');
                $smarty->register_modifier('i18n', 'smarty_modifier_i18n');
                $smarty->register_modifier('checkbox', 'smarty_modifier_checkbox');
                $smarty->register_modifier('select', 'smarty_modifier_select');

diff --git a/class/Ethna_LogWriter.php b/class/Ethna_LogWriter.php
index 2aa4b1a..80bb846 100644 (file)
--- a/class/Ethna_LogWriter.php
+++ b/class/Ethna_LogWriter.php
@@ -88,18 +88,30 @@ class Ethna_LogWriter
         */
        function log($level, $message)
        {
-               $prefix = strftime('%Y/%m/%d %H:%M:%S ') . $this->ident;
+               $c =& Ethna_Controller::getInstance();
+
+               $prefix = $this->ident;
                if ($this->option & LOG_PID) {
                        $prefix .= sprintf('[%d]', getmypid());
                }
-               $prefix .= sprintf('(%s): ', $this->_getLogLevelName($level));
-               if ($this->option & LOG_FUNCTION) {
-                       $function = $this->_getFunctionName();
-                       if ($function) {
-                               $prefix .= sprintf('%s: ', $function);
+               $prefix .= sprintf($c->getCLI() ? '(%s): ' : '(<b>%s</b>): ',
+                       $this->_getLogLevelName($level)
+               );
+               if ($this->option & (LOG_FUNCTION | LOG_POS)) {
+                       $tmp = "";
+                       $bt = $this->_getBacktrace();
+                       if ($bt && ($this->option & LOG_FUNCTION) && $bt['function']) {
+                               $tmp .= $bt['function'];
+                       }
+                       if ($bt && ($this->option & LOG_POS) && $bt['pos']) {
+                               $tmp .= $tmp ? sprintf('(%s)', $bt['pos']) : $bt['pos'];
+                       }
+                       if ($tmp) {
+                               $prefix .= $tmp . ": ";
                        }
                }
-               printf($prefix . $message . "\n");
+
+               printf($prefix . $message . "%s\n", $c->getCLI() ? "" : "<br />");
 
                return $prefix . $message;
        }
@@ -140,17 +152,19 @@ class Ethna_LogWriter
        }
 
        /**
-        *      ¥í¥°½ÐÎϸµ¤Î´Ø¿ô¤ò¼èÆÀ¤¹¤ë
+        *      ¥í¥°½ÐÎϲսê¤Î¾ðÊó(´Ø¿ô̾/¥Õ¥¡¥¤¥ë̾Åù)¤ò¼èÆÀ¤¹¤ë
         *
         *      @access private
-        *      @return string  ¥í¥°½ÐÎϸµ¥¯¥é¥¹/¥á¥½¥Ã¥É̾("class.method")
+        *      @return array   ¥í¥°½ÐÎϲսê¤Î¾ðÊó
         */
-       function _getFunctionName()
+       function _getBacktrace()
        {
                $skip_method_list = array(
-                       array('ethna', 'raise*'),
+                       array('ethna', 'raise.*'),
+                       array(null, 'raiseerror'),
+                       array(null, 'handleerror'),
                        array('ethna_logger', null),
-                       array('ethna_logwriter_*', null),
+                       array('ethna_logwriter*', null),
                        array('ethna_error', null),
                        array('ethna_apperror', null),
                        array('ethna_actionerror', null),
@@ -175,20 +189,10 @@ class Ethna_LogWriter
                        foreach ($skip_method_list as $method) {
                                $class = $function = true;
                                if ($method[0] != null) {
-                                       if (preg_match('/\*$/', $method[0])) {
-                                               $n = strncasecmp($bt[$i]['class'], $method[0], strlen($method[0])-1);
-                                       } else {
-                                               $n = strcasecmp($bt[$i]['class'], $method[0]);
-                                       }
-                                       $class = $n == 0 ? true : false;
+                                       $class = preg_match("/$method[0]/i", $bt[$i]['class']);
                                }
                                if ($method[1] != null) {
-                                       if (preg_match('/\*$/', $method[1])) {
-                                               $n = strncasecmp($bt[$i]['function'], $method[1], strlen($method[1])-1);
-                                       } else {
-                                               $n = strcasecmp($bt[$i]['function'], $method[1]);
-                                       }
-                                       $function = $n == 0 ? true : false;
+                                       $function = preg_match("/$method[1]/i", $bt[$i]['function']);
                                }
                                if ($class && $function) {
                                        $skip = true;
@@ -203,7 +207,20 @@ class Ethna_LogWriter
                        }
                }
 
-               return sprintf("%s.%s", isset($bt[$i]['class']) ? $bt[$i]['class'] : 'global', $bt[$i]['function']);
+               $c =& Ethna_Controller::getInstance();
+               $basedir = $c->getBasedir();
+
+               $function = sprintf("%s.%s", isset($bt[$i]['class']) ? $bt[$i]['class'] : 'global', $bt[$i]['function']);
+
+               $file = $bt[$i]['file'];
+               if (strncmp($file, $basedir, strlen($basedir)) == 0) {
+                       $file = substr($file, strlen($basedir));
+               }
+               if (strncmp($file, ETHNA_BASE, strlen(ETHNA_BASE)) == 0) {
+                       $file = preg_replace('#^/+#', '', substr($file, strlen(ETHNA_BASE)));
+               }
+               $line = $bt[$i]['line'];
+               return array('function' => $function, 'pos' => sprintf('%s:%s', $file, $line));
        }
 }
 // }}}

diff --git a/class/Ethna_LogWriter_File.php b/class/Ethna_LogWriter_File.php
index 0e0a8df..2b0cdff 100644 (file)
--- a/class/Ethna_LogWriter_File.php
+++ b/class/Ethna_LogWriter_File.php
@@ -71,10 +71,17 @@ class Ethna_LogWriter_File extends Ethna_LogWriter
                        $prefix .= sprintf('[%d]', getmypid());
                }
                $prefix .= sprintf('(%s): ', $this->_getLogLevelName($level));
-               if ($this->option & LOG_FUNCTION) {
-                       $function = $this->_getFunctionName();
-                       if ($function) {
-                               $prefix .= sprintf('%s: ', $function);
+               if ($this->option & (LOG_FUNCTION | LOG_POS)) {
+                       $tmp = "";
+                       $bt = $this->_getBacktrace();
+                       if ($bt && ($this->option & LOG_FUNCTION) && $bt['function']) {
+                               $tmp .= $bt['function'];
+                       }
+                       if ($bt && ($this->option & LOG_POS) && $bt['pos']) {
+                               $tmp .= $tmp ? sprintf('(%s)', $bt['pos']) : $bt['pos'];
+                       }
+                       if ($tmp) {
+                               $prefix .= $tmp . ": ";
                        }
                }
                fwrite($this->fp, $prefix . $message . "\n");

diff --git a/class/Ethna_LogWriter_Syslog.php b/class/Ethna_LogWriter_Syslog.php
index a65c5d3..6390158 100644 (file)
--- a/class/Ethna_LogWriter_Syslog.php
+++ b/class/Ethna_LogWriter_Syslog.php
@@ -42,10 +42,17 @@ class Ethna_LogWriter_Syslog extends Ethna_LogWriter
        function log($level, $message)
        {
                $prefix = sprintf('%s: ', $this->_getLogLevelName($level));
-               if ($this->option & LOG_FUNCTION) {
-                       $function = $this->_getFunctionName();
-                       if ($function) {
-                               $prefix .= sprintf('%s: ', $function);
+               if ($this->option & (LOG_FUNCTION | LOG_POS)) {
+                       $tmp = "";
+                       $bt = $this->_getBacktrace();
+                       if ($bt && ($this->option & LOG_FUNCTION) && $bt['function']) {
+                               $tmp .= $bt['function'];
+                       }
+                       if ($bt && ($this->option & LOG_POS) && $bt['pos']) {
+                               $tmp .= $tmp ? sprintf('(%s)', $bt['pos']) : $bt['pos'];
+                       }
+                       if ($tmp) {
+                               $prefix .= $tmp . ": ";
                        }
                }
                syslog($level, $prefix . $message);

diff --git a/class/Ethna_Logger.php b/class/Ethna_Logger.php
index 33b3d01..f56daf7 100644 (file)
--- a/class/Ethna_Logger.php
+++ b/class/Ethna_Logger.php
@@ -15,9 +15,19 @@
 define('LOG_FILE', 1 << 16);
 
 /**
+ *     ³ÈÄ¥¥í¥°¥×¥í¥Ñ¥Æ¥£:     ɸ½à½ÐÎÏ
+ */
+define('LOG_ECHO', 1 << 17);
+
+/**
  *     ³ÈÄ¥¥í¥°¥×¥í¥Ñ¥Æ¥£:     ´Ø¿ô̾ɽ¼¨
  */
-define('LOG_FUNCTION', 1 << 17);
+define('LOG_FUNCTION', 1 << 18);
+
+/**
+ *     ³ÈÄ¥¥í¥°¥×¥í¥Ñ¥Æ¥£:     ¥Õ¥¡¥¤¥ë̾+¹ÔÈÖ¹æɽ¼¨
+ */
+define('LOG_POS', 1 << 19);
 
 
 // {{{ ethna_error_handler
@@ -31,16 +41,53 @@ define('LOG_FUNCTION', 1 << 17);
  */
 function ethna_error_handler($errno, $errstr, $errfile, $errline)
 {
-       $c =& Ethna_Controller::getInstance();
-
-       list($level, $name) = Ethna_Logger::errorLevelToLogLevel($errno);
        if ($errno == E_STRICT) {
                // E_STRICT¤Ïɽ¼¨¤·¤Ê¤¤
                return E_STRICT;
        }
 
+       list($level, $name) = Ethna_Logger::errorLevelToLogLevel($errno);
+       switch ($errno) {
+       case E_ERROR:
+       case E_CORE_ERROR:
+       case E_COMPILE_ERROR:
+       case E_USER_ERROR:
+               $php_errno = 'Fatal error'; break;
+       case E_WARNING:
+       case E_CORE_WARNING:
+       case E_COMPILE_WARNING:
+       case E_USER_WARNING:
+               $php_errno = 'Warning'; break;
+       case E_PARSE:
+               $php_errno = 'Parse error'; break;
+       case E_NOTICE:
+       case E_USER_NOTICE:
+               $php_errno = 'Notice'; break;
+       default:
+               $php_errno = 'Unknown error'; break;
+       }
+
+       $php_errstr = sprintf('PHP %s: %s in %s on line %d', $php_errno, $errstr, $errfile, $errline);
+       if (ini_get('log_errors') && (error_reporting() & $errno)) {
+               $locale = setlocale(LC_TIME, 0);
+               setlocale(LC_TIME, 'C');
+               error_log($php_errstr, 0);
+               setlocale(LC_TIME, $locale);
+       }
+
+       $c =& Ethna_Controller::getInstance();
        $logger =& $c->getLogger();
-       $logger->log($level, sprintf("[PHP] %s: %s in %s on line %d", $code, $errstr, $errfile, $errline));
+       $logger->log($level, sprintf("[PHP] %s: %s in %s on line %d", $name, $errstr, $errfile, $errline));
+
+       $facility = $logger->getLogFacility();
+       if (($facility != LOG_ECHO && is_null($facility) == false) && ini_get('display_errors') && (error_reporting() & $errno)) {
+               if ($c->getCLI()) {
+                       $format = "%s: %s in %s on line %d\n";
+               } else {
+                       $format = "<b>%s</b>: %s in <b>%s</b> on line <b>%d</b><br />\n";
+               }
+               printf($format, $php_errno, $errstr, $errfile, $errline);
+       }
 }
 // }}}
 
@@ -80,6 +127,7 @@ class Ethna_Logger extends Ethna_AppManager
                'user' => array('name' => 'LOG_USER'),
                'uucp' => array('name' => 'LOG_UUCP'),
                'file' => array('name' => 'LOG_FILE'),
+               'echo' => array('name' => 'LOG_ECHO'),
        );
 
        /**     @var    array   ¥í¥°¥ì¥Ù¥ë°ìÍ÷ */
@@ -98,6 +146,7 @@ class Ethna_Logger extends Ethna_AppManager
        var $log_option_list = array(
                'pid' => array('name' => 'PIDɽ¼¨', 'value' => LOG_PID),
                'function' => array('name' => '´Ø¿ô̾ɽ¼¨', 'value' => LOG_FUNCTION),
+               'pos' => array('name' => '¥Õ¥¡¥¤¥ë̾ɽ¼¨', 'value' => LOG_POS),
        );
 
        /**     @var    array   ¥í¥°¥ì¥Ù¥ë¥Æ¡¼¥Ö¥ë */
@@ -118,6 +167,9 @@ class Ethna_Logger extends Ethna_AppManager
        /**     @var    int             ¥í¥°¥ì¥Ù¥ë */
        var $level;
 
+       /**     @var    int             ¥í¥°¥Õ¥¡¥·¥ê¥Æ¥£ */
+       var $facility;
+
        /**     @var    int             ¥¢¥é¡¼¥È¥ì¥Ù¥ë */
        var $alert_level;
 
@@ -152,27 +204,32 @@ class Ethna_Logger extends Ethna_AppManager
                        // ̤ÀßÄê¤Ê¤éLOG_WARNING
                        $this->level = LOG_WARNING;
                }
-               $facility = $this->_parseLogFacility($config->get('log_facility'));
-               $file = sprintf('%s/%s.log', $controller->getDirectory('log'), strtolower($controller->getAppid()));
+               $this->facility = $this->_parseLogFacility($config->get('log_facility'));
                $option = $this->_parseLogOption($config->get('log_option'));
                $this->alert_level = $this->_parseLogLevel($config->get('log_alert_level'));
                $this->alert_mailaddress = preg_split('/\s*,\s*/', $config->get('log_alert_mailaddress'));
                $this->message_filter_do = $config->get('log_filter_do');
                $this->message_filter_ignore = $config->get('log_filter_ignore');
 
-               if ($facility == LOG_FILE) {
-                       $writer_class = "Ethna_LogWriter_File";
-               } else if (is_null($facility)) {
-                       $writer_class = "Ethna_LogWriter";
-               } else {
-                       $writer_class = "Ethna_LogWriter_Syslog";
-               }
-               $this->writer =& new $writer_class($controller->getAppId(), $facility, $file, $option);
+               // LogWriter¥¯¥é¥¹¤ÎÀ¸À®
+               $file = $this->_getLogFile();
+               $this->writer =& $this->_getLogWriter($file, $option);
 
                set_error_handler("ethna_error_handler");
        }
 
        /**
+        *      ¥í¥°¥Õ¥¡¥·¥ê¥Æ¥£¤ò¼èÆÀ¤¹¤ë
+        *
+        *      @access public
+        *      @return int             ¥í¥°¥Õ¥¡¥·¥ê¥Æ¥£
+        */
+       function getLogFacility()
+       {
+               return $this->facility;
+       }
+
+       /**
         *      PHP¥¨¥é¡¼¥ì¥Ù¥ë¤ò¥í¥°¥ì¥Ù¥ë¤ËÊÑ´¹¤¹¤ë
         *
         *      @access public
@@ -253,6 +310,47 @@ class Ethna_Logger extends Ethna_AppManager
        }
 
        /**
+        *      ¥í¥°¥Õ¥¡¥¤¥ë¤Î½ñ¤­½Ð¤·Àè¤ò¼èÆÀ¤¹¤ë(¥í¥°¥Õ¥¡¥·¥ê¥Æ¥£¤Ë
+        *      LOG_FILE¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Î¤ßÍ­¸ú)
+        *
+        *      ¥í¥°¥Õ¥¡¥¤¥ë¤Î½ñ¤­½Ð¤·Àè¤òÊѹ¹¤·¤¿¤¤¾ì¹ç¤Ï¤³¤Î¥á¥½¥Ã¥É¤ò
+        *      ¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹
+        *
+        *      @access protected
+        *      @return string  ¥í¥°¥Õ¥¡¥¤¥ë¤Î½ñ¤­½Ð¤·Àè
+        */
+       function _getLogFile()
+       {
+               return sprintf('%s/%s.log',
+                       $this->controller->getDirectory('log'),
+                       strtolower($this->controller->getAppid())
+               );
+       }
+
+       /**
+        *      LogWriter¥ª¥Ö¥¸¥§¥¯¥È¤ò¼èÆÀ¤¹¤ë
+        *
+        *      ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¸ÇÍ­¤ÎLogWriter¤òÍøÍѤ·¤¿¤¤¾ì¹ç¤Ï¤³¤Î¥á¥½¥Ã¥É¤ò
+        *      ¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹
+        *
+        *      @access protected
+        *      @param  string  $file           ¥í¥°¥Õ¥¡¥¤¥ë
+        *      @param  array   $option         ¥í¥°¥ª¥×¥·¥ç¥ó
+        *      @return object  LogWriter       LogWriter¥ª¥Ö¥¸¥§¥¯¥È
+        */
+       function &_getLogWriter($file, $option)
+       {
+               if ($this->facility == LOG_FILE) {
+                       $writer_class = "Ethna_LogWriter_File";
+               } else if ($this->facility == LOG_ECHO || is_null($this->facility)) {
+                       $writer_class = "Ethna_LogWriter";
+               } else {
+                       $writer_class = "Ethna_LogWriter_Syslog";
+               }
+               return new $writer_class($this->controller->getAppId(), $this->facility, $file, $option);
+       }
+
+       /**
         *      ¥í¥°¥ª¥×¥·¥ç¥ó(ÀßÄê¥Õ¥¡¥¤¥ëÃÍ)¤ò²òÀϤ¹¤ë
         *
         *      @access private
@@ -268,6 +366,8 @@ class Ethna_Logger extends Ethna_AppManager
                                $option |= LOG_PID;
                        } else if ($elt == 'function') {
                                $option |= LOG_FUNCTION;
+                       } else if ($elt == 'pos') {
+                               $option |= LOG_POS;
                        }
                }
 

diff --git a/class/Ethna_Session.php b/class/Ethna_Session.php
index 66d16a0..4026952 100644 (file)
--- a/class/Ethna_Session.php
+++ b/class/Ethna_Session.php
@@ -273,7 +273,7 @@ class Ethna_Session
                if (($src & 0xffff0000) == ($dst & 0xffff0000)) {
                        return true;
                } else {
-                       $this->logger(LOG_NOTICE, "session IP validation failed [%s] - [%s]", $src_ip, $dst_ip);
+                       $this->logger->log(LOG_NOTICE, "session IP validation failed [%s] - [%s]", $src_ip, $dst_ip);
                        return false;
                }
        }

diff --git a/class/Ethna_SmartyPlugin.php b/class/Ethna_SmartyPlugin.php
index 65dada5..ed5ce48 100644 (file)
--- a/class/Ethna_SmartyPlugin.php
+++ b/class/Ethna_SmartyPlugin.php
@@ -243,6 +243,25 @@ function smarty_modifier_wordwrap_i18n($string, $width, $break = "\n", $indent =
 }
 
 /**
+ *     smarty modifier:ʸ»úÎóÀÚ¤êµÍ¤á½èÍý(i18nÂбþ)
+ *
+ *     sample:
+ *     <code>
+ *     {"ÆüËܸì¤Ç¤¹"|truncate_i18n:5:"..."}
+ *     </code>
+ *     <code>
+ *     ÆüËÜ...
+ *     </code>
+ *
+ *     @param  int             $len            ºÇÂçʸ»úÉý
+ *     @param  string  $postfix        ËöÈø¤ËÉղ乤ëʸ»úÎó
+ */
+function smarty_modifier_truncate_i18n($string, $len = 80, $postfix = "...")
+{
+       return mb_strimwidth($string, 0, $len, $postfix, 'EUC-JP');
+}
+
+/**
  *     smarty modifier:i18n¥Õ¥£¥ë¥¿
  *
  *     sample:

diff --git a/skel/app.controller.php b/skel/app.controller.php
index 05d37c6..f903bd9 100644 (file)
--- a/skel/app.controller.php
+++ b/skel/app.controller.php
@@ -13,7 +13,7 @@ define('BASE', dirname(dirname(__FILE__)));
 // include_path¤ÎÀßÄê(¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲÃ)
 $app = BASE . "/app";
 $lib = BASE . "/lib";
-ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . implode(PATH_SEPARATOR, array"$app, $lib));
+ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . implode(PATH_SEPARATOR, array($app, $lib)));
 
 
 /** ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥é¥¤¥Ö¥é¥ê¤Î¥¤¥ó¥¯¥ë¡¼¥É */

diff --git a/skel/etc.ini.php b/skel/etc.ini.php
index bcbf426..45c88d8 100644 (file)
--- a/skel/etc.ini.php
+++ b/skel/etc.ini.php
@@ -6,5 +6,12 @@
  */
 $config = array(
        'debug' => false,
+       'log_facility'  => 'echo',
+       'log_level' => 'warning',
+       'log_option' => 'pid,function,pos',
+       'log_alert_level' => 'crit',
+       'log_alert_mailaddress' => '',
+       'log_filter_do' => '',
+       'log_filter_ignore' => 'Undefined index.*%%.*tpl',
 );
 ?>