bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

non security modules update

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-20 16:32:07 +02:00
parent 6a8d30db08
commit 37fbabab56
466 changed files with 32690 additions and 9652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sites/all/modules/contrib/mail/maillog/includes/maillog.mail.inc
View File

@@ -14,7 +14,8 @@ class MaillogMailSystem implements MailSystemInterface {
* The formatted $message.
*/
public function format(array $message) {
$default = new DefaultMailSystem();
$mailclass = variable_get('maillog_engine', 'DefaultMailSystem');
$default = new $mailclass();
return $default->format($message);
}
@@ -90,7 +91,8 @@ class MaillogMailSystem implements MailSystemInterface {
}
if (variable_get('maillog_send', TRUE)) {
$default = new DefaultMailSystem();
$mailclass = variable_get('maillog_engine', 'DefaultMailSystem');
$default = new $mailclass();
$result = $default->mail($message);
}
elseif (user_access('administer maillog')) {

2
sites/all/modules/contrib/mail/maillog/includes/maillog.views_default.inc
View File

@@ -218,7 +218,7 @@ $handler->override_option('cache', array(
));
$handler->override_option('title', 'Maillog');
$handler->override_option('empty', 'Maillog is currently empty. Send a mail!');
$handler->override_option('empty_format', '1');
$handler->override_option('empty_format', 'plain_text');
$handler->override_option('use_pager', '1');
$handler->override_option('style_plugin', 'table');
$handler = $view->new_display('page', 'Page', 'page_1');

6
sites/all/modules/contrib/mail/maillog/maillog.info
View File

@@ -11,9 +11,9 @@ files[] = includes/maillog.mail.inc
files[] = includes/maillog_handler_field_maillog_entry_link_delete.inc
files[] = includes/maillog_handler_field_maillog_link_delete.inc
; Information added by drupal.org packaging script on 2012-02-13
version = "7.x-1.x-dev"
; Information added by Drupal.org packaging script on 2014-07-20
version = "7.x-1.0-alpha1"
core = "7.x"
project = "maillog"
datestamp = "1329135676"
datestamp = "1405886928"

12
sites/all/modules/contrib/mail/maillog/maillog.module
View File

@@ -138,15 +138,15 @@ function maillog_admin_settings() {
'#title' => t("Display the e-mails on page using devel module (if enabled)."),
'#default_value' => variable_get('maillog_devel', TRUE),
);
if (module_exists('mimemail')) {
$engines = mimemail_get_engines();
if (module_exists('mailsystem')) {
$mailsystem_classes = mailsystem_get_classes();
// maillog will be unset, because ist would cause an recursion
unset($engines['maillog']);
unset($mailsystem_classes['MaillogMailSystem']);
$form['maillog_engine'] = array(
'#type' => 'select',
'#title' => t("Select the mailengine which should be used."),
'#default_value' => variable_get('maillog_engine', 'mimemail'),
'#options' => $engines,
'#title' => t("Select the mail system which should be used."),
'#default_value' => variable_get('maillog_engine', 'DefaultMailSystem'),
'#options' => $mailsystem_classes,
);
}
return system_settings_form($form);