Show
Ignore:
Timestamp:
02/11/10 17:34:27 (2 years ago)
Author:
gbastien
Message:

* Merged recent changes in the trunk into this branch
* New token architecture not yet fully functional, nor tested, but ...

  • can now edit token templates for different context of tokens (from the edit netork interface at the bottom of page)
  • Users connected through a wifidog gateway can view their connection token information
Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/newtoken/wifidog/classes/Mail.php

    r1424 r1446  
    368368         */ 
    369369        public function send() { 
    370             $phpmailerPath = 'lib/PHPMailer_v2.0.0/'; 
     370            $dir = new DirectoryIterator('lib'); 
     371            foreach ($dir as $fileinfo) { 
     372                if ($fileinfo->isDir() && (substr($fileinfo->getFilename(), 0, 9) == 'PHPMailer')) { 
     373                    $phpmailerPath = 'lib/' . $fileinfo->getFilename() . '/'; 
     374                } 
     375            } 
    371376            require_once ($phpmailerPath.'class.phpmailer.php'); 
    372377            require_once ($phpmailerPath.'class.smtp.php');