Changeset 21262

Timestamp:

10/13/08 22:43:08 (5 years ago)

Author:

heavenshell

Message:

Modify comments.

Files:

• events/phpframework/zend_framework/trunk/app/Init.php (modified) (8 diffs)

events/phpframework/zend_framework/trunk/app/Init.php

@@ -26 +26 @@
  * @version $id$
  * @copyright 2008 Heavens hell
- * @author Heavens hell <heavenshell@heavenshell.jp>
+ * @author Heavens hell <heavenshell.jp@gmail.com>
  * @license New BSD License
  */
@@ -118 +118 @@
             ->_loadLayoutSetting()
             ->_loadPaths()
-            ->_loadDbAdapter();
+            ->_loadDbAdapter()
+            ->_loadMailConfig();
 
         return $this;
@@ -299 +300 @@
             return $config->toArray();
         }
+
         return $config;
     }
@@ -312 +314 @@
     {
         $appPath = $this->_getParam('appPath');
-        $file = $appPath . 'configs' . DIRECTORY_SEPARATOR . 'core.ini';
+        $file    = $appPath . 'configs' . DIRECTORY_SEPARATOR . 'core.ini';
         if (!file_exists($file)) {
             throw new Zend_Config_Exception('Could not load configs.ini.');
@@ -346 +348 @@
         }
         $logDir = rtrim($logDir, '/\\') . DIRECTORY_SEPARATOR;
+
         $this->_setParam('rootDir', $rootDir);
         $this->_setParam('cacheDir', $cacheDir);
@@ -423 +426 @@
 
     /**
+     * Load mail config
+     *
+     * @access private
+     * @return Init
+     * @throws Zend_Config_Exception
+     */
+    private function _loadMailConfig()
+    {
+        $appPath    = $this->_getParam('appPath');
+        $file       = $appPath . 'configs' . DIRECTORY_SEPARATOR . 'mail.ini';
+        $mailConfig = null;
+        if (file_exists($file)) {
+            $mailConfig = $this->_loadConfig($file, $this->_getParam('envMode'));
+        }
+        $this->_setParam('mailConfig', $mailConfig);
+
+        return $this;
+    }
+
+    /**
      * Create plugin objects
      *
@@ -487 +510 @@
         }
 
-        // Default settings. 
+        // Default settings.
         $router->removeDefaultRoutes();
         if (is_array($this->_modules)) {
@@ -544 +567 @@
             $router = $front->getRouter();
             $this->_initRoute($router, $defaultModule);
-
             $front->setDefaultModule($defaultModule)
                 ->addModuleDirectory($this->_getParam('moduleDir'))