Merge branch 'master' of github.com:easysoft/zentaopms

module/file/view/export.html.php

@@ -32,7 +32,9 @@ function closeWindow()
 }
 function switchEncode(fileType)
 {
-    $('#encode').toggleClass('hidden', fileType != 'csv');
+    $('#encode').toggleClass('hidden', fileType != 'csv' && fileType != 'xls' && fileType != 'xlsx');
+    $('#encode').removeAttr('disabled');
+    if(fileType != 'csv') $('#encode').attr('disabled', 'disabled');
 }
 </script>
 <div id='titlebar'>

module/mail/control.php

@@ -167,7 +167,7 @@ class mail extends control
                 $this->view->error = $this->mail->getError();
                 die($this->display());
             }
-            die(js::alert($this->lang->mail->successSended));
+            die(js::alert($this->lang->mail->successSended) . js::locate(inlink('test')));
         }
 
         $this->view->title      = $this->lang->mail->common . $this->lang->colon . $this->lang->mail->test;

module/mail/model.php

@@ -294,6 +294,9 @@ class mailModel extends model
             $this->errors[] = trim(strip_tags($e->getMessage()));
         }
 
+        /* save errors. */
+        if($this->isError()) $this->app->saveError('E_MAIL', join(' ', $this->errors), __FILE__, __LINE__, true);
+
         $message = ob_get_contents();
         ob_clean();
 

module/mail/view/test.html.php

@@ -9,14 +9,11 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
-if(isset($error))
-{
-    include '../../common/view/header.lite.html.php';
-    die("<br />" . nl2br(join('', $error)));
-}
 ?>
-
 <?php include '../../common/view/header.html.php';?>
+<?php if(isset($error)):?>
+<div class='alert alert-warning with-icon'><i class='icon-frown'></i><div class='content'><?php echo str_replace('\n', '<br>', join('', $error));?></div></div>
+<?php else:?>
 <div class='container mw-700px'>
   <div id='titlebar'>
     <div class='heading'>
@@ -41,4 +38,5 @@ if(isset($error))
   </form>
   <table class='table table-form'><tr><td><iframe id='resultWin'></iframe></td></tr></table>
 </div>
+<?php endif;?>
 <?php include '../../common/view/footer.html.php';?>