Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task #2275.

Browse Source
This commit is contained in:
wangyidong
2015-09-07 13:20:03 +08:00
parent 474e1fe5bd
commit b80a050ae3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/cron/view/index.html.php
View File

@@ -52,7 +52,7 @@
<td class='text-left'>
<?php
if(common::hasPriv('cron', 'toggle') and !empty($cron->command)) echo html::a(inlink('toggle', "id=$cron->id&status=" . ($cron->status == 'stop' ? 'normal' : 'stop')), $cron->status == 'stop' ? $lang->cron->toggleList['start'] : $lang->cron->toggleList['stop'], 'hiddenwin');
if($cron->buildin == 0 and common::hasPriv('cron', 'edit')) echo html::a(inlink('edit', "id=$cron->id"), $lang->edit);
if(!empty($cron->command) and common::hasPriv('cron', 'edit')) echo html::a(inlink('edit', "id=$cron->id"), $lang->edit);
if($cron->buildin == 0 and common::hasPriv('cron', 'delete')) echo html::a(inlink('delete', "id=$cron->id"), $lang->delete, 'hiddenwin');
?>
</td>

6
module/report/control.php
View File

@@ -169,7 +169,11 @@ class report extends control
$this->loadModel('mail');
/* Check mail turnon.*/
if(!$this->config->mail->turnon) die("You should turn on the Email feature first.\n");
if(!$this->config->mail->turnon)
{
echo "You should turn on the Email feature first.\n";
return false;
}
foreach($reminder as $user => $mail)
{