# This patch file was generated by NetBeans IDE # This patch can be applied using context Tools: Apply Diff Patch action on respective folder. # It uses platform neutral UTF-8 encoding. # Above lines and this line are ignored by the patching process. Index: moodle/lib/moodlelib.php --- moodle/lib/moodlelib.php Base (1.1397) +++ moodle/lib/moodlelib.php Locally Modified (Based On 1.1397) @@ -8920,7 +8920,7 @@ return; } - if (!get_user_preferences('message_showmessagewindow', 1)) { + /*if (!get_user_preferences('message_showmessagewindow', 1)) { return; } @@ -8928,6 +8928,15 @@ $USER->message_lastpopup = time(); $PAGE->requires->js_function_call('openpopup', array('/message/index.php', 'message', 'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500', 0)); + }*/ + $sql = "SELECT COUNT(mw.id) FROM {message} m +JOIN {message_working} mw ON m.id=mw.unreadmessageid +JOIN {message_processors} p ON mw.processorid=p.id +WHERE m.useridto = :userid AND m.timecreated > :ts AND p.name='popup'"; + if ($DB->count_records_sql($sql, array('userid'=>$USER->id, 'ts'=>$USER->message_lastpopup))) { + $USER->message_lastpopup = time(); + $PAGE->requires->js_function_call('openpopup', array('/message/index.php', 'message', + 'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500', 0)); } } Index: moodle/message/lib.php --- moodle/message/lib.php Base (1.114) +++ moodle/message/lib.php Locally Modified (Based On 1.114) @@ -303,9 +303,9 @@ echo '
'; print_string('contactlistempty', 'message'); echo '
'; - echo '
'; - print_string('addsomecontacts', 'message', message_remove_url_params($PAGE->url).'?tab=search'); - echo '
'; + //echo '
'; + //print_string('addsomecontacts', 'message', message_remove_url_params($PAGE->url).'?tab=search'); + //echo '
'; } echo ''; @@ -580,32 +580,16 @@ if ($frm = data_submitted() and confirm_sesskey()) { $pref = array(); - $pref['message_showmessagewindow'] = (isset($frm->showmessagewindow)) ? '1' : '0'; $pref['message_beepnewmessage'] = (isset($frm->beepnewmessage)) ? '1' : '0'; $pref['message_blocknoncontacts'] = (isset($frm->blocknoncontacts)) ? '1' : '0'; - $pref['message_usehtmleditor'] = (isset($frm->usehtmleditor)) ? '1' : '0'; - $pref['message_noframesjs'] = (isset($frm->noframesjs)) ? '1' : '0'; - $pref['message_emailmessages'] = (isset($frm->emailmessages)) ? '1' : '0'; - $pref['message_emailtimenosee'] = ((int)$frm->emailtimenosee > 0) ? (int)$frm->emailtimenosee : '10'; - $pref['message_emailaddress'] = (!empty($frm->emailaddress)) ? $frm->emailaddress : $USER->email; - $pref['message_emailformat'] = (isset($frm->emailformat)) ? $frm->emailformat : FORMAT_PLAIN; set_user_preferences($pref); redirect(message_remove_url_params($PAGE->url), get_string('settingssaved', 'message'), 1); } - $cbshowmessagewindow = (get_user_preferences('message_showmessagewindow', 1) == '1') ? 'checked="checked"' : ''; $cbbeepnewmessage = (get_user_preferences('message_beepnewmessage', 0) == '1') ? 'checked="checked"' : ''; $cbblocknoncontacts = (get_user_preferences('message_blocknoncontacts', 0) == '1') ? 'checked="checked"' : ''; - $cbusehtmleditor = (get_user_preferences('message_usehtmleditor', 0) == '1') ? 'checked="checked"' : ''; - $cbnoframesjs = (get_user_preferences('message_noframesjs', 0) == '1') ? 'checked="checked"' : ''; - $cbemailmessages = (get_user_preferences('message_emailmessages', 1) == '1') ? 'checked="checked"' : ''; - $txemailaddress = get_user_preferences('message_emailaddress', $USER->email); - $txemailtimenosee = get_user_preferences('message_emailtimenosee', 10); - $format_select = html_writer::select(array(FORMAT_PLAIN => get_string('formatplain'), - FORMAT_HTML => get_string('formathtml')), - 'emailformat', get_user_preferences('message_emailformat', FORMAT_PLAIN)); \ No newline at end of file include('settings.html'); } Index: moodle/message/output/popup/message_output_popup.php --- moodle/message/output/popup/message_output_popup.php Base (1.10) +++ moodle/message/output/popup/message_output_popup.php Locally Modified (Based On 1.10) @@ -53,44 +53,22 @@ function config_form($preferences) { return '
'. - ''. ''. ''. - ''. - ''. - ''. - ''. - ''. - ''. '
'.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('htmleditor').':usehtmleditor==1?" checked=\"checked\"":"").' />
'.get_string('noframesjs', 'message').':noframesjs==1?" checked=\"checked\"":"").' />
'.get_string('emailmessages', 'message').':emailmessages==1?" checked=\"checked\"":"").' />
'.get_string('formorethan', 'message').': '.get_string('mins').'
'.get_string('email').':
'.get_string('format').':'.$preferences->formatselect.'
'; } public function process_form($form, &$preferences) { - $preferences['message_showmessagewindow'] = !empty($form->showmessagewindow)?1:0; $preferences['message_blocknoncontacts'] = !empty($form->blocknoncontacts)?1:0; $preferences['message_beepnewmessage'] = !empty($form->beepnewmessage)?1:0; - $preferences['message_usehtmleditor'] = !empty($form->usehtmleditor)?1:0; - $preferences['message_noframesjs'] = !empty($form->noframesjs)?1:0; - $preferences['message_emailmessages'] = !empty($form->emailmessages)?1:0; - $preferences['message_emailtimenosee'] = $form->emailtimenosee; - $preferences['message_emailaddress'] = $form->emailaddress; - $preferences['message_emailformat'] = $form->emailformat; return true; } public function load_data(&$preferences, $userid) { global $USER; - $preferences->showmessagewindow = get_user_preferences( 'message_showmessagewindow', 1, $userid); + $preferences->blocknoncontacts = get_user_preferences( 'message_blocknoncontacts', '', $userid); $preferences->beepnewmessage = get_user_preferences( 'message_beepnewmessage', '', $userid); - $preferences->usehtmleditor = get_user_preferences( 'message_usehtmleditor', '', $userid); - $preferences->noframesjs = get_user_preferences( 'message_noframesjs', '', $userid); - $preferences->emailmessages = get_user_preferences( 'message_emailmessages', 1, $userid); - $preferences->emailtimenosee = get_user_preferences( 'message_emailtimenosee', 10, $userid); - $preferences->emailaddress = get_user_preferences( 'message_emailaddress', $USER->email, $userid); - $preferences->formatselect = html_writer::select(array(FORMAT_PLAIN => get_string('formatplain'), - FORMAT_HTML => get_string('formathtml')), - 'emailformat', get_user_preferences('message_emailformat', FORMAT_PLAIN)); \ No newline at end of file return true; } Index: moodle/message/settings.html --- moodle/message/settings.html Base (1.11) +++ moodle/message/settings.html Locally Modified (Based On 1.11) @@ -8,10 +8,6 @@ - - - - @@ -19,39 +15,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/>
/>
/>
/>
/>
/>
 
 
  -