Fixes to issues #153 and #147

email_form.php

@@ -76,13 +76,15 @@ public function definition() {
         }
 
         $group_options = empty($this->_customdata['groups']) ? array() : array(
-            'all' => quickmail::_s('all_sections')
+            'allusers' => quickmail::_s('allusers')
         );
+
+        $group_options['all'] = quickmail::_s('all_sections');
         foreach ($this->_customdata['groups'] as $group) {
             $group_options[$group->id] = $group->name;
         }
-        $group_options[0] = quickmail::_s('no_section');
-        $group_options['allusers'] = quickmail::_s('allusers');
+
+		$group_options[0] = quickmail::_s('no_section');
 
         $user_options = array();
         foreach ($this->_customdata['users'] as $user) {
@@ -193,10 +195,12 @@ public function definition() {
 
         $mform->addElement('static', 'selectors', '', html_writer::table($table));
 
+		if (!empty($CFG->block_quickmail_addionalemail)) {
         $mform->addElement('text', 'additional_emails', quickmail::_s('additional_emails'), array('style'=>'width: 50%;'));
         $mform->setType('additional_emails', PARAM_TEXT);
         $mform->addRule('additional_emails', 'One or more email addresses is invalid', 'callback', 'block_quickmail_mycallback', 'client');
         $mform->addHelpButton('additional_emails', 'additional_emails', 'block_quickmail');
+        }
         $mform->addElement(
             'filemanager', 'attachments', quickmail::_s('attachment'),
             null, array('subdirs' => 1, 'accepted_types' => '*')

lang/en/block_quickmail.php

@@ -1,7 +1,7 @@
 <?php
 $string['allusers'] = ' All Users';
 $string['pluginname'] = 'Quickmail';
-$string['sendadmin'] = 'Admin Email';   
+$string['sendadmin'] = 'Admin Email';
 $string['quickmail:cansend'] = "Allows users to send email through Quickmail";
 $string['quickmail:canconfig'] = "Allows users to configure Quickmail instance.";
 $string['quickmail:canimpersonate'] = "Allows users to log in as other users and view history.";
@@ -97,6 +97,9 @@
 $string['are_you_sure'] = 'Are you sure you want to delete {$a->title}? This action
 cannot be reversed.';
 
+$string['addionalemail'] = 'Allow emails to external email addresses';
+$string['addionalemail_desc'] = 'If this option is enabled quickmail emails are also sent so external email adresses the user entered within the form.';
+
 // Alternate Email strings
 $string['alternate_new'] = 'Add Alternate Address';
 $string['sure'] = 'Are you sure you want to delete {$a->address}? This action cannot be undone.';
@@ -164,6 +167,6 @@
 $string['time_elapsed'] = 'Time Elapsed: ';
 $string['additional_emails'] = 'Additional Emails';
 $string['additional_emails_help'] = 'Other email addresses you would like the message sent to, in a comma or semicolon separated list. Example:
- 
+
  email1@example.com, email2@example.com
  ';

settings.php

@@ -75,4 +75,11 @@
         )
     );
 
+    $settings->add(
+        new admin_setting_configcheckbox('block_quickmail_addionalemail',
+            quickmail::_s('addionalemail'), quickmail::_s('addionalemail_desc'),
+            0
+        )
+    );
+
 }