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

security updates

Browse Source 
have to check views and entityreference for custom patches
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-19 20:45:16 +02:00
parent 802ec0c6f3
commit b3221c71e2
516 changed files with 14267 additions and 7349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sites/all/modules/contrib/mail/simplenews/includes/simplenews.admin.inc
View File

@@ -862,7 +862,7 @@ function simplenews_subscription_list_export($form, &$form_state) {
'#options' => array(
'subscribed' => t('Subscribed to the newsletter'),
'unconfirmed' => t('Unconfirmed to the newsletter'),
'unsubscribed' => t('UnSubscribed from the newsletter'),
'unsubscribed' => t('Unsubscribed from the newsletter'),
),
'#default_value' => $default['subscribed'],
'#description' => t('Subscriptions matching the selected subscription states will be exported.'),
@@ -1112,7 +1112,7 @@ function simplenews_subscription_list_form() {
foreach ($result as $subscriber) {
$options[$subscriber->snid] = array(
'mail' => $subscriber->mail,
'mail' => check_plain($subscriber->mail),
'username' => isset($subscriber->uid) ? l($subscriber->name, 'user/' . $subscriber->uid) : check_plain($subscriber->name),
'status' => theme('simplenews_status', array('source' => 'activated', 'status' => $subscriber->activated)),
'language' => check_plain($subscriber->language),

8
sites/all/modules/contrib/mail/simplenews/includes/simplenews.subscription.inc
View File

@@ -229,7 +229,7 @@ function simplenews_subscriptions_page_form($form, &$form_state, $code = NULL) {
// Get newsletters for subscription form checkboxes.
// Newsletters with opt-in/out method 'hidden' will not be listed.
foreach (simplenews_category_get_visible() as $newsletter) {
$options[$newsletter->tid] = check_plain($newsletter->name);
$options[$newsletter->tid] = check_plain(_simplenews_newsletter_name($newsletter));
$default_value[$newsletter->tid] = FALSE;
}
@@ -395,7 +395,7 @@ function simplenews_subscriptions_multi_block_form($form, &$form_state) {
// Get newsletters for subscription form checkboxes.
// Newsletters with opt-in/out method 'hidden' will not be listed.
foreach (simplenews_category_get_visible() as $newsletter) {
$options[$newsletter->tid] = check_plain($newsletter->name);
$options[$newsletter->tid] = check_plain(_simplenews_newsletter_name($newsletter));
$default_value[$newsletter->tid] = FALSE;
}
@@ -726,7 +726,7 @@ function simplenews_subscriptions_admin_form($form, &$form_state, $snid) {
// Get newsletters for subscription form checkboxes.
// Newsletters with opt-in/out method 'hidden' will not be listed.
foreach (simplenews_category_get_visible() as $newsletter) {
$options[$newsletter->tid] = check_plain($newsletter->name);
$options[$newsletter->tid] = check_plain(_simplenews_newsletter_name($newsletter));
$default_value[$newsletter->tid] = FALSE;
}
@@ -760,7 +760,7 @@ function simplenews_subscriptions_admin_form($form, &$form_state, $snid) {
}
$form['language'] = array(
'#type' => 'fieldset',
'#title' => 'Preferred language',
'#title' => t('Preferred language'),
'#description' => t('The e-mails will be localized in language chosen. Real users have their preference in account settings.'),
'#disabled' => FALSE,
);

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

@@ -350,8 +350,10 @@ function simplenews_views_data() {
'click sortable' => TRUE,
),
'filter' => array(
'handler' => 'views_handler_filter_boolean',
'allow empty' => TRUE,
'handler' => 'views_handler_filter_boolean_operator',
'label' => t('Activated'),
'type' => 'yes-no',
'accept null' => TRUE,
),
'argument' => array(
'handler' => 'views_handler_argument_numeric',