Plan Status: #1031 was successful
Build: #898 was successful
Code Changes
Code has been updated by Ben Zheng <ben.zheng@reyosoft.com>, Administrator <ben.zheng@reyosoft.com>, Andrew Reeves <andrew.reeves@endeavorsystems.com>.
Plan Repository
-
Andrew Reeves <andrew.reeves@endeavorsystems.com> ae6f67c73cf16f9b9755554364e206c2466946a6
Merge remote-tracking branch 'origin/ofj447'
Conflicts:
application/Bootstrap.php
application/doctrine/data/fixtures/Migration.yml
tests/library/Fisma/Cli/Notify.php -
Administrator <ben.zheng@reyosoft.com> 0abe28f827d62a84b4626ba1a18fc0694d54fd39
OFJ-447 Re-engineer Fisma_Mail
Remove unrelated codes from previous commit. -
Ben Zheng <ben.zheng@reyosoft.com> b47f6c9838c00b69d7e65edd700379ec278856b3
OFJ-447 Re-engineer Fisma_Mail
Add migration to migration.yml file. -
Ben Zheng <ben.zheng@reyosoft.com> d7e3e5d9527f7c7acc8c14d92db15f81268e511f
OFJ-447 Re-engineer Fisma_Mail
Change 'mails' to 'mail'.- library/Fisma/Cli/SendMail.php (version d7e3e5d9527f7c7acc8c14d92db15f81268e511f) (diffs)
- library/Fisma/Cli/SendMails.php (version d7e3e5d9527f7c7acc8c14d92db15f81268e511f) (diffs)
- scripts/bin/send-mail.php (version d7e3e5d9527f7c7acc8c14d92db15f81268e511f) (diffs)
- scripts/bin/send-mails.php (version d7e3e5d9527f7c7acc8c14d92db15f81268e511f) (diffs)
-
Ben Zheng <ben.zheng@reyosoft.com> 5121237b06f88a76542282c1610324b0d86187c5
OFJ-447 Re-engineer Fisma_Mail
Fix invalid phpdoc. -
Ben Zheng <ben.zheng@reyosoft.com> 389ffb07c760fd14fbf3761a829c82c489d438f8
OFJ-447 Re-engineer Fisma_Mail
1. Add phpdoc to unit test files.
2. Remove unnecessary files.- application/modules/default/controllers/IncidentController.php (version 389ffb07c760fd14fbf3761a829c82c489d438f8) (diffs)
- library/Fisma/Mail.php (version 389ffb07c760fd14fbf3761a829c82c489d438f8) (diffs)
- tests/library/Fisma/Mail.php (version 389ffb07c760fd14fbf3761a829c82c489d438f8) (diffs)
- tests/library/Fisma/MailHandler/Immediate.php (version 389ffb07c760fd14fbf3761a829c82c489d438f8) (diffs)
- tests/library/Fisma/MailHandler/Queue.php (version 389ffb07c760fd14fbf3761a829c82c489d438f8) (diffs)
-
Ben Zheng <ben.zheng@reyosoft.com> d3a5d215a768cf8df832c7314983faa0bdd96fa0
OFJ-447 Re-engineer Fisma_Mail
Fix defects of OFC-511 from crucible.
1. Change the table name 'QueueMail' to 'Mail'.
2. Move the logic from Fisma_Mail to Mail model.
3. Change mail templates from default module folder to application/common-views/mail folder.
4. Update related codes base on ofc-511 suggestions.- application/Bootstrap.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/common-views/mail/ir_assign.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/common-views/mail/ir_reported.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/common-views/mail/ir_step.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/common-views/mail/notification.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/common-views/mail/send_account_info.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/common-views/mail/send_password.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/doctrine/schema/Mail.yml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/doctrine/schema/QueueMail.yml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/migrations/021700/AddMailTable.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/migrations/021700/AddQueueMailTable.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/models/Mail.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/models/MailTable.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/models/QueueMail.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/models/QueueMailTable.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/controllers/ConfigController.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/controllers/IncidentController.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/controllers/UserController.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/views/scripts/mail/IRAssign.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/views/scripts/mail/IRClose.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/views/scripts/mail/IRComment.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/views/scripts/mail/IROpen.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/views/scripts/mail/IRReported.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/views/scripts/mail/IRResolve.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/views/scripts/mail/IRStep.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/views/scripts/mail/notification.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/views/scripts/mail/sendAccountInfo.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- application/modules/default/views/scripts/mail/sendPassword.phtml (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- library/Fisma/Cli/Notify.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- library/Fisma/Cli/SendMails.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- library/Fisma/MailHandler/Abstract.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- library/Fisma/MailHandler/Immediate.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- library/Fisma/MailHandler/Null.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- library/Fisma/MailHandler/Queue.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- scripts/bin/send-mails.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- tests/application/models/Mail.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- tests/application/models/MailTable.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- tests/library/Fisma/MailHandler/Immediate.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
- tests/library/Fisma/MailHandler/Queue.php (version d3a5d215a768cf8df832c7314983faa0bdd96fa0) (diffs)
-
Administrator <ben.zheng@reyosoft.com> 33b14faf01e9e331ffb0a520d8730562295c0c13
OFJ-447 Re-engineer Fisma_Mail
Fix migration error on addAddQueueMailTable.php file. -
Administrator <ben.zheng@reyosoft.com> 4d974ea47505f7edbcbf63a1c6ace87d43b37034
OFJ-447 Re-engineer Fisma_Mail
1. Add send mail cronjob script.
2. Add unit test for Fisma_MailHandler_Immediate, Fisma_MailHandler_Queue and Fisma_Mail.
3. Add migration file for adding queue mail table.- application/doctrine/schema/QueueMail.yml (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- application/migrations/021700/AddQueueMailTable.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- application/modules/default/controllers/IncidentController.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- library/Fisma/Cli/Notify.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- library/Fisma/Cli/SendMails.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- library/Fisma/Mail.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- library/Fisma/MailHandler/Abstract.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- library/Fisma/MailHandler/Immediate.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- library/Fisma/MailHandler/Null.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- library/Fisma/MailHandler/Queue.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- scripts/bin/send-mails.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- tests/library/Fisma/Cli/Notify.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- tests/library/Fisma/Mail.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- tests/library/Fisma/MailHandler/Immediate.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
- tests/library/Fisma/MailHandler/Queue.php (version 4d974ea47505f7edbcbf63a1c6ace87d43b37034) (diffs)
-
Ben Zheng <ben.zheng@reyosoft.com> 4fb4844667a8e240af3d9e54aa514fa549ef1422
OFJ-447 Re-engineer Fisma_Mail
1. Add a file missing from previous commit.
2. Add construct function for Fisma_Mail and update related codes.- application/doctrine/schema/QueueMail.yml (version 4fb4844667a8e240af3d9e54aa514fa549ef1422) (diffs)
- application/modules/default/controllers/ConfigController.php (version 4fb4844667a8e240af3d9e54aa514fa549ef1422) (diffs)
- application/modules/default/controllers/IncidentController.php (version 4fb4844667a8e240af3d9e54aa514fa549ef1422) (diffs)
- application/modules/default/controllers/UserController.php (version 4fb4844667a8e240af3d9e54aa514fa549ef1422) (diffs)
- library/Fisma/Cli/Notify.php (version 4fb4844667a8e240af3d9e54aa514fa549ef1422) (diffs)
- library/Fisma/Mail.php (version 4fb4844667a8e240af3d9e54aa514fa549ef1422) (diffs)
- library/Fisma/MailHandler/Queue.php (version 4fb4844667a8e240af3d9e54aa514fa549ef1422) (diffs)
- scripts/bin/bootstrap.php (version 4fb4844667a8e240af3d9e54aa514fa549ef1422) (diffs)
-
Ben Zheng <ben.zheng@reyosoft.com> 88d6be1ee6fd860cbdfed88b5b588473b1b404e4
OFJ-447 Re-engineer Fisma_Mail
1. Add Fisma_MailHandler_Abstract which can be implemented in the subclass.
2. Add Fisma_MailHandler_Queue to implement send () function store to DB.
3. Add Fisma_MailHandler_Immediate to implement send() function to send mail directly to user.
4. Add Fisma_MailHandler_Null implement send() function to send nothing.
5. Add codes to bootstrap which instantiates a mail hanlder.
6. Change UserController, IncidentController and ConfigController to use Fisma_MailHandler.
7. Remove Fisma_Zend_Mail class.- application/Bootstrap.php (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/models/QueueMail.php (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/models/QueueMailTable.php (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/controllers/ConfigController.php (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/controllers/IncidentController.php (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/controllers/UserController.php (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/views/scripts/mail/IRAssign.phtml (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/views/scripts/mail/IRClose.phtml (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/views/scripts/mail/IRComment.phtml (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/views/scripts/mail/IROpen.phtml (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/views/scripts/mail/IRReported.phtml (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/views/scripts/mail/IRResolve.phtml (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/views/scripts/mail/IRStep.phtml (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/views/scripts/mail/sendAccountInfo.phtml (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/views/scripts/mail/sendPassword.phtml (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/views/scripts/mail/sendaccountinfo.phtml (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- application/modules/default/views/scripts/mail/sendpassword.phtml (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- library/Fisma/Mail.php (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- library/Fisma/MailHandler/Abstract.php (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- library/Fisma/MailHandler/Immediate.php (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- library/Fisma/MailHandler/Null.php (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- library/Fisma/MailHandler/Queue.php (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)
- library/Fisma/Zend/Mail.php (version 88d6be1ee6fd860cbdfed88b5b588473b1b404e4) (diffs)