From f3d095f870fb962ecbcf3cb841bf4d13b6569d96 Mon Sep 17 00:00:00 2001 From: moodler Date: Tue, 23 Sep 2008 03:05:44 +0000 Subject: [PATCH] MDL-16267 and MDL-10107 I did some further work tidying up the form. I also just treat the popup like another plugin and moved all the config into the plugin. This still needs help buttons everywhere now! --- lang/en_utf8/messageprocessor_jabber.php | 1 + message/edit.php | 35 +++---------------- message/output/email/message_output_email.php | 8 ++--- .../output/jabber/message_output_jabber.php | 8 ++--- message/output/lib.php | 1 + message/output/popup/message_output_popup.php | 26 +++++++++++--- theme/standard/styles_layout.css | 4 +++ 7 files changed, 40 insertions(+), 43 deletions(-) diff --git a/lang/en_utf8/messageprocessor_jabber.php b/lang/en_utf8/messageprocessor_jabber.php index 22ebe0b3242..97b38709a05 100644 --- a/lang/en_utf8/messageprocessor_jabber.php +++ b/lang/en_utf8/messageprocessor_jabber.php @@ -1,3 +1,4 @@ diff --git a/message/edit.php b/message/edit.php index fc6a8b160e9..7c50015d047 100644 --- a/message/edit.php +++ b/message/edit.php @@ -93,12 +93,6 @@ if ($user->id == $USER->id) { if ( ($form = data_submitted()) && confirm_sesskey()) { $preferences = array(); - /// Set the overall preferences - $preferences['message_showmessagewindow'] = $form->showmessagewindow?1:0; - $preferences['message_blocknoncontacts'] = $form->blocknoncontacts?1:0; - $preferences['message_beepnewmessage'] = $form->beepnewmessage?1:0; - $preferences['message_noframesjs'] = $form->noframesjs?1:0; - /// Set all the preferences for all the message providers $providers = message_get_my_providers(); foreach ( $providers as $providerid => $provider){ @@ -114,6 +108,7 @@ if ( ($form = data_submitted()) && confirm_sesskey()) { $preferences['message_provider_'.$provider->component.'_'.$provider->name.'_'.$state] = $linepref; } } + /// Set all the processor options as well $processors = $DB->get_records('message_processors'); foreach ( $processors as $processorid => $processor){ @@ -141,11 +136,6 @@ if ( ($form = data_submitted()) && confirm_sesskey()) { //load preferences so show $preferences = new object(); -//get the message general preferences -$preferences->showmessagewindow = get_user_preferences( 'message_showmessagewindow', 1, $user->id); -$preferences->blocknoncontacts = get_user_preferences( 'message_blocknoncontacts', '', $user->id); -$preferences->beepnewmessage = get_user_preferences( 'message_beepnewmessage', '', $user->id); -$preferences->noframesjs = get_user_preferences( 'message_noframesjs', '', $user->id); //get providers preferences $providers = message_get_my_providers(); foreach ( $providers as $providerid => $provider){ @@ -204,22 +194,12 @@ $showroles = 1; $currenttab = 'editmessage'; require('../user/tabs.php'); -echo '
'; - -echo '
'; -echo ''; -echo ''; -echo ''; -echo ''; -echo ''; -echo ''; -echo '

'.get_string('private_config', 'message').'

'.get_string('showmessagewindow', 'message').'showmessagewindow==1?" checked=\"checked\"":"").' />
'.get_string('blocknoncontacts', 'message').'blocknoncontacts==1?" checked=\"checked\"":"").' />
'.get_string('beepnewmessage', 'message').'beepnewmessage==1?" checked=\"checked\"":"").' />
'.get_string('noframesjs', 'message').'noframesjs==1?" checked=\"checked\"":"").' />
'; -echo '
'; +echo ''; //output settings table -echo '
'; +echo '
'; +echo ''.get_string('providers_config', 'message').''; echo ''; -echo ''."\n"; $providers = message_get_my_providers(); $processors = $DB->get_records('message_processors'); $number_procs = count($processors); @@ -254,11 +234,8 @@ foreach ( $providers as $providerid => $provider){ } echo '

'.get_string('providers_config', 'message').'

'; echo ''; -echo '
'; +echo ''; -echo '
'; -echo ''; -echo ''."\n"; //get a listing of all the message processors $processors = $DB->get_records('message_processors'); @@ -278,8 +255,6 @@ foreach ( $processors as $processorid => $processor){ } } } -echo '

'.get_string('processor_config', 'message').'

'; -echo '
'; echo '

'; echo '
'; diff --git a/message/output/email/message_output_email.php b/message/output/email/message_output_email.php index 36e8ef3f55e..ac96cfd3148 100644 --- a/message/output/email/message_output_email.php +++ b/message/output/email/message_output_email.php @@ -83,10 +83,10 @@ class message_output_email extends message_output { * @param object $mform preferences form class */ function config_form($preferences){ - $dest = get_string('email', 'messageprocessor_email'); - echo ''.get_string('processortag', 'message').$dest.''."\n"; - echo ''.get_string('email').''."\n"; - return true; + echo '
'; + echo ''.get_string('email', 'messageprocessor_email').''; + echo get_string('email').': '; + echo '
'; } /** diff --git a/message/output/jabber/message_output_jabber.php b/message/output/jabber/message_output_jabber.php index 167e4a2544a..766d504a227 100644 --- a/message/output/jabber/message_output_jabber.php +++ b/message/output/jabber/message_output_jabber.php @@ -83,10 +83,10 @@ class message_output_jabber extends message_output { * @param object $mform preferences form class */ function config_form($preferences){ - $dest = get_string('jabber', 'messageprocessor_jabber'); - echo ''.get_string('processortag', 'message').$dest.''."\n"; - echo 'Jabber ID'."\n"; - return true; + echo '
'; + echo ''.get_string('jabber', 'messageprocessor_jabber').''; + echo get_string('jabberid', 'messageprocessor_jabber').': '; + echo '
'; } /** diff --git a/message/output/lib.php b/message/output/lib.php index 7e390a6b72c..be8c56c879b 100644 --- a/message/output/lib.php +++ b/message/output/lib.php @@ -39,6 +39,7 @@ abstract class message_output { public abstract function send_message($message); public abstract function process_form($form, &$preferences); public abstract function load_data(&$preferences, $userid); + public abstract function config_form($preferences); } diff --git a/message/output/popup/message_output_popup.php b/message/output/popup/message_output_popup.php index 799da5b5e93..0a57a8ec6bf 100644 --- a/message/output/popup/message_output_popup.php +++ b/message/output/popup/message_output_popup.php @@ -45,7 +45,7 @@ class message_output_popup extends message_output{ * @param object $message the message to be sent * @return true if ok, false if error */ - public function send_message($message){ + public function send_message($message) { global $DB; //put the process record into db @@ -62,14 +62,30 @@ class message_output_popup extends message_output{ return true; } - function config_form($preferences){ - return true; + function config_form($preferences) { + echo '
'; + echo ''.get_string('popup', 'messageprocessor_popup').''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
'.get_string('showmessagewindow', 'message').'showmessagewindow==1?" checked=\"checked\"":"").' />
'.get_string('blocknoncontacts', 'message').'blocknoncontacts==1?" checked=\"checked\"":"").' />
'.get_string('beepnewmessage', 'message').'beepnewmessage==1?" checked=\"checked\"":"").' />
'.get_string('noframesjs', 'message').'noframesjs==1?" checked=\"checked\"":"").' />
'; + echo '
'; } - public function process_form($form, &$preferences){ + public function process_form($form, &$preferences) { + $preferences['message_showmessagewindow'] = $form->showmessagewindow?1:0; + $preferences['message_blocknoncontacts'] = $form->blocknoncontacts?1:0; + $preferences['message_beepnewmessage'] = $form->beepnewmessage?1:0; + $preferences['message_noframesjs'] = $form->noframesjs?1:0; return true; } - public function load_data(&$preferences, $userid){ + public function load_data(&$preferences, $userid) { + $preferences->showmessagewindow = get_user_preferences( 'message_showmessagewindow', 1, $user->id); + $preferences->blocknoncontacts = get_user_preferences( 'message_blocknoncontacts', '', $user->id); + $preferences->beepnewmessage = get_user_preferences( 'message_beepnewmessage', '', $user->id); + $preferences->noframesjs = get_user_preferences( 'message_noframesjs', '', $user->id); return true; } } diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index fbafdbc7d38..e20572d4eab 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -2569,6 +2569,10 @@ body#message-send td.fixeditor { text-align:center; } +body#message-edit fieldset { + padding: 20px; +} + /*** *** Notes ***/