'. t('Internal paths in single or double quotes, written as "internal:node/99", for example, are replaced with the appropriate absolute URL or path. Given a site located at http://example.com/mysite, assuming clean URLs are enabled and "internal:admin/user" becomes "http://example.com/mysite/admin/user" and "internal:node/99" becomes "http://example.com/mysite/node/99". If \'node/99\' has a URL alias assigned, such as \'news/latest\' the alias will be substituted giving "http://example.com/mysite/news/latest".') .'
'; - $output .= ''. t('Paths to files in single or double quotes, written as "files:somefile.ext", for example, are replaced with the appropriate URL that can be used to download the file.') .'
'; - return $output; - } - else { - return t('Internal paths in single or double quotes, written as "internal:node/99", for example, are replaced with the appropriate absolute URL or path. Paths to files in single or double quotes, written as "files:somefile.ext", for example, are replaced with the appropriate URL that can be used to download the file.'); - } - break; - } +* Implement hook_filter_info(). +*/ +function pathfilter_filter_info() { + $filters = array(); + $filters['pathfilter'] = array( + 'title' => t('URL Path Filter'), + 'description' => t('Replaces "internal:node/nid" with the appropriate absolute url'), + 'process callback' => '_pathfilter_filter_process', + 'default settings' => array( + 'pathfilter_link_type' => 'absolute', + ), + 'settings callback' => '_pathfilter_settings', + 'tips callback' => '_pathfilter_filter_tips', + ); + return $filters; } /** - * Implementation of hook_filter(). - */ -function pathfilter_filter($op, $delta = 0, $format = -1, $text = '') { - // The "list" operation provides the module an opportunity to declare - // both how many filters it defines and a human-readable name for each filter. - // Note that the returned name should be passed through t() for translation. - if ($op == 'list') { - return array(0 => t('Internal path filter')); - } - - // All operations besides "list" provide a $delta argument so we know which - // filter they refer to. - switch ($delta) { - case 0: - switch ($op) { - // This description is shown in the administrative interface, unlike - // the filter tips which are shown in the content editing interface. - case 'description': - $output = t('Internal paths in single or double quotes, written as "internal:node/99", for example, are replaced with the appropriate absolute URL or path.'); - $output .= t(' Paths to files in single or double quotes, written as "files:somefile.ext", for example, are replaced with the appropriate URL that can be used to download the file.'); - return $output; - - // The actual filtering is performed here. The supplied text should be - // returned, once any necessary substitutions have taken place. - case 'process': - $patterns = array(); - $replacement = array(); - $patterns[] = '/(["\'])(internal):([^"#\?\']+)\??([^"#\']+)?#?([^"\']+)?\1/'; - $patterns[] = '/(["\'])(files):([^"\']+)\1/'; - - // use the 'currying' technique to allow us to pass the format into - // the callback function. - $callback = _pathfilter_curry(_pathfilter_process, 2); - return preg_replace_callback($patterns, $callback($format), $text); - - // Filter settings for pathfilter. - case 'settings': - return _pathfilter_settings($format); - - default: - return $text; - } - break; - } -} - -/* - * A 'currying' function that allows paramaters to be passed into the - * preg_replace_callback callback. Taken from - * http://ie2.php.net/manual/en/function.preg-replace-callback.php#88013 - */ -function _pathfilter_curry($func, $arity) { - return create_function('', " - \$args = func_get_args(); - if(count(\$args) >= $arity) - return call_user_func_array('$func', \$args); - \$args = var_export(\$args, 1); - return create_function('',' - \$a = func_get_args(); - \$z = ' . \$args . '; - \$a = array_merge(\$z,\$a); - return call_user_func_array(\'$func\', \$a); - '); - "); +* pathfilter filter process callback +* +* The actual filtering is performed here. The supplied text should be +* returned, once any necessary substitutions have taken place. +*/ +function _pathfilter_filter_process($text, $filter, $format) { + $absolute = isset($filter->settings['pathfilter_link_type']) ? 'TRUE' : 'FALSE'; + return preg_replace('/"internal:([^"#\?]+)\??([^"#]+)?#?([^"]+)?"/e', "'\"'. url('$1', array('query' => '$2' ? '$2' : NULL, 'fragment' => '$3' ? '$3' : NULL, 'absolute' => ". $absolute .")) .'\"'", $text); } -function _pathfilter_process($format, $matches) { - switch ($matches[2]) { - case 'internal': - return _pathfilter_process_internal($format, $matches); - break; - - case 'files': - return _pathfilter_process_files($matches); - } -} - -function _pathfilter_process_internal($format, $matches) { - $absolute = variable_get('pathfilter_link_absolute_'. $format, 1) ? TRUE : FALSE; - if (module_exists('i18n')) { - if (preg_match('/(node\/([0-9]+))$/', $matches[3], $match)) { - // if we have a drupal node url, ensure we get the translated url alias - $languages = language_list('enabled'); - $languages = $languages[1]; - $language = $languages[i18n_node_get_lang($match[2])]; - $link = url($match[1], array('language' => $language, 'query' => $matches[4], 'fragment' => $matches[5], 'absolute' => $absolute )); - } - } - $link = $link? $link : url($matches[3], array('query' => $matches[4], 'fragment' => $matches[5], 'absolute' => $absolute )); - return $matches[1] . $link . $matches[1]; -} - -function _pathfilter_process_files($matches) { - return $matches[1] . file_create_url($matches[3]) . $matches[1]; +/** +* Filter tips callback for creative juice filter. +* +* The tips callback allows filters to provide help text to users during the content +* editing process. Short tips are provided on the content editing screen, while +* long tips are provided on a separate linked page. Short tips are optional, +* but long tips are highly recommended. +*/ +function _pathfilter_filter_tips($filter, $format, $long = FALSE) { + return t('Replaces "internal:node/nid" with the appropriate absolute url'); } - /** * Helper settings function for hook_filter('settings'). */ -function _pathfilter_settings($format) { - $form = array(); - $form['pathfilter'] = array( - '#type' => 'fieldset', - '#title' => t('Internal path filter'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, - ); - $form['pathfilter']['pathfilter_link_absolute_'. $format] = array( +function _pathfilter_settings($form, $form_state, $filter, $format, $defaults) { + $settings['pathfilter_link_type'] = array( '#type' => 'radios', '#title' => t('Convert internal paths to'), - '#options' => array(1 => t('Absolute URL (including http://www.example.com)'), 0 => t('Absolute path (relative to document root)')), - '#default_value' => variable_get('pathfilter_link_absolute_'. $format, 1), - '#description' => t('Should internal paths be transformed to absolute URLs, such as %absolute_url or absolute paths, like %absolute_path. Note that your changes may not appear until the cache has been cleared.', array('%absolute_url' => 'http://www.example.com/my-page', '%absolute_path' => '/my-page')), + '#options' => array('absolute' => t('Absolute links'), 'relative' => t('Relative links')), + '#default_value' => isset($filter->settings['pathfilter_link_type']) ? $filter->settings['pathfilter_link_type'] : $defaults['pathfilter_link_type'], + '#description' => t('Should internal paths be transformed to absolute URLs, such as %absolute or relative paths, like %relative. Note that your changes may not appear until the cache has been cleared.', array('%absolute' => 'http://www.example.com/my-page', '%relative' => '/my-page')), ); - return $form; -} \ No newline at end of file + return $settings; +} diff --git a/tests/pathfilter.test b/tests/pathfilter.test deleted file mode 100644 index ed17cd6..0000000 --- a/tests/pathfilter.test +++ /dev/null @@ -1,194 +0,0 @@ - t('Path Filter tests'), - 'desc' => t('Tests Path Filter link parsing'), - 'group' => t('Path Filter') - ); - } - - /** - * Implementation of setUp(). - */ - function setUp() { - parent::setUp(); - } - - /** - * Get a sample file of the specified type. - */ - function getTestFile($type, $size = NULL) { - // Get a file to upload. - $file = current($this->drupalGetTestFiles($type, $size)); - - // SimpleTest files incorrectly use "filename" instead of "filepath". - $file->filepath = $file->filename; - $file->filename = basename($file->filepath); - $file->filesize = filesize($file->filepath); - - return $file; - } - - /** - * Upload a file to a node. - */ - function uploadNodeFile($file, $field_name, $nid_or_type, $new_revision = TRUE) { - $edit = array( - 'title' => $this->randomName(), - 'revision' => (string) (int) $new_revision, - ); - - if (is_numeric($nid_or_type)) { - $node = node_load($nid_or_type); - $delta = isset($node->$field_name) ? count($node->$field_name) : 0; - $edit['files[' . $field_name . '_' . $delta . ']'] = realpath($file->filepath); - $this->drupalPost('node/' . $nid_or_type . '/edit', $edit, t('Save')); - } - else { - $edit['files[' . $field_name . '_0]'] = realpath($file->filepath); - $type = str_replace('_', '-', $nid_or_type); - $this->drupalPost('node/add/' . $type, $edit, t('Save')); - } - - $matches = array(); - preg_match('/node\/([0-9]+)/', $this->getUrl(), $matches); - return $matches[1]; - } - - function CompareSnippets($snippets) { - foreach ($snippets as $before => $after) { - $result = pathfilter_filter('process', 0, 1, $before); - if ($after) { - $this->assertTrue($result == $after, 'Parsing: '.$before .'