MailTemplateList.php

[Pman.Core] / MailTemplateList.php

diff --git a/MailTemplateList.php b/MailTemplateList.php
index acf8a31..e57fa79 100644 (file)
--- a/MailTemplateList.php
+++ b/MailTemplateList.php
@@ -18,31 +18,35 @@ class Pman_Core_MailTemplateList extends Pman
     {
         $fopts = HTML_FlexyFramework::get()->HTML_Template_Flexy;
         
-        $templateDir = explode(PATH_SEPARATOR, $fopts->templateDir);
+        $templateDir = explode(PATH_SEPARATOR, $fopts['templateDir']);
+        
+        $ret = array();
         
         foreach ($templateDir as $dir){
+            
             if(!file_exists($dir . '/mail')){
                 continue;
             }
             
-            if ($handle = opendir($dir . '/')) {
+            if ($handle = opendir($dir . '/mail')) {
                 while (false !== ($entry = readdir($handle))) {
-                    if ($entry == "." || $entry == "..") {
+                    if ($entry == "." || $entry == ".." || !preg_match('/\.html$/', $entry)) {
                         continue;
                     }
                     
-                    echo "$entry\n";
+                    $ret[] = array(
+                        'file' => $entry,
+                        'content' => file_get_contents("$dir/mail/$entry")
+                    );
                 }
                 
                 closedir($handle);
             }
             
         }
-        exit;
-        $this->jdata(array(array('name' => 'aa', 'body'=> 'test')));
         
-        print_r(array_unique($fopts->templateDir));
-        exit;
+        $this->jdata($ret);
+        
     }
      
 }