Index: branches/5.3.x/core/kernel/application.php =================================================================== diff -u -N -r15652 -r15677 --- branches/5.3.x/core/kernel/application.php (.../application.php) (revision 15652) +++ branches/5.3.x/core/kernel/application.php (.../application.php) (revision 15677) @@ -1,6 +1,6 @@ ConfigValue('Config_Site_Time'); if ( $site_timezone ) { - putenv('TZ=' . $site_timezone); + date_default_timezone_set($site_timezone); } if ( defined('DEBUG_MODE') && $this->isDebugMode() ) { @@ -729,6 +729,7 @@ $this->registerClass('kLogger', KERNEL_PATH . '/utility/logger.php'); $this->registerClass('kUnitConfigReader', KERNEL_PATH . '/utility/unit_config_reader.php'); + $this->registerClass('PasswordHash', KERNEL_PATH . '/utility/php_pass.php'); // Params class descendants $this->registerClass('kArray', KERNEL_PATH . '/utility/params.php'); @@ -1327,7 +1328,9 @@ return false; } - return $this->ConfigValue('UseOutputCompression') && function_exists('gzencode') && strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip'); + $accept_encoding = isset($_SERVER['HTTP_ACCEPT_ENCODING']) ? $_SERVER['HTTP_ACCEPT_ENCODING'] : ''; + + return $this->ConfigValue('UseOutputCompression') && function_exists('gzencode') && strstr($accept_encoding, 'gzip'); } // Facade @@ -1726,6 +1729,19 @@ } /** + * Returns section template for given physical/virtual template + * + * @param string $template + * @param int $theme_id + * @return string + * @access public + */ + public function getSectionTemplate($template, $theme_id = null) + { + return $this->UrlManager->getSectionTemplate($template, $theme_id); + } + + /** * Returns variables with values that should be passed through with this link + variable list * * @param Array $params @@ -2003,7 +2019,7 @@ $user_timezone = $this->Session->GetField('TimeZone'); if ( $user_timezone ) { - putenv('TZ=' . $user_timezone); + date_default_timezone_set($user_timezone); } } @@ -2450,48 +2466,48 @@ /** * Triggers email event of type Admin * - * @param string $email_event_name + * @param string $email_template_name * @param int $to_user_id * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text * @return kEvent * @access public */ - public function EmailEventAdmin($email_event_name, $to_user_id = null, $send_params = Array ()) + public function emailAdmin($email_template_name, $to_user_id = null, $send_params = Array ()) { - return $this->_emailEvent($email_event_name, EmailEvent::EVENT_TYPE_ADMIN, $to_user_id, $send_params); + return $this->_email($email_template_name, EmailTemplate::TEMPLATE_TYPE_ADMIN, $to_user_id, $send_params); } /** * Triggers email event of type User * - * @param string $email_event_name + * @param string $email_template_name * @param int $to_user_id * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text * @return kEvent * @access public */ - public function EmailEventUser($email_event_name, $to_user_id = null, $send_params = Array ()) + public function emailUser($email_template_name, $to_user_id = null, $send_params = Array ()) { - return $this->_emailEvent($email_event_name, EmailEvent::EVENT_TYPE_FRONTEND, $to_user_id, $send_params); + return $this->_email($email_template_name, EmailTemplate::TEMPLATE_TYPE_FRONTEND, $to_user_id, $send_params); } /** * Triggers general email event * - * @param string $email_event_name - * @param int $email_event_type (0 for User, 1 for Admin) + * @param string $email_template_name + * @param int $email_template_type (0 for User, 1 for Admin) * @param int $to_user_id * @param array $send_params associative array of direct send params, * possible keys: to_email, to_name, from_email, from_name, message, message_text * @return kEvent * @access protected */ - protected function _emailEvent($email_event_name, $email_event_type, $to_user_id = null, $send_params = Array ()) + protected function _email($email_template_name, $email_template_type, $to_user_id = null, $send_params = Array ()) { $email = $this->makeClass('kEmail'); /* @var $email kEmail */ - if ( !$email->findEvent($email_event_name, $email_event_type) ) { + if ( !$email->findTemplate($email_template_name, $email_template_type) ) { return false; } @@ -3036,4 +3052,15 @@ { $this->_logger->delete($unique_id, $storage_medium); } + + /** + * Returns the client IP address. + * + * @return string The client IP address + * @access public + */ + public function getClientIp() + { + return $this->HttpQuery->getClientIp(); + } }