Changeset 5106

Timestamp:

09/15/07 11:25:00 (6 years ago)

Author:

fabien

Message:

moved phpmailer and all related files to sfCompat10Plugin (will be replaced by SwiftMailer?)

Files:

• trunk/COPYRIGHT (modified) (1 diff)
• trunk/lib/config/sfLoader.class.php (modified) (1 diff)
• trunk/lib/controller/sfController.class.php (modified) (2 diffs)
• trunk/lib/plugins/sfCompat10Plugin/LICENSE.PHPMailer (moved) (moved from trunk/licenses/LICENSE.PHPMailer)
• trunk/lib/plugins/sfCompat10Plugin/config (added)
• trunk/lib/plugins/sfCompat10Plugin/config/mailer.yml (moved) (moved from trunk/data/config/mailer.yml)
• trunk/lib/plugins/sfCompat10Plugin/lib/sfMail.class.php (moved) (moved from trunk/lib/addon/sfMail.class.php) (1 diff)
• trunk/lib/plugins/sfCompat10Plugin/lib/vendor (added)
• trunk/lib/plugins/sfCompat10Plugin/lib/vendor/phpmailer (moved) (moved from trunk/lib/vendor/phpmailer)
• trunk/lib/plugins/sfCompat10Plugin/lib/view (added)
• trunk/lib/plugins/sfCompat10Plugin/lib/view/sfMailView.class.php (moved) (moved from trunk/lib/view/sfMailView.class.php)
• trunk/lib/plugins/sfCompat10Plugin/test/unit/sfMailTest.php (moved) (moved from trunk/test/unit/addon/sfMailTest.php) (1 diff)

trunk/COPYRIGHT

@@ -64 +64 @@
-License:   BSD - see licenses/LICENSE.prado file
-
-PHPMailer
----------
-
-symfony contains the PHPMailer software
-
-Url:       http://phpmailer.sourceforge.net/
-Copyright: Chris Ryan
-License:   LGPL - see licenses/LICENSE.PHPMailer file
-
-Spyc
-----

trunk/lib/config/sfLoader.class.php

@@ -301 +301 @@
-    );
-
+    if ($bundledPluginDirs = glob(sfConfig::get('sf_symfony_lib_dir').'/plugins/*/'.$globalConfigPath))
+    {
+      $files = array_merge($files, $bundledPluginDirs);                              // bundled plugins
+    }
+
-    if ($pluginDirs = glob(sfConfig::get('sf_plugins_dir').'/*/'.$globalConfigPath))
-    {

trunk/lib/controller/sfController.class.php

@@ -389 +389 @@
-
-  /**
-
+[DEPRECATED] 
-   *
-   * This methods calls a module/action with the sfMailView class.
@@ -402 +402 @@
-  public function sendEmail($module, $action)
-  {
+    if (sfConfig::get('sf_logging_enabled'))
+    {
+      $this->dispatcher->notify(new sfEvent($this, 'application.log', array('sendEmail method is deprecated', 'priority' => 'err')));
+    }
+
-    return $this->getPresentationFor($module, $action, 'sfMail');
-  }

trunk/lib/plugins/sfCompat10Plugin/lib/sfMail.class.php

@@ -24 +24 @@
-  public function __construct()
-  {
-sfConfig::get('sf_symfony_lib_dir'
-sfConfig::get('sf_symfony_lib_dir'
+dirname(__FILE__
+dirname(__FILE__
-
-    $this->mailer = new PHPMailer();

trunk/lib/plugins/sfCompat10Plugin/test/unit/sfMailTest.php

@@ -9 +9 @@
- */
-
-
+../../../test/
-
-$t = new lime_test(2, new lime_output_color());