SF.net SVN: postfixadmin:[1588] trunk
Brought to you by:
christian_boltz,
gingerdog
From: <chr...@us...> - 2013-11-16 20:32:40
|
Revision: 1588 http://sourceforge.net/p/postfixadmin/code/1588 Author: christian_boltz Date: 2013-11-16 20:32:37 +0000 (Sat, 16 Nov 2013) Log Message: ----------- DomainHandler.php: - better error/info messages - remove superfluous (and never displayed) success message in storemore() languages/*.lang: - add texts for DomainHandler - delete empty pAdminCreate_domain_defaultaliases_text Modified Paths: -------------- trunk/languages/en.lang trunk/model/DomainHandler.php Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2013-11-16 20:20:50 UTC (rev 1587) +++ trunk/languages/en.lang 2013-11-16 20:32:37 UTC (rev 1588) @@ -232,13 +232,14 @@ $PALANG['domain_does_not_exist'] = 'This domain does not exist!'; $PALANG['pAdminCreate_domain_domain_text_error2'] = 'The domain is invalid!'; $PALANG['pAdminCreate_domain_defaultaliases'] = 'Add default mail aliases'; -$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; $PALANG['pAdminCreate_domain_button'] = 'Add Domain'; $PALANG['pAdminCreate_domain_result_error'] = 'Adding the domain %s failed!'; $PALANG['pAdminCreate_domain_result_success'] = 'The domain %s has been added.'; +$PALANG['domain_updated'] = 'The domain %s has been updated.'; $PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; $PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; +$PALANG['domain_postcreate_failed'] = 'The domain postcreate script failed, check the error log for details!'; $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, check the error log for details!'; $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; Modified: trunk/model/DomainHandler.php =================================================================== --- trunk/model/DomainHandler.php 2013-11-16 20:20:50 UTC (rev 1587) +++ trunk/model/DomainHandler.php 2013-11-16 20:32:37 UTC (rev 1588) @@ -24,7 +24,6 @@ # init $this->struct, $this->db_table and $this->id_field protected function initStruct() { # TODO: shorter PALANG labels ;-) - # TODO: hardcode 'default' to Config::read in pacol()? $transp = Config::intbool('transport'); $quota = Config::intbool('quota'); @@ -79,7 +78,7 @@ } else { $this->msg['logname'] = 'edit_domain'; $this->msg['store_error'] = 'pAdminEdit_domain_result_error'; - $this->msg['successmessage'] = 'pAdminCreate_domain_result_success'; # TODO: better message for edit + $this->msg['successmessage'] = 'domain_updated'; } } @@ -115,15 +114,10 @@ # TODO: error checking } } - if ($this->new) { - $tMessage = Config::lang('pAdminCreate_domain_result_success') . " (" . $this->id . ")"; # TODO: tMessage is not used/returned anywhere - } else { - # TODO: success message for edit - } if ($this->new) { if (!$this->domain_postcreation()) { - $this->errormsg[] = Config::lang('pAdminCreate_domain_error'); + $this->errormsg[] = Config::lang('domain_postcreate_failed'); } } else { # we don't have domain_postedit() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |