'. t('Flexifilters are flexible filters that can be used by Input Formats to filter created content.', array('@input_formats' => url('admin/settings/filters'))) .'
'; - //$output .= ''. t('For more information, see the online handbook entry for Flexifilter module.', array('@flexifilter' => 'http://drupal.org/handbook/modules/flexifilter/')) .'
'; + $output .= ''. t('For more information, see the online handbook entry for Flexifilter module.', array('@flexifilter' => 'http://drupal.org/node/212410/')) .'
'; return $output; case 'admin/build/flexifilters': @@ -215,7 +240,14 @@ function flexifilter_get_condition_list( * operations that the component doesn't support, it will return $text. */ function flexifilter_invoke_component($component, $op, $settings = array(), $text = '') { - return call_user_func_array($component['callback'], array_merge($component['callback_arguments'], array($op, $settings, $text))); + $text = call_user_func_array($component['callback'], array_merge($component['callback_arguments'], array($op, $settings, $text))); + $_flexifilter_preview = variable_get('flexifilter_preview', FALSE); + if ($_flexifilter_preview) { + $_flexifilter_preview_text = variable_get('flexifilter_preview_text', array()); + $_flexifilter_preview_text[] = array('value' => $text, 'type' => 'component', 'step' => $op, 'class' => $component['label'], 'settings' => $settings); + variable_set('flexifilter_preview_text', $_flexifilter_preview_text); + } + return $text; } /** @@ -253,7 +285,6 @@ function flexifilter_invoke_condition($d return $return_value; // For prepare and process, force the return value to TRUE or FALSE - case 'prepare': case 'process': if ($return_value) { @@ -368,23 +399,49 @@ function flexifilter_filter($op, $delta $filter = flexifilter_get_filter_by_delta($delta); return flexifilter_invoke_components($filter['components'], $op, $text); + case 'no cache': + $filter = flexifilter_get_filter_by_delta($delta); + return !($filter['cache']); + default: return $text; } } /** - * Menu callback; loads a flexifilter object + * Implementation of hook_filter_tips. + */ +function flexifilter_filter_tips($delta, $format, $long = FALSE) { + $flexifilter = flexifilter_get_filter_by_delta($delta); + if ($long) { + return str_replace('<--break-->', '', $flexifilter['description']); + } + else { + $pos = strpos($flexifilter['description'], ''); + if ($pos === FALSE) { + return substr($flexifilter['description'], 0); + } + return substr($flexifilter['description'], 0, $pos); + } +} + +/** + * Menu callback; loads a flexifilter object. + * + * @param $fid + * The uniqe flexifilter id of the flexifilter to load. + * @return + * The flexifilter upon success; FALSE upon failure. */ function flexifilter_load($fid) { if (!is_numeric($fid)) { return FALSE; } - $filters = flexifilter_get_filters(); - if (!isset($filters[$fid])) { - return FALSE; + $result = db_query('SELECT * FROM {flexifilters} WHERE fid = %d', $fid); + if ($row = db_fetch_object($result)) { + return _flexifilter_filter_from_db_row($row, TRUE); } - return $filters[$fid]; + return FALSE; } function flexifilter_get_field($flexifilter, $field) { @@ -435,9 +492,10 @@ function flexifilter_save_filter($filter $label = $filter['label']; $description = $filter['description']; $advanced = $filter['advanced']; + $cache = isset($filter['cache']) ? $filter['cache'] : 1; if ($fid === 'new') { - db_query("INSERT INTO {flexifilters} (label, description, enabled, delta, pid_root, advanced) VALUES ('%s', '%s', 0, 0, 0, %d)", - $label, $description, $advanced); + db_query("INSERT INTO {flexifilters} (label, description, enabled, delta, pid_root, advanced, cache) VALUES ('%s', '%s', 0, 0, 0, %d, %d)", + $label, $description, $advanced, $cache); $fid = db_last_insert_id('flexifilters', 'fid'); $pids_to_reuse = array(); $pid_root = _flexifilter_save_filter_components($filter['components'], $fid, $pids_to_reuse); @@ -454,8 +512,8 @@ function flexifilter_save_filter($filter if (count($pids_to_reuse) > 0) { db_query('DELETE FROM {flexifilters_parts} WHERE pid = '. implode($pids_to_reuse, ' OR pid = '), $fid); } - db_query("UPDATE {flexifilters} SET label = '%s', description = '%s', pid_root = %d, advanced = %d WHERE fid = %d", - $label, $description, $pid_root, $advanced, $fid); + db_query("UPDATE {flexifilters} SET label = '%s', description = '%s', pid_root = %d, advanced = %d, cache = %d WHERE fid = %d", + $label, $description, $pid_root, $advanced, $cache, $fid); } $existing_filters = flexifilter_get_filters(FALSE, TRUE); if (isset($existing_filters[$fid]['enabled']) && isset($filter['enabled'])) { @@ -572,6 +630,7 @@ function _flexifilter_filter_from_db_row 'enabled' => ($row->enabled == 1), 'advanced' => ($row->advanced == 1), 'delta' => $row->delta, + 'cache' => $row->cache, ); $pid_root = $row->pid_root; @@ -690,16 +749,26 @@ function flexifilter_get_number_enabled_ * * @param $module - The name of the module whose flexifilters should be installed. * @param $flexifilters - Optional. An array of flexifilters to be installed. If passed in, $module is irrelevant. + * @return + * An array of fids of the filters saved. */ function flexifilter_install_flexifilters($module, $flexifilters = NULL) { if (is_null($flexifilters)) { + // Allow for magic file naming. + $file = drupal_get_path('module', $module) ."/$module.flexifilters.inc"; + if (file_exists($file)) { + require_once $file; + } $flexifilters = module_invoke($module, 'flexifilters'); } + $fids = array(); foreach ($flexifilters as $flexifilter) { $fid = flexifilter_save_filter($flexifilter); drupal_set_message(t('The !url flexifilter has been saved.', array('!url' => l($flexifilter['label'], "admin/build/flexifilters/$fid")))); watchdog('flexifilter', 'The !url flexifilter has been saved.', array('!url' => l($flexifilter['label'], "admin/build/flexifilters/$fid"))); + $fids[] = $fid; } + return $fids; } function flexifilter_get_unused_delta() { @@ -718,13 +787,4 @@ function flexifilter_get_unused_delta() } } return FALSE; -} - -/** - * Implementation of hook_enable. - */ -function flexifilter_enable() { - // We install flexifilter's flexifilters here so the tables, etc., will already have been set up. - // Other modules can put this in hook_install. - flexifilter_install_flexifilters('flexifilter'); } \ No hay ningún carácter de nueva línea al final del fichero