security updates

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

View File

@@ -0,0 +1,3 @@
label.printmail-label {
float: right;
}

View File

@@ -0,0 +1,8 @@
label.printmail-label {
width: 175px;
float: left;
}
form#print-mail-form textarea#edit-txt-to-addrs {
width: auto;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

View File

@@ -14,123 +14,18 @@
@include_once('Mail/mime.php');
/**
* Menu callback for the send by email module settings form.
* Form constructor for the send by email module settings form.
*
* @ingroup forms
*/
function print_mail_settings() {
$link = print_mail_print_link();
$form['settings'] = array(
'#type' => 'fieldset',
'#title' => t('Send by email options'),
);
$form['settings']['print_mail_link_pos'] = array(
'#type' => 'checkboxes',
'#title' => t('Send by email link'),
'#default_value' => variable_get('print_mail_link_pos', drupal_json_decode(PRINT_MAIL_LINK_POS_DEFAULT)),
'#options' => array('link' => t('Links area'), 'corner' => t('Content corner'), 'block' => t('Block'), 'help' => t('Help area')),
'#description' => t('Choose the location of the link(s) to the send by email page. The Links area is usually below the node content, whereas the Content corner is placed in the upper-right corner of the node content. Unselect all options to disable the link. Even if the link is disabled, you can still send a node by email by going to !path/nid where nid is the numeric id of the node.', array('!path' => PRINTMAIL_PATH)),
);
$form['settings']['print_mail_link_teaser'] = array(
'#type' => 'checkbox',
'#title' => t('Display send by email link in teaser'),
'#default_value' => variable_get('print_mail_link_teaser', PRINT_MAIL_LINK_TEASER_DEFAULT),
'#description' => t('Enabling this will display the link in teaser mode.'),
);
$form['settings']['adv_link'] = array(
'#type' => 'fieldset',
'#title' => t('Advanced link options'),
'#collapsible' => TRUE,
'#collapsed' => FALSE,
);
$form['settings']['adv_link']['print_mail_show_link'] = array(
'#type' => 'radios',
'#title' => t('Link style'),
'#default_value' => variable_get('print_mail_show_link', PRINT_MAIL_SHOW_LINK_DEFAULT),
'#options' => array(1 => t('Text only'), 2 => t('Icon only'), 3 => t('Icon and Text')),
'#description' => t('Select the visual style of the link.'),
);
$form['settings']['adv_link']['print_mail_link_use_alias'] = array(
'#type' => 'checkbox',
'#title' => t('Use URL alias instead of node ID'),
'#default_value' => variable_get('print_mail_link_use_alias', PRINT_MAIL_LINK_USE_ALIAS_DEFAULT),
'#description' => t('Enabling this will create the link using the URL alias instead of the node ID.'),
);
$form['settings']['adv_link']['print_mail_link_class'] = array(
'#type' => 'textfield',
'#title' => t('Link class'),
'#default_value' => variable_get('print_mail_link_class', PRINT_MAIL_LINK_CLASS_DEFAULT),
'#size' => 60,
'#maxlength' => 250,
'#description' => t('This can be used by themers to change the link style or by jQuery modules to open in a new window (e.g. greybox or thickbox). Multiple classes can be specified, separated by spaces.'),
);
$form['settings']['adv_link']['print_mail_node_link_visibility'] = array(
'#type' => 'radios',
'#title' => t('Link visibility'),
'#default_value' => variable_get('print_mail_node_link_visibility', PRINT_MAIL_NODE_LINK_VISIBILITY_DEFAULT),
'#options' => array(t('Show on every page except the listed pages.'), t('Show on only the listed pages.')),
);
$form['settings']['adv_link']['print_mail_node_link_pages'] = array(
'#type' => 'textarea',
'#default_value' => variable_get('print_mail_node_link_pages', PRINT_MAIL_NODE_LINK_PAGES_DEFAULT),
'#rows' => 3,
'#description' => t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '<front>')),
);
if (module_exists('php')) {
$access = user_access('use PHP for settings');
if ($form['settings']['adv_link']['print_mail_node_link_visibility']['#default_value'] == 2 && !$access) {
$form['settings']['adv_link']['print_mail_node_link_visibility'] = array('#type' => 'value', '#value' => 2);
$form['settings']['adv_link']['print_mail_node_link_pages'] = array('#type' => 'value', '#value' => $form['settings']['adv_link']['print_mail_node_link_pages']['#default_value']);
}
elseif ($access) {
$form['settings']['adv_link']['print_mail_node_link_visibility']['#options'][] = t('Show if the following PHP code returns <code>TRUE</code> (PHP-mode, experts only).');
$form['settings']['adv_link']['print_mail_node_link_pages']['#description'] .= ' ' . t('If the PHP-mode is chosen, enter PHP code between %php. Note that executing incorrect PHP-code can break your Drupal site.', array('%php' => '<?php ?>'));
}
}
$form['settings']['adv_link']['print_mail_sys_link_visibility'] = array(
'#type' => 'radios',
'#title' => t('Show link in system (non-content) pages'),
'#description' => 'Any page that is not a Drupal node. Usually pages generated by Drupal or a module such as Views or Panels.',
'#default_value' => variable_get('print_mail_sys_link_visibility', PRINT_MAIL_SYS_LINK_VISIBILITY_DEFAULT),
'#options' => array(t('Show on every page except the listed pages.'), t('Show on only the listed pages.')),
);
$form['settings']['adv_link']['print_mail_sys_link_pages'] = array(
'#type' => 'textarea',
'#default_value' => variable_get('print_mail_sys_link_pages', PRINT_MAIL_SYS_LINK_PAGES_DEFAULT),
'#rows' => 3,
'#description' => t('Setting this option will add a send by email link on pages created by Drupal or the enabled modules.') . '<br />' .
t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '<front>')),
);
if (module_exists('php')) {
if ($form['settings']['adv_link']['print_mail_sys_link_visibility']['#default_value'] == 2 && !$access) {
$form['settings']['adv_link']['print_mail_sys_link_visibility'] = array('#type' => 'value', '#value' => 2);
$form['settings']['adv_link']['print_mail_sys_link_pages'] = array('#type' => 'value', '#value' => $form['settings']['adv_link']['print_mail_sys_link_pages']['#default_value']);
}
elseif ($access) {
$form['settings']['adv_link']['print_mail_sys_link_visibility']['#options'][] = t('Show if the following PHP code returns <code>TRUE</code> (PHP-mode, experts only).');
$form['settings']['adv_link']['print_mail_sys_link_pages']['#description'] .= ' ' . t('If the PHP-mode is chosen, enter PHP code between %php. Note that executing incorrect PHP-code can break your Drupal site.', array('%php' => '<?php ?>'));
}
}
$form['settings']['adv_link']['print_mail_book_link'] = array(
'#type' => 'radios',
'#title' => t('Link in book hierarchy nodes'),
'#default_value' => variable_get('print_mail_book_link', PRINT_MAIL_BOOK_LINK_DEFAULT),
'#options' => array(t('No link'), t('Current page and sub-pages'), t('Current page only')),
);
$form['settings']['print_mail_hourly_threshold'] = array(
'#type' => 'select',
'#title' => t('Hourly threshold'),
@@ -153,6 +48,13 @@ function print_mail_settings() {
'#description' => t("If selected, the default choice will be to send only the node's teaser instead of the full content."),
);
$form['settings']['print_mail_user_recipients'] = array(
'#type' => 'checkbox',
'#title' => t('Enable user list recipients'),
'#default_value' => variable_get('print_mail_user_recipients', PRINT_MAIL_USER_RECIPIENTS_DEFAULT),
'#description' => t("If selected, a user list will be included as possible email recipients."),
);
$form['settings']['print_mail_teaser_choice'] = array(
'#type' => 'checkbox',
'#title' => t('Enable teaser/full mode choice'),
@@ -188,78 +90,22 @@ function print_mail_settings() {
'#description' => t('Enabling this option will display a list of printer-friendly destination URLs at the bottom of the page.'),
);
return system_settings_form($form);
}
/**
* Menu callback for the send by email module text strings settings form.
*
* @ingroup forms
*/
function print_mail_strings_settings() {
drupal_set_message(t("Saving these strings will disable their translation via Drupal's language system. Use the reset button to return them to the original state."), 'warning', FALSE);
$form['print_mail_text'] = array(
$form['settings']['link_text'] = array(
'#type' => 'fieldset',
'#title' => t('Text strings'),
'#title' => t('Custom link text'),
'#collapsible' => TRUE,
'#collapsed' => TRUE,
);
$form['print_mail_text']['print_mail_link_text'] = array(
$form['settings']['link_text']['print_mail_link_text_enabled'] = array(
'#type' => 'checkbox',
'#title' => t('Enable custom link text'),
'#default_value' => variable_get('print_mail_link_text_enabled', PRINT_TYPE_LINK_TEXT_ENABLED_DEFAULT),
);
$form['settings']['link_text']['print_mail_link_text'] = array(
'#type' => 'textfield',
'#title' => t('Link text'),
'#default_value' => variable_get('print_mail_link_text', t('Send by email')),
'#description' => t('Text used in the link to the send by-email form.'),
);
$form['print_mail_text']['print_mail_text_title'] = array(
'#type' => 'textfield',
'#title' => t('Form page title'),
'#default_value' => variable_get('print_mail_text_title', t('Send page by email')),
'#description' => t("Text used as the page title of the mail submission form. Requires a menu rebuild to apply."),
);
$form['print_mail_text']['print_mail_text_subject'] = array(
'#type' => 'textfield',
'#title' => t('Message subject'),
'#default_value' => variable_get('print_mail_text_subject', t('!user has sent you a message from !site')),
'#description' => t("email subject line. The sender's name will appear in place of !user in the subject. The web site name will be inserted in place of !site. The page title replaces !title."),
);
$form['print_mail_text']['print_mail_text_message'] = array(
'#type' => 'textarea',
'#title' => t('Message preamble'),
'#default_value' => variable_get('print_mail_text_message', t('Message from sender')),
'#description' => t('email message preamble. The sender will be able to add their own message after this.'),
);
$form['print_mail_text']['print_mail_text_content'] = array(
'#type' => 'textarea',
'#title' => t('Message content'),
'#default_value' => variable_get('print_mail_text_content', ''),
'#description' => t('Set the default contents of the message.'),
);
$form['print_mail_text']['print_mail_text_confirmation'] = array(
'#type' => 'textfield',
'#title' => t('Thank you message'),
'#default_value' => variable_get('print_mail_text_confirmation', t('Thank you for spreading the word about !site.')),
'#description' => t('This message will be displayed after the user successfully submits the form.'),
);
$form['print_mail_text']['reset'] = array(
'#type' => 'submit',
'#value' => t('Reset to defaults'),
'#submit' => array('print_mail_strings_settings_delete'),
'#default_value' => variable_get('print_mail_link_text', $link['text']),
'#description' => t('Text used in the link to the send by email form.'),
);
return system_settings_form($form);
}
/**
* Reset button callback for text strings settings form
*
* @ingroup forms
*/
function print_mail_strings_settings_delete() {
variable_del('print_mail_link_text');
variable_del('print_mail_text_title');
variable_del('print_mail_text_subject');
variable_del('print_mail_text_message');
variable_del('print_mail_text_content');
variable_del('print_mail_text_confirmation');
}

View File

@@ -10,19 +10,15 @@
* @ingroup print
*/
require_once(DRUPAL_ROOT . '/' . drupal_get_path('module', 'print') . '/print.pages.inc');
// Include MIME library
@include_once('Mail/mime.php');
/**
* Menu callback for the send by email form.
* Form constructor for the send by email form.
*
* @ingroup forms
*/
function print_mail_form($form, &$form_state) {
global $user;
// Remove the printmail/ prefix
$path_arr = explode('/', $_GET['q']);
unset($path_arr[0]);
@@ -30,13 +26,14 @@ function print_mail_form($form, &$form_state) {
if (empty($path)) {
// If no path was provided, let's try to generate a page for the referer
global $base_url;
$link = print_mail_print_link();
$ref = $_SERVER['HTTP_REFERER'];
$path = preg_replace("!^$base_url/!", '', $ref);
if (($path === $ref) || empty($path)) {
$path = variable_get('site_frontpage', 'node');
}
drupal_goto(PRINTMAIL_PATH . '/' . $path);
drupal_goto($link['path'] . '/' . $path);
}
elseif (ctype_digit($path_arr[1])) {
if (drupal_lookup_path('source', $path)) {
@@ -56,6 +53,19 @@ function print_mail_form($form, &$form_state) {
$query = $_GET;
unset($query['q']);
return print_mail_form_for_path($form, $form_state, $path, $query);
}
/**
* Build email form for the page provided in the path argument.
*
* @ingroup forms
*/
function print_mail_form_for_path($form, &$form_state, $path, $query = NULL, $user = NULL) {
if ($user === NULL) {
global $user;
}
$print_mail_hourly_threshold = variable_get('print_mail_hourly_threshold', PRINT_MAIL_HOURLY_THRESHOLD);
if ((!user_access('send unlimited emails')) && (!flood_is_allowed('print_mail', $print_mail_hourly_threshold))) {
@@ -68,11 +78,26 @@ function print_mail_form($form, &$form_state) {
$print_mail_teaser_default = variable_get('print_mail_teaser_default', PRINT_MAIL_TEASER_DEFAULT_DEFAULT);
$print_mail_teaser_choice = variable_get('print_mail_teaser_choice', PRINT_MAIL_TEASER_CHOICE_DEFAULT);
$print_mail_user_recipients_default = variable_get('print_mail_user_recipients', PRINT_MAIL_USER_RECIPIENTS_DEFAULT);
$form = array();
$cid = isset($_GET['comment']) ? (int)$_GET['comment'] : NULL;
$title = _print_get_title($path);
if ($print_mail_user_recipients_default) {
$options = array();
if (module_exists('realname')) {
$sql = "SELECT u.mail, r.realname AS name from {users} u LEFT JOIN {realname} r ON u.uid = r.uid WHERE u.uid <> :uid ORDER BY name ASC";
}
else {
$sql = "SELECT mail, name from {users} WHERE uid <> :uid ORDER BY name ASC";
}
$recipients = db_query($sql, array(':uid' => drupal_anonymous_user()->uid));
foreach ($recipients as $recipient) {
$options[$recipient->mail] = $recipient->name;
}
}
if (count($form_state['input']) == 0) {
$nodepath = drupal_get_normal_path($path);
db_merge('print_mail_page_counter')
@@ -101,14 +126,26 @@ function print_mail_form($form, &$form_state) {
'#title' => t('Your name'),
'#size' => 62,
);
$form['txt_to_addrs'] = array(
$form['txt_to'] = array(
'#tree' => TRUE,
);
$form['txt_to']['addrs'] = array(
'#type' => 'textarea',
'#title' => t('Send to'),
'#rows' => 3,
'#resizable' => FALSE,
'#description' => t('Enter multiple addresses separated by commas and/or different lines.'),
'#required' => TRUE,
'#required' => !$print_mail_user_recipients_default,
);
if ($print_mail_user_recipients_default) {
$form['txt_to']['users'] = array(
'#type' => 'select',
'#title' => t('Send to users'),
'#multiple' => TRUE,
'#size' => 10,
'#options' => $options,
);
}
$form['fld_subject'] = array(
'#type' => 'textfield',
'#title' => t('Subject'),
@@ -116,8 +153,8 @@ function print_mail_form($form, &$form_state) {
'#required' => TRUE,
);
if (!empty($title)) {
// To prevent useless translation strings, try to translate only node titles
if (drupal_substr($path, 0, 5) == 'node/') {
// To prevent useless translation strings, try to translate only non-node titles
if (drupal_substr($path, 0, 5) != 'node/') {
$title = t($title);
}
@@ -150,10 +187,6 @@ function print_mail_form($form, &$form_state) {
'#type' => 'submit',
'#value' => t('Send email'),
);
$form['btn_clear'] = array(
'#type' => 'markup',
'#markup' => '<input type="reset" name="clear" id="edit-btn-clear" value="' . t('Clear form') . '" class="form-submit" />',
);
$form['btn_cancel'] = array(
'#name' => 'cancel',
'#type' => 'submit',
@@ -171,33 +204,37 @@ function print_mail_form($form, &$form_state) {
$user_name = t('Someone');
}
$site_name = variable_get('site_name', t('an interesting site'));
$print_mail_text_subject = filter_xss(variable_get('print_mail_text_subject', t('!user has sent you a message from !site')));
$form['fld_subject']['#default_value'] = t($print_mail_text_subject, array('!user' => $user_name, '!site' => $site_name, '!title' => $title));
$print_mail_text_content = filter_xss(variable_get('print_mail_text_content', ''));
$form['txt_message']['#default_value'] = t($print_mail_text_content);
$form['fld_subject']['#default_value'] = t('!user has sent you a message from !site', array('!user' => $user_name, '!site' => $site_name, '!title' => $title));
$form['txt_message']['#default_value'] = t('');
return $form;
}
/**
* Theme function for the send by-email form submission.
* Returns HTML for the send by-email form.
*
* Adds a class to the form labels. This class is used to place the label on
* the left of the input fields.
*
* @param array $form
* Form array
*
* @see print_mail_form()
* @ingroup forms
* @ingroup themeable
* @ingroup print_themeable
*/
function theme_print_mail_form($variables) {
$form = $variables['form'];
drupal_add_css(drupal_get_path('module', 'print') . '/css/printlinks.css');
drupal_add_css(drupal_get_path('module', 'print_mail') . '/css/print_mail.theme.css');
$content = '';
foreach (element_children($form) as $key) {
$tmp = drupal_render($form[$key]);
switch ($key) {
case 'fld_from_addr':
case 'fld_from_name':
case 'txt_to_addrs':
case 'txt_to':
case 'fld_subject':
case 'fld_title':
$tmp = str_replace('<label', '<label class ="printmail-label"', $tmp);
@@ -209,11 +246,44 @@ function theme_print_mail_form($variables) {
}
/**
* Validate the send by-email form submission.
* Theme function for the email sending just the link.
*
* Allows themes and modules to override the default sendlink plain text format.
*
* @param $params
* $params as passed to print_mail_mail().
*
* @ingroup themeable
* @ingroup print_themeable
*/
function theme_print_mail_sendlink_plain($params) {
return $params['message'] . '\n\n' . $params['link'];
}
/**
* Theme function for the email sending just the link.
*
* Allows themes and modules to override the default sendlink HTML format.
*
* @param $params
* $params as passed to print_mail_mail().
*
* @ingroup themeable
* @ingroup print_themeable
*/
function theme_print_mail_sendlink_html($params) {
return $params['message'] . '<br/><br/>' . l($params['title'], $params['link']);
}
/**
* Form validation handler for print_mail_form().
*
* @see print_mail_form()
* @ingroup forms
*/
function print_mail_form_validate($form, &$form_state) {
$print_mail_user_recipients_default = variable_get('print_mail_user_recipients', PRINT_MAIL_USER_RECIPIENTS_DEFAULT);
if (array_key_exists('cancel', $form_state['input'])) {
form_set_error(NULL, '', TRUE);
drupal_get_messages('error');
@@ -227,10 +297,22 @@ function print_mail_form_validate($form, &$form_state) {
form_set_error('fld_from_addr', $test);
}
// All new-lines are replaced by commas
$to_addrs = preg_replace('![\r|\n|,]+!', ',', trim($form_state['values']['txt_to_addrs']));
// Create an array from the string
$to_array = explode(',', $to_addrs);
$to_array = array();
if (!empty($form_state['values']['txt_to']['users'])) {
$to_array = array_values($form_state['values']['txt_to']['users']);
}
if (!empty($form_state['values']['txt_to']['addrs'])) {
// All new-lines are replaced by commas
$to_addrs = preg_replace('![\r|\n|,]+!', ',', trim($form_state['values']['txt_to']['addrs']));
// Create an array from the string
$to_array = array_merge($to_array, explode(',', $to_addrs));
}
if (empty($to_array) && $print_mail_user_recipients_default) {
form_set_error('txt_to', t('You must specify at least one email address or user as a recipient.'));
}
// Verify each element of the array
foreach ($to_array as $key => $address) {
$address = trim($address);
@@ -244,14 +326,14 @@ function print_mail_form_validate($form, &$form_state) {
$test = user_validate_mail($address);
}
if ($test) {
form_set_error('txt_to_addrs', $test);
form_set_error('txt_to', $test);
}
}
$print_mail_hourly_threshold = variable_get('print_mail_hourly_threshold', PRINT_MAIL_HOURLY_THRESHOLD);
if ((!user_access('send unlimited emails')) && (!flood_is_allowed('print_mail', $print_mail_hourly_threshold - count($to_array) + 1))) {
form_set_error('txt_to_addrs', t('You cannot send more than %number messages per hour. Please reduce the number of recipients.', array('%number' => $print_mail_hourly_threshold)));
form_set_error('txt_to', t('You cannot send more than %number messages per hour. Please reduce the number of recipients.', array('%number' => $print_mail_hourly_threshold)));
}
// In all fields, prevent insertion of custom headers
@@ -264,29 +346,33 @@ function print_mail_form_validate($form, &$form_state) {
$form_state['values']['fld_from_addr'] = $from_addr;
$form_state['values']['fld_from_name'] = trim($form_state['values']['fld_from_name']);
// Re-create the string from the re-organized array
$form_state['values']['txt_to_addrs'] = implode(', ', $to_array);
$form_state['values']['txt_to']['addrs'] = implode(', ', $to_array);
}
/**
* Process the send by-email form submission.
* Form submission handler for print_mail_form().
*
* @see print_mail_form()
* @see print_controller()
* @ingroup forms
*/
function print_mail_form_submit($form, &$form_state) {
if (!array_key_exists('cancel', $form_state['values'])) {
module_load_include('inc', 'print', 'print.pages');
module_load_include('inc', 'print', 'includes/print');
$link = print_mail_print_link();
$cid = isset($form_state['values']['cid']) ? $form_state['values']['cid'] : NULL;
$print_mail_text_message = filter_xss_admin(variable_get('print_mail_text_message', t('Message from sender')));
$sender_message = $print_mail_text_message . ':<br /><br /><em>' . nl2br(check_plain($form_state['values']['txt_message'])) . '</em>';
$view_mode = $form_state['values']['chk_teaser'] ? 'teaser' : PRINT_VIEW_MODE;
$node = print_controller($form_state['values']['path'], $link['format'], $cid, $view_mode);
$print = print_controller($form_state['values']['path'], $form_state['values']['query'], $cid, PRINT_MAIL_FORMAT, $form_state['values']['chk_teaser'], $sender_message);
if ($print !== FALSE) {
if ($node) {
$print_mail_send_option_default = variable_get('print_mail_send_option_default', PRINT_MAIL_SEND_OPTION_DEFAULT);
$params = array();
$params['subject'] = $form_state['values']['fld_subject'];
$params['message'] = $sender_message;
$params['link'] = $print['url'];
$params['message'] = t('Message from sender') . ':<br /><br /><em>' . nl2br(check_plain($form_state['values']['txt_message'])) . '</em>';
$params['link'] = url($form_state['values']['path'], array('absolute' => TRUE, 'query' => $form_state['values']['query']));
$params['title'] = $form_state['values']['title'];
// If a name is provided, make From: in the format Common Name <address>
@@ -305,10 +391,9 @@ function print_mail_form_submit($form, &$form_state) {
// Spaces in img URLs must be replaced with %20
$pattern = '!<(img\s[^>]*?)>!is';
$print['content'] = preg_replace_callback($pattern, '_print_replace_spaces', $print['content']);
$node->content = preg_replace_callback($pattern, '_print_replace_spaces', $node->content);
$node = $print['node'];
$params['body'] = theme('print', array('print' => $print, 'type' => PRINT_MAIL_FORMAT, 'node' => $node));
$params['body'] = theme('print', array('node' => $node, 'query' => $form_state['values']['query'], 'format' => $link['format'], 'expand_css' => TRUE, 'message' => $params['message']));
// Img elements must be set to absolute
$pattern = '!<(img\s[^>]*?)>!is';
@@ -318,13 +403,16 @@ function print_mail_form_submit($form, &$form_state) {
$pattern = '!<(a\s[^>]*?)>!is';
$params['body'] = preg_replace_callback($pattern, '_print_rewrite_urls', $params['body']);
// Enable support for third-party modules to alter the e-mail before it's sent
drupal_alter('print_mail', $params, $to);
$ok = FALSE;
$use_job_queue = variable_get('print_mail_job_queue', PRINT_MAIL_JOB_QUEUE_DEFAULT);
if ($use_job_queue) {
$queue = DrupalQueue::get('print_mail_send');
}
$addresses = explode(', ', $form_state['values']['txt_to_addrs']);
$addresses = explode(', ', $form_state['values']['txt_to']['addrs']);
foreach ($addresses as $to) {
if ($use_job_queue) {
// Use job queue to send mails during cron runs
@@ -341,10 +429,9 @@ function print_mail_form_submit($form, &$form_state) {
}
if ($ok) {
$query = empty($form_state['values']['query']) ? '' : '?' . rawurldecode(drupal_http_build_query($form_state['values']['query']));
watchdog('print_mail', '%name [%from] sent %page to [%to]', array('%name' => $form_state['values']['fld_from_name'], '%from' => $form_state['values']['fld_from_addr'], '%page' => $form_state['values']['path'] . $query, '%to' => $form_state['values']['txt_to_addrs']));
watchdog('print_mail', '%name [%from] sent %page to [%to]', array('%name' => $form_state['values']['fld_from_name'], '%from' => $form_state['values']['fld_from_addr'], '%page' => $form_state['values']['path'] . $query, '%to' => $form_state['values']['txt_to']['addrs']));
$site_name = variable_get('site_name', t('us'));
$print_mail_text_confirmation = variable_get('print_mail_text_confirmation', t('Thank you for spreading the word about !site.'));
drupal_set_message(check_plain(t($print_mail_text_confirmation, array('!site' => $site_name))));
drupal_set_message(check_plain(t('Thank you for spreading the word about !site.', array('!site' => $site_name))));
$nodepath = drupal_get_normal_path($form_state['values']['path']);
db_update('print_mail_page_counter')

View File

@@ -1,18 +1,13 @@
name = "Send by email"
description = "Provides the capability to send the web page by email"
core=7.x
core = 7.x
package = "Printer, email and PDF versions"
dependencies[] = print
files[] = print_mail.module
files[] = print_mail.inc
files[] = print_mail.admin.inc
files[] = print_mail.install
files[] = print_mail.views.inc
configure = admin/config/user-interface/print/email
; Information added by drupal.org packaging script on 2012-09-04
version = "7.x-1.2"
; Information added by Drupal.org packaging script on 2014-04-02
version = "7.x-2.0"
core = "7.x"
project = "print"
datestamp = "1346768900"
datestamp = "1396426766"

View File

@@ -40,29 +40,26 @@ function print_mail_disable() {
* Implements hook_uninstall().
*/
function print_mail_uninstall() {
variable_del('print_mail_settings');
variable_del('print_mail_show_link');
variable_del('print_mail_display_sys_urllist');
variable_del('print_mail_hourly_threshold');
variable_del('print_mail_job_queue');
variable_del('print_mail_link_text');
variable_del('print_mail_link_text_enabled');
variable_del('print_mail_send_option_default');
variable_del('print_mail_teaser_choice');
variable_del('print_mail_teaser_default');
variable_del('print_mail_use_reply_to');
variable_del('print_mail_user_recipients');
variable_del('print_mail_book_link');
variable_del('print_mail_link_class');
variable_del('print_mail_link_pos');
variable_del('print_mail_link_teaser');
variable_del('print_mail_node_link_visibility');
variable_del('print_mail_node_link_pages');
variable_del('print_mail_link_class');
variable_del('print_mail_sys_link_visibility');
variable_del('print_mail_sys_link_pages');
variable_del('print_mail_book_link');
variable_del('print_mail_hourly_threshold');
variable_del('print_mail_use_reply_to');
variable_del('print_mail_teaser_default');
variable_del('print_mail_teaser_choice');
variable_del('print_mail_link_text');
variable_del('print_mail_link_use_alias');
variable_del('print_mail_text_title');
variable_del('print_mail_text_confirmation');
variable_del('print_mail_text_message');
variable_del('print_mail_text_subject');
variable_del('print_mail_text_content');
variable_del('print_mail_job_queue');
variable_del('print_mail_display_sys_urllist');
variable_del('print_mail_show_link');
variable_del('print_mail_sys_link_pages');
variable_del('print_mail_sys_link_visibility');
$settings = db_query("SELECT name FROM {variable} WHERE name LIKE 'print\_mail\_display\_%'");
foreach ($settings as $variable) {
variable_del($variable->name);
@@ -115,7 +112,7 @@ function print_mail_schema() {
'fields' => array(
'path' => array(
'type' => 'varchar',
'length' => 128,
'length' => 255,
'not null' => TRUE,
'description' => 'Page path',
),
@@ -192,12 +189,38 @@ function print_mail_update_7101(&$sandbox) {
->execute();
}
/**
* Delete old variables
*/
function print_mail_update_7200(&$sandbox) {
variable_del('print_mail_settings');
variable_del('print_mail_node_link_pages');
variable_del('print_mail_node_link_visibility');
variable_del('print_mail_text_title');
variable_del('print_mail_text_confirmation');
variable_del('print_mail_text_message');
variable_del('print_mail_text_subject');
variable_del('print_mail_text_content');
}
/**
* Enable block and help area links
*/
function print_mail_update_7102(&$sandbox) {
function print_mail_update_7202(&$sandbox) {
$link_pos = variable_get('print_mail_link_pos', drupal_json_decode('{ "link": "link", "block": "block", "help": "help" }'));
$link_pos['block'] = 'block';
$link_pos['help'] = 'help';
variable_set('print_mail_link_pos', $link_pos);
}
/**
* Increase size of the path field in the print_mail_page_counter table
*/
function print_mail_update_7203(&$sandbox) {
db_drop_primary_key('print_mail_page_counter');
db_change_field('print_mail_page_counter', 'path', 'path',
array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'description' => 'Page path'),
array('primary key' => array('path')));
}

View File

@@ -7,27 +7,28 @@
* @ingroup print
*/
define('PRINTMAIL_PATH', 'printmail');
// Defined in print.module
// define('PRINT_MAIL_FORMAT', 'mail');
define('PRINT_MAIL_LINK_POS_DEFAULT', '{ "link": "link", "block": "block", "help": "help" }');
define('PRINT_MAIL_LINK_TEASER_DEFAULT', 0);
define('PRINT_MAIL_SHOW_LINK_DEFAULT', 1);
define('PRINT_MAIL_NODE_LINK_VISIBILITY_DEFAULT', 0);
define('PRINT_MAIL_NODE_LINK_PAGES_DEFAULT', '');
define('PRINT_MAIL_LINK_CLASS_DEFAULT', 'print-mail');
define('PRINT_MAIL_SYS_LINK_VISIBILITY_DEFAULT', 1);
define('PRINT_MAIL_SYS_LINK_PAGES_DEFAULT', '');
define('PRINT_MAIL_LINK_USE_ALIAS_DEFAULT', 0);
define('PRINT_MAIL_BOOK_LINK_DEFAULT', 1);
define('PRINT_MAIL_HOURLY_THRESHOLD', 3);
define('PRINT_MAIL_USE_REPLY_TO', TRUE);
define('PRINT_MAIL_TEASER_DEFAULT_DEFAULT', 1);
define('PRINT_MAIL_TEASER_CHOICE_DEFAULT', 0);
define('PRINT_MAIL_SEND_OPTION_DEFAULT', 'sendpage');
define('PRINT_MAIL_JOB_QUEUE_DEFAULT', 0);
define('PRINT_MAIL_USER_RECIPIENTS_DEFAULT', 0);
/**
* Implements hook_print_link().
*/
function print_mail_print_link() {
return array(
'format' => 'mail',
'text' => t('Send by email'),
'description' => t('Send this page by email.'),
'path' => 'printmail',
'class' => 'print-mail',
'icon' => 'mail_icon.png',
'module' => 'print_mail',
);
}
/**
* Implements hook_permission().
@@ -50,13 +51,18 @@ function print_mail_permission() {
*/
function print_mail_theme() {
return array(
'print_mail_format_link' => array(
'variables' => array(),
),
'print_mail_form' => array(
'render element' => 'form',
'file' => 'print_mail.inc',
),
'print_mail_sendlink_html' => array(
'variables' => array('params' => NULL),
'file' => 'print_mail.inc',
),
'print_mail_sendlink_plain' => array(
'variables' => array('params' => NULL),
'file' => 'print_mail.inc',
),
);
}
@@ -64,10 +70,11 @@ function print_mail_theme() {
* Implements hook_menu().
*/
function print_mail_menu() {
$link = print_mail_print_link();
$items = array();
$items[PRINTMAIL_PATH] = array(
'title' => variable_get('print_mail_text_title', 'Send page by email'),
$items[$link['path']] = array(
'title' => 'Send by email',
'page callback' => 'drupal_get_form',
'page arguments' => array('print_mail_form'),
'access callback' => '_print_mail_access',
@@ -75,7 +82,7 @@ function print_mail_menu() {
'type' => MENU_CALLBACK,
'file' => 'print_mail.inc',
);
$items[PRINTMAIL_PATH . '/' . PRINTMAIL_PATH] = array(
$items[$link['path'] . '/' . $link['path']] = array(
'access callback' => FALSE,
);
$items['admin/config/user-interface/print/email'] = array(
@@ -88,25 +95,26 @@ function print_mail_menu() {
'type' => MENU_LOCAL_TASK,
'file' => 'print_mail.admin.inc',
);
$items['admin/config/user-interface/print/email/options'] = array(
'title' => 'Options',
'weight' => 1,
'type' => MENU_DEFAULT_LOCAL_TASK,
);
$items['admin/config/user-interface/print/email/strings'] = array(
'title' => 'Text strings',
'description' => 'Override the user-facing strings used in the send by email version.',
'page callback' => 'drupal_get_form',
'page arguments' => array('print_mail_strings_settings'),
'access arguments' => array('administer print'),
'weight' => 2,
'type' => MENU_LOCAL_TASK,
'file' => 'print_mail.admin.inc',
);
return $items;
}
/**
* Implements hook_variable_info().
*/
function print_mail_variable_info($options) {
$link = print_mail_print_link();
$variable['print_mail_link_text'] = array(
'title' => t('Send by email'),
'description' => t('Text used in the link to the send by email form.'),
'type' => 'string',
'default' => t($link['text']),
);
return $variable;
}
/**
* Implements hook_requirements().
*/
@@ -136,207 +144,41 @@ function print_mail_requirements($phase) {
* Implements hook_block_info().
*/
function print_mail_block_info() {
$block['print_mail-top']['info'] = t('Most emailed');
$block['print_mail-top']['cache'] = DRUPAL_CACHE_GLOBAL;
return $block;
$block['print_mail-top']['info'] = t('Most emailed');
$block['print_mail-top']['cache'] = DRUPAL_CACHE_GLOBAL;
return $block;
}
/**
* Implements hook_block_view().
*/
function print_mail_block_view($delta = 0) {
switch ($delta) {
case 'print_mail-top':
$block['subject'] = t('Most emailed');
$result = db_query_range("SELECT path FROM {print_mail_page_counter} LEFT JOIN {node} n ON path = CONCAT('node/', n.nid) WHERE status <> 0 OR status IS NULL ORDER BY sentcount DESC", 0, 3)
->fetchAll();
if (count($result)) {
$block['content'] = '<div class="item-list"><ul>';
foreach ($result as $obj) {
$block['content'] .= '<li>' . l(_print_get_title($obj->path), $obj->path) . '</li>';
}
$block['content'] .= '</ul></div>';
switch ($delta) {
case 'print_mail-top':
$block['subject'] = t('Most emailed');
$result = db_query_range("SELECT path FROM {print_mail_page_counter} LEFT JOIN {node} n ON path = CONCAT('node/', n.nid) WHERE status <> 0 OR status IS NULL ORDER BY sentcount DESC", 0, 3)
->fetchAll();
if (count($result)) {
$items = array();
foreach ($result as $obj) {
$items[] = l(_print_get_title($obj->path), $obj->path);
}
break;
$block['content'] = theme('item_list', array('items' => $items, 'type' => 'ul'));
}
return $block;
}
/**
* Implements hook_node_view().
*/
function print_mail_node_view($node, $view_mode) {
$print_mail_link_pos = variable_get('print_mail_link_pos', drupal_json_decode(PRINT_MAIL_LINK_POS_DEFAULT));
$print_mail_link_use_alias = variable_get('print_mail_link_use_alias', PRINT_MAIL_LINK_USE_ALIAS_DEFAULT);
foreach (array('node', 'comment') as $type) {
$allowed_type = print_mail_link_allowed(array('type' => $type, 'node' => $node, 'view_mode' => $view_mode));
if (($allowed_type) && !empty($print_mail_link_pos['link'])) {
drupal_add_css(drupal_get_path('module', 'print') . '/css/printlinks.css');
$links = array();
$format = theme('print_mail_format_link');
// Show book link
if ($allowed_type === PRINT_ALLOW_BOOK_LINK) {
$links['book_mail'] = array(
'href' => PRINTMAIL_PATH . '/book/export/html/' . $node->nid,
'title' => $format['text'],
'attributes' => $format['attributes'],
'html' => $format['html'],
);
}
elseif ($allowed_type === PRINT_ALLOW_NORMAL_LINK) {
$path = (($print_mail_link_use_alias) && ($alias = drupal_lookup_path('alias', 'node/' . $node->nid))) ? $alias : $node->nid;
$links['print_mail'] = array(
'href' => PRINTMAIL_PATH . '/' . $path,
'title' => $format['text'],
'attributes' => $format['attributes'],
'html' => $format['html'],
'query' => print_query_string_encode($_GET, array('q')),
);
}
$link_content = array(
'#theme' => 'links',
'#links' => $links,
'#attributes' => array('class' => array('links', 'inline')),
);
if ($type == 'node') {
$node->content['links']['print_mail'] = $link_content;
}
elseif (($type == 'comment') && isset($node->content['comments']['comments'])) {
foreach ($node->content['comments']['comments'] as $cid => $comment) {
if (is_numeric($cid)) {
$link_content['#links']['print_mail']['query']['comment'] = $cid;
$node->content['comments']['comments'][$cid]['links']['print_mail'] = $link_content;
}
}
}
}
}
// Insert content corner links
if (!empty($print_mail_link_pos['corner']) && ($view_mode == 'full')) {
$node->content['print_links']['#markup'] .= print_mail_insert_link(NULL, $node);
}
}
/**
* Implements hook_help().
*/
function print_mail_help($path, $arg) {
$print_mail_link_pos = variable_get('print_mail_link_pos', drupal_json_decode(PRINT_MAIL_LINK_POS_DEFAULT));
if (($path !== 'node/%') && !(empty($print_mail_link_pos['help']))) {
static $output = FALSE;
if ($output === FALSE) {
$output = TRUE;
$link = print_mail_insert_link();
if ($link) {
return "<span class='print-syslink'>$link</span>";
}
}
}
}
/**
* Implements hook_node_load().
*/
function print_mail_node_load($nodes, $types) {
$ids = array();
foreach ($nodes as $node) {
$ids[] = $node->nid;
}
$result = db_query('SELECT nid, link, comments, url_list FROM {print_mail_node_conf} WHERE nid IN (:nids)', array(':nids' => $ids))->fetchAllAssoc('nid');
foreach ($nodes as $node) {
$node->print_mail_display = isset($result[$node->nid]) ? intval($result[$node->nid]->link) : variable_get('print_mail_display_' . $node->type, PRINT_TYPE_SHOW_LINK_DEFAULT);
$node->print_mail_display_comment = isset($result[$node->nid]) ? intval($result[$node->nid]->comments) : variable_get('print_mail_display_comment_' . $node->type, PRINT_TYPE_COMMENT_LINK_DEFAULT);
$node->print_mail_display_urllist = isset($result[$node->nid]) ? intval($result[$node->nid]->url_list) : variable_get('print_mail_display_urllist_' . $node->type, PRINT_TYPE_URLLIST_DEFAULT);
}
}
/**
* Implements hook_node_insert().
*/
function print_mail_node_insert($node) {
if (user_access('administer print') || user_access('node-specific print configuration')) {
if (!isset($node->print_mail_display)) $node->print_mail_display = variable_get('print_mail_display_' . $node->type, PRINT_TYPE_SHOW_LINK_DEFAULT);
if (!isset($node->print_mail_display_comment)) $node->print_mail_display_comment = variable_get('print_mail_display_comment_' . $node->type, PRINT_TYPE_COMMENT_LINK_DEFAULT);
if (!isset($node->print_mail_display_urllist)) $node->print_mail_display_urllist = variable_get('print_mail_display_urllist_' . $node->type, PRINT_TYPE_URLLIST_DEFAULT);
_print_mail_node_conf_modify($node->nid, $node->print_mail_display, $node->print_mail_display_comment, $node->print_mail_display_urllist);
}
}
/**
* Implements hook_node_update().
*/
function print_mail_node_update($node) {
if (user_access('administer print') || user_access('node-specific print configuration')) {
if (!isset($node->print_mail_display)) $node->print_mail_display = variable_get('print_mail_display_' . $node->type, PRINT_TYPE_SHOW_LINK_DEFAULT);
if (!isset($node->print_mail_display_comment)) $node->print_mail_display_comment = variable_get('print_mail_display_comment_' . $node->type, PRINT_TYPE_COMMENT_LINK_DEFAULT);
if (!isset($node->print_mail_display_urllist)) $node->print_mail_display_urllist = variable_get('print_mail_display_urllist_' . $node->type, PRINT_TYPE_URLLIST_DEFAULT);
_print_mail_node_conf_modify($node->nid, $node->print_mail_display, $node->print_mail_display_comment, $node->print_mail_display_urllist);
break;
}
return $block;
}
/**
* Implements hook_node_delete().
*/
function print_mail_node_delete($node) {
db_delete('print_mail_node_conf')
->condition('nid', $node->nid)
->execute();
db_delete('print_mail_page_counter')
->condition('path', 'node/' . $node->nid)
->execute();
}
/**
* Implements hook_form_alter().
*/
function print_mail_form_alter(&$form, &$form_state, $form_id) {
// Add the node-type settings option to activate the mail version link
if ((user_access('administer print') || user_access('node-specific print configuration')) &&
(($form_id == 'node_type_form') || !empty($form['#node_edit_form']))) {
$form['print']['mail_label'] = array(
'#type' => 'markup',
'#markup' => '<p><strong>' . t('Send by email') . '</strong></p>',
);
$form['print']['print_mail_display'] = array(
'#type' => 'checkbox',
'#title' => t('Show link'),
);
$form['print']['print_mail_display_comment'] = array(
'#type' => 'checkbox',
'#title' => t('Show link in individual comments'),
);
$form['print']['print_mail_display_urllist'] = array(
'#type' => 'checkbox',
'#title' => t('Show Printer-friendly URLs list'),
);
if ($form_id == 'node_type_form') {
$form['print']['print_mail_display']['#default_value'] = variable_get('print_mail_display_' . $form['#node_type']->type, PRINT_TYPE_SHOW_LINK_DEFAULT);
$form['print']['print_mail_display_comment']['#default_value'] = variable_get('print_mail_display_comment_' . $form['#node_type']->type, PRINT_TYPE_COMMENT_LINK_DEFAULT);
$form['print']['print_mail_display_urllist']['#default_value'] = variable_get('print_mail_display_urllist_' . $form['#node_type']->type, PRINT_TYPE_URLLIST_DEFAULT);
}
else {
$node = $form['#node'];
$form['print']['print_mail_display']['#default_value'] = isset($node->print_mail_display) ? $node->print_mail_display : variable_get('print_mail_display_' . $node->type, PRINT_TYPE_SHOW_LINK_DEFAULT);
$form['print']['print_mail_display_comment']['#default_value'] = isset($node->print_mail_display_comment) ? $node->print_mail_display_comment : variable_get('print_mail_display_comment_' . $node->type, PRINT_TYPE_COMMENT_LINK_DEFAULT);
$form['print']['print_mail_display_urllist']['#default_value'] = isset($node->print_mail_display_urllist) ? $node->print_mail_display_urllist : variable_get('print_mail_display_urllist_' . $node->type, PRINT_TYPE_URLLIST_DEFAULT);
}
}
}
/**
* Implements hook_cron_queue_info().
*/
@@ -348,6 +190,19 @@ function print_mail_cron_queue_info() {
return $queues;
}
/**
* Worker callback for print_mail_cron_queue_info()
*
* @param array $data
* An associative array containing:
* - module: A module name to invoke hook_mail() on.
* - key: A key to identify the e-mail sent.
* - to: The e-mail address or addresses where the message will be sent to.
* - language: Language object to use to compose the e-mail.
* - params: Optional parameters to build the e-mail.
* - from: Sets From to this value, if given.
* These are the input arguments of the drupal_mail() function.
*/
function print_mail_send($data) {
drupal_mail($data['module'], $data['key'], $data['to'], $data['language'], $data['params'], $data['from']);
}
@@ -369,8 +224,8 @@ function print_mail_mail($key, &$message, $params) {
break;
case 'sendlink':
// Generate plain-text and html versions of message with link
$sendlink_plain = $params['message'] . '\n\n' . $params['link'];
$sendlink_html = $params['message'] . '<br/><br/>' . l($params['title'], $params['link']);
$sendlink_plain = theme('print_mail_sendlink_plain', $params);
$sendlink_html = theme('print_mail_sendlink_html', $params);
// Send HTML-only version if MIME library not present
if (!class_exists('Mail_mime')) {
@@ -416,15 +271,17 @@ function print_mail_mail($key, &$message, $params) {
/**
* Access callback to check a combination of user_acess() and page access
*
* @param $permission
* @param string $permission
* permission required to view the page
* @return
*
* @return bool
* TRUE if the user has permission to view the page, FALSE otherwise
*/
function _print_mail_access($permission) {
$link = print_mail_print_link();
$page_access = TRUE;
$parts = explode('/', $_GET['q']);
if ($parts[0] == PRINTMAIL_PATH) {
if ($parts[0] == $link['path']) {
if (count($parts) > 1) {
unset($parts[0]);
$path = implode('/', $parts);
@@ -451,109 +308,29 @@ function _print_mail_access($permission) {
return (user_access($permission) && $page_access);
}
/**
* Update the print_mail_node_conf table to reflect the given attributes
*
* If updating to the default values, delete the record.
*
* @param $nid
* value of the nid field (primary key)
* @param $link
* value of the link field (0 or 1)
* @param $comments
* value of the comments field (0 or 1)
* @param $url_list
* value of the url_list field (0 or 1)
*/
function _print_mail_node_conf_modify($nid, $link, $comments, $url_list) {
db_merge('print_mail_node_conf')
->key(array('nid' => $nid))
->fields(array(
'link' => $link,
'comments' => $comments,
'url_list' => $url_list,
))
->execute();
}
/**
* Format the send by email link
*
* @return
* array of formatted attributes
* @ingroup themeable
*/
function theme_print_mail_format_link() {
$print_mail_link_class = variable_get('print_mail_link_class', PRINT_MAIL_LINK_CLASS_DEFAULT);
$print_mail_show_link = variable_get('print_mail_show_link', PRINT_MAIL_SHOW_LINK_DEFAULT);
$print_mail_link_text = filter_xss(variable_get('print_mail_link_text', t('Send by email')));
$img = drupal_get_path('module', 'print') . '/icons/mail_icon.gif';
$title = t('Send this page by email.');
$class = strip_tags($print_mail_link_class);
$new_window = FALSE;
$format = _print_format_link_aux($print_mail_show_link, $print_mail_link_text, $img);
return array('text' => $format['text'],
'html' => $format['html'],
'attributes' => print_fill_attributes($title, $class, $new_window),
);
}
/**
* Auxiliary function to display a formatted send by email link
*
* Function made available so that developers may call this function from
* their defined pages/blocks.
*
* @param $path
* path of the original page (optional). If not specified, the current URL
* is used
* @param $node
* an optional node object, to be used in defining the path, if used, the
* path argument is irrelevant
* @return
* @param string $path
* path to be used in the link. If not specified, the current URL is used.
* @param object $node
* node object, to be used in checking node access. If the path argument is
* not provided, the path used will be node/nid.
* @param string $location
* where in the page where the link is being inserted ('link', 'corner',
* 'block', 'help').
*
* @return string
* string with the HTML link to the printer-friendly page
*
* @ingroup print_api
*/
function print_mail_insert_link($path = NULL, $node = NULL) {
if ($node !== NULL) {
$nid = $node->nid;
$path = 'node/' . $nid;
$allowed_type = print_mail_link_allowed(array('node' => $node));
}
else {
if ($path === NULL) {
$nid = preg_replace('!^node/([\d]+)!', '$1', $_GET['q']);
$path = $_GET['q'];
}
else {
$nid = NULL;
}
$allowed_type = print_mail_link_allowed(array('path' => $path));
}
if ($allowed_type) {
if ($nid !== NULL) {
if ($allowed_type === PRINT_ALLOW_BOOK_LINK) {
$path = 'book/export/html/' . $nid;
}
else {
if (variable_get('print_mail_link_use_alias', PRINT_MAIL_LINK_USE_ALIAS_DEFAULT) && ($alias = drupal_lookup_path('alias', $path))) {
$path = $alias;
}
else {
$path = $nid;
}
}
$path = PRINTMAIL_PATH . '/' . $path;
$query = print_query_string_encode($_GET, array('q'));
}
else {
$query = NULL;
}
drupal_add_css(drupal_get_path('module', 'print') . '/css/printlinks.css');
$format = theme('print_mail_format_link');
return '<span class="print_mail">' . l($format['text'], $path, array('attributes' => $format['attributes'], 'query' => $query, 'absolute' => TRUE, 'html' => $format['html'])) . '</span>';
function print_mail_insert_link($path = NULL, $node = NULL, $location = '') {
if (function_exists('print_ui_insert_link')) {
return print_ui_insert_link(print_mail_print_link(), array('path' => $path, 'node' => $node, 'location' => $location));
}
else {
return FALSE;
@@ -563,86 +340,15 @@ function print_mail_insert_link($path = NULL, $node = NULL) {
/**
* Check if the link to send by email is allowed depending on the settings
*
* @param $args
* @param array $args
* array containing the possible parameters:
* teaser, node, type, path
* @return
* FALSE if not allowed
* PRINT_ALLOW_NORMAL_LINK if a normal link is allowed
* PRINT_ALLOW_BOOK_LINK if a link is allowed in a book node
* view_mode, node, type, path
*
* @return bool
* FALSE if not allowed, TRUE otherwise
*/
function print_mail_link_allowed($args) {
$view_mode = isset($args['view_mode']) ? $args['view_mode'] : '';
if ((($view_mode == 'teaser') && !variable_get('print_mail_link_teaser', PRINT_MAIL_LINK_TEASER_DEFAULT))
|| !in_array($view_mode, array('full', 'teaser', '')) || !user_access('access send by email')) {
// If the teaser link is disabled or the user is not allowed
return FALSE;
}
if (!empty($args['path'])) {
$nid = preg_replace('!^node/!', '', drupal_get_normal_path($args['path']));
if (ctype_digit($nid)) {
$args['node'] = node_load($nid);
}
}
if (!empty($args['node'])) {
static $node_type = FALSE;
$node = $args['node'];
if (isset($node->type)) {
$node_type = $node->type;
}
// Node
$print_mail_node_link_visibility = variable_get('print_mail_node_link_visibility', PRINT_MAIL_NODE_LINK_VISIBILITY_DEFAULT);
$print_mail_node_link_pages = variable_get('print_mail_node_link_pages', PRINT_MAIL_NODE_LINK_PAGES_DEFAULT);
if (!_print_page_match($print_mail_node_link_visibility, "node/" . $node->nid, $print_mail_node_link_pages)) {
// Page not in visibility list
return FALSE;
}
elseif (isset($args['type']) && ($args['type'] == 'comment') && isset($node_type)) {
// Link is for a comment, return the configured setting
// Cache this statically to avoid duplicate queries for every comment.
static $res = array();
if (!isset($res[$node->nid])) {
$res[$node->nid] = db_query("SELECT comments FROM {print_mail_node_conf} WHERE nid = :nid", array(':nid' => $node->nid))->fetchField();
}
$print_display_comment = ($res && ($res[$node->nid] !== FALSE)) ? $res[$node->nid] : variable_get('print_mail_display_comment_' . $node_type, PRINT_TYPE_COMMENT_LINK_DEFAULT);
if ($print_display_comment) {
return PRINT_ALLOW_NORMAL_LINK;
}
}
else {
// Node link
if (isset($node->print_mail_display) && !$node->print_mail_display) {
// Link for this node is disabled
return FALSE;
}
elseif (isset($node->book)) {
// Node is a book;
$print_mail_book_link = variable_get('print_mail_book_link', PRINT_MAIL_BOOK_LINK_DEFAULT);
switch ($print_mail_book_link) {
case 1:
if (user_access('access printer-friendly version')) {
return PRINT_ALLOW_BOOK_LINK;
}
break;
case 2:
return PRINT_ALLOW_NORMAL_LINK;
}
}
else {
return PRINT_ALLOW_NORMAL_LINK;
}
}
}
else {
// 'System' page
$print_mail_sys_link_visibility = variable_get('print_mail_sys_link_visibility', PRINT_MAIL_SYS_LINK_VISIBILITY_DEFAULT);
$print_mail_sys_link_pages = variable_get('print_mail_sys_link_pages', PRINT_MAIL_SYS_LINK_PAGES_DEFAULT);
return _print_page_match($print_mail_sys_link_visibility, $_GET['q'], $print_mail_sys_link_pages);
}
return FALSE;
return (user_access('access send by email'));
}
/**
@@ -650,7 +356,7 @@ function print_mail_link_allowed($args) {
*/
function print_mail_mollom_form_list() {
$forms['print_mail_form'] = array(
'title' => t('Send page form'),
'title' => t('Send by email form'),
'entity' => 'print_mail',
);
return $forms;
@@ -666,7 +372,7 @@ function print_mail_mollom_form_info($form_id) {
'elements' => array(
'fld_from_addr' => t('Sender email'),
'fld_from_name' => t('Sender name'),
'txt_to_addrs' => t('Recipients'),
'txt_to' => t('Recipients'),
'fld_subject' => t('Subject'),
'fld_title' => t('Page to be sent'),
'txt_message' => t('Your message'),
@@ -729,12 +435,12 @@ function print_mail_action_submit($from, $from_name, $to, $subject, $message, $n
$form_state['values'] = array(
'path' => 'node/' . $node->nid,
'cid' => NULL,
'query' => NULL,
'cid' => NULL,
'title' => $node->title,
'fld_from_addr' => $from,
'fld_from_name' => $from_name,
'txt_to_addrs' => $to,
'txt_to' => array('addrs' => $to),
'fld_subject' => $subject,
'txt_message' => $message,
'chk_teaser' => FALSE,